From a3a3a410c69329d2d4b18d512820011a55309e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Fri, 27 Dec 2019 19:07:12 +0100 Subject: [PATCH] Correcciones sobre interfaz. --- .../MyHealth/docroot/visit/AddVisit.xhtml | 19 +++++---------- .../MyHealth/docroot/visit/VisitView.xhtml | 4 ++-- .../src/managedbean/visit/AddVisitMBean.java | 23 +++++++++++-------- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/1.sources/MyHealth/docroot/visit/AddVisit.xhtml b/1.sources/MyHealth/docroot/visit/AddVisit.xhtml index 68420d2..9dace3a 100644 --- a/1.sources/MyHealth/docroot/visit/AddVisit.xhtml +++ b/1.sources/MyHealth/docroot/visit/AddVisit.xhtml @@ -3,7 +3,7 @@ - + @@ -36,7 +36,7 @@
-
@@ -48,7 +48,10 @@
- + + +
@@ -64,16 +67,6 @@
-
- -
-
- -
-
- -
-
diff --git a/1.sources/MyHealth/docroot/visit/VisitView.xhtml b/1.sources/MyHealth/docroot/visit/VisitView.xhtml index 2e2e2d3..22e4ca6 100644 --- a/1.sources/MyHealth/docroot/visit/VisitView.xhtml +++ b/1.sources/MyHealth/docroot/visit/VisitView.xhtml @@ -37,7 +37,7 @@
-
@@ -49,7 +49,7 @@
- diff --git a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java index 66fa1c3..597cfe8 100644 --- a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java @@ -1,11 +1,13 @@ package managedbean.visit; import java.io.Serializable; -import java.sql.Time; +import java.time.LocalTime; import java.util.Date; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; +import javax.faces.application.FacesMessage; +import javax.faces.view.ViewScoped; import javax.inject.Named; import TO.FamilyDoctorTO; @@ -14,21 +16,21 @@ import managedbean.common.ManagedBeanBase; import managedbean.common.SessionUtils; @Named("AddVisit") -@RequestScoped +@ViewScoped public class AddVisitMBean extends ManagedBeanBase implements Serializable { private static final long serialVersionUID = 1L; - + private Integer id; private Date date; - private Time time; + private LocalTime time; private String observations; private String result; private String patientDisplayName; private String familyDoctorDisplayName; private PatientTO patient; private FamilyDoctorTO familyDoctor; - + public AddVisitMBean() { } @@ -36,15 +38,16 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable { public void init() { // El usuario actual es un medico de familia, recuperamos su Id de la sessión actual Integer patientId = Integer.valueOf(SessionUtils.getUserId()); - + this.patient = this.getRemoteManagerCommon().findPatientById(patientId); this.familyDoctor = this.patient.getFamilyDoctor(); - + this.date = new Date(); } - + public void saveData() { // TODO: Añadir la nueva visita a la BBDD + this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Visita creada", "La nueva visita se ha registrado correctamente en el sistema."); } public Date getDate() { @@ -55,11 +58,11 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable { this.date = date; } - public Time getTime() { + public LocalTime getTime() { return time; } - public void setTime(Time time) { + public void setTime(LocalTime time) { this.time = time; }