droideparanoico/myhealth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cambiado tipo de datos Date a LocalDate para componente visit.

Browse Source
This commit is contained in:
Marcos Garcia Nuñez
2019-12-30 12:41:35 +01:00
parent e9f103123d
commit e07ed75132
14 changed files with 124 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
1.sources/MyHealth/docroot/visit/AddVisit.xhtml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"> xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
<ui:composition template="../header.xhtml"> <ui:composition template="../header.xhtml">
<ui:define name="content"> <ui:define name="content">
@@ -36,8 +36,10 @@
</div> </div>
<div class="ui-g-2"> <div class="ui-g-2">
<div class="ui-inputgroup"> <div class="ui-inputgroup">
<p:datePicker id="fecha" value="#{AddVisit.date}" pattern="dd/MM/yyyy" showIcon="true" showOn="none" showButtonBar="true" autocomplete="true" required="true" <p:datePicker id="fecha" widgetVar="fecha" value="#{AddVisit.date}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
requiredMessage="Especifique la fecha de la visita." /> requiredMessage="Especifique la fecha de la visita.">
<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" />
</p:datePicker>
</div> </div>
</div> </div>
<div class="ui-g-8"> <div class="ui-g-8">

3
1.sources/MyHealth/docroot/visit/PatientVisitList.xhtml
View File

@@ -17,6 +17,7 @@
<div class="ui-g-3"> <div class="ui-g-3">
<div class="ui-inputgroup"> <div class="ui-inputgroup">
<p:datePicker id="fecha" value="#{PatientVisitList.selectedDate}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true"> <p:datePicker id="fecha" value="#{PatientVisitList.selectedDate}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true">
<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" />
<p:ajax event="dateSelect" listener="#{PatientVisitList.showData}" update="frmPatientVisitList" /> <p:ajax event="dateSelect" listener="#{PatientVisitList.showData}" update="frmPatientVisitList" />
</p:datePicker> </p:datePicker>
<p:commandButton value="Mostrar" update="frmPatientVisitList" action="#{PatientVisitList.showData}" icon="fa calendar-alt" /> <p:commandButton value="Mostrar" update="frmPatientVisitList" action="#{PatientVisitList.showData}" icon="fa calendar-alt" />
@@ -50,7 +51,7 @@
<p:column headerText="Fecha" width="90"> <p:column headerText="Fecha" width="90">
<h:outputText value="#{v.date}"> <h:outputText value="#{v.date}">
<f:convertDateTime type="date" pattern="dd/MM/yyyy" timeStyle="short" /> <f:convertDateTime type="localDate" pattern="dd/MM/yyyy" />
</h:outputText> </h:outputText>
</p:column> </p:column>

12
1.sources/MyHealth/docroot/visit/UpdateVisit.xhtml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"> xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
<f:viewParam name="id" value="#{UpdateVisit.id}" required="true" /> <f:viewParam name="id" value="#{UpdateVisit.id}" required="true" />
<ui:composition template="../header.xhtml"> <ui:composition template="../header.xhtml">
@@ -37,8 +37,10 @@
</div> </div>
<div class="ui-g-2"> <div class="ui-g-2">
<div class="ui-inputgroup"> <div class="ui-inputgroup">
<p:datePicker id="fecha" value="#{UpdateVisit.date}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="true" autocomplete="true" required="true" <p:datePicker id="fecha" value="#{UpdateVisit.date}" pattern="dd/MM/yyyy" disabled="#{UpdateVisit.onlyResult}" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
requiredMessage="Especifique la fecha de la visita." readonly="#{UpdateVisit.onlyResult}" /> requiredMessage="Especifique la fecha de la visita." readonly="#{UpdateVisit.onlyResult}">
<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" timeStyle="short" />
</p:datePicker>
</div> </div>
</div> </div>
<div class="ui-g-8"> <div class="ui-g-8">
@@ -49,9 +51,9 @@
<p:outputLabel for="hora" value="Hora:" /> <p:outputLabel for="hora" value="Hora:" />
</div> </div>
<div class="ui-g-2"> <div class="ui-g-2">
<p:datePicker id="hora" value="#{UpdateVisit.time}" timeOnly="true" pattern="HH:mm" showIcon="true" showButtonBar="true" autocomplete="true" required="true" <p:datePicker id="hora" value="#{UpdateVisit.time}" timeOnly="true" pattern="HH:mm" disabled="#{UpdateVisit.onlyResult}" showIcon="true" showButtonBar="true" autocomplete="true" required="true"
requiredMessage="Especifique la hora de la visita." readonly="#{UpdateVisit.onlyResult}"> requiredMessage="Especifique la hora de la visita." readonly="#{UpdateVisit.onlyResult}">
<f:convertDateTime type="localTime" pattern="HH:mm" /> <f:convertDateTime type="localTime" pattern="HH:mm" timeStyle="Short" />
</p:datePicker> </p:datePicker>
</div> </div>
<div class="ui-g-8"> <div class="ui-g-8">

3
1.sources/MyHealth/docroot/visit/VisitList.xhtml
View File

@@ -18,6 +18,7 @@
<div class="ui-inputgroup"> <div class="ui-inputgroup">
<p:datePicker id="fecha" value="#{VisitList.selectedDate}" pattern="dd/MM/yyyy" showIcon="true" showButtonBar="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."> requiredMessage="Especifique una fecha para realizar la consulta.">
<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" />
<p:ajax event="dateSelect" listener="#{VisitList.showData}" update="frmVisitList" /> <p:ajax event="dateSelect" listener="#{VisitList.showData}" update="frmVisitList" />
</p:datePicker> </p:datePicker>
<p:commandButton value="Mostrar" update="frmVisitList" action="#{VisitList.showData}" icon="fa calendar-alt" /> <p:commandButton value="Mostrar" update="frmVisitList" action="#{VisitList.showData}" icon="fa calendar-alt" />
@@ -35,7 +36,7 @@
<p:column headerText="Fecha" width="90"> <p:column headerText="Fecha" width="90">
<h:outputText value="#{v.date}"> <h:outputText value="#{v.date}">
<f:convertDateTime type="date" pattern="dd/MM/yyyy" timeStyle="short" /> <f:convertDateTime type="localDate" pattern="dd/MM/yyyy" />
</h:outputText> </h:outputText>
</p:column> </p:column>

8
1.sources/MyHealth/docroot/visit/VisitView.xhtml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"> xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
<f:viewParam name="id" value="#{VisitView.id}" required="true" /> <f:viewParam name="id" value="#{VisitView.id}" required="true" />
<ui:composition template="../header.xhtml"> <ui:composition template="../header.xhtml">
@@ -37,8 +37,10 @@
</div> </div>
<div class="ui-g-2"> <div class="ui-g-2">
<div class="ui-inputgroup"> <div class="ui-inputgroup">
<p:datePicker id="fecha" value="#{VisitView.date}" pattern="dd/MM/yyyy" showIcon="true" disabled="true" showButtonBar="true" <p:datePicker id="fecha" value="#{VisitView.date}" pattern="dd/MM/yyyy" showIcon="true" disabled="true" showButtonBar="true" autocomplete="true" required="true"
autocomplete="true" required="true" requiredMessage="Especifique la fecha de la visita." /> requiredMessage="Especifique la fecha de la visita.">
<f:convertDateTime type="localDate" pattern="dd/MM/yyyy" />
</p:datePicker>
</div> </div>
</div> </div>
<div class="ui-g-8"> <div class="ui-g-8">

9
1.sources/MyHealth/src/TO/VisitTO.java
View File

@@ -1,6 +1,7 @@
package TO; package TO;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Date; import java.util.Date;
@@ -19,7 +20,7 @@ public class VisitTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id; private Integer id;
private Date date; private LocalDate date;
private LocalTime time; private LocalTime time;
private String observations; private String observations;
private String result; private String result;
@@ -30,7 +31,7 @@ public class VisitTO implements Serializable {
super(); super();
} }
public VisitTO(Integer Id, Date date, LocalTime time, String observations, String result, FamilyDoctorTO fd, PatientTO pat) { public VisitTO(Integer Id, LocalDate date, LocalTime time, String observations, String result, FamilyDoctorTO fd, PatientTO pat) {
this.id = Id; this.id = Id;
this.date = date; this.date = date;
this.time = time; this.time = time;
@@ -48,11 +49,11 @@ public class VisitTO implements Serializable {
this.id = id; this.id = id;
} }
public Date getDate() { public LocalDate getDate() {
return this.date; return this.date;
} }
public void setDate(Date date) { public void setDate(LocalDate date) {
this.date = date; this.date = date;
} }

28
1.sources/MyHealth/src/ejb/visit/VisitFacadeBean.java
View File

@@ -1,8 +1,8 @@
package ejb.visit; package ejb.visit;
import java.util.ArrayList; import java.time.LocalDate;
import java.util.Date;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
@@ -17,9 +17,8 @@ import jpa.PatientJPA;
import jpa.VisitJPA; 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 * @author mark
* *
@@ -33,19 +32,16 @@ public class VisitFacadeBean implements VisitFacadeRemote {
@EJB @EJB
CommonFacadeLocal commonServices; CommonFacadeLocal commonServices;
public Long getScheduledVisitsCount(int familyDoctorId, Date date) { public Long getScheduledVisitsCount(int familyDoctorId, LocalDate date) {
TypedQuery<Long> query = entman.createQuery( TypedQuery<Long> query = entman.createQuery("SELECT count(1) from VisitJPA v where v.date=:date and v.familyDoctor.id=:docId", Long.class);
"SELECT count(1) from VisitJPA v where v.date=:date and v.familyDoctor.id=:docId", Long.class);
query.setParameter("date", date); query.setParameter("date", date);
query.setParameter("docId", familyDoctorId); query.setParameter("docId", familyDoctorId);
return query.getSingleResult(); return query.getSingleResult();
} }
public List<VisitTO> listAllScheduledVisitsPaged(int familyDoctorId, Date date, int pageNumber, int pageSize) { public List<VisitTO> listAllScheduledVisitsPaged(int familyDoctorId, LocalDate date, int pageNumber, int pageSize) {
TypedQuery<VisitJPA> query = entman.createQuery( 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);
"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("date", date);
query.setParameter("docId", familyDoctorId); query.setParameter("docId", familyDoctorId);
@@ -64,7 +60,7 @@ public class VisitFacadeBean implements VisitFacadeRemote {
return listTO; return listTO;
} }
public Long getVisitsCount(Integer patientId, Date date) { public Long getVisitsCount(Integer patientId, LocalDate date) {
String strQuery = "SELECT count(1) from VisitJPA v %s"; String strQuery = "SELECT count(1) from VisitJPA v %s";
String strFilter = ""; String strFilter = "";
if (patientId != null) if (patientId != null)
@@ -87,7 +83,7 @@ public class VisitFacadeBean implements VisitFacadeRemote {
return query.getSingleResult(); return query.getSingleResult();
} }
public List<VisitTO> listVisitsPaged(Integer patientId, Date date, int pageNumber, int pageSize) { public List<VisitTO> listVisitsPaged(Integer patientId, LocalDate date, int pageNumber, int pageSize) {
String strQuery = "SELECT v from VisitJPA v %s order by v.patient, v.date"; String strQuery = "SELECT v from VisitJPA v %s order by v.patient, v.date";
String strFilter = ""; String strFilter = "";
if (patientId != null) if (patientId != null)
@@ -143,14 +139,14 @@ public class VisitFacadeBean implements VisitFacadeRemote {
entman.remove(vi); entman.remove(vi);
} }
public void updateVisit(int id, Date date, LocalTime time) { public void updateVisit(int id, LocalDate date, LocalTime time) {
VisitJPA vi = entman.find(VisitJPA.class, id); VisitJPA vi = entman.find(VisitJPA.class, id);
vi.setDate(date); vi.setDate(date);
vi.setTime(time); vi.setTime(time);
entman.persist(vi); entman.persist(vi);
} }
public VisitTO addVisit(int patientId, Date date, LocalTime time, String observations) { public VisitTO addVisit(int patientId, LocalDate date, LocalTime time, String observations) {
PatientJPA pat = entman.find(PatientJPA.class, patientId); PatientJPA pat = entman.find(PatientJPA.class, patientId);

17
1.sources/MyHealth/src/ejb/visit/VisitFacadeRemote.java
View File

@@ -1,7 +1,7 @@
package ejb.visit; package ejb.visit;
import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.ejb.Remote; import javax.ejb.Remote;
@@ -9,8 +9,7 @@ import javax.ejb.Remote;
import TO.VisitTO; 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 alina * @author alina
* *
@@ -21,13 +20,13 @@ public interface VisitFacadeRemote {
* Definimos la interfaz remota * Definimos la interfaz remota
*/ */
public Long getScheduledVisitsCount(int familyDoctorId, Date date); public Long getScheduledVisitsCount(int familyDoctorId, LocalDate date);
public List<VisitTO> listAllScheduledVisitsPaged(int familyDoctorId, Date date, int pageNumber, int pageSize); public List<VisitTO> listAllScheduledVisitsPaged(int familyDoctorId, LocalDate date, int pageNumber, int pageSize);
public Long getVisitsCount(Integer patientId, Date date); public Long getVisitsCount(Integer patientId, LocalDate date);
public List<VisitTO> listVisitsPaged(Integer patientId, Date date, int pageNumber, int pageSize); public List<VisitTO> listVisitsPaged(Integer patientId, LocalDate date, int pageNumber, int pageSize);
public VisitTO getVisit(int id) throws Exception; public VisitTO getVisit(int id) throws Exception;
@@ -35,8 +34,8 @@ public interface VisitFacadeRemote {
public void removeVisit(int id); public void removeVisit(int id);
public void updateVisit(int id, Date date, LocalTime time); public void updateVisit(int id, LocalDate date, LocalTime time);
public VisitTO addVisit(int patientId, Date date, LocalTime time, String observations); public VisitTO addVisit(int patientId, LocalDate date, LocalTime time, String observations);
} }

11
1.sources/MyHealth/src/jpa/VisitJPA.java
View File

@@ -1,9 +1,8 @@
package jpa; package jpa;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Time; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Date;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
@@ -29,7 +28,7 @@ public class VisitJPA implements Serializable {
@Column(updatable = false) @Column(updatable = false)
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
private Date date; private LocalDate date;
private LocalTime time; private LocalTime time;
private String observations; private String observations;
private String result; private String result;
@@ -49,7 +48,7 @@ public class VisitJPA implements Serializable {
super(); super();
} }
public VisitJPA(Date date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) { public VisitJPA(LocalDate date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
this.date = date; this.date = date;
this.time = time; this.time = time;
this.observations = observations; this.observations = observations;
@@ -66,11 +65,11 @@ public class VisitJPA implements Serializable {
this.id = value; this.id = value;
} }
public Date getDate() { public LocalDate getDate() {
return date; return date;
} }
public void setDate(Date value) { public void setDate(LocalDate value) {
this.date = value; this.date = value;
} }

33
1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java
View File

@@ -1,11 +1,12 @@
package managedbean.visit; package managedbean.visit;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.ZoneId;
import java.util.Date; import java.util.Date;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped;
import javax.faces.application.FacesMessage; import javax.faces.application.FacesMessage;
import javax.faces.view.ViewScoped; import javax.faces.view.ViewScoped;
import javax.inject.Named; import javax.inject.Named;
@@ -22,7 +23,7 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id; private Integer id;
private Date date; private LocalDate date;
private LocalTime time; private LocalTime time;
private String observations; private String observations;
private String result; private String result;
@@ -43,43 +44,43 @@ public class AddVisitMBean extends ManagedBeanBase implements Serializable {
this.patient = this.getRemoteManagerCommon().findPatientById(patientId); this.patient = this.getRemoteManagerCommon().findPatientById(patientId);
this.familyDoctor = this.patient.getFamilyDoctor(); this.familyDoctor = this.patient.getFamilyDoctor();
this.date = new Date(); this.date = LocalDate.now();
}catch (Exception e) { } catch (Exception e) {
this.manageException(e); this.manageException(e);
} }
} }
public void saveData() { public void saveData() {
//Comprobamos que la fecha fijada para la visita no sea anterior a la actual // Comprobamos que la fecha fijada para la visita no sea anterior a la actual
int error = 0; int error = 0;
if (this.date.before( new Date())) { LocalTime midnight = LocalTime.MIDNIGHT;
this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", LocalDate today = LocalDate.now();
"La cita fijada es anterior al momento actual");
if (this.date.isBefore(today)) {
this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", "La cita fijada es anterior al momento actual");
error++; error++;
} }
if (this.date.equals(new Date()) && this.time.isBefore(LocalTime.now())){ if (this.date.equals(today) && this.time.isBefore(LocalTime.now())) {
this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", "La cita fijada es anterior al momento actual");
"La cita fijada es anterior al momento actual");
error++; error++;
} }
if (error==0) { if (error == 0) {
try { try {
this.getRemoteManagerVisit().addVisit(this.patient.getId(), this.date, this.time, this.observations); this.getRemoteManagerVisit().addVisit(this.patient.getId(), this.date, this.time, this.observations);
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Visita creada", "La nueva visita se ha registrado correctamente en el sistema."); this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Visita creada", "La nueva visita se ha registrado correctamente en el sistema.");
}catch (Exception e) { } catch (Exception e) {
this.manageException(e); this.manageException(e);
} }
} }
} }
public Date getDate() { public LocalDate getDate() {
return date; return date;
} }
public void setDate(Date date) { public void setDate(LocalDate date) {
this.date = date; this.date = date;
} }

9
1.sources/MyHealth/src/managedbean/visit/PatientVisitListMBean.java
View File

@@ -2,6 +2,7 @@ package managedbean.visit;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -32,7 +33,7 @@ public class PatientVisitListMBean extends ManagedBeanBase implements Serializab
private Integer patientId; private Integer patientId;
private LazyDataModel<VisitTO> lazyDataModelVisitList; private LazyDataModel<VisitTO> lazyDataModelVisitList;
private Date selectedDate; private LocalDate selectedDate;
private String lastUIQuery; private String lastUIQuery;
private List<PatientTO> patientList; private List<PatientTO> patientList;
@@ -48,7 +49,7 @@ public class PatientVisitListMBean extends ManagedBeanBase implements Serializab
case ADMINISTRATOR: case ADMINISTRATOR:
this.patientId = null; this.patientId = null;
this.patient = null; this.patient = null;
this.selectedDate = new Date(); this.selectedDate = LocalDate.now();
this.patientList = this.getRemoteManagerCommon().listPatientsPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); this.patientList = this.getRemoteManagerCommon().listPatientsPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH);
break; break;
@@ -111,11 +112,11 @@ public class PatientVisitListMBean extends ManagedBeanBase implements Serializab
public void showData() { public void showData() {
} }
public Date getSelectedDate() { public LocalDate getSelectedDate() {
return selectedDate; return selectedDate;
} }
public void setSelectedDate(Date selectedDate) { public void setSelectedDate(LocalDate selectedDate) {
this.selectedDate = selectedDate; this.selectedDate = selectedDate;
} }

