diff --git a/1.sources/MyHealth/docroot/menubar.xhtml b/1.sources/MyHealth/docroot/menubar.xhtml new file mode 100644 index 0000000..2097408 --- /dev/null +++ b/1.sources/MyHealth/docroot/menubar.xhtml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml new file mode 100644 index 0000000..40b1818 --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

AddFamilyDoctor Page

+
+
AddFamilyDoctor:
+
+ AddFamilyDoctor content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/AddPaciente.xhtml b/1.sources/MyHealth/docroot/profile/AddPaciente.xhtml new file mode 100644 index 0000000..5565229 --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/AddPaciente.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

AddPaciente Page

+
+
AddPaciente:
+
+ AddPaciente content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml b/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml new file mode 100644 index 0000000..0c1768a --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

AddSpecialistDoctor Page

+
+
AddSpecialistDoctor:
+
+ AddSpecialistDoctor content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml new file mode 100644 index 0000000..8939d9b --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

ChangeFamilyDoctor Page

+
+
ChangeFamilyDoctor:
+
+ ChangeFamilyDoctor content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml new file mode 100644 index 0000000..2092955 --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

ChangePrimaryHealthCareCenter Page

+
+
ChangePrimaryHealthCareCenter:
+
+ ChangePrimaryHealthCareCenter content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml new file mode 100644 index 0000000..76ce1ed --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

ShowFamilyDoctor Page

+
+
ShowFamilyDoctor:
+
+ ShowFamilyDoctor content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml b/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml new file mode 100644 index 0000000..1e4e54e --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

ShowPaciente Page

+
+
ShowPaciente:
+
+ ShowPaciente content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml new file mode 100644 index 0000000..516efa6 --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

ShowSpecialistDoctor Page

+
+
ShowSpecialistDoctor:
+
+ ShowSpecialistDoctor content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml new file mode 100644 index 0000000..be56e8e --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

UpdateFamilyDoctor Page

+
+
UpdateFamilyDoctor:
+
+ UpdateFamilyDoctor content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/UpdatePaciente.xhtml b/1.sources/MyHealth/docroot/profile/UpdatePaciente.xhtml new file mode 100644 index 0000000..bb15d1b --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/UpdatePaciente.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

UpdatePaciente Page

+
+
UpdatePaciente:
+
+ UpdatePaciente content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml b/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml new file mode 100644 index 0000000..3c3e69f --- /dev/null +++ b/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml @@ -0,0 +1,24 @@ + + + + + + + + +
+

UpdateSpecialistDoctor Page

+
+
UpdateSpecialistDoctor:
+
+ UpdateSpecialistDoctor content +
+
+

+ +

+ + + + diff --git a/1.sources/MyHealth/docroot/visit/testView_3.xhtml b/1.sources/MyHealth/docroot/visit/testView_3.xhtml index 7d9aee8..6c6738c 100644 --- a/1.sources/MyHealth/docroot/visit/testView_3.xhtml +++ b/1.sources/MyHealth/docroot/visit/testView_3.xhtml @@ -16,7 +16,7 @@

- +

