From 846ff98002dca1b680b9915faccc83f8891bc359 Mon Sep 17 00:00:00 2001 From: mgarcianun Date: Mon, 25 Nov 2019 23:08:25 +0100 Subject: [PATCH] =?UTF-8?q?*=20Implementado=20esqueleto=20de=20menu=20prin?= =?UTF-8?q?cipal.=20*=20Filtro=20AuthorizationFilter=20para=20gestionar=20?= =?UTF-8?q?inicio=20de=20sesi=C3=B3n.=20*=20Interfaz=20para=20p=C3=A1gina?= =?UTF-8?q?=20de=20login=20b=C3=A1sica.=20*=20Todos=20los=20managed=20bean?= =?UTF-8?q?s=20movidos=20a=20paquete=20managedbean=20*=20Configuraci=C3=B3?= =?UTF-8?q?n=20b=C3=A1sica=20de=20faces-config=20con=20navegaci=C3=B3n=20d?= =?UTF-8?q?e=20paginas=20outcome.=20*=20Actualizado=20web.xml=20*=20Utiliz?= =?UTF-8?q?aci=C3=B3n=20de=20librer=C3=ADa=20primefaces=20para=20interfaz?= =?UTF-8?q?=20de=20usuario.=20*=20Aplicado=20tema=20bootstrap=20para=20pri?= =?UTF-8?q?mefaces.=20*=20Los=20iconos=20(glyph-icons)=20de=20primefaces?= =?UTF-8?q?=20no=20se=20cargan=20en=20la=20interfaz=20(Pendiente=20de=20in?= =?UTF-8?q?vestigar).=20*=20Actualizaci=C3=B3n=20de=20projects=20archives?= =?UTF-8?q?=20para=20inclusi=C3=B3n=20de=20clases=20nuevas=20en=20JAR/WAR/?= =?UTF-8?q?EAR=20de=20forma=20correcta.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.sources/MyHealth/.project | 2 +- .../MyHealth/docroot/WEB-INF/faces-config.xml | 70 +++- .../docroot/WEB-INF/lib/bootstrap-1.0.10.jar | Bin 0 -> 16476 bytes 1.sources/MyHealth/docroot/WEB-INF/web.xml | 106 +++++- 1.sources/MyHealth/docroot/error.xhtml | 2 +- 1.sources/MyHealth/docroot/header.xhtml | 90 +++++- 1.sources/MyHealth/docroot/home.xhtml | 34 +- 1.sources/MyHealth/docroot/login.xhtml | 54 ++-- .../MedicalTests.xhtml} | 8 +- .../docroot/profile/AddFamilyDoctor.xhtml | 2 +- .../{AddPaciente.xhtml => AddPatient.xhtml} | 4 +- .../docroot/profile/AddSpecialistDoctor.xhtml | 2 +- .../docroot/profile/ChangeFamilyDoctor.xhtml | 2 +- .../ChangePrimaryHealthCareCenter.xhtml | 2 +- .../docroot/profile/ShowFamilyDoctor.xhtml | 2 +- .../docroot/profile/ShowPaciente.xhtml | 25 +- ...datePaciente.xhtml => UpdatePatient.xhtml} | 0 .../docroot/resources/css/estilos.css | 303 +----------------- .../ManageSpecialties.xhtml} | 8 +- .../testView.xhtml => visit/VisitView.xhtml} | 8 +- .../src/common/ApplicationConfig.java | 10 - 1.sources/MyHealth/src/common/homeMBean.java | 28 -- .../common/AuthorizationFilter.java | 2 +- .../src/managedbean/common/MenuMBean.java | 115 +++++++ .../common/SessionUtils.java | 23 +- .../src/managedbean/common/homeMBean.java | 41 +++ .../medicalTest/MedicalTestMBean.java | 8 +- .../profile/AddFamilyDoctorMBean.java | 17 +- .../managedbean/profile/AddPatientMBean.java | 9 +- .../profile/AddSpecialistDoctorMBean.java | 11 +- .../profile/ChangeFamilyDoctorMBean.java | 8 +- .../ChangePrimaryHealthCareCenterMBean.java | 8 +- .../managedbean/profile/ProfileMBeanBase.java | 2 + .../profile/ShowFamilyDoctorMBean.java | 8 +- .../managedbean/profile/ShowPatientMBean.java | 11 +- .../profile/ShowSpecialistDoctorMBean.java | 8 +- .../profile/UpdateFamilyDoctorMBean.java | 11 +- .../profile/UpdatePatientMBean.java | 11 +- .../profile/UpdateSpecialistDoctorMBean.java | 11 +- .../managedbean/systemAdmin/LoginMBean.java | 75 ++--- .../systemAdmin/SystemAdminMBean.java | 11 +- .../src/managedbean/visit/VisitMBean.java | 11 +- 42 files changed, 582 insertions(+), 581 deletions(-) create mode 100644 1.sources/MyHealth/docroot/WEB-INF/lib/bootstrap-1.0.10.jar rename 1.sources/MyHealth/docroot/{systemAdmin/testView_2.xhtml => medicaltest/MedicalTests.xhtml} (76%) rename 1.sources/MyHealth/docroot/profile/{AddPaciente.xhtml => AddPatient.xhtml} (84%) rename 1.sources/MyHealth/docroot/profile/{UpdatePaciente.xhtml => UpdatePatient.xhtml} (100%) rename 1.sources/MyHealth/docroot/{visit/testView_3.xhtml => systemAdmin/ManageSpecialties.xhtml} (76%) rename 1.sources/MyHealth/docroot/{medicaltest/testView.xhtml => visit/VisitView.xhtml} (78%) delete mode 100644 1.sources/MyHealth/src/common/ApplicationConfig.java delete mode 100644 1.sources/MyHealth/src/common/homeMBean.java rename 1.sources/MyHealth/src/{ => managedbean}/common/AuthorizationFilter.java (94%) create mode 100644 1.sources/MyHealth/src/managedbean/common/MenuMBean.java rename 1.sources/MyHealth/src/{ => managedbean}/common/SessionUtils.java (54%) create mode 100644 1.sources/MyHealth/src/managedbean/common/homeMBean.java diff --git a/1.sources/MyHealth/.project b/1.sources/MyHealth/.project index 359ab94..5a94305 100644 --- a/1.sources/MyHealth/.project +++ b/1.sources/MyHealth/.project @@ -17,7 +17,7 @@ - org.jboss.ide.eclipse.archives.core.archivesNature org.eclipse.jdt.core.javanature + org.jboss.ide.eclipse.archives.core.archivesNature diff --git a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml index 4ebfd2c..b8b9092 100644 --- a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml +++ b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml @@ -1,17 +1,67 @@ - - - + + - /login.xhtml home /home.xhtml + + AddPatient + /profile/AddPatient.xhtml + + + AddFamilyDoctor + /profile/AddFamilyDoctor.xhtml + + + AddSpecialistDoctor + /profile/AddSpecialistDoctor.xhtml + + + ChangeFamilyDoctor + /profile/ChangeFamilyDoctor.xhtml + + + ShowPatient + /profile/ShowPatient.xhtml + + + ShowFamilyDoctor + /profile/ShowFamilyDoctor.xhtml + + + ShowSpecialistDoctor + /profile/ShowSpecialistDoctor.xhtml + + + UpdateSpecialistDoctor + /profile/UpdateSpecialistDoctor.xhtml + + + UpdateFamilyDoctor + /profile/UpdateFamilyDoctor.xhtml + + + UpdatePatient + /profile/UpdatePatient.xhtml + + + changecap + /profile/ChangePrimaryHealthCareCenter.xhtml + + + MedicalTests + /medicaltest/MedicalTests.xhtml + + + VisitView + /visit/VisitView.xhtml + + + ManageSpecialties + /systemAdmin/ManageSpecialties.xhtml + - - - \ No newline at end of file + diff --git a/1.sources/MyHealth/docroot/WEB-INF/lib/bootstrap-1.0.10.jar b/1.sources/MyHealth/docroot/WEB-INF/lib/bootstrap-1.0.10.jar new file mode 100644 index 0000000000000000000000000000000000000000..583e691bfda5fc296eba72b7fbc528661f566121 GIT binary patch literal 16476 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 + + + @@ -19,29 +19,101 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" true + + javax.faces.DEFAULT_SUFFIX + .xhtml + + + primefaces.THEME + bootstrap + + + Faces Servlet javax.faces.webapp.FacesServlet 1 + + + Faces Servlet + /faces/* + + + Faces Servlet + *.jsf + + + Faces Servlet + *.faces + Faces Servlet *.xhtml - - - 404 - /error.xhtml - - - 500 - /error.xhtml - - - - home.xhtml - + + + + + + + + + + 30 + + + + + + home.xhtml + + + + ttf + application/font-sfnt + + + woff + application/font-woff + + + woff2 + application/font-woff2 + + + eot + application/vnd.ms-fontobject + + + eot?#iefix + application/vnd.ms-fontobject + + + svg + image/svg+xml + + + svg#latobold + image/svg+xml + + + svg#latoblack + image/svg+xml + + + svg#latolight + image/svg+xml + + + svg#latoregular + image/svg+xml + + + svg#fontawesomeregular + image/svg+xml + diff --git a/1.sources/MyHealth/docroot/error.xhtml b/1.sources/MyHealth/docroot/error.xhtml index 1f552b1..3e98d38 100644 --- a/1.sources/MyHealth/docroot/error.xhtml +++ b/1.sources/MyHealth/docroot/error.xhtml @@ -17,7 +17,7 @@

- +

diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml index 7f7c8b7..a764b67 100644 --- a/1.sources/MyHealth/docroot/header.xhtml +++ b/1.sources/MyHealth/docroot/header.xhtml @@ -1,35 +1,103 @@ - - myHealth page header + MyHealth Online Services - + + function handleLoginRequest(xhr, status, args) { + if(args.validationFailed || !args.loggedIn) { + PF('dlgLogin').jq.effect("shake", {times:5}, 100); + } + else { + PF('dlgLogin').hide(); + $('#loginLink').fadeOut(); + } + } +

myHealth Site

- diff --git a/1.sources/MyHealth/docroot/home.xhtml b/1.sources/MyHealth/docroot/home.xhtml index 0633d02..a37395a 100644 --- a/1.sources/MyHealth/docroot/home.xhtml +++ b/1.sources/MyHealth/docroot/home.xhtml @@ -1,10 +1,7 @@ - @@ -13,23 +10,20 @@ - - - - + + + + + + + + + + + - - - -
-
- -
-
- -
Welcome #{home.userName} - -
+ + diff --git a/1.sources/MyHealth/docroot/login.xhtml b/1.sources/MyHealth/docroot/login.xhtml index 558b90c..d6a1daa 100644 --- a/1.sources/MyHealth/docroot/login.xhtml +++ b/1.sources/MyHealth/docroot/login.xhtml @@ -1,32 +1,46 @@ - - + login + + + - -

