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 @@
- +
- - - - - + - + @@ -56,14 +53,14 @@ - +
- +
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 load(int first, int pageSize, String sortField, SortOrder sortOrder, Map filters) { - Long totalRowCount = getRemoteManagerMedicalTest().getPendingQuestionsCount(familyDoctorId); + Long totalRowCount = getRemoteManagerVisit().getScheduledVisitsCount(familyDoctorId, selectedDate); this.setRowCount(totalRowCount.intValue()); return getRemoteManagerVisit().listAllScheduledVisitsPaged(familyDoctorId, selectedDate, (first / pageSize), pageSize);