From e8df59352fbc9583535552d570f099c645160268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Fri, 27 Dec 2019 00:46:24 +0100
Subject: [PATCH] =?UTF-8?q?Interfaz=20para=20filtro=20de=20fechas=20y=20bo?=
 =?UTF-8?q?t=C3=B3n=20adicional.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docroot/visit/PatientVisitList.xhtml      | 21 ++++++++++---------
 .../MyHealth/docroot/visit/VisitList.xhtml    | 19 ++++++++++-------
 .../MyHealth/docroot/visit/VisitView.xhtml    |  2 +-
 .../src/managedbean/visit/VisitListMBean.java |  5 +++++
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml b/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml
index f80a5cd..a84bdf8 100644
--- a/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml
+++ b/1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml
@@ -14,22 +14,23 @@
 					<div class="ui-g-2">
 						<p:outputLabel for="fecha" value="Ver agenda del día:" />
 					</div>
-					<div class="ui-g-2">
+					<div class="ui-g-3">
 						<div class="ui-inputgroup">
-							<p:calendar id="fecha" value="#{PatientVisitList.selectedDate}" pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
-							<p:commandButton value="Mostrar" update="frmPatientVisitList" action="#{PatientVisitList.showData}" icon="fa calendar-alt" />
+							<p:datePicker id="fecha" value="#{PatientVisitList.selectedDate}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
+								requiredMessage="Especifique una fecha para realizar la consulta." />
+						<p:commandButton value="Mostrar" update="frmPatientVisitList" action="#{PatientVisitList.showData}" icon="fa calendar-alt" />
 						</div>
 					</div>
-					<div class="ui-g-3">
-						<p:message for="fecha" display="text" />
-					</div>
+					<div class="ui-g-2" />					
 					<div class="ui-g-5">
-						Paciente: <h:outputText value="#{PatientVisitList.patient.displayName}" style="font-weight: bold;" />
+						Paciente:
+						<h:outputText value="#{PatientVisitList.patient.displayName}" style="font-weight: bold;" />
 					</div>
 
-					<p:dataTable id="dtPatientVisitList" widgetVar="dtPatientVisitList" var="v" value="#{PatientVisitList.lazyDataModelVisitList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom"
-						paginatorAlwaysVisible="true" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-						rowsPerPageTemplate="10,20,30,40" emptyMessage="No existen datos para los filtros seleccionados.">
+					<p:dataTable id="dtPatientVisitList" widgetVar="dtPatientVisitList" var="v" value="#{PatientVisitList.lazyDataModelVisitList}" lazy="true" paginator="true" rows="10"
+						paginatorPosition="bottom" paginatorAlwaysVisible="true"
+						paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,40"
+						emptyMessage="No existen datos para los filtros seleccionados.">
 
 						<p:column headerText="Fecha" width="90">
 							<h:outputText value="#{v.date}">
diff --git a/1.sources/MyHealth/docroot/visit/VisitList.xhtml b/1.sources/MyHealth/docroot/visit/VisitList.xhtml
index 0160ce5..21402dc 100644
--- a/1.sources/MyHealth/docroot/visit/VisitList.xhtml
+++ b/1.sources/MyHealth/docroot/visit/VisitList.xhtml
@@ -14,18 +14,17 @@
 					<div class="ui-g-2">
 						<p:outputLabel for="fecha" value="Ver agenda del día:" />
 					</div>
-					<div class="ui-g-2">
+					<div class="ui-g-3">
 						<div class="ui-inputgroup">
-							<p:calendar id="fecha" value="#{VisitList.selectedDate}" pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" required="true"
+							<p:datePicker id="fecha" value="#{VisitList.selectedDate}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
 								requiredMessage="Especifique una fecha para realizar la consulta." />
 							<p:commandButton value="Mostrar" update="frmVisitList" action="#{VisitList.showData}" icon="fa calendar-alt" />
 						</div>
 					</div>
-					<div class="ui-g-3">
-						<p:message for="fecha" display="text" />
-					</div>
+					<div class="ui-g-2" />
 					<div class="ui-g-5">
-						Médico de familia: <h:outputText value="#{VisitList.familyDoctorDisplayName}" style="font-weight: bold;" />
+						Médico de familia:
+						<h:outputText value="#{VisitList.familyDoctorDisplayName}" style="font-weight: bold;" />
 					</div>
 
 					<p:dataTable id="dtVisitList" widgetVar="dtVisitList" var="v" value="#{VisitList.lazyDataModelVisitList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom"
@@ -56,10 +55,14 @@
 							<h:outputText value="#{v.result}" />
 						</p:column>
 
-						<p:column headerText="Acción" width="80px;">
+						<p:column headerText="Ver" width="80px;">
 							<p:commandButton value="Ver" action="#{VisitList.showVisit(v.id)}" icon="pi pi-check" />
 						</p:column>
 
+						<p:column headerText="Editar" width="80px;">
+							<p:commandButton value="Editar" action="#{VisitList.editVisit(v.id)}" icon="pi pi-check" />
+						</p:column>
+						
 						<f:facet name="paginatorBottomLeft">
 							<p:commandButton update="dtVisitList" action="#{VisitList.showData}" icon="pi pi-refresh" />
 						</f:facet>
@@ -69,7 +72,7 @@
 						<div class="ui-g-4 ui-md-4" />
 						<div class="ui-g-2 ui-md-2 ">
 							<p:commandButton validateClient="true" value="Consultar" update="frmVisitList" action="#{VisitList.showData}" icon="pi pi-check" />
-							
+
 						</div>
 						<div class="ui-g-2 ui-md-2">
 							<p:button value="Volver" outcome="/home" icon="pi pi-home" />
diff --git a/1.sources/MyHealth/docroot/visit/VisitView.xhtml b/1.sources/MyHealth/docroot/visit/VisitView.xhtml
index b61af5d..0bfd34c 100644
--- a/1.sources/MyHealth/docroot/visit/VisitView.xhtml
+++ b/1.sources/MyHealth/docroot/visit/VisitView.xhtml
@@ -37,7 +37,7 @@
 					</div>
 					<div class="ui-g-2">
 						<div class="ui-inputgroup">
-							<p:datePicker id="fecha" value="#{VisitView.date}" pattern="dd/MM/yyyy" showIcon="true" readonly="true" showButtonBar="true" autocomplete="true" required="true"
+							<p:datePicker id="fecha" value="#{VisitView.date}" pattern="dd/MM/yyyy" showIcon="true" readonlyInput="true" showOn="none" readonly="true" showButtonBar="true" autocomplete="true" required="true"
 								requiredMessage="Especifique la fecha de la visita." />
 						</div>
 					</div>
diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
index ec1972a..16b3534 100644
--- a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
@@ -65,6 +65,11 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
 	    ctx.getExternalContext().redirect(String.format("VisitView.xhtml?id=%d&fromPage=%s", visitId, ctx.getViewRoot().getViewId()));
 	}
 
+	public void editVisit(Integer visitId) throws IOException {
+		FacesContext ctx = FacesContext.getCurrentInstance();
+	    ctx.getExternalContext().redirect(String.format("UpdateVisit.xhtml?id=%d&fromPage=%s", visitId, ctx.getViewRoot().getViewId()));
+	}
+
 	public Date getSelectedDate() {
 		return selectedDate;
 	}