From 2b89caf1ba5053266b51ace05ae3bdfef3960f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Fri, 27 Dec 2019 15:32:57 +0100 Subject: [PATCH] =?UTF-8?q?Auto=20reorganizaci=C3=B3n=20de=20imports.=20El?= =?UTF-8?q?iminaci=C3=B3n=20de=20warnings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../medicalTest/MedicalTestFacadeBean.java | 5 ---- .../systemAdmin/SystemAdminFacadeRemote.java | 1 - .../src/ejb/visit/VisitFacadeBean.java | 7 ------ 1.sources/MyHealth/src/jpa/QuestionJPA.java | 1 - .../common/AuthorizationFilter.java | 8 +++++-- .../medicalTest/QuestionsMBean.java | 23 +++++++++---------- .../medicalTest/SearchSpecialistMBean.java | 7 ------ .../src/managedbean/visit/AddVisitMBean.java | 8 ------- .../managedbean/visit/UpdateVisitMBean.java | 4 ---- .../src/managedbean/visit/VisitMBean.java | 1 - 10 files changed, 17 insertions(+), 48 deletions(-) diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java index 13d16d9..dfd8911 100644 --- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java @@ -10,19 +10,14 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; -import TO.LoggedUserTO; -import TO.MedicalSpecialtyTO; import TO.QuestionTO; import TO.SpecialistDoctorTO; import common.MedicalTestType; import common.QuestionStatus; -import common.UserType; import ejb.common.CommonFacadeLocal; -import jpa.FamilyDoctorJPA; import jpa.PatientJPA; import jpa.QuestionJPA; import jpa.SpecialistDoctorJPA; -import managedbean.common.SessionUtils; /** * 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 diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java index c7fad6e..0980961 100644 --- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java @@ -4,7 +4,6 @@ import javax.ejb.Remote; import TO.LoggedUserTO; import TO.MedicalSpecialtyTO; -import TO.PatientTO; /** * diff --git a/1.sources/MyHealth/src/ejb/visit/VisitFacadeBean.java b/1.sources/MyHealth/src/ejb/visit/VisitFacadeBean.java index 21f6e9d..4312d72 100644 --- a/1.sources/MyHealth/src/ejb/visit/VisitFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/visit/VisitFacadeBean.java @@ -11,14 +11,7 @@ import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; import TO.VisitTO; -import common.HashUtils; -import common.QuestionStatus; -import common.Utils; import ejb.common.CommonFacadeLocal; -import jpa.FamilyDoctorJPA; -import jpa.MedicalSpecialtyJPA; -import jpa.QuestionJPA; -import jpa.SpecialistDoctorJPA; import jpa.VisitJPA; /** diff --git a/1.sources/MyHealth/src/jpa/QuestionJPA.java b/1.sources/MyHealth/src/jpa/QuestionJPA.java index 40132a0..3b5f826 100644 --- a/1.sources/MyHealth/src/jpa/QuestionJPA.java +++ b/1.sources/MyHealth/src/jpa/QuestionJPA.java @@ -12,7 +12,6 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import TO.QuestionTO; import common.QuestionStatus; /** diff --git a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java index 909db0b..3c149ec 100644 --- a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java +++ b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java @@ -58,8 +58,8 @@ public class AuthorizationFilter implements Filter { resp = (HttpServletResponse) response; - //TODO: Eliminar este código al terminar el desarrollo. - //Realizamos un login automatico (para agilizar el desarrollo. + // TODO: Eliminar este código al terminar el desarrollo. + // Realizamos un login automatico (para agilizar el desarrollo. if (Debug == true) { ses = req.getSession(true); @@ -69,6 +69,10 @@ public class AuthorizationFilter implements Filter { login.setPassword("asdf"); boolean result = login.autoLogin(ses); + if (result == true) + SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR, "Login automático correcto", "Se ha realizado un login automático correctamente."); + else + SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR, "El login automático ha fallado.", "No se ha podido realizar el login automático."); } } diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java index b2c0d2e..d8a3a3b 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/QuestionsMBean.java @@ -25,7 +25,6 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable { private int userID; private UserType userType; private List pendingQuestions; - private Integer id; private QuestionTO selected; private boolean addNewMode; @@ -37,7 +36,7 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable { // Inicialización de variables y propiedades van aquí. this.userType = SessionUtils.getUserType(); this.userID = Integer.valueOf(SessionUtils.getUserId()); - + this.addNewMode = false; this.selected = null; @@ -51,9 +50,9 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable { public void setPendingQuestions(List value) { this.pendingQuestions = value; } + /** - * Cargará las preguntas enviadas al médico o escritas por el paciente, esto irá - * en función del tipo de usuario en sesión + * Cargará las preguntas enviadas al médico o escritas por el paciente, esto irá en función del tipo de usuario en sesión */ private void loadQuestions() { if (this.userType == UserType.FAMILY_DOCTOR) { @@ -76,30 +75,30 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable { public void onUnSelect(SelectEvent event) { this.selected = null; } - + public void setSelected(QuestionTO selected) { this.selected = selected; } - + public QuestionTO getSelected() { return this.selected; } - + public void save() { getRemoteManagerMedicalTest().answerQuestion(this.selected.getId(), this.selected.getResponse()); this.loadQuestions(); this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Datos guardados", "La respuesta se registrado correctamente en el sistema."); this.selected = null; } - + public void create() { - this.addNewMode = true; + this.addNewMode = true; this.selected = new QuestionTO(); this.selected.setId(-1); this.selected.setTitle(""); this.selected.setMessage(""); } - + public void addNewQuestion() { getRemoteManagerMedicalTest().askQuestion(userID, this.selected.getTitle(), this.selected.getMessage()); this.create(); @@ -118,11 +117,11 @@ public class QuestionsMBean extends ManagedBeanBase implements Serializable { public boolean isFamilyDoctor() { return (this.userType == UserType.FAMILY_DOCTOR); } - + public boolean isAddNewMode() { return addNewMode; } - + public boolean isRespuestaEditable() { return (this.userType == UserType.FAMILY_DOCTOR && this.selected != null && this.selected.getStatus() == QuestionStatus.PENDING); } diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java index a7f6e14..3ef34ff 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/SearchSpecialistMBean.java @@ -8,16 +8,13 @@ import javax.annotation.PostConstruct; import javax.faces.view.ViewScoped; import javax.inject.Named; -import org.primefaces.event.SelectEvent; import org.primefaces.model.LazyDataModel; import org.primefaces.model.SortOrder; import TO.MedicalSpecialtyTO; import TO.SpecialistDoctorTO; import common.Constants; -import common.UserType; import managedbean.common.ManagedBeanBase; -import managedbean.common.SessionUtils; @Named("sspec") @ViewScoped @@ -25,8 +22,6 @@ public class SearchSpecialistMBean extends ManagedBeanBase implements Serializab private static final long serialVersionUID = 1L; - private int userID; - private UserType userType; private List medicalSpecialitiesList; private MedicalSpecialtyTO medicalSpeciality; private String lastUIQueryMS; @@ -38,8 +33,6 @@ public class SearchSpecialistMBean extends ManagedBeanBase implements Serializab @PostConstruct public void init() { // Inicialización de variables y propiedades van aquí. - this.userType = SessionUtils.getUserType(); - this.userID = Integer.valueOf(SessionUtils.getUserId()); this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH); this.medicalSpeciality = null; this.lastUIQueryMS = ""; diff --git a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java index 2edc628..66fa1c3 100644 --- a/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/AddVisitMBean.java @@ -3,21 +3,13 @@ package managedbean.visit; import java.io.Serializable; import java.sql.Time; import java.util.Date; -import java.util.List; -import java.util.Map; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import javax.inject.Named; -import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; - import TO.FamilyDoctorTO; import TO.PatientTO; -import TO.VisitTO; import managedbean.common.ManagedBeanBase; import managedbean.common.SessionUtils; diff --git a/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java index ae3281e..b1a2b41 100644 --- a/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/UpdateVisitMBean.java @@ -1,13 +1,10 @@ package managedbean.visit; import java.io.Serializable; -import java.sql.Time; -import java.time.LocalTime; import java.util.Date; import java.util.Map; import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; import javax.faces.view.ViewScoped; @@ -16,7 +13,6 @@ import javax.inject.Named; import TO.FamilyDoctorTO; import TO.PatientTO; import TO.VisitTO; -import common.UserType; import managedbean.common.ManagedBeanBase; import managedbean.common.SessionUtils; diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java index c1c0a94..a6773c9 100644 --- a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java @@ -7,7 +7,6 @@ import java.util.Date; import java.util.Map; import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; import javax.faces.view.ViewScoped;