From 1dff77f32a34a8392cd203844d0f254a979ed5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Sun, 8 Dec 2019 10:57:39 +0100
Subject: [PATCH] =?UTF-8?q?Correcci=C3=B3n=20de=20error=20en=20el=20alta?=
 =?UTF-8?q?=20de=20usuarios=20y=20formato=20de=20la=20pantalla=20de=20logi?=
 =?UTF-8?q?n=20de=20usuarios.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyHealth/docroot/WEB-INF/faces-config.xml |  4 ++
 1.sources/MyHealth/docroot/error.xhtml        | 41 ++++++++++-------
 1.sources/MyHealth/docroot/header.xhtml       | 30 ++++++++-----
 1.sources/MyHealth/docroot/login.xhtml        | 40 ++++++++++-------
 .../docroot/profile/RegisterUserResult.xhtml  | 44 +++++++++++++++++++
 .../docroot/profile/UpdateProfile.xhtml       | 17 ++++---
 .../src/ejb/profile/ProfileFacadeBean.java    | 12 ++---
 .../systemAdmin/SystemAdminFacadeRemote.java  |  2 +-
 .../MyHealth/src/jpa/FamilyDoctorJPA.java     |  4 +-
 1.sources/MyHealth/src/jpa/PatientJPA.java    |  3 +-
 .../MyHealth/src/jpa/SpecialistDoctorJPA.java |  4 +-
 .../common/AuthorizationFilter.java           |  8 ++--
 .../profile/RegisterUserMBean.java            | 15 ++++---
 13 files changed, 153 insertions(+), 71 deletions(-)
 create mode 100644 1.sources/MyHealth/docroot/profile/RegisterUserResult.xhtml
diff --git a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
index 78e201d..e902330 100644
--- a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
+++ b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
@@ -11,6 +11,10 @@
 			<from-outcome>RegisterUser</from-outcome>
 			<to-view-id>/profile/RegisterUser.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>RegisterUserResult</from-outcome>
+			<to-view-id>/profile/RegisterUserResult.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>AddPatient</from-outcome>
 			<to-view-id>/profile/AddPatient.xhtml</to-view-id>
diff --git a/1.sources/MyHealth/docroot/error.xhtml b/1.sources/MyHealth/docroot/error.xhtml
index 3e98d38..5d3b36f 100644
--- a/1.sources/MyHealth/docroot/error.xhtml
+++ b/1.sources/MyHealth/docroot/error.xhtml
@@ -1,25 +1,34 @@
 <?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">
 
-  <ui:composition template="./header.xhtml">
+<ui:composition template="./header.xhtml">
 	<ui:define name="content">
- 		<h:form id="errorForm">
- 			<div align="center">
- 				<h1>Se ha producido un error</h1>
- 				<hr/>
- 				<div>Descripcion del error:</div>
- 				<div>
- 					<h:messages fatalClass="ErrorMessage" showDetail="true" showSummary="true" globalOnly="true">
- 					</h:messages>
+		<h:form id="errorForm">
+			<div align="center">
+				<h1>Se ha producido un error</h1>
+				<hr />
+				<div>Descripcion del error:</div>
+				<div>
+					<h:messages fatalClass="ErrorMessage" showDetail="true" showSummary="true" globalOnly="true" />
 				</div>
 			</div>
-			<p align="center">
-				<h:button value="Volver al inicio" outcome="home?refresh=1" />
-			</p>
- 		</h:form>
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-5"></div>
+						<div class="ui-g-2 ui-md-2">
+							
+						</div>
+						<div class="ui-g-4 ui-md-5"></div>
+					</div>			
+			<div class="ui-g-12 ui-g-nopad">
+				<div class="ui-g-4 ui-md-5"></div>
+				<div class="ui-g-2 ui-md-2">
+					<p:button value="Ir a la página principal" outcome="home" icon="pi pi-home" />
+				</div>
+				<div class="ui-g-4 ui-md-5"></div>
+			</div>
+		</h:form>
 	</ui:define>
-  </ui:composition>
+</ui:composition>
 </html>
diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml
index d1bcee3..1ce0ce5 100644
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -33,7 +33,7 @@
 		</div>
 		<hr />
 		<div id="menuDiv">
-			<p:growl id="messages" sticky="false" showDetail="true" life="15000"  />
+			<p:growl id="messages" sticky="false" showDetail="true" life="15000" />
 			<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>
@@ -46,19 +46,25 @@
 
 			<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}" />
