From 627ee49afaef84972819e6abfc71429e2a22d147 Mon Sep 17 00:00:00 2001
From: Alejandro Linares Amado <alinaresa@uoc.edu>
Date: Sat, 28 Dec 2019 20:58:51 +0100
Subject: [PATCH] =?UTF-8?q?A=C3=B1adidas=20llamadas=20a=20EJB=20y=20retoca?=
 =?UTF-8?q?da=20interfaz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml            | 2 +-
 1.sources/MyHealth/src/jpa/VisitJPA.java                      | 3 +--
 1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java   | 2 +-
 .../MyHealth/src/managedbean/visit/PatientVisitListMBean.java | 2 +-
 .../MyHealth/src/managedbean/visit/UpdateVisitMBean.java      | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml b/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml
index dcc8add..eb0a8bf 100644
--- a/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml
+++ b/1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml
@@ -62,7 +62,7 @@
 						<p:outputLabel for="observaciones" value="Observaciones:" />
 					</div>
 					<div class="ui-g-8">
-						<p:inputTextarea id="observaciones" value="#{UpdateVisit.observations}" readonly="true" />
+						<p:inputTextarea id="observaciones" value="#{UpdateVisit.observations}" readonly="#{UpdateVisit.onlyResult}" />
 					</div>
 					<div class="ui-g-2">
 						<p:message for="observaciones" display="text" />
diff --git a/1.sources/MyHealth/src/jpa/VisitJPA.java b/1.sources/MyHealth/src/jpa/VisitJPA.java
index 705d1bb..e788f48 100644
--- a/1.sources/MyHealth/src/jpa/VisitJPA.java
+++ b/1.sources/MyHealth/src/jpa/VisitJPA.java
@@ -49,8 +49,7 @@ public class VisitJPA implements Serializable {
 		super();
 	}
 
-	public VisitJPA(Integer id, Date date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
-		this.id = id;
+	public VisitJPA(Date date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
 		this.date = date;
 		this.time = time;
 		this.observations = observations;
diff --git a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
index 597cfe8..c833a1f 100644
--- a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
@@ -46,7 +46,7 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
 	}
 
 	public void saveData() {
-		// TODO: Añadir la nueva visita a la BBDD
+		this.getRemoteManagerVisit().addVisit(this.patient.getId(), this.date, this.time, this.observations);
 		this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Visita creada", "La nueva visita se ha registrado correctamente en el sistema.");
 	}
 
diff --git a/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java
index 0d414cf..ab15d6e 100644
--- a/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java
@@ -95,7 +95,7 @@ public class PatientVisitListMBean extends ManagedBeanBase implements Serializab
 	}
 
 	public void removeVisit(Integer visitId) throws IOException {
-		// TODO: Eliminar visita de la BBDD
+		this.getRemoteManagerVisit().removeVisit(visitId);
 		this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Visita eliminada", String.format("La visita con Id: %d se ha eliminado correctamente", visitId));
 	}
 
diff --git a/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java
index ebc6891..a10cdee 100644
--- a/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java
@@ -91,13 +91,13 @@ public class UpdateVisitMBean extends ManagedBeanBase implements Serializable {
 		case PATIENT:
 			// Administrador y paciente pueden actualizar la fecha y hora de la visita (excepto esl resultado)
 			// TODO: Implementar método en EJB
-			// this.getRemoteManagerVisit().updateVisit(this.id, this.date, this.time);
+			this.getRemoteManagerVisit().updateVisit(this.id, this.date, this.time);
 			this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Visita actualizada", "La fecha y hora de la visita se ha actualizado correctamente.");
 			break;
 		case FAMILY_DOCTOR:
 			// El médico de familia solo puede actualizar el resultado.
 			// TODO: implementar método EJB para actualizar el resultado.
-			// this.getRemoteManagerVisit().addResultToVisit(this.id, this.result);
+			this.getRemoteManagerVisit().addResultToVisit(this.id, this.result);
 			this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Resultado actualizado", "El resultado de la visita se ha actualizado correctamente.");
 			break;
 		case SPECIALIST_DOCTOR: