From 10059aacdb751d55f479011e7cf3353fe7f14856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= Date: Wed, 1 Jan 2020 16:21:49 +0100 Subject: [PATCH] =?UTF-8?q?Organizaci=C3=B3n=20de=20controles=20en=20la=20?= =?UTF-8?q?pantalla=20de=20alta=20de=20administradores.=20Conversi=C3=B3n?= =?UTF-8?q?=20a=20minusculas=20de=20la=20direcci=C3=B3n=20de=20email=20de?= =?UTF-8?q?=20los=20administradores.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docroot/systemAdmin/AddAdmin.xhtml | 52 ++++++++++++------- .../systemAdmin/SystemAdminFacadeBean.java | 15 +----- .../systemAdmin/AddAdminMBean.java | 11 +++- 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/1.sources/MyHealth/docroot/systemAdmin/AddAdmin.xhtml b/1.sources/MyHealth/docroot/systemAdmin/AddAdmin.xhtml index d235d1b..3a9e7f4 100644 --- a/1.sources/MyHealth/docroot/systemAdmin/AddAdmin.xhtml +++ b/1.sources/MyHealth/docroot/systemAdmin/AddAdmin.xhtml @@ -10,41 +10,53 @@
-
+
-
- +
+ + + +
-
+
+ +
+ +
-
+
-
- -
-
- -
-
- -
-
- -
-
+
-
+ +
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+
diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java index c5ec1a4..bf48a48 100644 --- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java @@ -112,7 +112,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return usr; } - @Override public MedicalSpecialtyTO updateSpecialty(int id, String name, String description) throws Exception { MedicalSpecialtyJPA ms = entman.find(MedicalSpecialtyJPA.class, id); @@ -140,7 +139,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return null; } - @Override public void deleteSpecialty(int id) throws Exception { MedicalSpecialtyJPA ms = entman.find(MedicalSpecialtyJPA.class, id); @@ -151,7 +149,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { entman.remove(ms); } - @Override public MedicalSpecialtyTO insertSpecialty(String name, String description) throws Exception { MedicalSpecialtyJPA ms = new MedicalSpecialtyJPA(name, description); entman.persist(ms); @@ -159,7 +156,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return this.commonServices.getPOJOforMedicalSpecialtyJPA(ms); } - @Override public PrimaryHealthCareCenterTO updateHealthCareCenter(int id, String name, String location) throws Exception { PrimaryHealthCareCenterJPA ms = entman.find(PrimaryHealthCareCenterJPA.class, id); @@ -175,7 +171,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return this.commonServices.getPOJOforPrimaryHealthCareCenterJPA(ms); } - @Override public PrimaryHealthCareCenterTO findHealthCareCenterByName(String searchedName) { TypedQuery query = entman.createQuery("from PrimaryHealthCareCenterJPA cap where cap.name=:name", PrimaryHealthCareCenterJPA.class); query.setMaxResults(1); @@ -188,7 +183,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return null; } - @Override public void deleteHealthCareCenter(int id) throws Exception { PrimaryHealthCareCenterJPA cap = entman.find(PrimaryHealthCareCenterJPA.class, id); @@ -199,7 +193,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { entman.remove(cap); } - @Override public PrimaryHealthCareCenterTO insertHealthCareCenter(String name, String location) throws Exception { PrimaryHealthCareCenterJPA cap = new PrimaryHealthCareCenterJPA(name, location); entman.persist(cap); @@ -207,14 +200,12 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return this.commonServices.getPOJOforPrimaryHealthCareCenterJPA(cap); } - @Override public Long getCAPCount() { TypedQuery query = entman.createQuery("SELECT count(1) from PrimaryHealthCareCenterJPA", Long.class); return query.getSingleResult(); } - @Override public List listCAPsPaged(int pageNumber, int pageSize) { TypedQuery query = entman.createQuery("SELECT c from PrimaryHealthCareCenterJPA c order by c.name", PrimaryHealthCareCenterJPA.class); @@ -233,7 +224,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return caps; } - @Override public List listAllFamilyDoctorsByCAPPaged(int primaryHealthCareCenterId, int pageNumber, int pageSize) { List familyDoctorsByCAP = new ArrayList(); @@ -254,8 +244,7 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return familyDoctorsByCAP; } - - @Override + public Long getPatientCount(int familyDoctorId) { TypedQuery query = entman.createQuery("SELECT count(1) from PatientJPA p where p.familyDoctor.id=:familyDoctorId", Long.class); query.setParameter("familyDoctorId", familyDoctorId); @@ -263,7 +252,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return query.getSingleResult(); } - @Override public SystemAdminTO findAdminByEmail(String email) { TypedQuery query = entman.createQuery("from SystemAdminJPA a where a.email=:email", SystemAdminJPA.class); query.setMaxResults(1); @@ -276,7 +264,6 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote { return null; } - @Override public SystemAdminTO insertAdmin(String email, String password) throws Exception { SystemAdminJPA admin = new SystemAdminJPA(email, password); entman.persist(admin); diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/AddAdminMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/AddAdminMBean.java index 2399264..b70f2d3 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/AddAdminMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/AddAdminMBean.java @@ -56,17 +56,24 @@ public class AddAdminMBean extends ManagedBeanBase implements Serializable { this.password = password; } + public boolean emailAlreadyRegistered(String email) { + return this.getRemoteManagerSystemAdmin().findAdminByEmail(email) != null; + } + public void insertData() { int error = 0; - if (this.getRemoteManagerSystemAdmin().findAdminByEmail(email) != null) { + if (this.emailAlreadyRegistered(email) == true) { this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Administrador ya existente", "El administrador ya se encuentra dado de alta"); error++; } if (error == 0) { try { - this.getRemoteManagerSystemAdmin().insertAdmin(email, HashUtils.hashMD5(password)); + this.getRemoteManagerSystemAdmin().insertAdmin(email.toLowerCase(), HashUtils.hashMD5(password)); + + this.email = ""; + this.password = ""; this.addFacesMessage(FacesMessage.SEVERITY_INFO, "El administrador se ha dado de alta", "Los datos del administrador se han guardado correctamente."); } catch (Exception e) {