+				<p:dialog header="Acceder al sistema" width="350px" widgetVar="dlgLogin" resizable="false" modal="true" closeOnEscape="true">
+					<div class="ui-g ui-fluid">
+						<div class="ui-g-12">
+							<h:outputLabel for="username" value="Usuario:" />
+							<p:inputText id="username" value="#{loginView.username}" />
+						</div>
+						<div class="ui-g-12">
 
-						<h:outputLabel for="password" value="Password:" />
-						<p:password id="password" value="#{loginView.password}" />
-
-						<f:facet name="footer">
-							<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()" oncomplete="handleLoginRequest(xhr, status, args)"/>
+							<h:outputLabel for="password" value="Contraseña:" />
+							<p:password id="password" value="#{loginView.password}" />
+						</div>
+						<div class="ui-g-6">
+							<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
+								oncomplete="handleLoginRequest(xhr, status, args)" />
+						</div>
+						<div class="ui-g-6">
 							<p:commandButton value="Cancel" icon="pi pi-ban" onclick="PF('dlgLogin').hide();" />
-						</f:facet>
-					</h:panelGrid>
+						</div>
+					</div>
 				</p:dialog>
 			</h:form>
 			<h:form id="frmMenu">
diff --git a/1.sources/MyHealth/docroot/login.xhtml b/1.sources/MyHealth/docroot/login.xhtml
index d6a1daa..9151d21 100644
--- a/1.sources/MyHealth/docroot/login.xhtml
+++ b/1.sources/MyHealth/docroot/login.xhtml
@@ -23,23 +23,33 @@
 <ui:composition template="./header.xhtml">
 	<ui:define name="content">
 		<h:form>
-			<h:outputLink value="javascript:void(0)" onclick="PF('dlg').show();" title="login">
-				<h:outputText>Login</h:outputText>
-			</h:outputLink>
+			<div class="ui-g ui-fluid">
+				<div class="ui-g-4 ui-md-4" />
+				<div class="ui-g-4 ui-md-4">
+					<p:panel id="LoginPanel" header="Acceder al sistema">
+						<div class="ui-g ui-fluid">
+							<div class="ui-g-12">
+								<h:outputLabel for="username" value="Usuario:" />
+								<p:inputText id="username" value="#{loginView.username}" />
+							</div>
 
-			<p:growl id="growl" sticky="true" showDetail="true" life="3000" />
+							<div class="ui-g-12">
+								<h:outputLabel for="password" value="Contraseña:" />
+								<p:password id="password" value="#{loginView.password}" />
+							</div>
 
-			<h:panelGrid columns="2" cellpadding="5">
-				<h:outputLabel for="username" value="Username:" />
-				<p:inputText id="username" value="#{loginView.username}" required="true" label="username" />
-
-				<h:outputLabel for="password" value="Password:" />
-				<p:password id="password" value="#{loginView.password}" required="true" label="password" />
-
-				<f:facet name="footer">
-					<p:commandButton value="Login" update="growl" action="#{loginView.login}" oncomplete="handleLoginRequest(xhr, status, args)" />
-				</f:facet>
-			</h:panelGrid>
+							<div class="ui-g-6">
+								<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
+									oncomplete="handleLoginRequest(xhr, status, args)" />
+							</div>
+							<div class="ui-g-6">
+								<p:button value="Volver" outcome="home" icon="pi pi-home" />
+							</div>
+						</div>
+					</p:panel>
+				</div>
+				<div class="ui-g-4 ui-md-4" />
+			</div>
 		</h:form>
 	</ui:define>
 </ui:composition>
diff --git a/1.sources/MyHealth/docroot/profile/RegisterUserResult.xhtml b/1.sources/MyHealth/docroot/profile/RegisterUserResult.xhtml
new file mode 100644
index 0000000..746e3a7
--- /dev/null
+++ b/1.sources/MyHealth/docroot/profile/RegisterUserResult.xhtml
@@ -0,0 +1,44 @@
+<?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:form id="frmRegisterUserResult">
+			<div class="ui-g-4 ui-md-4" />
+			<div class="ui-g-4 ui-md-4">
+
+				<p:panel id="DatosPersonales" header="El registro se ha realizado correctamente">
+					<div class="ui-g ui-fluid">
+
+						<div class="ui-g-12">
+							Se ha registrado correctamente, el sistema le ha asignado un <b> <p:outputLabel value="Código de Identificación Personal (CIP)" rendered="#{registerUser.patient}" /> <p:outputLabel
+									value="Número de Profesional" rendered="#{registerUser.familyDoctor or registerUser.specialistDoctor}" />
+							</b> , por favor recuerdelo ya que deberá utilizarlo para logearse en el sistema.
+						</div>
+
+						<div class="ui-g-12">
+							<p:outputLabel value="Su Código de Identificación Personal (CIP) es" rendered="#{registerUser.patient}" />
+							<p:outputLabel value="Número de Profesional es" rendered="#{registerUser.familyDoctor or registerUser.specialistDoctor}" />
+						</div>
+
+						<div class="ui-g-12" style="font-size: larger;font-weight: bold; text-align:center;">
+							<p:outputLabel value="#{registerUser.id}" />
+						</div>
+
+						<div class="ui-g-2"></div>
+						<div class="ui-g-8">
+							<p:button value="Ir a la página principal" outcome="home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-2"></div>
+					</div>
+
+				</p:panel>
+			</div>
+			<div class="ui-g-4 ui-md-4" />
+		</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
index 3b4248f..60a768a 100644
--- a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
@@ -30,7 +30,8 @@
 						<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">
