From 96c514f8a5a8a7c1cb43ecdefb3c381d126b5c9d Mon Sep 17 00:00:00 2001
From: mgarcianun <mgarcianun@uoc.edu>
Date: Wed, 4 Dec 2019 23:39:21 +0100
Subject: [PATCH] Mejoras en el login, y mock para pantallas de componente
 profile.

---
 .../MyHealth/docroot/WEB-INF/faces-config.xml |  10 +-
 1.sources/MyHealth/docroot/header.xhtml       |  29 ++--
 .../docroot/profile/AddFamilyDoctor.xhtml     |  47 +++--
 .../MyHealth/docroot/profile/AddPatient.xhtml |  71 +++-----
 .../docroot/profile/AddSpecialistDoctor.xhtml |  45 +++--
 .../docroot/profile/ChangeFamilyDoctor.xhtml  |  43 +++--
 .../ChangePrimaryHealthCareCenter.xhtml       |  46 +++--
 .../docroot/profile/RegisterUser.xhtml        |   2 +-
 .../docroot/profile/ShowFamilyDoctor.xhtml    |  46 +++--
 .../docroot/profile/ShowPaciente.xhtml        |  39 +++--
 .../profile/ShowSpecialistDoctor.xhtml        |  42 +++--
 .../docroot/profile/UpdateFamilyDoctor.xhtml  |  47 +++--
 .../docroot/profile/UpdatePatient.xhtml       |  43 +++--
 .../docroot/profile/UpdateProfile.xhtml       | 164 ++++++++++++++++++
 .../profile/UpdateSpecialistDoctor.xhtml      |  42 +++--
 .../src/managedbean/common/MenuMBean.java     |   6 +-
 .../profile/RegisterUserMBean.java            |   6 +-
 17 files changed, 512 insertions(+), 216 deletions(-)
 create mode 100644 1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml

diff --git a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
index ffcf652..78e201d 100644
--- a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
+++ b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
@@ -89,23 +89,23 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>MedicaltestManage</from-outcome>
-			<to-view-id>/mdicaltest/MedicalTests.xhtml</to-view-id>
+			<to-view-id>/medicaltest/MedicalTests.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>QueryDoctorBySpecialty</from-outcome>
-			<to-view-id>/mdicaltest/MedicalTests.xhtml</to-view-id>
+			<to-view-id>/medicaltest/MedicalTests.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>ListDoctorsbySpecialty</from-outcome>
-			<to-view-id>/mdicaltest/MedicalTests.xhtml</to-view-id>
+			<to-view-id>/medicaltest/MedicalTests.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>AskQuestion</from-outcome>
-			<to-view-id>/mdicaltest/MedicalTests.xhtml</to-view-id>
+			<to-view-id>/medicaltest/MedicalTests.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>AnswerQuestion</from-outcome>
-			<to-view-id>/mdicaltest/MedicalTests.xhtml</to-view-id>
+			<to-view-id>/medicaltest/MedicalTests.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 </faces-config>
diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml
index e91705d..7da85b0 100644
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -12,18 +12,17 @@
 </h:head>
 <h:outputScript>
 	    function handleLoginRequest(xhr, status, args) {
-            $('#loginSpin').slideUp();
-	    
 	        if(args.validationFailed || !args.loggedIn) {
 	            PF('dlgLogin').jq.effect("shake", {times:5}, 100);
+	            //PF('Login').attr("disabled", false);
 	        }
 	        else {
 	            PF('dlgLogin').hide();
 	        }
 	    }
 	    
