From 8aa0db0777c2fb0e95a05cde503a58ca127bb198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Tue, 31 Dec 2019 18:14:20 +0100
Subject: [PATCH] =?UTF-8?q?Comprobaci=C3=B3n=20de=20m=C3=A9dico=20de=20fam?=
 =?UTF-8?q?ilia=20asignado=20al=20crear=20una=20visita.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyHealth/docroot/visit/AddVisit.xhtml     | 10 ++++----
 .../src/managedbean/visit/AddVisitMBean.java  | 23 +++++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/1.sources/MyHealth/docroot/visit/AddVisit.xhtml b/1.sources/MyHealth/docroot/visit/AddVisit.xhtml
index fa31a04..59404cf 100644
--- a/1.sources/MyHealth/docroot/visit/AddVisit.xhtml
+++ b/1.sources/MyHealth/docroot/visit/AddVisit.xhtml
@@ -14,20 +14,20 @@
 					<div class="ui-g-2">
 						<p:outputLabel for="paciente" value="Paciente:" />
 					</div>
-					<div class="ui-g-8">
+					<div class="ui-g-6">
 						<p:inputText id="paciente" value="#{AddVisit.patient.displayName}" readonly="true" />
 					</div>
-					<div class="ui-g-2">
+					<div class="ui-g-4">
 						<p:message for="paciente" display="text" />
 					</div>
 
 					<div class="ui-g-2">
 						<p:outputLabel for="medico" value="Médico de familia:" />
 					</div>
-					<div class="ui-g-8">
-						<p:inputText id="medico" value="#{AddVisit.familyDoctor.displayName}" readonly="true" />
+					<div class="ui-g-6">
+						<p:inputText id="medico" value="#{AddVisit.familyDoctorDisplayName}" readonly="true" required="true" requiredMessage="Dese tener asignado un médico de familia. Por favor, cambie su médico de familia." />
 					</div>
-					<div class="ui-g-2">
+					<div class="ui-g-4">
 						<p:message for="medico" display="text" />
 					</div>
 
diff --git a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
index 69243e5..8abab17 100644
--- a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
@@ -28,7 +28,6 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
 	private String patientDisplayName;
 	private String familyDoctorDisplayName;
 	private PatientTO patient;
-	private FamilyDoctorTO familyDoctor;
 
 	public AddVisitMBean() {
 	}
@@ -40,7 +39,11 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
 			Integer patientId = Integer.valueOf(SessionUtils.getUserId());
 
 			this.patient = this.getRemoteManagerCommon().findPatientById(patientId);
-			this.familyDoctor = this.patient.getFamilyDoctor();
+			
+			if (this.patient.getFamilyDoctor() != null)
+				this.familyDoctorDisplayName = this.patient.getFamilyDoctor().getDisplayName();
+			else
+				this.familyDoctorDisplayName = null;
 
 			this.date = LocalDate.now();
 		} catch (Exception e) {
@@ -54,6 +57,10 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
 		int error = 0;
 		LocalDate today = LocalDate.now();
 
+		if (this.patient.getFamilyDoctor() == null) {
+			this.addFacesMessage("visitForm:medico", FacesMessage.SEVERITY_ERROR, "Médico de familia no asignado", "Es necesario que tenga un médico de familia asignado, por favor, cambie el médico de familia que tiene asignado");
+			error++;
+		}
 		if (this.date.isBefore(today)) {
 			this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", "La cita fijada es anterior al momento actual");
 			error++;
@@ -112,6 +119,10 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
 	public String getFamilyDoctorDisplayName() {
 		return familyDoctorDisplayName;
 	}
+	
+	public void setFamilyDoctorDisplayName(String value) {
+		this.familyDoctorDisplayName = value;
+	}
 
 	public PatientTO getPatient() {
 		return patient;
@@ -121,14 +132,6 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
 		this.patient = patient;
 	}
 
-	public FamilyDoctorTO getFamilyDoctor() {
-		return familyDoctor;
-	}
-
-	public void setFamilyDoctor(FamilyDoctorTO familyDoctor) {
-		this.familyDoctor = familyDoctor;
-	}
-
 	public Integer getId() {
 		return id;
 	}