84
1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java
View File

@@ -1,6 +1,7 @@
package managedbean.visit; package managedbean.visit;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
@@ -24,7 +25,7 @@ public class UpdateVisitMBean extends ManagedBeanBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id; private Integer id;
private Date date; private LocalDate date;
private LocalTime time; private LocalTime time;
private String observations; private String observations;
private String result; private String result;
@@ -81,66 +82,55 @@ public class UpdateVisitMBean extends ManagedBeanBase implements Serializable {
this.onlyResult = true; this.onlyResult = true;
break; break;
case SPECIALIST_DOCTOR: case SPECIALIST_DOCTOR:
this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Acesso denegado", this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Acesso denegado", "Su perfil de usuario no está autorizado acceder a esta página.");
"Su perfil de usuario no está autorizado acceder a esta página.");
return; return;
} }
} }
public void saveData() { public void saveData() {
//Comprobamos que la fecha fijada para la visita no sea anterior a la actual try {
int error = 0; switch (SessionUtils.getUserType()) {
if (this.date.before( new Date())) { case ADMINISTRATOR:
this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", case PATIENT:
"La cita fijada es anterior al momento actual"); // Administrador y paciente pueden actualizar la fecha y hora de la visita (excepto el resultado)
error++; // Comprobamos que la fecha fijada para la visita no sea anterior a la actual
} int error = 0;
if (this.date.equals(new Date()) && this.time.isBefore(LocalTime.now())){ LocalTime midnight = LocalTime.MIDNIGHT;
this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", LocalDate today = LocalDate.now();
"La cita fijada es anterior al momento actual");
error++;
}
// Si el usuario es un paciente listamos las visitas de ese paciente, si es
// admnistrador listamos todas.
if(error==0) {
try {
switch (SessionUtils.getUserType()) {
case ADMINISTRATOR:
case PATIENT:
// Administrador y paciente pueden actualizar la fecha y hora de la visita
// (excepto esl resultado)
// TODO: Implementar método en EJB
this.getRemoteManagerVisit().updateVisit(this.id, this.date, this.time);
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Visita actualizada",
"La fecha y hora de la visita se ha actualizado correctamente.");
break;
case FAMILY_DOCTOR:
// El médico de familia solo puede actualizar el resultado.
// TODO: implementar método EJB para actualizar el resultado.
this.getRemoteManagerVisit().addResultToVisit(this.id, this.result);
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Resultado actualizado",
"El resultado de la visita se ha actualizado correctamente.");
break;
case SPECIALIST_DOCTOR:
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Acesso denegado",
"Su perfil de usuario no está autorizado acceder a esta página.");
return;
if (this.date.isBefore(today)) {
this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", "La cita fijada es anterior al momento actual");
error++;
} }
if (this.date.equals(today) && this.time.isBefore(LocalTime.now())) {
}catch(Exception e){ this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Fecha incorrecta", "La cita fijada es anterior al momento actual");
this.manageException(e); error++;
}
if (error == 0) {
this.getRemoteManagerVisit().updateVisit(this.id, this.date, this.time);
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Visita actualizada", "La fecha y hora de la visita se ha actualizado correctamente.");
}
break;
case FAMILY_DOCTOR:
// El médico de familia solo puede actualizar el resultado.
// TODO: implementar método EJB para actualizar el resultado.
this.getRemoteManagerVisit().addResultToVisit(this.id, this.result);
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Resultado actualizado", "El resultado de la visita se ha actualizado correctamente.");
break;
case SPECIALIST_DOCTOR:
this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Acesso denegado", "Su perfil de usuario no está autorizado acceder a esta página.");
return;
} }
} catch (Exception e) {
this.manageException(e);
} }
} }
public Date getDate() { public LocalDate getDate() {
return date; return date;
} }
public void setDate(Date date) { public void setDate(LocalDate date) {
this.date = date; this.date = date;
} }

