From ae79658a23f3bed317446add9e5eb4af46c20401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Sun, 15 Dec 2019 23:07:34 +0100 Subject: [PATCH 01/65] =?UTF-8?q?Corregido=20error=20en=20la=20validaci?= =?UTF-8?q?=C3=B3n=20del=20NIF=20para=20m=C3=A9dicos=20especialistas.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/src/managedbean/common/ValidationUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java b/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java index d147b8e..8d90abd 100644 --- a/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java +++ b/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java @@ -82,7 +82,7 @@ public class ValidationUtils { // para los especialistas SpecialistDoctorTO sd = remoteSvc.findSpecialistDoctorByNif(nif); - if (sd != null && (id == null || fd.getId() != id)) + if (sd != null && (id == null || sd.getId() != id)) nifExists = true; } else if (id == null || fd.getId() != id) // Si se trata de un usuario diferente, entonces está repetido From 2e5ae9bb6cb04385aba2c68f2bcec19a6f93d9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Sun, 15 Dec 2019 23:12:16 +0100 Subject: [PATCH 02/65] =?UTF-8?q?Cambiada=20variable=20de=20entorno=20en?= =?UTF-8?q?=20build.xml=20a=20env.JBOSS=5FHOME=20para=20que=20pueda=20real?= =?UTF-8?q?izarse=20el=20despliegue=20autom=C3=A1tico=20en=20la=20m=C3=A1q?= =?UTF-8?q?uina=20de=20PRE=20(azure).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/build.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/1.sources/MyHealth/build.xml b/1.sources/MyHealth/build.xml index a970c24..e809e36 100644 --- a/1.sources/MyHealth/build.xml +++ b/1.sources/MyHealth/build.xml @@ -4,7 +4,7 @@ - + @@ -88,11 +88,12 @@ - - + + + - + From 48c04a6681d45fbd9ba3f2db15ffd9864ada7097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Sun, 15 Dec 2019 23:19:49 +0100 Subject: [PATCH 03/65] Beans esqueleto actualizados. --- .../medicalTest/MedicalTestMBean.java | 44 +++++-------------- .../systemAdmin/SystemAdminMBean.java | 42 +++++------------- .../src/managedbean/visit/VisitMBean.java | 42 +++++------------- 3 files changed, 30 insertions(+), 98 deletions(-) diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java index f14f4e7..2396638 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java @@ -1,51 +1,27 @@ package managedbean.medicalTest; import java.io.Serializable; -import java.util.Properties; -import javax.ejb.EJB; +import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import ejb.medicalTest.MedicalTestFacadeRemote; +import managedbean.common.ManagedBeanBase; -/** - * ManagedBEan que gestiona la edición y actualización de una especialidad - * médica. - * - * @author mark - * - */ @Named("MedicalTestMBean") @RequestScoped -public class MedicalTestMBean implements Serializable { +public class MedicalTestMBean extends ManagedBeanBase implements Serializable { private static final long serialVersionUID = 1L; - @EJB - private MedicalTestFacadeRemote remoteManager; - - /** - * Constructor. Inicializa la conexión con el EJB Remoto - * - * @throws Exception - */ - public MedicalTestMBean() throws Exception { - initializeAdminFacadeRemote(); + public MedicalTestMBean() { } - /** - * Inicializa la conexión con el EJB Remoto - * - * @throws Exception - */ - private void initializeAdminFacadeRemote() throws Exception { - Properties props = System.getProperties(); - Context ctx = new InitialContext(props); - remoteManager = (MedicalTestFacadeRemote) ctx - .lookup("java:app/myHealth.jar/MedicalTestFacadeBean!ejb.component.MedicalTestFacadeRemote"); - } + @PostConstruct + public void init() { + // Inicialización de variables y propiedades van aquí. + // Como realizar llamadas al EJB Remoto + // this.getRemoteManagerSystemAdmin().MetodoEJB + } } diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java index 5d7eb33..4529c03 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java @@ -1,50 +1,28 @@ package managedbean.systemAdmin; import java.io.Serializable; -import java.util.Properties; -import javax.ejb.EJB; +import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import ejb.systemAdmin.SystemAdminFacadeRemote; +import managedbean.common.ManagedBeanBase; -/** - * ManagedBEan que gestiona la edición y actualización de una especialidad - * médica. - * - * @author mark - * - */ @Named("SystemAdminMBean") @RequestScoped -public class SystemAdminMBean implements Serializable { +public class SystemAdminMBean extends ManagedBeanBase implements Serializable { private static final long serialVersionUID = 1L; - @EJB - private SystemAdminFacadeRemote remoteManager; - - /** - * Constructor. Inicializa la conexión con el EJB Remoto - * - * @throws Exception - */ - public SystemAdminMBean() throws Exception { - initializeAdminFacadeRemote(); + public SystemAdminMBean() { } - /** - * Inicializa la conexión con el EJB Remoto - * - * @throws Exception - */ - private void initializeAdminFacadeRemote() throws Exception { - Properties props = System.getProperties(); - Context ctx = new InitialContext(props); - remoteManager = (SystemAdminFacadeRemote) ctx.lookup("java:app/myHealth.jar/ClassFacadeBean!ejb.component.SystemAdminFacadeRemote"); + @PostConstruct + public void init() { + // Inicialización de variables y propiedades van aquí. + + // Como realizar llamadas al EJB Remoto + // this.getRemoteManagerSystemAdmin().MetodoEJB } } diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java index 9c32df4..22a4920 100644 --- a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java @@ -1,50 +1,28 @@ package managedbean.visit; import java.io.Serializable; -import java.util.Properties; -import javax.ejb.EJB; +import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import ejb.visit.VisitFacadeRemote; +import managedbean.common.ManagedBeanBase; -/** - * ManagedBEan que gestiona la edición y actualización de una especialidad - * médica. - * - * @author mark - * - */ @Named("VisitMBean") @RequestScoped -public class VisitMBean implements Serializable { +public class VisitMBean extends ManagedBeanBase implements Serializable { private static final long serialVersionUID = 1L; - @EJB - private VisitFacadeRemote remoteManager; - - /** - * Constructor. Inicializa la conexión con el EJB Remoto - * - * @throws Exception - */ - public VisitMBean() throws Exception { - initializeAdminFacadeRemote(); + public VisitMBean() { } - /** - * Inicializa la conexión con el EJB Remoto - * - * @throws Exception - */ - private void initializeAdminFacadeRemote() throws Exception { - Properties props = System.getProperties(); - Context ctx = new InitialContext(props); - remoteManager = (VisitFacadeRemote) ctx.lookup("java:app/myHealth.jar/ClassFacadeBean!ejb.component.VisitFacadeRemote"); + @PostConstruct + public void init() { + // Inicialización de variables y propiedades van aquí. + + // Como realizar llamadas al EJB Remoto + // this.getRemoteManagerSystemAdmin().MetodoEJB } } From dcbebe52532dd15fc294e49bce441c56ac90264f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Mon, 16 Dec 2019 15:57:02 +0100 Subject: [PATCH 04/65] =?UTF-8?q?Corregido=20error=20al=20realizar=20login?= =?UTF-8?q?a=20(la=20ventana=20se=20agitaba=20a=C3=BAn=20con=20login=20cor?= =?UTF-8?q?recto).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/docroot/header.xhtml | 8 ++++---- .../MyHealth/src/managedbean/systemAdmin/LoginMBean.java | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml index 2e76837..000aba7 100644 --- a/1.sources/MyHealth/docroot/header.xhtml +++ b/1.sources/MyHealth/docroot/header.xhtml @@ -14,15 +14,16 @@ function handleLoginRequest(xhr, status, args) { if(args.validationFailed || !args.loggedIn) { PF('dlgLogin').jq.effect("shake", {times:5}, 100); - //PF('Login').attr("disabled", false); + PF('btnLogin').enable(); } else { + PF('btnLogin').enable(); PF('dlgLogin').hide(); } } function startLogin() { - //PF('Login').attr("disabled", true); + PF('btnLogin').disable(); } @@ -57,8 +58,7 @@
- +
diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java index f86bf7e..29d8c08 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java @@ -42,10 +42,11 @@ public class LoginMBean extends ManagedBeanBase { public String login() { boolean loggedIn = false; + String viewRedirect = ""; LoggedUserTO usr = null; - if (username != null && password != null) { + if (username != null && password != null && username.equals("") == false && password.equals("") == false) { try { usr = this.getRemoteManagerSystemAdmin().login(username, password); @@ -54,8 +55,7 @@ public class LoginMBean extends ManagedBeanBase { SessionUtils.CreateSession(usr); this.addFacesMessageKeep(FacesMessage.SEVERITY_INFO, "Login correcto", "Bienvenido " + usr.getName()); - - return ("/home?faces-redirect=true"); + viewRedirect = "/home?faces-redirect=true"; } else this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos"); } catch (Exception ex) { @@ -66,8 +66,7 @@ public class LoginMBean extends ManagedBeanBase { this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos"); PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn); - - return ""; + return viewRedirect; } // logout event, invalidate session From 9bfdebbea41c8b87c60388c347456897f23640bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Mon, 16 Dec 2019 22:02:27 +0100 Subject: [PATCH 05/65] =?UTF-8?q?Ejemplo=20de=20paginaci=C3=B3n=20(Listado?= =?UTF-8?q?=20de=20preguntas=20pendientes)=20con=20primefaces=20utilizando?= =?UTF-8?q?=20LazyDataModel,=20con=20recarga=20autom=C3=A1tica=20de=20la?= =?UTF-8?q?=20p=C3=A1gina=20solicitada.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/docroot/header.xhtml | 2 +- .../medicaltest/PendingQuestions.xhtml | 85 +++++++++++++++++++ 1.sources/MyHealth/src/common/Constants.java | 2 + .../src/ejb/common/CommonFacadeBean.java | 25 +++++- .../src/ejb/common/CommonFacadeLocal.java | 4 +- .../medicalTest/MedicalTestFacadeBean.java | 47 +++++++--- .../medicalTest/MedicalTestFacadeRemote.java | 10 ++- .../MyHealth/src/jpa/FamilyDoctorJPA.java | 18 ++-- .../MyHealth/src/jpa/MedicalTestJPA.java | 36 ++++---- 1.sources/MyHealth/src/jpa/QuestionJPA.java | 20 +++-- .../src/managedbean/common/MenuMBean.java | 2 +- .../medicalTest/PendingQuestionsMBean.java | 53 ++++++++++++ 12 files changed, 250 insertions(+), 54 deletions(-) create mode 100644 1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml create mode 100644 1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml index 000aba7..6c3d4f0 100644 --- a/1.sources/MyHealth/docroot/header.xhtml +++ b/1.sources/MyHealth/docroot/header.xhtml @@ -28,13 +28,13 @@
+