From 524b3bb8c745cd302353c77037e03e08650c1b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Mon, 23 Dec 2019 16:24:10 +0100
Subject: [PATCH] =?UTF-8?q?Muestra=20el=20nombre=20del=20m=C3=A9dico=20log?=
 =?UTF-8?q?eado=20par=20el=20cual=20se=20est=C3=A1=20consultando=20la=20ag?=
 =?UTF-8?q?enda=20del=20d=C3=ADa.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.sources/MyHealth/docroot/visit/VisitList.xhtml | 16 ++++++++++------
 .../src/managedbean/visit/VisitListMBean.java    |  7 +++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/1.sources/MyHealth/docroot/visit/VisitList.xhtml b/1.sources/MyHealth/docroot/visit/VisitList.xhtml
index ce3a677..315ca15 100644
--- a/1.sources/MyHealth/docroot/visit/VisitList.xhtml
+++ b/1.sources/MyHealth/docroot/visit/VisitList.xhtml
@@ -8,21 +8,25 @@
 	<ui:define name="content">
 		<h:form id="frmVisitList">
 			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-			<p:panel id="PanelUnderConstruction" header="Pagina en construcción de Visitas">
+			<p:panel id="PanelUnderConstruction" header="Consultar agenda del día">
 				<div class="ui-g ui-fluid">
 
-					<div class="ui-g-3">
+					<div class="ui-g-2">
 						<p:outputLabel for="fecha" value="Ver agenda del día:" />
 					</div>
-					<div class="ui-g-3">
+					<div class="ui-g-2">
 						<div class="ui-inputgroup">
-							<p:calendar id="fecha" value="#{VisitList.selectedDate}" pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
-							<p:commandButton value="Mostrar" update="dtVisitList" action="#{VisitList.showData}" />
+							<p:calendar id="fecha" value="#{VisitList.selectedDate}" pattern="dd/MM/yyyy" showButtonPanel="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-7">
+					<div class="ui-g-3">
 						<p:message for="fecha" display="text" />
 					</div>
+					<div class="ui-g-5">
+						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"
 						paginatorAlwaysVisible="true" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
index ec252ba..7f1a8d1 100644
--- a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
@@ -23,6 +23,7 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private int familyDoctorId;
+	private String familyDoctorDisplayName;
 	private LazyDataModel<VisitTO> lazyDataModelVisitList;
 	private Date selectedDate;
 
@@ -33,6 +34,8 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
 	public void init() {
 		// El usuario actual es un medico de familia, recuperamos su Id de la sessión actual
 		this.familyDoctorId = Integer.valueOf(SessionUtils.getUserId());
+		this.familyDoctorDisplayName = SessionUtils.getUserDisplayName();
+		
 		this.selectedDate = new Date();
 
 		this.lazyDataModelVisitList = new LazyDataModel<VisitTO>() {
@@ -66,4 +69,8 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
 	public void setSelectedDate(Date selectedDate) {
 		this.selectedDate = selectedDate;
 	}
+
+	public String getFamilyDoctorDisplayName() {
+		return familyDoctorDisplayName;
+	}
 }