+						<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>
@@ -40,9 +41,9 @@
 			<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" />
+						<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" />
@@ -50,7 +51,7 @@
 					<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>
@@ -116,7 +117,8 @@
 							<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">
+							<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>
@@ -133,7 +135,8 @@
 							<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" >
+							<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>
diff --git a/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java b/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
index 1b0fb33..efd2d82 100644
--- a/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
@@ -45,8 +45,11 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 
 	public PatientTO registerPatient(Integer id, String nif, String name, String surname, String password, String email) {
 		PatientTO paTO = null;
+		
+		if (id == null)
+			id = 1;
 
-		PatientJPA ms = new PatientJPA(id, nif, name, surname, HashUtils.hashMD5(password), email);
+		PatientJPA ms = new PatientJPA(nif, name, surname, HashUtils.hashMD5(password), email);
 		entman.persist(ms);
 		paTO = new PatientTO(ms.getId(), ms.getNif(), ms.getName(), ms.getSurname(), ms.getPassword(), ms.getEmail());
 
@@ -60,8 +63,9 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 
 		// TODO: Lanzar error si no se encuentra la especialidad.
 		if (ms != null) {
-			SpecialistDoctorJPA sd = new SpecialistDoctorJPA(id, nif, name, surname, HashUtils.hashMD5(password), email);
+			SpecialistDoctorJPA sd = new SpecialistDoctorJPA(nif, name, surname, HashUtils.hashMD5(password), email, ms);
 			entman.persist(sd);
+			
 			sdTO = new SpecialistDoctorTO(sd.getId(), sd.getNif(), sd.getName(), sd.getSurname(), sd.getPassword(), sd.getEmail());
 		}
 		
@@ -76,9 +80,7 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		// TODO: Lanzar error si no encontramos el cap!!!!!
 		if (phcC != null) {
 
-			FamilyDoctorJPA fd = new FamilyDoctorJPA(id, nif, name, surname, HashUtils.hashMD5(password), email);
-			fd.setPrimaryHealthCareCenter(phcC);
-
+			FamilyDoctorJPA fd = new FamilyDoctorJPA(nif, name, surname, HashUtils.hashMD5(password), email, phcC);
 			entman.persist(fd);
 
 			fdTO = new FamilyDoctorTO(fd.getId(), fd.getNif(), fd.getName(), fd.getSurname(), fd.getPassword(), fd.getEmail());
diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java
index 015c7cc..98bbf18 100644
--- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java
+++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java
@@ -4,9 +4,9 @@ import java.util.Collection;
 
 import javax.ejb.Remote;
 
+import TO.LoggedUserTO;
 import TO.MedicalSpecialtyTO;
 import TO.PrimaryHealthCareCenterTO;
-import TO.LoggedUserTO;
 
 /**
  * 
diff --git a/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java b/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
index 69b24b1..0961147 100644
--- a/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
+++ b/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
@@ -42,13 +42,13 @@ public class FamilyDoctorJPA implements Serializable {
 		super();
 	}
 
-	public FamilyDoctorJPA(int id, String nif, String name, String surname, String password, String email) {
-		this.id = id;
+	public FamilyDoctorJPA(String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterJPA phc) {
 		this.nif = nif;
 		this.name = name;
 		this.surname = surname;
 		this.password = password;
 		this.email = email;
+		this.primaryHealthCareCenter = phc;
 	}
 
 	@Id
diff --git a/1.sources/MyHealth/src/jpa/PatientJPA.java b/1.sources/MyHealth/src/jpa/PatientJPA.java
index 8ff3570..c239379 100644
--- a/1.sources/MyHealth/src/jpa/PatientJPA.java
+++ b/1.sources/MyHealth/src/jpa/PatientJPA.java
@@ -40,8 +40,7 @@ public class PatientJPA implements Serializable {
 		super();
 	}
 
-	public PatientJPA(int id, String nif, String name, String surname, String password, String email) {
-		this.id = id;
+	public PatientJPA(String nif, String name, String surname, String password, String email) {
 		this.nif = nif;
 		this.name = name;
 		this.surname = surname;
diff --git a/1.sources/MyHealth/src/jpa/SpecialistDoctorJPA.java b/1.sources/MyHealth/src/jpa/SpecialistDoctorJPA.java
index 32aa941..065d40e 100644
--- a/1.sources/MyHealth/src/jpa/SpecialistDoctorJPA.java
+++ b/1.sources/MyHealth/src/jpa/SpecialistDoctorJPA.java
@@ -37,13 +37,13 @@ public class SpecialistDoctorJPA implements Serializable {
 		super();
 	}
 
-	public SpecialistDoctorJPA(Integer id, String nif, String name, String surname, String password, String email) {
-		this.id = id;
+	public SpecialistDoctorJPA(String nif, String name, String surname, String password, String email, MedicalSpecialtyJPA ms) {
 		this.nif = nif;
 		this.name = name;
 		this.surname = surname;
 		this.password = password;
 		this.email = email;
+		this.medicalSpecialty = ms;
 	}
 
 	@Id
diff --git a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
index 9c4c348..56a8b2f 100644
--- a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
+++ b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
@@ -26,8 +26,7 @@ public class AuthorizationFilter implements Filter {
 	}
 
 	@Override
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		try {
 
 			HttpServletRequest reqt = (HttpServletRequest) request;
@@ -35,8 +34,9 @@ public class AuthorizationFilter implements Filter {
 			HttpSession ses = reqt.getSession(false);
 
 			String reqURI = reqt.getRequestURI();
-			if (reqURI.indexOf("/login.xhtml") >= 0 || reqURI.indexOf("/RegisterUser.xhtml") >= 0 || (ses != null && ses.getAttribute("username") != null)
-					|| reqURI.indexOf("/public/") >= 0 || reqURI.indexOf("/home.xhtml") >= 0 || reqURI.contains("javax.faces.resource"))
+			if (reqURI.indexOf("/login.xhtml") >= 0 || reqURI.indexOf("/RegisterUser.xhtml") >= 0 || reqURI.indexOf("/RegisterUserResult.xhtml") >= 0
+					|| (ses != null && ses.getAttribute("username") != null) || reqURI.indexOf("/public/") >= 0 || reqURI.indexOf("/home.xhtml") >= 0
+					|| reqURI.contains("javax.faces.resource"))
 				chain.doFilter(request, response);
 			else
 				resp.sendRedirect(reqt.getContextPath() + "/login.xhtml");
diff --git a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
index c8044e9..3894289 100644
--- a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
@@ -184,15 +184,15 @@ public class RegisterUserMBean extends ProfileMBeanBase implements Serializable
 		this.nif = nif;
 	}
 
-	public Integer getId() {
+	public int getId() {
 		return id;
 	}
 
-	public void setId(Integer id) {
+	public void setId(int id) {
 		this.id = id;
 	}
 	
-	public void addNewUser() {
+	public String addNewUser() {
 		int error = 0;
 
 		if (this.isFamilyDoctor() && this.primaryHealthCareCenter == null) {
@@ -213,28 +213,33 @@ public class RegisterUserMBean extends ProfileMBeanBase implements Serializable
 				switch (UserType.valueOf(this.userType)) {
 				case PATIENT:
 					PatientTO pat = this.remoteManager.registerPatient(id, nif, name, surname, password, email);
+					this.id = pat.getId();
 
 					break;
 				case FAMILY_DOCTOR:
 					FamilyDoctorTO fd = this.remoteManager.registerFamilyDoctor1(id, nif, name, surname, password, email, this.primaryHealthCareCenter);
+					this.id = fd.getId();
 
 					break;
 				case SPECIALIST_DOCTOR:
 					SpecialistDoctorTO sd = this.remoteManager.registerSpecialistDoctor(id, nif, name, surname, password, email, this.medicalSpecialty);
+					this.id = sd.getId();
 
 					break;
 				case ADMINISTRADOR:
 					throw new NotSupportedException("No se soporta el registro directo de administradores.");
 				}
 
-				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Alta realizada",
+				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Registro realizado",
 						"El usuario " + name + " " + surname + " se ha registrado correctamente. Por favor, comprueba su correo electrónico para verificar su cuenta.");
+
+				return "RegisterUserResult";
 			} catch (Exception e) {
 				this.manageException(e);
 			}
 		}
 
-		// FacesContext.getCurrentInstance().addMessage(null, msg);
+		return "";
 	}
 
 	public String getPasswordRepeat() {
