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 0000000..583e691 Binary files /dev/null and b/1.sources/MyHealth/docroot/WEB-INF/lib/bootstrap-1.0.10.jar differ diff --git a/1.sources/MyHealth/docroot/WEB-INF/web.xml b/1.sources/MyHealth/docroot/WEB-INF/web.xml index 1d71ea4..172f965 100644 --- a/1.sources/MyHealth/docroot/WEB-INF/web.xml +++ b/1.sources/MyHealth/docroot/WEB-INF/web.xml @@ -1,7 +1,7 @@ - + + + @@ -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"); } }