9
1.sources/MyHealth/src/managedbean/visit/VisitListMBean.java
View File

@@ -2,6 +2,7 @@ package managedbean.visit;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -27,7 +28,7 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
private int familyDoctorId; private int familyDoctorId;
private String familyDoctorDisplayName; private String familyDoctorDisplayName;
private LazyDataModel<VisitTO> lazyDataModelVisitList; private LazyDataModel<VisitTO> lazyDataModelVisitList;
private Date selectedDate; private LocalDate selectedDate;
public VisitListMBean() { public VisitListMBean() {
} }
@@ -38,7 +39,7 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
this.familyDoctorId = Integer.valueOf(SessionUtils.getUserId()); this.familyDoctorId = Integer.valueOf(SessionUtils.getUserId());
this.familyDoctorDisplayName = SessionUtils.getUserDisplayName(); this.familyDoctorDisplayName = SessionUtils.getUserDisplayName();
this.selectedDate = new Date(); this.selectedDate = LocalDate.now();
this.lazyDataModelVisitList = new LazyDataModel<VisitTO>() { this.lazyDataModelVisitList = new LazyDataModel<VisitTO>() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -70,11 +71,11 @@ public class VisitListMBean extends ManagedBeanBase implements Serializable {
ctx.getExternalContext().redirect(String.format("UpdateVisit.xhtml?id=%d&fromPage=%s", visitId, ctx.getViewRoot().getViewId())); ctx.getExternalContext().redirect(String.format("UpdateVisit.xhtml?id=%d&fromPage=%s", visitId, ctx.getViewRoot().getViewId()));
} }
public Date getSelectedDate() { public LocalDate getSelectedDate() {
return selectedDate; return selectedDate;
} }
public void setSelectedDate(Date selectedDate) { public void setSelectedDate(LocalDate selectedDate) {
this.selectedDate = selectedDate; this.selectedDate = selectedDate;
} }

8
1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
View File

@@ -2,8 +2,8 @@ package managedbean.visit;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Date;
import java.util.Map; import java.util.Map;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
@@ -24,7 +24,7 @@ public class VisitMBean extends ManagedBeanBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Integer id; private Integer id;
private Date date; private LocalDate date;
private LocalTime time; private LocalTime time;
private String observations; private String observations;
private String result; private String result;
@@ -75,11 +75,11 @@ public class VisitMBean extends ManagedBeanBase implements Serializable {
ctx.getExternalContext().redirect(String.format("UpdateVisit.xhtml?id=%d&fromPage=%s", visitId, this.fromPage)); ctx.getExternalContext().redirect(String.format("UpdateVisit.xhtml?id=%d&fromPage=%s", visitId, this.fromPage));
} }
public Date getDate() { public LocalDate getDate() {
return date; return date;
} }
public void setDate(Date date) { public void setDate(LocalDate date) {
this.date = date; this.date = date;
} }