From 4d22327267db674db4a2120597cc0d2c0ec3e353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Mon, 30 Dec 2019 13:26:27 +0100 Subject: [PATCH] =?UTF-8?q?Corregido=20error=20al=20refrescar=20lista=20tr?= =?UTF-8?q?as=20a=C3=B1adir=20una=20nueva=20prueba.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docroot/medicaltest/MedicalTests.xhtml | 8 +-- .../medicalTest/MedicalTestMBean.java | 67 +++++++++++++++---- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml index 4f61d2b..7574fc0 100644 --- a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml +++ b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml @@ -136,7 +136,7 @@
Fecha:
- @@ -144,7 +144,7 @@
Hora:
- @@ -152,12 +152,12 @@
Observaciones:
- +
Tipo de prueba:
- +
diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java index 71e7503..29471c1 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java @@ -1,6 +1,8 @@ package managedbean.medicalTest; import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalTime; import java.util.ArrayList; import java.util.Base64; import java.util.List; @@ -41,6 +43,10 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { private String lastUIQuery; private String lastUIQueryPatFilter; private List medicalTestTypes; + private LocalDate testDate; + private LocalTime testTime; + private String testObservations; + private MedicalTestType testType; public MedicalTestMBean() { } @@ -64,7 +70,7 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { case PATIENT: this.patientList = null; this.patientWithTestList = null; - break; + break; case SPECIALIST_DOCTOR: this.patientList = this.getRemoteManagerCommon().listPatientsPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); this.patientWithTestList = this.getRemoteManagerMedicalTest().loadPatientsForSpecialistDoctor(userID, null, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); @@ -73,7 +79,7 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { this.patientList = null; this.patientWithTestList = this.getRemoteManagerMedicalTest().loadPatientsForFamilyDoctor(userID, null, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); } - + this.loadMedicalTests(); } @@ -125,7 +131,7 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { Integer patId = null; if (this.patientFilterSelected != null) patId = this.patientFilterSelected.getId(); - + switch (userType) { case PATIENT: // Cargar las pruebas para el paciente en sesión @@ -181,7 +187,7 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { public List getPatientList() { return patientList; } - + public List getPatientWithTestList() { return patientWithTestList; } @@ -203,16 +209,17 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { } public void clearFilteredPatient() { + this.addNewMode = false; this.selected = null; this.patientFilterSelected = null; this.loadMedicalTests(); } - + public void onChangePatient(AjaxBehaviorEvent event) { this.selected = null; this.loadMedicalTests(); } - + public void onSelectPatient(SelectEvent event) { this.selected = null; this.loadMedicalTests(); @@ -226,10 +233,10 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { public void addMT() { // Si hay un paciente filtrado en la busqueda de pruebas, lo seleccionamos para la prueba a añadir. this.patSelected = this.patientFilterSelected; - this.selected = new MedicalTestTO(); - this.selected.setId(-1); - this.selected.setObservations(""); - this.selected.setType(MedicalTestType.BLOOD_TEST); + this.testDate = LocalDate.now(); + this.testTime = LocalTime.now(); + this.testObservations = ""; + this.testType = MedicalTestType.BLOOD_TEST; this.addNewMode = true; } @@ -256,14 +263,14 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { public void save() { try { - MedicalTestTO mt = this.getRemoteManagerMedicalTest().addMedicalTest(this.patSelected.getId(), this.userID, this.selected.getDate(), this.selected.getTime(), - this.selected.getType(), this.selected.getObservations()); + MedicalTestTO mt = this.getRemoteManagerMedicalTest().addMedicalTest(this.patSelected.getId(), this.userID, this.testDate, this.testTime, this.testType, + this.testObservations); this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Éxito", String.format("La prueba médica se ha guardado correctamente, el identificador asignado es: %d", mt.getId())); - + // Volvemos al modo añadir (limpiamos el formulario). this.addMT(); - + this.loadMedicalTests(); } catch (Exception ex) { this.manageException(ex); @@ -278,4 +285,36 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { this.patientFilterSelected = patientFilterSelected; } + public LocalDate getTestDate() { + return testDate; + } + + public void setTestDate(LocalDate testDate) { + this.testDate = testDate; + } + + public LocalTime getTestTime() { + return testTime; + } + + public void setTestTime(LocalTime testTime) { + this.testTime = testTime; + } + + public String getTestObservations() { + return testObservations; + } + + public void setTestObservations(String testObservations) { + this.testObservations = testObservations; + } + + public MedicalTestType getTestType() { + return testType; + } + + public void setTestType(MedicalTestType testType) { + this.testType = testType; + } + }