From 7971350815bd202b99e439b743d10a837159922f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Thu, 2 Jan 2020 23:38:19 +0100
Subject: [PATCH] =?UTF-8?q?Mejora=20en=20men=C3=BA=20principal,=20quitados?=
 =?UTF-8?q?=20botones=20y=20reemplazados=20por=20menuitems=20con=20estilo?=
 =?UTF-8?q?=20homogeneo.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.sources/MyHealth/docroot/header.xhtml       | 18 ++-------
 .../src/managedbean/common/MenuMBean.java     | 38 +++++++++++++++----
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml
index 3c118de..f7e64b5 100644
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -21,7 +21,7 @@
 	<p:growl id="messages" globalOnly="true" sticky="false" showDetail="true" life="15000" />
 	<div id="layout">
 		<div id="top" class="top background-light-blue">
-			<h:graphicImage library="images" name="logo-small.png" height="116" alt="MyHealth by Grupo 2"/>
+			<h:graphicImage library="images" name="logo-small.png" height="116" alt="MyHealth by Grupo 2" />
 		</div>
 		<div id="menuDiv" style="padding: 8px;">
 			<p:ajaxStatus style="width:32px; height:32px; position:fixed; right:48px; bottom:48px" onerror="onAjaxError()">
@@ -57,22 +57,10 @@
 				</p:dialog>
 			</h:form>
 			<h:form id="frmMenu">
-				<p:menubar model="#{menuView.model}">
-					<f:facet name="options">
-						<ui:fragment rendered="#{home.logedIn}">
-							<h:outputText value="Bienvenido, #{home.userDisplayName} (#{home.userType}) " />
-							<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-sign-in" onclick="PF('dlgLogin').show();" title="login" />
-							<p:button value="Registrarse" icon="pi pi-user-plus" outcome="/profile/RegisterUser" />
-						</ui:fragment>
-					</f:facet>
-				</p:menubar>
+				<p:menubar model="#{menuView.model}" />
 			</h:form>
 		</div>
-		<div id="content" style="padding-left: 8px;padding-right: 8px;">
+		<div id="content" style="padding-left: 8px; padding-right: 8px;">
 			<ui:insert name="content">Content</ui:insert>
 		</div>
 	</div>
diff --git a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
index 605e243..dabd7c4 100644
--- a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
+++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
@@ -10,6 +10,7 @@ import org.primefaces.model.menu.DefaultMenuItem;
 import org.primefaces.model.menu.DefaultMenuModel;
 import org.primefaces.model.menu.DefaultSeparator;
 import org.primefaces.model.menu.DefaultSubMenu;
+import org.primefaces.model.menu.MenuElement;
 import org.primefaces.model.menu.MenuModel;
 
 import common.UserType;
@@ -28,13 +29,16 @@ public class MenuMBean implements Serializable {
 
 	@PostConstruct
 	public void init() {
+		boolean loggedIn = SessionUtils.isLogedIn();
+
 		model = new DefaultMenuModel();
 		DefaultSubMenu subMenu;
 		UserType tipoUsuario = null;
+		DefaultMenuItem menuItem;
 
 		model.addElement(createMenuItem("Home", "pi pi-home", "/home", null));
 
-		if (SessionUtils.isLogedIn() == true) {
+		if (loggedIn == true) {
 			tipoUsuario = SessionUtils.getUserType();
 
 			// Administracion Sistema
@@ -78,7 +82,7 @@ public class MenuMBean implements Serializable {
 
 				// Todos pueden consultar (P S F)
 				subMenu.addElement(createMenuItem("Consultar prueba", "fa fa-search", "/medicaltest/MedicalTests", null));
-				subMenu.addElement(new DefaultSeparator()); 
+				subMenu.addElement(new DefaultSeparator());
 
 				if (tipoUsuario == UserType.SPECIALIST_DOCTOR) {
 					subMenu.addElement(new DefaultSeparator());
@@ -99,12 +103,8 @@ public class MenuMBean implements Serializable {
 
 		// Perfil
 		subMenu = new DefaultSubMenu("Gestionar perfil", "fa fa-gears");
-		if (SessionUtils.isLogedIn() == false) {
+		if (loggedIn == false) {
 			subMenu.addElement(createMenuItem("Registro de usuario", "fa fa-user-plus", "/profile/RegisterUser", null));
-//			subMenu.addElement(createMenuItem("Registro de paciente", "fa fa-user-plus", "/profile/AddPatient", null));
-//			subMenu.addElement(createMenuItem("Registro de médico", "fa fa-user-md", "/profile/AddFamilyDoctor", null));
-//			subMenu.addElement(createMenuItem("Registro de especialista", "fa fa-user-md", "/profile/AddSpecialistDoctor", null));
-
 			model.addElement(subMenu);
 		} else {
 			if (tipoUsuario != UserType.ADMINISTRATOR) {
@@ -123,6 +123,30 @@ public class MenuMBean implements Serializable {
 				model.addElement(subMenu);
 			}
 		}
+
+		// Opciones de menu a la derecha (login, logout, registrase y descripción del usuario logeado
+		if (loggedIn == true) {
+			menuItem = createMenuItem("Salir", "pi pi-sign-out", null, "#{loginView.logout}");
+			menuItem.setContainerStyle("float: right;");
+			model.addElement(menuItem);
+
+			menuItem = createMenuItem("Bienvenido, " + SessionUtils.getUserDisplayName(), null, "/profile/UpdateProfile", null);
+			menuItem.setContainerStyle("float: right;");
+			model.addElement(menuItem);
+		} else {
+			menuItem = createMenuItem("Login", "pi pi-sign-in", null, null);
+			menuItem.setOnclick("PF('dlgLogin').show();");
+			menuItem.setContainerStyle("float: right;");
+			model.addElement(menuItem);
+			
+			menuItem = createMenuItem("Registrarse", "pi pi-user-plus", "/profile/RegisterUser", null);
+			menuItem.setContainerStyle("float: right;");
+			model.addElement(menuItem);
+			
+			menuItem = createMenuItem("hola, invitado", null, null, null);
+			menuItem.setContainerStyle("float: right;");
+			model.addElement(menuItem);
+		}
 	}
 
 	private DefaultMenuItem createMenuItem(String name, String icon, String outcome, String command) {