From 7cf4a93c2cebc01bcd1afce82edb7969786177ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Mon, 23 Dec 2019 14:46:00 +0100
Subject: [PATCH] =?UTF-8?q?Correcci=C3=B3n=20de=20error=20en=20paginaci?=
 =?UTF-8?q?=C3=B3n=20la=20refrescar=20datos.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/1.sources/MyHealth/docroot/visit/VisitList.xhtml b/1.sources/MyHealth/docroot/visit/VisitList.xhtml
index f84b588..77777ec 100644
--- a/1.sources/MyHealth/docroot/visit/VisitList.xhtml
+++ b/1.sources/MyHealth/docroot/visit/VisitList.xhtml
@@ -17,25 +17,22 @@
 					<div class="ui-g-3">
 						<div class="ui-inputgroup">
 							<p:calendar id="fecha" value="#{VisitList.selectedDate}" pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
-							<p:commandButton value="Consultar" onclick="dtVisitList.getPaginator().setPage(0);"/>
+							<p:commandButton value="Mostrar" update="dtVisitList" action="#{VisitList.showData}"/>
 						</div>
 					</div>
 					<div class="ui-g-7">
 						<p:message for="fecha" display="text" />
 					</div>
 
-					<p:dataTable widgetVar="dtVisitList" var="v" value="#{VisitList.lazyDataModelVisitList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom"
+					<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}"
 						rowsPerPageTemplate="10,20,30,40">
-						<p:column headerText="Id" width="60px;">
-							<h:outputText value="#{v.id}" />
-						</p:column>
 
-						<p:column headerText="Fecha" width="auto">
+						<p:column headerText="Fecha" width="90px;">
 							<h:outputText value="#{v.date}" />
 						</p:column>
 
-						<p:column headerText="Hora" width="auto">
+						<p:column headerText="Hora" width="90px;">
 							<h:outputText value="#{v.time}" />
 						</p:column>
 
@@ -56,14 +53,14 @@
 						</p:column>
 
 						<f:facet name="paginatorBottomLeft">
-							<p:commandButton type="button" action="#{VisitList.showData}" icon="pi pi-refresh" onclick="PF('dtVisitList').getPaginator().setPage(0);" />
+							<p:commandButton update="dtVisitList" action="#{VisitList.showData}" icon="pi pi-refresh" />
 						</f:facet>
 					</p:dataTable>
 
 					<div class="ui-g-12 ui-g-nopad">
 						<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.consultar}" icon="pi pi-check" />
+							<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/src/managedbean/visit/VisitListMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
index 11fd906..cfca0b3 100644
--- a/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
+import javax.faces.view.ViewScoped;
 import javax.inject.Named;
 
 import org.primefaces.model.LazyDataModel;
@@ -17,7 +17,7 @@ import managedbean.common.ManagedBeanBase;
 import managedbean.common.SessionUtils;
 
 @Named("VisitList")
-@RequestScoped
+@ViewScoped
 public class VisitListMBean extends ManagedBeanBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -40,7 +40,7 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
 
 			@Override
 			public List<VisitTO> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
-				Long totalRowCount = getRemoteManagerMedicalTest().getPendingQuestionsCount(familyDoctorId);
+				Long totalRowCount = getRemoteManagerVisit().getScheduledVisitsCount(familyDoctorId, selectedDate);
 				this.setRowCount(totalRowCount.intValue());
 
 				return getRemoteManagerVisit().listAllScheduledVisitsPaged(familyDoctorId, selectedDate, (first / pageSize), pageSize);