From 893431851b08131e9c0ca439b9a4da6f44d71ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Mon, 30 Dec 2019 17:55:35 +0100
Subject: [PATCH] =?UTF-8?q?Corregido=20error=20en=20la=20lista=20de=20paci?=
 =?UTF-8?q?entes=20con=20pruebas=20m=C3=A9dicas=20(Se=20mostraban=20pacien?=
 =?UTF-8?q?tes=20sin=20prueba=20m=C3=A9dica).=20Arreglos=20menores=20en=20?=
 =?UTF-8?q?la=20interfaz.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docroot/medicaltest/MedicalTests.xhtml    | 33 +++++++++++++------
 .../docroot/profile/RegisterUser.xhtml        |  2 +-
 .../medicalTest/MedicalTestFacadeBean.java    |  4 +--
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml
index 4ca889b..f287fa9 100644
--- a/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml
+++ b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml
@@ -116,8 +116,8 @@
 
 					<p:panel rendered="#{mt.viewCreate}" id="createPanel" header="Añadir una nueva prueba médica">
 						<div class="ui-g ui-fluid">
-							<div class="ui-g-3">Paciente:</div>
-							<div class="ui-g-9">
+							<div class="ui-g-2">Paciente:</div>
+							<div class="ui-g-10">
 								<p:autoComplete id="addTestPatient" dropdown="true" value="#{mt.patSelected}" completeMethod="#{mt.completePatient}" var="p" itemLabel="#{p.displayName}" itemValue="#{p}"
 									forceSelection="true" placeholder="Seleccione un paciente o teclee para buscar..." required="true"
 									requiredMessage="Por favor, seleccione un paciente al cual aádir la prueba.">
@@ -134,33 +134,46 @@
 								</p:autoComplete>
 							</div>
 
-							<div class="ui-g-3">Fecha:</div>
-							<div class="ui-g-9">
+							<div class="ui-g-2">Fecha:</div>
+							<div class="ui-g-3">
 								<p:datePicker id="fecha" value="#{mt.testDate}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
 									requiredMessage="Especifique la fecha de la prueba médica">
 									<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" timeStyle="short" />
 								</p:datePicker>
 							</div>
+							<div class="ui-g-1" />
+							<div class="ui-g-6">
+								<p:message for="fecha" />
+							</div>
 
-							<div class="ui-g-3">Hora:</div>
-							<div class="ui-g-9">
+							<div class="ui-g-2">Hora:</div>
+							<div class="ui-g-3">
 								<p:datePicker id="hora" value="#{mt.testTime}" timeOnly="true" pattern="HH:mm" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
 									requiredMessage="Especifique la hora de la prueba médica">
 									<f:convertDateTime type="localTime" pattern="HH:mm" />
 								</p:datePicker>
 							</div>
+							<div class="ui-g-1" />
+							<div class="ui-g-6">
+								<p:message for="hora" />
+							</div>
 
-							<div class="ui-g-3">Observaciones:</div>
-							<div class="ui-g-9">
+							<div class="ui-g-2">Observaciones:</div>
+							<div class="ui-g-10">
 								<p:textEditor value="#{mt.testObservations}" required="true" requiredMessage="Debe indicar las observaciones de la prueba" />
 							</div>
 
-							<div class="ui-g-3">Tipo de prueba:</div>
-							<div class="ui-g-9">
+							<div class="ui-g-2">Tipo de prueba:</div>
+							<div class="ui-g-5">
 								<p:selectOneMenu id="selUsertype" value="#{mt.testType}" required="true" unselectable="false" requiredMessage="Debe especificar un tipo de prueba médica">
 									<f:selectItems value="#{mt.medicalTestTypes}" var="item" itemLabel="#{item.testTypeName}" />
 								</p:selectOneMenu>
 							</div>
+							<div class="ui-g-1" />
+							<div class="ui-g-4">
+								<p:message for="selUsertype" />
+							</div>
+
 							<div class="ui-g-4 ui-md-5" />
 							<div class="ui-g-4 ui-md-2">
 								<p:commandButton value="Guardar" action="#{mt.save}" icon="pi pi-save" update="frmMT,frmImage,frmNEW" />
diff --git a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
index a65f328..81f8f9f 100644
--- a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
+++ b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
@@ -35,7 +35,7 @@
 							<div class="ui-g-6">
 								<p:button value="Ir a la página principal" outcome="/home" icon="pi pi-home" />
 							</div>
-							<div class="ui-g-3"></div>
+							<div class="ui-g-3" />
 						</div>
 
 					</p:panel>
diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
index ca972e3..23fbd40 100644
--- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
@@ -345,7 +345,7 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
 			searchTerm = Utils.normalizeTerm(searchTerm);
 
 		if (searchTerm.length() > 0) {
-			strFilter = "and lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm";
+			strFilter = "and (lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm)";
 		}
 
 		TypedQuery<PatientJPA> query = entman.createQuery(String.format(strQuery, strFilter), PatientJPA.class);
@@ -380,7 +380,7 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
 			searchTerm = Utils.normalizeTerm(searchTerm);
 
 		if (searchTerm.length() > 0) {
-			strFilter = "and lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm";
+			strFilter = "and (lower(q.patient.name) LIKE :searchTerm OR lower(q.patient.surname) LIKE :searchTerm)";
 		}
 
 		TypedQuery<PatientJPA> query = entman.createQuery(String.format(strQuery, strFilter), PatientJPA.class);