From 55e69697edd03415dc003aff2edeeac82c08d196 Mon Sep 17 00:00:00 2001
From: mgarcianun <mgarcianun@uoc.edu>
Date: Wed, 4 Dec 2019 17:29:41 +0100
Subject: [PATCH] =?UTF-8?q?Men=C3=BA=20principal=20din=C3=A1mico=20en=20fu?=
 =?UTF-8?q?nci=C3=B3n=20de=20login/logout=20y=20refresco=20de=20la=20p?=
 =?UTF-8?q?=C3=A1gina=20principal=20al=20realizar=20login=20o=20logout.=20?=
 =?UTF-8?q?Activaci=C3=B3n=20de=20awesome=20fonts=20de=20primefaces,=20par?=
 =?UTF-8?q?a=20disponer=20de=20=C3=A1s=20iconos.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.sources/MyHealth/docroot/WEB-INF/web.xml    |  6 ++
 1.sources/MyHealth/docroot/header.xhtml       | 82 ++++++-------------
 .../src/managedbean/common/MenuMBean.java     | 16 ++--
 .../managedbean/systemAdmin/LoginMBean.java   |  7 +-
 4 files changed, 45 insertions(+), 66 deletions(-)

diff --git a/1.sources/MyHealth/docroot/WEB-INF/web.xml b/1.sources/MyHealth/docroot/WEB-INF/web.xml
index 80b6117..99dda7f 100644
--- a/1.sources/MyHealth/docroot/WEB-INF/web.xml
+++ b/1.sources/MyHealth/docroot/WEB-INF/web.xml
@@ -23,6 +23,12 @@
 		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
 		<param-value>.xhtml</param-value>
 	</context-param>
+	<context-param>
+		<param-name>primefaces.FONT_AWESOME</param-name>
+		<param-value>true</param-value>
+	</context-param>
+		
+	
 	<context-param>
 		<param-name>primefaces.THEME</param-name>
 		<param-value>#{sessionPreferences.currentTheme}</param-value>
diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml
index 6b06d69..f0087af 100644
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -34,70 +34,40 @@
 		</div>
 		<hr />
 		<div id="menuDiv">
+			<p:growl id="messages" sticky="true" showDetail="true" life="3000" />
+			
+			<h:form id="frmLogin">
+				<i id="loginSpin" class="pi pi-spin pi-spinner hide" style="font-size: 3em"></i>
+
+				<p:dialog header="Acceder al sistema" widgetVar="dlgLogin" resizable="false">
+					<h:panelGrid columns="2" cellpadding="5">
+						<h:outputLabel for="username" value="Username:" />
+						<p:inputText id="username" value="#{loginView.username}" />
+
+						<h:outputLabel for="password" value="Password:" />
+						<p:password id="password" value="#{loginView.password}" />
+
+						<f:facet name="footer">
+							<p:commandButton value="Login" update="messages, frmMenu" icon="pi pi-user" action="#{loginView.login}" onstart="showSpinner()"
+								oncomplete="handleLoginRequest(xhr, status, args)">
+								<p:ajax event="keyup" update="out" listener="#{listenerView.handleKeyEvent}" />
+								</p:commandButton>
+							<p:commandButton value="Cancel" icon="pi pi-ban" onclick="PF('dlgLogin').hide();" />
+						</f:facet>
+					</h:panelGrid>
+				</p:dialog>
+			</h:form>
 			<h:form id="frmMenu">
-				<p:growl id="messages" sticky="true" showDetail="true" life="3000" />
-
-
 				<p:menubar model="#{menuView.model}">
-					<p:menuitem label="Home" icon="pi pi-home" outcome="home" />
-					<p:submenu label="Administración del sistema" icon="pi pi-briefcase">
-						<p:menuitem value="Gestionar especialidades" icon="pi pi-briefcase" action="#{menuView.goManageSpecialties}" />
-						<p:menuitem value="Gestionar CAPs" action="#{menuView.goManageSpecialties}" />
-						<p:separator />
-						<p:menuitem value="Consultar medicos de familia por CAP" icon="pi pi-search" action="#{menuView.goManageSpecialties}" />
-						<p:separator />
-						<p:menuitem value="Nuevo administrador" icon="pi pi-user" action="#{menuView.goManageSpecialties}" />
-					</p:submenu>
-					<p:submenu label="Visitas" icon="pi pi-calendar">
-						<p:menuitem value="Programar visita" icon="pi pi-briefcase" action="#{menuView.goVisit}" />
-						<p:menuitem value="Ver visitas programadas" icon="pi pi-briefcase" action="#{menuView.goVisit}" />
-					</p:submenu>
-					<p:submenu label="Pruebas médicas" icon="pi pi-clone">
-						<p:menuitem value="Gestionar pruebas médicas" icon="pi pi-briefcase" action="#{menuView.goMedicalTests}" />
-						<p:menuitem value="Consultar médicos especialistas por especialidad" action="#{menuView.goMedicalTests}" />
-						<p:separator />
-						<p:menuitem value="Listar medicos especialistas por especialidad" icon="pi pi-search" action="#{menuView.goMedicalTests}" />
-					</p:submenu>
-					<p:submenu label="Preguntas" icon="pi pi-clone">
-						<p:menuitem value="Añadir pregunta" action="#{menuView.goMedicalTests}" />
-						<p:menuitem value="Responder prguntas pendientes" icon="pi pi-search" action="#{menuView.goMedicalTests}" />
-					</p:submenu>
-					<p:submenu label="Perfil" icon="pi pi-id-card">
-						<p:menuitem value="Nuevo paciente" icon="pi pi-briefcase" outcome="AddPatient" />
-						<p:menuitem value="Nuevo médico de familia" outcome="AddFamilyDoctor" />
-						<p:menuitem value="Nuevo médico especialista" outcome="AddSpecialistDoctor" />
-						<p:separator />
-						<p:menuitem value="Actualizar mi perfil" icon="pi pi-search" action="#{menuView.goUpdateProfile}" />
-						<p:separator />
-						<p:menuitem value="Cambiar médico de familia" icon="pi pi-search" outcome="ChangeFamilyDoctor" />
-						<p:separator />
-						<p:menuitem value="Cambiar de CAP" icon="pi pi-search" outcome="changecap" />
-					</p:submenu>
-
 					<f:facet name="options">
 						<ui:fragment rendered="#{home.logedIn}">
 							<h:outputText value="hola, #{home.userName} " />
-							<p:commandButton value="Logout" update="messages" icon="pi pi-user" action="#{loginView.logout}" />
+							<p:commandButton value="Logout" icon="pi pi-sign-out" action="#{loginView.logout}" />
 						</ui:fragment>
 						<ui:fragment rendered="#{not home.logedIn}">
 							<h:outputText value="hola, invitado " />
-							<p:commandButton value="login" icon="pi pi-user" onclick="PF('dlgLogin').show();" title="login" />
-							<p:button value="Registrarse" icon="pi pi-user" outcome="RegisterUser" />
-
-							<p:dialog header="Acceder al sistema" widgetVar="dlgLogin" resizable="false">
-								<h:panelGrid columns="2" cellpadding="5">
-									<h:outputLabel for="username" value="Username:" />
-									<p:inputText id="username" value="#{loginView.username}" />
-
-									<h:outputLabel for="password" value="Password:" />
-									<p:password id="password" value="#{loginView.password}" />
-
-									<f:facet name="footer">
-										<p:commandButton value="Login" update="messages" icon="pi pi-user" action="#{loginView.login}" onstart="showSpinner()" oncomplete="handleLoginRequest(xhr, status, args)" />
-										<i id="loginSpin" class="pi pi-spin pi-spinner hide" style="font-size: 3em"></i>
-									</f:facet>
-								</h:panelGrid>
-							</p:dialog>
+							<p:commandButton value="login" icon="pi pi-sign-in" onclick="PF('dlgLogin').show();" title="login" />
+							<p:button value="Registrarse" icon="pi pi-user-plus" outcome="RegisterUser" />
 						</ui:fragment>
 					</f:facet>
 				</p:menubar>
diff --git a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
index 5979d05..40add7a 100644
--- a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
+++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
@@ -90,24 +90,24 @@ public class MenuMBean implements Serializable {
 		// Perfil
 		subMenu = new DefaultSubMenu("Gestionar perfil", "pi pi-id-card");
 		if (SessionUtils.isLogedIn() == false) {
-			subMenu.addElement(createMenuItem("Registro de usuario", "pi pi-id-card", "RegisterUser", null));
-			subMenu.addElement(createMenuItem("Registro de paciente", "pi pi-id-card", "AddPatient", null));
-			subMenu.addElement(createMenuItem("Registro de médico", "pi pi-id-card", "AddFamilyDoctor", null));
-			subMenu.addElement(createMenuItem("Registro de especialista", "pi pi-id-card", "AddFamilyDoctor", null));
-			subMenu.addElement(createMenuItem("Registro de médico", "pi pi-id-card", "AddSpecialistDoctor", null));
+			subMenu.addElement(createMenuItem("Registro de usuario", "pi pi-users", "RegisterUser", null));
+			subMenu.addElement(createMenuItem("Registro de paciente", "pi pi-user-plus", "AddPatient", null));
+			subMenu.addElement(createMenuItem("Registro de médico", "pi pi-user-plus", "AddFamilyDoctor", null));
+			subMenu.addElement(createMenuItem("Registro de especialista", "pi pi-user-plus", "AddFamilyDoctor", null));
+			subMenu.addElement(createMenuItem("Registro de médico", "pi pi-id-user-plus", "AddSpecialistDoctor", null));
 			subMenu.addElement(new DefaultSeparator());
 		} else {
 
-			subMenu.addElement(createMenuItem("Actualizar mi perfil", "pi pi-search", "UpdateProfile", null));
+			subMenu.addElement(createMenuItem("Actualizar mi perfil", "pi pi-user-edit", "UpdateProfile", null));
 			subMenu.addElement(new DefaultSeparator());
 			// TODO: mostrar este menú solo si el usuario es paciente
 			if (true == true) {
-				subMenu.addElement(createMenuItem("Cambiar médico de familia", "pi pi-search", "ChangeFamilyDoctor", null));
+				subMenu.addElement(createMenuItem("Cambiar médico de familia", "pi pi-chevron-circle-right", "ChangeFamilyDoctor", null));
 				subMenu.addElement(new DefaultSeparator());
 			}
 			// TODO: mostrar este menú solo si el usuario es médico de familia
 			if (true == true)
-				subMenu.addElement(createMenuItem("Cambiar centro de atención", "pi pi-search", "changecap", null));
+				subMenu.addElement(createMenuItem("Cambiar centro de atención", "fa fa-h-square", "changecap", null));
 		}
 		model.addElement(subMenu);
 	}
diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
index 22b95d4..92f4907 100644
--- a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
+++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
@@ -52,7 +52,7 @@ public class LoginMBean {
 			session.setAttribute("userid", "1");
 			message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Bienvenido", username);
 
-			return ("home");
+			return ("home?faces-redirect=true");
 		} else {
 			loggedIn = false;
 			message = new FacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
@@ -66,8 +66,11 @@ public class LoginMBean {
 
 	// logout event, invalidate session
 	public String logout() {
+		FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, "Sessión cerrada", "Ha cerrado correctament su ssesión. Hasta la vista");
+		FacesContext.getCurrentInstance().addMessage(null, message);
+		
 		HttpSession session = SessionUtils.getSession();
 		session.invalidate();
-		return "home?refresh=1&faces-redirect=true";
+		return "home?faces-redirect=true";
 	}
 }