Esqueleto para consultar las visitas de un día.

1.sources/MyHealth/docroot/visit/VisitView.xhtml

@@ -11,35 +11,44 @@
 			<p:panel id="PanelUnderConstruction" header="Pagina en construcción de Visitas">
 				<div class="ui-g ui-fluid">
 
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-3">
-						<p:outputLabel for="campo" value="Etiqueta para campo de formulario:" />
+						<p:outputLabel for="campo" value="Ver agenda del día:" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-3">
-						<p:inputText id="campo" value="Valor del campo del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+						<div class="ui-inputgroup">
+							<p:calendar id="campo" value="" pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
+							<p:commandButton value="Fecha" />
+						</div>
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-7">
 						<p:message for="campo" display="text" />
 					</div>
 
-					<div class="ui-g-4 ui-md-4">
+					<p:dataTable widgetVar="dtPendingQuestions" var="qs" value="#{PendingQuestions.lazyDataModelQuestionList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom" paginatorAlwaysVisible="true"
-						<p:outputLabel for="campo2" value="Etiqueta para campo 2 de formulario:" />
+						paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,40">
-					</div>
+						<p:column headerText="Id" width="60px;">
-					<div class="ui-g-4 ui-md-4">
+							<h:outputText value="#{qs.id}" />
-						<p:inputText id="campo2" value="Valor del campo 2 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+						</p:column>
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:message for="campo" display="text" />
-					</div>
 
-					<div class="ui-g-4 ui-md-4">
+						<p:column headerText="Title" width="auto">
-						<p:outputLabel for="campo3" value="Etiqueta para campo 3 de formulario:" />
+							<h:outputText value="#{qs.title}"/>
-					</div>
+						</p:column>
-					<div class="ui-g-4 ui-md-4">
+
-						<p:inputText id="campo3" value="Valor del campo 3 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+						<p:column headerText="Patient" width="auto">
-					</div>
+							<h:outputText value="#{qs.patient.displayName}" />
-					<div class="ui-g-4 ui-md-4">
+						</p:column>
-						<p:message for="campo" display="text" />
+
-					</div>
+						<p:column headerText="Status" width="90px;">
+							<h:outputText value="#{qs.status}" />
+						</p:column>
+						<p:column headerText="Acción" width="80px;">
+							<h:outputText value="Responder" />
+						</p:column>
+
+						<f:facet name="paginatorBottomLeft">
+							<p:commandButton type="button" icon="pi pi-refresh" onclick="PF('dtPendingQuestions').getPaginator().setPage(0);" />
+						</f:facet>
+					</p:dataTable>
 
 					<div class="ui-g-12 ui-g-nopad">
 						<div class="ui-g-4 ui-md-4" />

1.sources/MyHealth/src/TO/VisitTO.java

@@ -7,20 +7,15 @@ import java.util.Date;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * Transfer object (TO) MedicalSpecialtyTO Para el intercambio de datos entre la
+ * Transfer object (TO) MedicalSpecialtyTO Para el intercambio de datos entre la capa de interfaz y la capa de negocio
- * capa de interfaz y la capa de negocio
  * 