-	    function showSpinner() {
-            $('#loginSpin').slideDown();
+	    function startLogin() {
+	    	//PF('Login').attr("disabled", true);
 	    }
 </h:outputScript>
 <h:body>
@@ -34,12 +33,20 @@
 		</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:growl id="messages" sticky="false" showDetail="true" life="3000"  />
+			<p:ajaxStatus style="width:32px; height:32px; position:fixed; right:32px; bottom:32px">
+				<f:facet name="start">
+					<i id="loginSpin" class="pi pi-spin pi-spinner" style="font-size: 3em"></i>
+				</f:facet>
 
-				<p:dialog header="Acceder al sistema" widgetVar="dlgLogin" resizable="false">
+				<f:facet name="complete">
+					<h:outputText value="" />
+				</f:facet>
+			</p:ajaxStatus>
+
+			<h:form id="frmLogin">
+
+				<p:dialog header="Acceder al sistema" widgetVar="dlgLogin" resizable="false" modal="true" closeOnEscape="true">
 					<h:panelGrid columns="2" cellpadding="5">
 						<h:outputLabel for="username" value="Username:" />
 						<p:inputText id="username" value="#{loginView.username}" />
@@ -48,9 +55,7 @@
 						<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:commandButton>
+							<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()" oncomplete="handleLoginRequest(xhr, status, args)"/>
 							<p:commandButton value="Cancel" icon="pi pi-ban" onclick="PF('dlgLogin').hide();" />
 						</f:facet>
 					</h:panelGrid>
diff --git a/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml
index 73415a0..3f9e53e 100644
--- a/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml
@@ -1,24 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
-  <ui:composition template="../header.xhtml">
+
+<ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>AddFamilyDoctor Page</h1>
- 				<hr/>
- 				<div>AddFamilyDoctor:</div>
- 				<div>
- 				AddFamilyDoctor content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Añadir un nuevo médico de familia">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
-  </ui:composition>
+</ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/AddPatient.xhtml b/1.sources/MyHealth/docroot/profile/AddPatient.xhtml
index 25fb910..a7a1d59 100644
--- a/1.sources/MyHealth/docroot/profile/AddPatient.xhtml
+++ b/1.sources/MyHealth/docroot/profile/AddPatient.xhtml
@@ -4,56 +4,33 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:p="http://primefaces.org/ui">
 
-<h:outputScript>
-	    function handleActionMessage(xhr, status, args) {
-	        if(args.validationFailed || !args.loggedIn) {
-	            PF('dlgLogin').jq.effect("shake", {times:5}, 100);
-	        }
-	        else {
-	            PF('dlgLogin').hide();
-	            $('#loginLink').fadeOut();
-	        }
-	    }
-</h:outputScript>
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
-		<h:form>
-			<p:messages id="mesgs" showDetail="true" closable="true">
-				<p:autoUpdate />
-			</p:messages>
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 
-			<p:panel id="AltaPaciente" header="Registrarse en el sistema como paciente">
-				<h:panelGrid columns="3">
-					<p:outputLabel value="NIF:" for="nif" />
-					<p:inputText id="nif" required="true" requiredMessage="Por favor, indque su NIF" />
-					<p:message for="nif" />
-					
-					<p:outputLabel value="Nombre:" for="name" />
-					<p:inputText id="name" required="true" requiredMessage="Por favor, indique su nombre" />
-					<p:message for="name" />
-					
-					<p:outputLabel value="Apellidos:" for="surname" />
-					<p:inputText id="surname" required="true" requiredMessage="Por favor, indique sus apellidos" />
-					<p:message for="surname" />
-					
-					<p:outputLabel value="Correo electrónico:" for="email"/>
-					<p:inputText id="email" required="true" requiredMessage="Por favor, especifique su correo electrónico" />
-					<p:message for="email" />
-					
-					<p:outputLabel value="Contraseña" for="password" />
-					<p:inputMask id="password" mask="*" required="true" requiredMessage="Por faovr, especifique una contraseña" maxlength="50" />
-					<p:message for="password" />
-					
-					<p:outputLabel value="Repita su contraseña:" for="passwordRepeat" />
-					<p:inputMask id="passwordRepeat" mask="*" />
-					<p:message for="passwordRepeat" />
-				</h:panelGrid>
-				<h:panelGroup>
-					<h:panelGrid columns="3" >
-						<p:commandButton validateClient="true" value="Registrarse" update="mesgs" action="#{addPatientMBean.save}" icon="pi pi-check" />
-						<p:commandButton value="Volver" outcome="home" />
-					</h:panelGrid>
-				</h:panelGroup>
+			<p:panel id="DatosPersonales" header="Añadir un nuevo paciente">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
+				</div>
 			</p:panel>
 		</h:form>
 	</ui:define>
diff --git a/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml b/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml
index f1121b0..129e462 100644
--- a/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml
@@ -1,24 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
   <ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>AddSpecialistDoctor Page</h1>
- 				<hr/>
- 				<div>AddSpecialistDoctor:</div>
- 				<div>
- 				AddSpecialistDoctor content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Añadir un nuevo médico especialista">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home" />
-			</p>
- 		</h:form>
-	</ui:define>
-  </ui:composition>
+			</p:panel>
+		</h:form>
+	</ui:define>  </ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
index 8c1694c..8cca1b8 100644
--- a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
@@ -2,23 +2,38 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
-  <ui:composition template="../header.xhtml">
+<ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>ChangeFamilyDoctor Page</h1>
- 				<hr/>
- 				<div>ChangeFamilyDoctor:</div>
- 				<div>
- 				ChangeFamilyDoctor content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Cambiar médico de familia">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home"/>
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
   </ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
index 347109a..3856934 100644
--- a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
@@ -1,24 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
-  <ui:composition template="../header.xhtml">
+<ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>ChangePrimaryHealthCareCenter Page</h1>
- 				<hr/>
- 				<div>ChangePrimaryHealthCareCenter:</div>
- 				<div>
- 				ChangePrimaryHealthCareCenter content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Cambiar el Centro de Atención Primaria">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
-  </ui:composition>
+</ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
index ea150aa..7b956fa 100644
--- a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
+++ b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
@@ -140,7 +140,7 @@
 							<p:commandButton validateClient="true" value="Registrarse" update="mesgs" action="#{registerUser.addNewUser}" icon="pi pi-check" />
 						</div>
 						<div class="ui-g-2 ui-md-2">
-							<p:commandButton type="button" value="Volver" outcome="home" icon="pi pi-home" />
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
 						</div>
 						<div class="ui-g-4 ui-md-4"></div>
 					</div>
diff --git a/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml
index 7abbf6e..2f26ec6 100644
--- a/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml
@@ -1,24 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
-  <ui:composition template="../header.xhtml">
+<ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>ShowFamilyDoctor Page</h1>
- 				<hr/>
- 				<div>ShowFamilyDoctor:</div>
- 				<div>
- 				ShowFamilyDoctor content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Consultar datos de médico de familia">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
-  </ui:composition>
+</ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml b/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml
index 557403b..12f2cb1 100644
--- a/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml
@@ -1,20 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
-		<h:form id="errorForm">
-			<div align="center">
-				<h1>ShowPaciente Page</h1>
-				<hr />
-				<div>ShowPaciente:</div>
-				<div>ShowPaciente content</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home" />
-			</p>
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Consultar datos de paciente">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
+				</div>
+			</p:panel>
 		</h:form>
 	</ui:define>
 </ui:composition>
diff --git a/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml
index 516efa6..33662cd 100644
--- a/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml
@@ -1,24 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
   <ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>ShowSpecialistDoctor Page</h1>
- 				<hr/>
- 				<div>ShowSpecialistDoctor:</div>
- 				<div>
- 				ShowSpecialistDoctor content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Consultar datos de especialista">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home?refresh=1" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
   </ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml
index be56e8e..2636796 100644
--- a/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml
@@ -1,24 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
-  <ui:composition template="../header.xhtml">
+
+<ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>UpdateFamilyDoctor Page</h1>
- 				<hr/>
- 				<div>UpdateFamilyDoctor:</div>
- 				<div>
- 				UpdateFamilyDoctor content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Actualizar médico de familia">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home?refresh=1" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
-  </ui:composition>
+</ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml b/1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml
index bb15d1b..143ea1e 100644
--- a/1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml
@@ -1,24 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
+
 
   <ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>UpdatePaciente Page</h1>
- 				<hr/>
- 				<div>UpdatePaciente:</div>
- 				<div>
- 				UpdatePaciente content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Actualizar paciente">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home?refresh=1" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
   </ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
new file mode 100644
index 0000000..3b4248f
--- /dev/null
+++ b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
+
+<ui:composition template="../header.xhtml">
+	<ui:define name="content">
+		<h:outputScript>
+		    function handleRequest(xhr, status, args) {
+		        if(args.specs) {
+		        	$('#panCentros').slideUp();
+		            $('#panEspecialidades').slideDown();
+		        }
+		        else if (args.caps) {
+		        	$('#panEspecialidades').slideUp();
+		            $('#panCentros').slideDown();
+		        } else {
+		            $('#panCentros').slideUp();
+		            $('#panEspecialidades').slideUp();
+		        }
+		    }
+		</h:outputScript>
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="tipoUsuario" header="Tipo de usuario registrado">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Tipo de usuario:" for="selUsertype" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:selectOneButton id="selUsertype" value="#{registerUser.userType}" disabled="true" required="true" unselectable="false" requiredMessage="Debe especificar un tipo de usuario">
+							<f:selectItems value="#{registerUser.userTypes}" var="item" itemLabel="#{item.userTypename}" itemValue="#{item.name}" />
+						</p:selectOneButton>
+					</div>
+					<div class="ui-g-4 ui-md-4"></div>
+				</div>
+			</p:panel>
+			<p:panel id="DatosPersonales" header="Actualizar datos personales">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+					<h:outputLabel value="value = 10" rendered="#{row == 10}" /> 
+						<p:outputLabel value="Código de Identificación Personal (CIP):" rendered="#{registerUser.patient}"  for="id" />
+						<p:outputLabel value="Número de Profesional:" rendered="#{registerUser.familyDoctor or registerUser.specialistDoctor}"  for="id" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="id" value="#{registerUser.id}" disabled="true" required="true" requiredMessage="Por favor, indque su identificador" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="id" display="text" />
+					</div>
+									
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="NIF:" for="nif" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="nif" value="#{registerUser.nif}" required="true" requiredMessage="Por favor, indque su NIF" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="nif" display="text" />
+					</div>
+
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Nombre:" for="name" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="name" value="#{registerUser.name}" required="true" requiredMessage="Por favor, indique su nombre" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="name" />
+					</div>
+
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Apellidos:" for="surname" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="surname" value="#{registerUser.surname}" required="true" requiredMessage="Por favor, indique sus apellidos" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="surname" />
+					</div>
+
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Correo electrónico:" for="email" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="email" value="#{registerUser.email}" required="true" requiredMessage="Por favor, especifique su correo electrónico" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="email" />
+					</div>
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Contraseña" for="password" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:password id="password" value="#{registerUser.password}" match="passwordRepeat" required="true" requiredMessage="Por favor, especifique una contraseña" maxlength="50"
+							feedback="true" promptLabel="Especifique una contraseña segura" weakLabel="La contraseña es débil" goodLabel="La contraseña es buena" strongLabel="La contraseña es segura"
+							validatorMessage="La contraseña y su verificación deben ser iguales" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="password" />
+					</div>
+					<div class="ui-g-2">
+						<p:outputLabel value="Verificación de contraseña:" for="passwordRepeat" />
+					</div>
+					<div class="ui-g-4">
+						<p:password id="passwordRepeat" value="#{registerUser.password}" required="true" requiredMessage="Por favor, escriba la verificación de su contraseña" maxlength="50" />
+					</div>
+					<div class="ui-g-6">
+						<p:message for="passwordRepeat" />
+					</div>
+
+					<div id="panCentros" class="ui-g-12 ui-g-nopad hide">
+						<div class="ui-g-2 ui-md-2">
+							<p:outputLabel value="Centro:" for="selPHC" />
+						</div>
+						<div class="ui-g-4 ui-md-4">
+							<p:selectOneMenu id="selPHC" value="#{registerUser.primaryHealthCareCenter}" converter="omnifaces.SelectItemsConverter" required="#{registerUser.familyDoctor}" requiredMessage="Por favor, selecciona un centro de antención primaria">
+								<f:selectItem itemLabel="Seleccione un centro de antención primario..." itemValue="" noSelectionOption="true" />
+								<f:selectItems value="#{registerUser.phcList}" var="phc" itemLabel="#{phc.location}" itemValue="#{phc}" />
+								<p:column>#{phc.name}</p:column>
+								<p:column>#{phc.location}</p:column>
+							</p:selectOneMenu>
+						</div>
+						<div class="ui-g-6 ui-md-6">
+							<p:message for="selPHC" />
+						</div>
+					</div>
+
+					<div id="panEspecialidades" class="ui-g-12 ui-g-nopad hide">
+						<div class="ui-g-2 ui-md-2">
+							<p:outputLabel value="Especialidad médica:" for="selMS" />
+						</div>
+						<div class="ui-g-4 ui-md-4">
+							<p:selectOneMenu id="selMS" value="#{registerUser.medicalSpecialty}" converter="omnifaces.SelectItemsConverter" required="#{registerUser.specialistDoctor}" requiredMessage="Por favor, seleccione una especialidad médica" >
+								<f:selectItem itemLabel="Seleccione una especialidad médica..." itemValue="" noSelectionOption="true" />
+								<f:selectItems value="#{registerUser.medicalSpecialtiesList}" var="ms" itemLabel="#{ms.description}" itemValue="#{ms}" />
+								<p:column>#{ms.name}</p:column>
+								<p:column>#{ms.description}</p:column>
+							</p:selectOneMenu>
+						</div>
+						<div class="ui-g-6 ui-md-6">
+							<p:message for="selMS" />
+						</div>
+					</div>
+
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Registrarse" update="mesgs" action="#{registerUser.addNewUser}" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
+				</div>
+
+			</p:panel>
+		</h:form>
+	</ui:define>
+</ui:composition>
+</html>
diff --git a/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml b/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml
index 3c3e69f..5888622 100644
--- a/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml
@@ -1,24 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
 
   <ui:composition template="../header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>UpdateSpecialistDoctor Page</h1>
- 				<hr/>
- 				<div>UpdateSpecialistDoctor:</div>
- 				<div>
- 				UpdateSpecialistDoctor content
+		<h:form id="frmRegisterUser">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+
+			<p:panel id="DatosPersonales" header="Consultar médico especialista">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel value="Campo1:" for="campo1" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo1" value="123 asdf 123" required="true" requiredMessage="Por favor, indque el campo 1" />
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:message for="campo1" display="text" />
+					</div>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4"></div>
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="mesgs" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4"></div>
+					</div>
 				</div>
-			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home?refresh=1" />
-			</p>
- 		</h:form>
+			</p:panel>
+		</h:form>
 	</ui:define>
   </ui:composition>
 </html>
diff --git a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
index 40add7a..5b9323a 100644
--- a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
+++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
@@ -41,7 +41,7 @@ public class MenuMBean implements Serializable {
 			// Administracion Sistema
 			// TODO: mostrar este menú solo si el usuario es administrador
 			if (1 == 1) {
-				subMenu = new DefaultSubMenu("Administración del sistema", "pi pi-settings");
+				subMenu = new DefaultSubMenu("Administración del sistema", "pi pi-cog");
 				subMenu.addElement(createMenuItem("Esp. médicas", "pi pi-calendar", "ManageMedicalSpecialties", null));
 				subMenu.addElement(createMenuItem("Centros At. Primaria", "pi pi-briefcase", "ManageCAPs", null));
 				subMenu.addElement(new DefaultSeparator());
@@ -94,7 +94,7 @@ public class MenuMBean implements Serializable {
 			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(createMenuItem("Registro de médico", "pi pi-user-plus", "AddSpecialistDoctor", null));
 			subMenu.addElement(new DefaultSeparator());
 		} else {
 
@@ -107,7 +107,7 @@ public class MenuMBean implements Serializable {
 			}
 			// TODO: mostrar este menú solo si el usuario es médico de familia
 			if (true == true)
-				subMenu.addElement(createMenuItem("Cambiar centro de atención", "fa fa-h-square", "changecap", null));
+				subMenu.addElement(createMenuItem("Cambiar CAP", "fa fa-h-square", "changecap", null));
 		}
 		model.addElement(subMenu);
 	}
diff --git a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
index 63ebee5..16073fc 100644
--- a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
@@ -140,6 +140,10 @@ public class RegisterUserMBean extends ProfileMBeanBase implements Serializable
 		return (UserType.valueOf(this.userType) == UserType.SPECIALIST_DOCTOR);
 	}
 
+	public boolean isDoctor() {
+		return (isFamilyDoctor() || isSpecialistDoctor());
+	}
+	
 	public String getEmail() {
 		return email;
 	}
@@ -187,7 +191,7 @@ public class RegisterUserMBean extends ProfileMBeanBase implements Serializable
 	public void setId(Integer id) {
 		this.id = id;
 	}
-
+	
 	public void addNewUser() {
 		int error = 0;