myHealth login

- - - - -



- - - - -



- - - + + + Login + + + + + + + + + + + + + + + + diff --git a/1.sources/MyHealth/docroot/systemAdmin/testView_2.xhtml b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml similarity index 76% rename from 1.sources/MyHealth/docroot/systemAdmin/testView_2.xhtml rename to 1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml index 6c6738c..15133ec 100644 --- a/1.sources/MyHealth/docroot/systemAdmin/testView_2.xhtml +++ b/1.sources/MyHealth/docroot/medicaltest/MedicalTests.xhtml @@ -8,15 +8,15 @@
-

test Page

+

Medical Tests

-
TestPage:
+
Medical Tests TestPage:
- test page content + Medical Tests content

- +

diff --git a/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml index 40b1818..73415a0 100644 --- a/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml +++ b/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml @@ -16,7 +16,7 @@

- +

diff --git a/1.sources/MyHealth/docroot/profile/AddPaciente.xhtml b/1.sources/MyHealth/docroot/profile/AddPatient.xhtml similarity index 84% rename from 1.sources/MyHealth/docroot/profile/AddPaciente.xhtml rename to 1.sources/MyHealth/docroot/profile/AddPatient.xhtml index 5565229..9dfff79 100644 --- a/1.sources/MyHealth/docroot/profile/AddPaciente.xhtml +++ b/1.sources/MyHealth/docroot/profile/AddPatient.xhtml @@ -6,7 +6,7 @@ - +

AddPaciente Page

@@ -16,7 +16,7 @@

- +

diff --git a/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml b/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml index 0c1768a..f1121b0 100644 --- a/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml +++ b/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml @@ -16,7 +16,7 @@

- +

diff --git a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml index 8939d9b..8c1694c 100644 --- a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml +++ b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml @@ -16,7 +16,7 @@

- +

diff --git a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml index 2092955..347109a 100644 --- a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml +++ b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml @@ -16,7 +16,7 @@

- +

diff --git a/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml index 76ce1ed..7abbf6e 100644 --- a/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml +++ b/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml @@ -16,7 +16,7 @@

- +

diff --git a/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml b/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml index 1e4e54e..557403b 100644 --- a/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml +++ b/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml @@ -1,24 +1,21 @@ - + - + - -
-

ShowPaciente Page

-
-
ShowPaciente:
-
- ShowPaciente content -
+ +
+

ShowPaciente Page

+
+
ShowPaciente:
+
ShowPaciente content

- +