- * Además esta clase facilita la implementación futura de una Capa SOA (Se
+ * Además esta clase facilita la implementación futura de una Capa SOA (Se define la anotación para la serialización de esta clase: @XmlRootElement(name = "medicalspeciality")
- * define la anotación para la serialización de esta clase: @XmlRootElement(name
- * = "medicalspeciality")
  * 
  * @author mark
  *
  */
 @XmlRootElement(name = "Visit")
 public class VisitTO implements Serializable {
-	
-
 
 	private static final long serialVersionUID = 1L;
 	private Integer id;
@@ -34,42 +29,71 @@ public class VisitTO implements Serializable {
 	public VisitTO() {
 		super();
 	}
-	public VisitTO(Integer id, Date date, Time time, String observation, String result) {
+
-		this.setId(id);
+	public VisitTO(Integer Id, Date date, Time time, String observations, String result, FamilyDoctorTO fd, PatientTO pat) {
-		this.date=date;
+		this.id = Id;
-		//this.time
+		this.date = date;
+		this.time = time;
+		this.observations = observations;
+		this.result = result;
+		this.familyDoctor = fd;
+		this.patient = pat;
 	}
+
 	public Integer getId() {
 		return this.id;
 	}
-	
+
 	public void setId(Integer id) {
-		this.id=id;
+		this.id = id;
 	}
-	
+
 	public Date getDate() {
 		return this.date;
 	}
-	
+
 	public void setDate(Date date) {
-		this.date=date;
+		this.date = date;
 	}
-	
+
 	public Time getTime() {
 		return this.time;
 	}
-	
+
 	public void setTime(Time time) {
-		this.time=time;
+		this.time = time;
 	}
-	
+
 	public String getObservations() {
 		return this.observations;
 	}
-	
+
 	public void setObservations(String observations) {
-		this.observations=observations;
+		this.observations = observations;
+	}
+
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String result) {
+		this.result = result;
+	}
+
+	public FamilyDoctorTO getFamilyDoctor() {
+		return familyDoctor;
+	}
+
+	public void setFamilyDoctor(FamilyDoctorTO familyDoctor) {
+		this.familyDoctor = familyDoctor;
+	}
+
+	public PatientTO getPatient() {
+		return patient;
+	}
+
+	public void setPatient(PatientTO patient) {
+		this.patient = patient;
 	}
 
- 	
 }

1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java

@@ -14,6 +14,7 @@ import TO.PatientTO;
 import TO.PrimaryHealthCareCenterTO;
 import TO.QuestionTO;
 import TO.SpecialistDoctorTO;
+import TO.VisitTO;
 import common.Utils;
 import jpa.FamilyDoctorJPA;
 import jpa.MedicalSpecialtyJPA;
@@ -21,6 +22,7 @@ import jpa.PatientJPA;
 import jpa.PrimaryHealthCareCenterJPA;
 import jpa.QuestionJPA;
 import jpa.SpecialistDoctorJPA;
+import jpa.VisitJPA;
 
 /***
  * 
@@ -479,4 +481,22 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return qsTO;
 	}
 
+	public VisitTO getPOJOforVisitJPA(VisitJPA qs, int nestedProps) {
+		VisitTO qsTO = null;
+
+		if (qs != null) {
+			FamilyDoctorJPA fd = null;
+			PatientJPA pat = null;
+			if (nestedProps > 0) {
+				fd = qs.getFamilyDoctor();
+				pat = qs.getPatient();
+			}
+
+			nestedProps--;
+			qsTO = new VisitTO(qs.getId(), qs.getDate(), qs.getTime(), qs.getObservations(), qs.getResult(), this.getPOJOforFamilyDoctorJPA(fd, nestedProps),
+					this.getPOJOforPatientJPA(pat, nestedProps));
+		}
+
+		return qsTO;
+	}
 }

1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java

@@ -10,12 +10,14 @@ import TO.PatientTO;
 import TO.PrimaryHealthCareCenterTO;
 import TO.QuestionTO;
 import TO.SpecialistDoctorTO;
+import TO.VisitTO;
 import jpa.FamilyDoctorJPA;
 import jpa.MedicalSpecialtyJPA;
 import jpa.PatientJPA;
 import jpa.PrimaryHealthCareCenterJPA;
 import jpa.QuestionJPA;
 import jpa.SpecialistDoctorJPA;
+import jpa.VisitJPA;
 
 /**
  * 
@@ -52,13 +54,13 @@ public interface CommonFacadeLocal {
 	public FamilyDoctorTO findFamilyDoctorById(int ProfessionalNumberId);
 
 	public FamilyDoctorTO findFamilyDoctorByCode(String code);
-	
+
 	public FamilyDoctorTO findFamilyDoctorByNif(String searchValue);
 
 	public SpecialistDoctorTO findSpecialistDoctorById(int ProfessionalNumberId);
 
 	public SpecialistDoctorTO findSpecialistDoctorByCode(String code);
-	
+
 	public SpecialistDoctorTO findSpecialistDoctorByNif(String searchValue);
 
 	public MedicalSpecialtyTO getPOJOforMedicalSpecialtyJPA(MedicalSpecialtyJPA ms);
@@ -72,4 +74,6 @@ public interface CommonFacadeLocal {
 	public PatientTO getPOJOforPatientJPA(PatientJPA pat, int nestedProps);
 
 	public QuestionTO getPOJOforQuestionJPA(QuestionJPA qs, int nestedProps);
+
+	public VisitTO getPOJOforVisitJPA(VisitJPA qs, int nestedProps);
 }

1.sources/MyHealth/src/ejb/visit/VisitFacadeBean.java

@@ -1,28 +1,63 @@
 package ejb.visit;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
 
+import TO.VisitTO;
+import common.QuestionStatus;
+import ejb.common.CommonFacadeLocal;
+import jpa.QuestionJPA;
+import jpa.VisitJPA;
 
 /**
- * EJB Session Bean Class para la Practica 2, Ejercicio 1 (ISCSD) Implementa los
+ * EJB Session Bean Class para la Practica 2, Ejercicio 1 (ISCSD) Implementa los métodos de la capa de negocio que implementan la logica de negocio y la interacción con la capa de
- * métodos de la capa de negocio que implementan la logica de negocio y la
+ * persistencia.
- * interacción con la capa de persistencia.
  * 
  * @author mark
  *
  */
 @Stateless
 public class VisitFacadeBean implements VisitFacadeRemote {
-
 	// Persistence Unit Context
 	@PersistenceContext(unitName = "MyHealth")
-	private EntityManager entman;
+	EntityManager entman;
 
-	public void ejbMethod(String parameter)
+	@EJB
-	{
+	CommonFacadeLocal commonServices;
-		
+
+	public Long getScheduledVisitsCount(int familyDoctorId, Date date) {
+		TypedQuery<Long> query = entman.createQuery("SELECT count(1) from VisitJPA v where v.date=:date and v.familyDoctor.id=:docId", Long.class);
+		query.setParameter("date", date);
+		query.setParameter("docId", familyDoctorId);
+
+		return query.getSingleResult();
+	}
+	
+	public List<VisitTO> listAllScheduledVisitsPaged(int familyDoctorId, Date date, int pageNumber, int pageSize) {
+		TypedQuery<VisitJPA> query = entman.createQuery("SELECT v from VisitJPA v where v.date=:date and v.familyDoctor.id=:docId order by v.date, v.time", VisitJPA.class);
+		query.setParameter("date", date);
+		query.setParameter("docId", familyDoctorId);
+
+		if (pageSize > 0) {
+			query.setFirstResult(pageNumber * pageSize);
+			query.setMaxResults(pageSize);
+		}
+
+		List<VisitJPA> allJPA = query.getResultList();
+		List<VisitTO> listTO = new ArrayList<VisitTO>();
+
+		for (VisitJPA item : allJPA) {
+			listTO.add(commonServices.getPOJOforVisitJPA(item, 1));
+		}
+
+		return listTO;
 	}
 
 }

1.sources/MyHealth/src/ejb/visit/VisitFacadeRemote.java

@@ -1,10 +1,14 @@
 package ejb.visit;
 
+import java.util.Date;
+import java.util.List;
+
 import javax.ejb.Remote;
 
+import TO.VisitTO;
+
 /**
- * Interfaz remota del EJB Definimos los métodos que estarán disponibles para
+ * Interfaz remota del EJB Definimos los métodos que estarán disponibles para los clientes del EJB
- * los clientes del EJB
  * 
  * @author mark
  *
@@ -14,5 +18,8 @@ public interface VisitFacadeRemote {
 	/**
 	 * Definimos la interfaz remota
 	 */
-	public void ejbMethod(String parameter);
+
+	public Long getScheduledVisitsCount(int familyDoctorId, Date date);
+
+	public List<VisitTO> listAllScheduledVisitsPaged(int familyDoctorId, Date date, int pageNumber, int pageSize);
 }

1.sources/MyHealth/src/jpa/VisitJPA.java

@@ -32,9 +32,11 @@ public class VisitJPA implements Serializable {
 	private Time time;
 	private String observations;
 	private String result;
+	
 	@ManyToOne
 	@JoinColumn(name = "FamilyDoctorId")
 	private FamilyDoctorJPA familyDoctor;
+	
 	@ManyToOne
 	@JoinColumn(name = "PatientId")
 	private PatientJPA patient;
@@ -46,16 +48,16 @@ public class VisitJPA implements Serializable {
 		super();
 	}
 
-	public VisitJPA(Integer id, Date date, Time time, String observations, String result) {
+	public VisitJPA(Integer id, Date date, Time time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
 		this.id = id;
 		this.date = date;
 		this.time = time;
 		this.observations = observations;
 		this.result = result;
+		this.patient = patient;
+		this.familyDoctor = familydoctor;
 	}
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	public Integer getId() {
 		return id;
 	}
@@ -84,8 +86,8 @@ public class VisitJPA implements Serializable {
 		return observations;
 	}
 
-	public void setObservations(String observation) {
+	public void setObservations(String value) {
-		this.observations = observations;
+		this.observations = value;
 	}
 
 	/**
@@ -106,4 +108,12 @@ public class VisitJPA implements Serializable {
 	public void setPatient(PatientJPA pat) {
 		this.patient = pat;
 	}
+
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String value) {
+		this.result = value;
+	}
 }

1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java

@@ -117,7 +117,7 @@ public class AuthorizationFilter implements Filter {
 						authorized = true;
 					if (reqURI.indexOf("/visit/VisitAddResult") > 0)
 						authorized = true;
-					if (reqURI.indexOf("/visit/VisitViewSchedules") > 0)
+					if (reqURI.indexOf("/visit/VisitList") > 0)
 						authorized = true;
 					if (reqURI.indexOf("/medicaltest/MedicalTests") > 0)
 						authorized = true;

1.sources/MyHealth/src/managedbean/common/MenuMBean.java

@@ -64,7 +64,7 @@ public class MenuMBean implements Serializable {
 				if (tipoUsuario == UserType.FAMILY_DOCTOR)
 					subMenu.addElement(createMenuItem("Añadir resultado", "fa fa-align-left", "/visit/VisitView", null));
 				if (tipoUsuario == UserType.FAMILY_DOCTOR)
-					subMenu.addElement(createMenuItem("Ver agenda del día", "fa fa-repeat", "/visit/VisitView", null));
+					subMenu.addElement(createMenuItem("Ver agenda del día", "fa fa-repeat", "/visit/VisitList", null));
 
 				model.addElement(subMenu);
 			}