diff --git a/1.sources/MyHealth/docroot/visit/AddVisit.xhtml b/1.sources/MyHealth/docroot/visit/AddVisit.xhtml index 5adc38a..68420d2 100644 --- a/1.sources/MyHealth/docroot/visit/AddVisit.xhtml +++ b/1.sources/MyHealth/docroot/visit/AddVisit.xhtml @@ -7,7 +7,7 @@ - +
diff --git a/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml b/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml index 064c4fe..f80a5cd 100644 --- a/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml +++ b/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml @@ -7,7 +7,7 @@ - +
diff --git a/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml b/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml index 5924cab..3acdabf 100644 --- a/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml +++ b/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml @@ -8,7 +8,7 @@ - +
@@ -53,7 +53,7 @@ requiredMessage="Especifique la hora de la visita." readonly="#{UpdateVisit.onlyResult}" /> - +
diff --git a/1.sources/MyHealth/docroot/visit/VisitList.xhtml b/1.sources/MyHealth/docroot/visit/VisitList.xhtml index aff554d..0160ce5 100644 --- a/1.sources/MyHealth/docroot/visit/VisitList.xhtml +++ b/1.sources/MyHealth/docroot/visit/VisitList.xhtml @@ -7,7 +7,7 @@ - +
@@ -69,6 +69,7 @@
+
diff --git a/1.sources/MyHealth/docroot/visit/VisitView.xhtml b/1.sources/MyHealth/docroot/visit/VisitView.xhtml index 92b8526..b61af5d 100644 --- a/1.sources/MyHealth/docroot/visit/VisitView.xhtml +++ b/1.sources/MyHealth/docroot/visit/VisitView.xhtml @@ -3,12 +3,12 @@ - + - +
@@ -37,7 +37,7 @@
-
@@ -49,7 +49,8 @@
- +
@@ -59,7 +60,7 @@
- +
@@ -69,7 +70,7 @@
- +
@@ -78,10 +79,10 @@
- +
- +
diff --git a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java index de491d4..909db0b 100644 --- a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java +++ b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java @@ -184,8 +184,10 @@ public class AuthorizationFilter implements Filter { SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR, "Error al intentar acceder a la base de datos", Utils.getExceptionRootCause(e).getLocalizedMessage()); resp.sendRedirect(req.getContextPath() + "/error.xhtml?type=sql"); - } else + } else { + SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR, "Error interno del servidor", Utils.getExceptionRootCause(e).getLocalizedMessage()); resp.sendRedirect(req.getContextPath() + "/error.xhtml"); + } } } diff --git a/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java index 26d3144..fe4c01f 100644 --- a/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java @@ -77,7 +77,8 @@ public class PatientVisitListMBean extends ManagedBeanBase implements Serializab } public void editVisit(Integer visitId) throws IOException { - FacesContext.getCurrentInstance().getExternalContext().redirect("VisitView.xhtml?id=" + visitId.toString()); + FacesContext ctx = FacesContext.getCurrentInstance(); + ctx.getExternalContext().redirect(String.format("UpdateVisit.xhtml?id=%d&fromPage=%s", visitId, ctx.getViewRoot().getViewId())); } public LazyDataModel getLazyDataModelVisitList() { diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java index fb0cc13..ec1972a 100644 --- a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java @@ -61,7 +61,8 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable { } public void showVisit(Integer visitId) throws IOException { - FacesContext.getCurrentInstance().getExternalContext().redirect("VisitView.xhtml?id=" + visitId.toString()); + FacesContext ctx = FacesContext.getCurrentInstance(); + ctx.getExternalContext().redirect(String.format("VisitView.xhtml?id=%d&fromPage=%s", visitId, ctx.getViewRoot().getViewId())); } public Date getSelectedDate() { diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java index 496a89d..c1c0a94 100644 --- a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java @@ -1,5 +1,6 @@ package managedbean.visit; +import java.io.IOException; import java.io.Serializable; import java.sql.Time; import java.util.Date; @@ -9,6 +10,7 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; +import javax.faces.view.ViewScoped; import javax.inject.Named; import TO.FamilyDoctorTO; @@ -17,7 +19,7 @@ import TO.VisitTO; import managedbean.common.ManagedBeanBase; @Named("VisitView") -@RequestScoped +@ViewScoped public class VisitMBean extends ManagedBeanBase implements Serializable { private static final long serialVersionUID = 1L; @@ -29,6 +31,7 @@ public class VisitMBean extends ManagedBeanBase implements Serializable { private String result; private PatientTO patient; private FamilyDoctorTO familyDoctor; + private String fromPage; public VisitMBean() { } @@ -43,15 +46,18 @@ public class VisitMBean extends ManagedBeanBase implements Serializable { VisitTO vi = null; try { - // Parámetro con el "name" de la especialidad a editar. - int id = Integer.valueOf(requestParams.get("id").toString()); + this.fromPage = requestParams.get("fromPage"); - vi = this.getRemoteManagerVisit().getVisit(id); + // Parámetro con el "id" de la visita. + int parId = Integer.valueOf(requestParams.get("id")); + + vi = this.getRemoteManagerVisit().getVisit(parId); } catch (Exception e) { this.manageException(e); } if (vi != null) { + this.id = vi.getId(); this.date = vi.getDate(); this.time = vi.getTime(); this.observations = vi.getObservations(); @@ -63,8 +69,9 @@ public class VisitMBean extends ManagedBeanBase implements Serializable { } } - public void saveData() { - + public void editVisit(Integer visitId) throws IOException { + FacesContext ctx = FacesContext.getCurrentInstance(); + ctx.getExternalContext().redirect(String.format("UpdateVisit.xhtml?id=%d&fromPage=%s", visitId, this.fromPage)); } public Date getDate() { @@ -123,4 +130,12 @@ public class VisitMBean extends ManagedBeanBase implements Serializable { this.id = id; } + public String getFromPage() { + return fromPage; + } + + public void setFromPage(String fromPage) { + this.fromPage = fromPage; + } + }