- + - + diff --git a/1.sources/MyHealth/docroot/profile/UpdatePaciente.xhtml b/1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml similarity index 100% rename from 1.sources/MyHealth/docroot/profile/UpdatePaciente.xhtml rename to 1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml diff --git a/1.sources/MyHealth/docroot/resources/css/estilos.css b/1.sources/MyHealth/docroot/resources/css/estilos.css index ba794fe..ff0b1b7 100644 --- a/1.sources/MyHealth/docroot/resources/css/estilos.css +++ b/1.sources/MyHealth/docroot/resources/css/estilos.css @@ -1,304 +1,3 @@ BODY{ font-family: Verdana, Arial, Helvetica, sans-serif; -} - -.ErrorMessage { - color: red; - font-size: 1.5em; -} - -.col1 { - width: 200px; -} - -.col2 { - width: 370px; -} - -.col3 { - width: 130px; - text-align: center; -} - -.estilomenu { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; -} - -.estilomenu2 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; -} - - -a.estilomenu2:link {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;font-weight: bold;text-decoration: none} -a.estilomenu2:visited {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;font-weight: bold;text-decoration: none} -a.estilomenu2:active {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;font-weight: bold;text-decoration: none} -a.estilomenu2:hover {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;font-weight: bold;text-decoration: none} - -.fecha { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; -} - -a.fecha:link {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;text-decoration: none} -a.fecha:visited {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;text-decoration: none} -a.fecha:active {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;text-decoration: none} -a.fecha:hover {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #939393;text-decoration: none} - -.Titulo { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 2.5em; - font-weight: normal; - text-align: center; -} -.paginacentral { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 16px; - font-weight: bold; - color: #939393; -} -.titulopequeno { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 9px; - font-weight: bold; -} - -.estilomenucabecera { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - font-weight: bold; -} - -.formularios { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; -} -.listado { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; -} - - -.estiloidiomas { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: 400; - -} - - - - - - - -.formulariospequeno { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: 600; -} - -.rojo { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold ; color: #FF0000} - - -a:link {color: #FFFFFF} -a:active {color: #FFFFFF} -a:visited {color: #FFFFFF} -a:hover {color: #FFFFFF} - - -.noticias1 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold; color: #FFFFFF; text-decoration:none } - -a.apartados:link {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} -a.apartados:visited {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} -a.apartados:active {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} -a.apartados:hover {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} - - -.pestanas {font-family: Arial, Helvetica, sans-serif;font-size: 12px;font-weight: bold;} - -a.pestanas:link {font-family: Arial, Helvetica, sans-serif;font-size: 12px;font-weight:bold; color: #939393; text-decoration: none} -a.pestanas:visited {font-family: Arial, Helvetica, sans-serif;font-size: 12px;font-weight: bold;color: #939393; text-decoration: none} -a.pestanas:active {font-family: Arial, Helvetica, sans-serif;font-size: 12px;font-weight: bold;color: #939393; text-decoration: none} -a.pestanas:hover {font-family: Arial, Helvetica, sans-serif;font-size: 12px;font-weight: bold;color: #939393 ; text-decoration: none} - - - -.estiloidiomas {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;} - -a.estiloidiomas:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: none} -a.estiloidiomas:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: none} -a.estiloidiomas:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: none} -a.estiloidiomas:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: none} - - -a.estiloidiomas2:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: underline} -a.estiloidiomas2:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: none} -a.estiloidiomas2:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: underline} -a.estiloidiomas2:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: 400;color: #939393; text-decoration: underline} - - - -a.linknegritasubrrado:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: bold;color: #939393; text-decoration: underline} -a.linknegritasubrrado:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: bold;color: #939393; text-decoration: none} -a.linknegritasubrrado:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: bold;color: #939393; text-decoration: underline} -a.linknegritasubrrado:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px;font-weight: bold;color: #939393; text-decoration: underline} - - - - - - -a.apartados2:link {font-family: Verdana;color:#3131D1 ; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} -a.apartados2:visited {font-family: Verdana;color: #3131D1; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} -a.apartados2:active {font-family: Verdana;color: #3131D1; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} -a.apartados2:hover {font-family: Verdana;color: #3131D1; text-decoration: none; font-size: 12px; font-size: 10px; font-weight: bold} - - -a.apartados3:link {font-family: Verdana;color:#3131D1 ; text-decoration: underline; font-size: 13px; font-size: 10px; font-weight: bold} -a.apartados3:visited {font-family: Verdana;color: #3131D1; text-decoration: underline; font-size: 13px; font-size: 10px; font-weight: bold} -a.apartados3:active {font-family: Verdana;color: #3131D1; text-decoration: underline; font-size: 13px; font-size: 10px; font-weight: bold} -a.apartados3:hover {font-family: Verdana;color: #3131D1; text-decoration: underline; font-size: 13px; font-size: 10px; font-weight: bold} - - - - -a.titulopequeno:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: bold;color: #939393;text-decoration: none} -a.titulopequeno:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: bold;color: #939393;text-decoration: none} -a.titulopequeno:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: bold;color: #939393;text-decoration: none} -a.titulopequeno:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 9px; font-weight: bold;color: #939393;text-decoration: none} - - - - - - -a.inicio:link {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 14px; font-weight: bold} -a.inicio:visited {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 14px; font-weight: bold} -a.inicio:active {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 14px; font-weight: bold} -a.inicio:hover {font-family: Verdana;color: #939393; text-decoration: none; font-size: 12px; font-size: 14px; font-weight: bold} -.masinfo {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: 400; text-decoration: underline;} - - - - -a.listado:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393;text-decoration:none} -a.listado:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393;text-decoration:none} -a.listado:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393;text-decoration:none} -a.listado:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393;text-decoration:none} - - - -.carrito {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold;} - - -a.carrito:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold;color: #939393;text-decoration:none} -a.carrito:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold;color: #939393;text-decoration:none} -a.carrito:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold;color: #939393;text-decoration:none} -a.carrito:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold;color: #939393; text-decoration:none} - - - -.linksabajo {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;font-weight: 400;color: #666666;} - -a.linksabajo:link {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;font-weight: 400;color: #666666;} -a.linksabajo:visited {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;font-weight: 400;color: #666666;} -a.linksabajo:active {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;font-weight: 400;color: #666666;} -a.linksabajo:hover {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;font-weight: 400;color: #666666;} - - - -a.masinfo:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: 400; text-decoration: underline;color: #939393;} -a.masinfo:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: 400; text-decoration: underline;color: #939393;} -a.masinfo:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: 400; text-decoration: underline;color: #939393;} -a.masinfo:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: 400; text-decoration: underline;color: #939393;}.estilonoticias { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - font-weight: 600; - letter-spacing: 2px; -} -.estilorecomanacions { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - font-weight: 600; - letter-spacing: 2px; - color: #A0630F; - -} -.estilonovetats { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - font-weight: 600; - letter-spacing: 2px; - color: #2F2F2F; - -} -.resaltado { - - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - font-weight: 600; - letter-spacing: 2px; - color: #2F2F2F; -} -.destacado { - - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - font-weight: 600; - letter-spacing: 2px; - color: #800000; -} -.registro {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold ; color: #939393} - - -a.registro:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold ; color: #939393; text-decoration: none} -a.registro:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold ; color: #939393; text-decoration: none} -a.registro:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold ; color: #939393; text-decoration: none} -a.registro:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; font-weight: bold ; color: #939393; text-decoration: underline} - - - - -.listadogris {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393; font-weight: bold;} - -a.listadogris:link {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393; font-weight: bold; text-decoration: none} -a.listadogris:visited {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393; font-weight: bold; text-decoration: none} -a.listadogris:active {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393; font-weight: bold; text-decoration: none} -a.listadogris:hover {font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; color: #939393; font-weight: bold; text-decoration: underline} - - - - - -.botonpeque { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 9px; - font-weight: normal; -} -.formulariosNegrita { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - font-weight: bold; - -} -.destacadopeque { - - - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; - color: #404040; -} -.listadogris { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - color: #939393; - font-weight: bold; - - -} -.linklistado { font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;font-weight: 400;color: #939393; } \ No newline at end of file +} \ No newline at end of file diff --git a/1.sources/MyHealth/docroot/visit/testView_3.xhtml b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml similarity index 76% rename from 1.sources/MyHealth/docroot/visit/testView_3.xhtml rename to 1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml index 6c6738c..f41089e 100644 --- a/1.sources/MyHealth/docroot/visit/testView_3.xhtml +++ b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml @@ -8,15 +8,15 @@
-

test Page

+

System Admin Page

-
TestPage:
+
System Admin TestPage:
- test page content + System Admin page content

- +

diff --git a/1.sources/MyHealth/docroot/medicaltest/testView.xhtml b/1.sources/MyHealth/docroot/visit/VisitView.xhtml similarity index 78% rename from 1.sources/MyHealth/docroot/medicaltest/testView.xhtml rename to 1.sources/MyHealth/docroot/visit/VisitView.xhtml index 6c6738c..2f35662 100644 --- a/1.sources/MyHealth/docroot/medicaltest/testView.xhtml +++ b/1.sources/MyHealth/docroot/visit/VisitView.xhtml @@ -8,15 +8,15 @@
-

test Page

+

Visit Page

-
TestPage:
+
Visit TestPage:
- test page content + Visit page content

- +

diff --git a/1.sources/MyHealth/src/common/ApplicationConfig.java b/1.sources/MyHealth/src/common/ApplicationConfig.java deleted file mode 100644 index b9a26b1..0000000 --- a/1.sources/MyHealth/src/common/ApplicationConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -package common; - -import javax.enterprise.context.ApplicationScoped; -import javax.faces.annotation.FacesConfig; - -@FacesConfig -@ApplicationScoped -public class ApplicationConfig { - -} diff --git a/1.sources/MyHealth/src/common/homeMBean.java b/1.sources/MyHealth/src/common/homeMBean.java deleted file mode 100644 index e34e171..0000000 --- a/1.sources/MyHealth/src/common/homeMBean.java +++ /dev/null @@ -1,28 +0,0 @@ -package common; - -import java.io.Serializable; - -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; - -/*** - * - * @author Marcos García Núñez (mgarcianun@uoc.edu) - * - */ -@SuppressWarnings("deprecation") -@ManagedBean(name = "home") -@SessionScoped -public class homeMBean implements Serializable { - - private static final long serialVersionUID = 1L; - - public String getUserName() { - return SessionUtils.getSession().getAttribute("username").toString(); - } - - public String getUserId() { - return (String) SessionUtils.getSession().getAttribute("userid"); - } - -} diff --git a/1.sources/MyHealth/src/common/AuthorizationFilter.java b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java similarity index 94% rename from 1.sources/MyHealth/src/common/AuthorizationFilter.java rename to 1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java index d021547..fde294e 100644 --- a/1.sources/MyHealth/src/common/AuthorizationFilter.java +++ b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java @@ -1,5 +1,5 @@ -package common; +package managedbean.common; import java.io.IOException; diff --git a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java new file mode 100644 index 0000000..d242825 --- /dev/null +++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java @@ -0,0 +1,115 @@ +package managedbean.common; + +import java.io.Serializable; + +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.menu.DefaultMenuItem; +import org.primefaces.model.menu.DefaultMenuModel; +import org.primefaces.model.menu.DefaultSubMenu; +import org.primefaces.model.menu.MenuModel; + +@Named("menuView") +@RequestScoped +public class MenuMBean implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + private MenuModel model; + + @PostConstruct + public void init() { + model = new DefaultMenuModel(); + + // First submenu + DefaultSubMenu firstSubmenu = new DefaultSubMenu("Dynamic submenu"); + DefaultMenuItem item = new DefaultMenuItem("External", "", "www.google.com"); +// item.setUrl("www.google.com"); + firstSubmenu.getElements().add(item); + + model.getElements().add(firstSubmenu); + + // Second submenu + DefaultSubMenu secondSubmenu = new DefaultSubMenu("Dynamic Actions"); + + item = new DefaultMenuItem("Save", "pi pi-save"); + item.setCommand("#{menuView.save}"); + item.setUpdate("messages"); + secondSubmenu.getElements().add(item); + + item = new DefaultMenuItem("Delete", "pi pi-times"); + item.setCommand("#{menuView.delete}"); + item.setAjax(false); + secondSubmenu.getElements().add(item); + + item = new DefaultMenuItem("Redirect", "pi pi-search"); + item.setCommand("#{menuView.redirect}"); + secondSubmenu.getElements().add(item); + + model.getElements().add(secondSubmenu); + } + + public MenuModel getModel() { + return model; + } + + public void save() { + addMessage("Success", "Data saved"); + } + + public void update() { + addMessage("Success", "Data updated"); + } + + public void delete() { + addMessage("Success", "Data deleted"); + } + + public String goManageSpecialties() { + + return "ManageSpecialties"; + } + + public String goVisit() { + return "VisitView"; + } + + public String goMedicalTests() { + return "MedicalTests"; + } + + public String goListSpecialistDoctors() { + return "header"; + } + + public String goListSpecialistDoctorsBySpecialty() { + return "header"; + } + + public String goListaFamilyDoctors() { + return "header"; + } + + public String goChangeDoctor() { + return "header"; + } + + public String goChangeCAP() { + return "header"; + } + + public String goAddPatient() { + return "profile/AddPaciente"; + } + + public void addMessage(String summary, String detail) { + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, summary, detail); + FacesContext.getCurrentInstance().addMessage(null, message); + } +} \ No newline at end of file diff --git a/1.sources/MyHealth/src/common/SessionUtils.java b/1.sources/MyHealth/src/managedbean/common/SessionUtils.java similarity index 54% rename from 1.sources/MyHealth/src/common/SessionUtils.java rename to 1.sources/MyHealth/src/managedbean/common/SessionUtils.java index 7360cea..73b1297 100644 --- a/1.sources/MyHealth/src/common/SessionUtils.java +++ b/1.sources/MyHealth/src/managedbean/common/SessionUtils.java @@ -1,10 +1,11 @@ -package common; +package managedbean.common; import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; + public class SessionUtils { public static HttpSession getSession() { @@ -15,16 +16,26 @@ public class SessionUtils { return (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest(); } + public static boolean isLogedIn() { + if (getUserId() == "") + return false; + else + return true; + } + public static String getUserName() { - HttpSession session = (HttpSession) FacesContext.getCurrentInstance().getExternalContext().getSession(false); - return session.getAttribute("username").toString(); + HttpSession session = getSession(); + if (session != null && session.getAttribute("username") != null) + return session.getAttribute("username").toString(); + else + return ""; } public static String getUserId() { HttpSession session = getSession(); - if (session != null) - return (String) session.getAttribute("userid"); + if (session != null && session.getAttribute("userid") != null) + return session.getAttribute("userid").toString(); else - return null; + return ""; } } diff --git a/1.sources/MyHealth/src/managedbean/common/homeMBean.java b/1.sources/MyHealth/src/managedbean/common/homeMBean.java new file mode 100644 index 0000000..50524ee --- /dev/null +++ b/1.sources/MyHealth/src/managedbean/common/homeMBean.java @@ -0,0 +1,41 @@ +package managedbean.common; + +import java.io.Serializable; + +import javax.annotation.PostConstruct; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; + +/*** + * + * @author Marcos García Núñez (mgarcianun@uoc.edu) + * + */ +@Named("home") +@RequestScoped +public class homeMBean implements Serializable { + + private static final long serialVersionUID = 1L; + private boolean isLogedIn; + + @PostConstruct + public void init() { + isLogedIn = SessionUtils.isLogedIn(); + } + + public boolean isLogedIn() { + return this.isLogedIn; + } + + public String getUserName() { + if (this.isLogedIn == false) + return "Invitado"; + else + return SessionUtils.getUserName(); + } + + public String getUserId() { + return SessionUtils.getUserId(); + } + +} diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java index d601661..f14f4e7 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -18,8 +18,8 @@ import ejb.medicalTest.MedicalTestFacadeRemote; * @author mark * */ -@ManagedBean(name = "MedicalTestMBean") -@SessionScoped +@Named("MedicalTestMBean") +@RequestScoped public class MedicalTestMBean implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java index c8a8ff3..b19a696 100644 --- a/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java @@ -1,24 +1,18 @@ package managedbean.profile; import java.io.Serializable; -import java.util.Properties; -import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.naming.Context; -import javax.naming.InitialContext; - -import ejb.profile.ProfileFacadeRemote; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; /*** * * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "AddFamilyDoctorMBean") -@SessionScoped -public class AddFamilyDoctorMBean extends ProfileMBeanBase implements Serializable { +@Named("AddFamilyDoctorMBean") +@RequestScoped +public class AddFamilyDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; @@ -31,5 +25,4 @@ public class AddFamilyDoctorMBean extends ProfileMBeanBase implements Serializab super.initializeProfileFacadeRemote(); } - } diff --git a/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java b/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java index b035334..cf3e4bb 100644 --- a/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java @@ -3,9 +3,8 @@ package managedbean.profile; import java.io.Serializable; import java.util.Properties; -import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -18,8 +17,8 @@ import ejb.profile.ProfileFacadeRemote; * @author mark * */ -@ManagedBean(name = "AddPatientMBean") -@SessionScoped +@Named( "AddPatientMBean") +@RequestScoped public class AddPatientMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java index bcf3b56..1368f4e 100644 --- a/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java @@ -1,13 +1,10 @@ package managedbean.profile; import java.io.Serializable; -import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.naming.Context; -import javax.naming.InitialContext; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import ejb.profile.ProfileFacadeRemote; @@ -16,8 +13,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "AddSpecialistDoctorMBean") -@SessionScoped +@Named( "AddSpecialistDoctorMBean") +@RequestScoped public class AddSpecialistDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java index 35a2c2a..5b1c361 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "ChangeFamilyDoctorMBean") -@SessionScoped +@Named( "ChangeFamilyDoctorMBean") +@RequestScoped 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 53bf064..ed7bd79 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "ChangePrimaryHealthCareCenterMBean") -@SessionScoped +@Named( "ChangePrimaryHealthCareCenterMBean") +@RequestScoped public class ChangePrimaryHealthCareCenterMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; diff --git a/1.sources/MyHealth/src/managedbean/profile/ProfileMBeanBase.java b/1.sources/MyHealth/src/managedbean/profile/ProfileMBeanBase.java index 3c65043..5bb3dc2 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ProfileMBeanBase.java +++ b/1.sources/MyHealth/src/managedbean/profile/ProfileMBeanBase.java @@ -3,11 +3,13 @@ package managedbean.profile; import java.util.Properties; import javax.ejb.EJB; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import ejb.profile.ProfileFacadeRemote; +@Named("profileMBean") public class ProfileMBeanBase { @EJB protected ProfileFacadeRemote remoteManager; diff --git a/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java index 3104b5f..b1e4975 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "ShowFamilyDoctorMBean") -@SessionScoped +@Named( "ShowFamilyDoctorMBean") +@RequestScoped 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 8b2f96d..2dcd888 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "ShowPatientMBean") -@SessionScoped +@Named("ShowPatientMBean") +@RequestScoped public class ShowPatientMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; @@ -42,8 +42,7 @@ public class ShowPatientMBean extends ProfileMBeanBase implements Serializable { 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"); + remoteManager = (ProfileFacadeRemote) ctx.lookup("java:app/myHealth.jar/ProfileFacadeBean!ejb.component.ProfileFacadeRemote"); } } diff --git a/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java index 7ec71b9..3f43dbf 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "ShowSpecialistDoctorMBean") -@SessionScoped +@Named( "ShowSpecialistDoctorMBean") +@RequestScoped 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 a29c359..a569289 100644 --- a/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "UpdateFamilyDoctorMBean") -@SessionScoped +@Named("UpdateFamilyDoctorMBean") +@RequestScoped public class UpdateFamilyDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; @@ -42,8 +42,7 @@ public class UpdateFamilyDoctorMBean extends ProfileMBeanBase implements Seriali 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"); + remoteManager = (ProfileFacadeRemote) ctx.lookup("java:app/myHealth.jar/ProfileFacadeBean!ejb.component.ProfileFacadeRemote"); } } diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java index 9ca7052..5074d27 100644 --- a/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "UpdatePatientMBean") -@SessionScoped +@Named("UpdatePatientMBean") +@RequestScoped public class UpdatePatientMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; @@ -42,8 +42,7 @@ public class UpdatePatientMBean extends ProfileMBeanBase implements Serializable 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"); + remoteManager = (ProfileFacadeRemote) ctx.lookup("java:app/myHealth.jar/ProfileFacadeBean!ejb.component.ProfileFacadeRemote"); } } diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java index 3962b2a..1bbdcca 100644 --- a/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -16,8 +16,8 @@ import ejb.profile.ProfileFacadeRemote; * @author Marcos García Núñez (mgarcianun@uoc.edu) * */ -@ManagedBean(name = "UpdateSpecialistDoctorMBean") -@SessionScoped +@Named("UpdateSpecialistDoctorMBean") +@RequestScoped public class UpdateSpecialistDoctorMBean extends ProfileMBeanBase implements Serializable { private static final long serialVersionUID = 1L; @@ -42,8 +42,7 @@ public class UpdateSpecialistDoctorMBean extends ProfileMBeanBase implements Ser 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"); + remoteManager = (ProfileFacadeRemote) ctx.lookup("java:app/myHealth.jar/ProfileFacadeBean!ejb.component.ProfileFacadeRemote"); } } diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java index 42f3773..ee31099 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java @@ -1,63 +1,56 @@ package managedbean.systemAdmin; -import java.io.Serializable; - +import javax.enterprise.context.RequestScoped; import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; import javax.faces.context.FacesContext; +import javax.inject.Named; import javax.servlet.http.HttpSession; -import common.SessionUtils; +import org.primefaces.PrimeFaces; -@SuppressWarnings("deprecation") -@ManagedBean(name = "login") -@SessionScoped -public class LoginMBean implements Serializable { +import managedbean.common.SessionUtils; - private static final long serialVersionUID = 1094801825228386363L; +@Named("loginView") +@RequestScoped +public class LoginMBean { - private String Password; - private String msg; - private String userName; + private String username; + + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } public String getPassword() { - return Password; + return password; } - public void setPassword(String pwd) { - this.Password = pwd; + public void setPassword(String password) { + this.password = password; } - public String getMsg() { - return msg; - } + public void login() { + FacesMessage message = null; + boolean loggedIn = false; - public void setMsg(String msg) { - this.msg = msg; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String user) { - this.userName = user; - } - - // validate login - public String validateUsernamePassword() { - // TODO: Validar login - boolean valid = this.userName.startsWith("a"); - if (valid) { + if (username != null && username.equals("admin") && password != null && password.equals("admin")) { + loggedIn = true; HttpSession session = SessionUtils.getSession(); - session.setAttribute("username", userName); - return "home"; + session.setAttribute("username", username); + session.setAttribute("userid", "1"); + message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Bienvenido", username); } else { - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_WARN, - "Usuario o contraseña incorrecta", "Por favor, intentalo de nuevo")); - return "login"; + loggedIn = false; + message = new FacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos"); } + + FacesContext.getCurrentInstance().addMessage(null, message); + PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn); } // logout event, invalidate session diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java index 3432a49..5d7eb33 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -18,8 +18,8 @@ import ejb.systemAdmin.SystemAdminFacadeRemote; * @author mark * */ -@ManagedBean(name = "SystemAdminMBean") -@SessionScoped +@Named("SystemAdminMBean") +@RequestScoped public class SystemAdminMBean implements Serializable { private static final long serialVersionUID = 1L; @@ -44,8 +44,7 @@ public class SystemAdminMBean implements Serializable { 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"); + remoteManager = (SystemAdminFacadeRemote) ctx.lookup("java:app/myHealth.jar/ClassFacadeBean!ejb.component.SystemAdminFacadeRemote"); } } diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java index 26bff4e..9c32df4 100644 --- a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java +++ b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.util.Properties; import javax.ejb.EJB; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.enterprise.context.RequestScoped; +import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; @@ -18,8 +18,8 @@ import ejb.visit.VisitFacadeRemote; * @author mark * */ -@ManagedBean(name = "SystemAdminMBean") -@SessionScoped +@Named("VisitMBean") +@RequestScoped public class VisitMBean implements Serializable { private static final long serialVersionUID = 1L; @@ -44,8 +44,7 @@ public class VisitMBean implements Serializable { 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"); + remoteManager = (VisitFacadeRemote) ctx.lookup("java:app/myHealth.jar/ClassFacadeBean!ejb.component.VisitFacadeRemote"); } }