diff --git a/1.sources/MyHealth/src/common/AuthorizationFilter.java b/1.sources/MyHealth/src/common/AuthorizationFilter.java index 05fb830..d021547 100644 --- a/1.sources/MyHealth/src/common/AuthorizationFilter.java +++ b/1.sources/MyHealth/src/common/AuthorizationFilter.java @@ -36,10 +36,10 @@ public class AuthorizationFilter implements Filter { String reqURI = reqt.getRequestURI(); if (reqURI.indexOf("/login.xhtml") >= 0 || (ses != null && ses.getAttribute("username") != null) - || reqURI.indexOf("/public/") >= 0 || reqURI.contains("javax.faces.resource")) + || reqURI.indexOf("/public/") >= 0 || reqURI.indexOf("/home.xhtml") >= 0 || reqURI.contains("javax.faces.resource")) chain.doFilter(request, response); else - resp.sendRedirect(reqt.getContextPath() + "/faces/login.xhtml"); + resp.sendRedirect(reqt.getContextPath() + "/login.xhtml"); } catch (Exception e) { System.out.println(e.getMessage()); } diff --git a/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java index c3d147e..c8a8ff3 100644 --- a/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java @@ -18,32 +18,18 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "AddFamilyDoctorMBean") @SessionScoped -public class AddFamilyDoctorMBean implements Serializable { +public class AddFamilyDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; - @EJB - private ProfileFacadeRemote remoteManager; - /** * Constructor. Inicializa la conexión con el EJB Remoto * * @throws Exception */ public AddFamilyDoctorMBean() throws Exception { - initializeAdminFacadeRemote(); + super.initializeProfileFacadeRemote(); } - /** - * 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 = (ProfileFacadeRemote) ctx - .lookup("java:app/myHealth.jar/ProfileFacadeBean!ejb.component.ProfileFacadeRemote"); - } } diff --git a/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java b/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java index e962daa..b035334 100644 --- a/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java @@ -20,13 +20,10 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "AddPatientMBean") @SessionScoped -public class AddPatientMBean implements Serializable { +public class AddPatientMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; - @EJB - private ProfileFacadeRemote remoteManager; - /** * Constructor. Inicializa la conexión con el EJB Remoto * diff --git a/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java index d9d460c..bcf3b56 100644 --- a/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "AddSpecialistDoctorMBean") @SessionScoped -public class AddSpecialistDoctorMBean implements Serializable { +public class AddSpecialistDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; @@ -31,19 +31,7 @@ public class AddSpecialistDoctorMBean implements Serializable { * @throws Exception */ public AddSpecialistDoctorMBean() throws Exception { - initializeAdminFacadeRemote(); - } - - /** - * 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 = (ProfileFacadeRemote) ctx - .lookup("java:app/myHealth.jar/ProfileFacadeBean!ejb.component.ProfileFacadeRemote"); + super.initializeProfileFacadeRemote(); } } diff --git a/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java index c2a34b7..35a2c2a 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "ChangeFamilyDoctorMBean") @SessionScoped -public class ChangeFamilyDoctorMBean implements Serializable { +public class ChangeFamilyDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java b/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java index b8e8ed1..53bf064 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "ChangePrimaryHealthCareCenterMBean") @SessionScoped -public class ChangePrimaryHealthCareCenterMBean implements Serializable { +public class ChangePrimaryHealthCareCenterMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java index 068d364..3104b5f 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "ShowFamilyDoctorMBean") @SessionScoped -public class ShowFamilyDoctorMBean implements Serializable { +public class ShowFamilyDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java b/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java index a4e2c5d..8b2f96d 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "ShowPatientMBean") @SessionScoped -public class ShowPatientMBean implements Serializable { +public class ShowPatientMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java index ca65ec0..7ec71b9 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "ShowSpecialistDoctorMBean") @SessionScoped -public class ShowSpecialistDoctorMBean implements Serializable { +public class ShowSpecialistDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java index 1c07c2a..a29c359 100644 --- a/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "UpdateFamilyDoctorMBean") @SessionScoped -public class UpdateFamilyDoctorMBean implements Serializable { +public class UpdateFamilyDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java index 948a2dd..9ca7052 100644 --- a/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "UpdatePatientMBean") @SessionScoped -public class UpdatePatientMBean implements Serializable { +public class UpdatePatientMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java index ea6ed36..3962b2a 100644 --- a/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java @@ -18,7 +18,7 @@ import ejb.profile.ProfileFacadeRemote; */ @ManagedBean(name = "UpdateSpecialistDoctorMBean") @SessionScoped -public class UpdateSpecialistDoctorMBean implements Serializable { +public class UpdateSpecialistDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/Login.java b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java similarity index 81% rename from 1.sources/MyHealth/src/managedbean/systemAdmin/Login.java rename to 1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java index a0c933e..42f3773 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/Login.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java @@ -10,9 +10,10 @@ import javax.servlet.http.HttpSession; import common.SessionUtils; -@ManagedBean +@SuppressWarnings("deprecation") +@ManagedBean(name = "login") @SessionScoped -public class Login implements Serializable { +public class LoginMBean implements Serializable { private static final long serialVersionUID = 1094801825228386363L; @@ -36,18 +37,18 @@ public class Login implements Serializable { this.msg = msg; } - public String getuserName() { + public String getUserName() { return userName; } - public void setuserName(String user) { + public void setUserName(String user) { this.userName = user; } // validate login public String validateUsernamePassword() { // TODO: Validar login - boolean valid = true; + boolean valid = this.userName.startsWith("a"); if (valid) { HttpSession session = SessionUtils.getSession(); session.setAttribute("username", userName);