diff --git a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml index 3e298f0..fe6dee4 100644 --- a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml +++ b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml @@ -11,13 +11,11 @@ -
- + diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java index aef69ea..48ad5c1 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.PostConstruct; +import javax.faces.application.FacesMessage; import javax.faces.component.html.HtmlSelectOneMenu; import javax.faces.event.AjaxBehaviorEvent; import javax.faces.view.ViewScoped; @@ -38,10 +39,10 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { public void init() { this.userType = SessionUtils.getUserType(); this.userID = Integer.valueOf(SessionUtils.getUserId()); - + this.selected = null; this.patSelected = null; - + this.loadMedicalTests(); this.getPatients(); } @@ -71,11 +72,11 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { public void setSelected(MedicalTestTO selected) { this.selected = selected; } - + public PatientTO getPatSelected() { return this.patSelected; } - + public void setPatSelected(PatientTO s) { this.patSelected = s; } @@ -96,10 +97,11 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { } System.out.println(this.medicalTests); } - + public List getPatients() { if (userType == UserType.SPECIALIST_DOCTOR) { - // Cargar los pacientes a los que ha añadido pruebas médicas el médico especialista + // Cargar los pacientes a los que ha añadido pruebas médicas el médico + // especialista return getRemoteManagerMedicalTest().loadPatientsForSpecialistDoctor(userID); } else if (userType == UserType.FAMILY_DOCTOR) { // Cargar los pacientes del médico de familia que tiene pruebas médicas hechas @@ -109,26 +111,27 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { return new ArrayList(); } } - + public List getMedicalTests() { return this.medicalTests; } - + public void setMedicalTests(List list) { // Nothing to do } /*************************************************** METODOS PARA LA VISTA */ private Integer patIdSelected = -1; + public void setPatIdSelected(Integer value) { this.patIdSelected = value; this.addNewMode = false; } - + public Integer getPatIdSelected() { return this.patIdSelected; } - + public String getTitlePanel() { String res; if (userType == UserType.PATIENT) { @@ -146,11 +149,11 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { } return res; } - + public boolean isPatSelector() { return !(userType == UserType.PATIENT); } - + public void onSelectPatient(AjaxBehaviorEvent event) { this.selected = null; if (userType == UserType.SPECIALIST_DOCTOR) { @@ -161,17 +164,21 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { medicalTests = getRemoteManagerMedicalTest().loadMedicalTestForFamilyDoctor(userID, this.patIdSelected); } } - + public void onSelectMT(SelectEvent event) { this.selected = (MedicalTestTO) event.getObject(); this.addNewMode = false; } - + public void addMT() { - this.selected = new MedicalTestTO(); - this.selected.setId(-1); - this.selected.setObservations(""); - this.addNewMode = true; + if (this.patIdSelected != -1) { + this.selected = new MedicalTestTO(); + this.selected.setId(-1); + this.selected.setObservations(""); + this.addNewMode = true; + } else { + this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Atención!", "Debe elegir un paciente al que añadir la prueba médica."); + } } public boolean isAddNewMode() { @@ -181,14 +188,13 @@ public class MedicalTestMBean extends ManagedBeanBase implements Serializable { public void setAddNewMode(boolean addNewMode) { this.addNewMode = addNewMode; } - + public boolean getViewCreate() { return addNewMode; } - + public boolean getViewEdit() { return !addNewMode && this.selected != null; } - - + }