copilar codigo con ant y deployar ultima version

conectarse a la db correcta
add jboss user creation scripts
2019-12-20 00:35:35 +01:00 · 2019-12-19 23:57:02 +01:00 · 2019-12-19 23:38:16 +01:00 · 2019-12-19 23:38:16 +01:00 · 2019-12-19 23:36:03 +01:00 · 2019-12-18 19:22:18 +01:00
75 changed files with 2819 additions and 1366 deletions
--- a/1.sources/MyHealth/.classpath
+++ b/1.sources/MyHealth/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/WildFly 14.0 Runtime"/>
-	<classpathentry kind="lib" path="docroot/WEB-INF/lib/primefaces-7.0.jar" sourcepath="C:/Users/mark/.m2/repository/org/primefaces/primefaces/7.0/primefaces-7.0-sources.jar"/>
-	<classpathentry kind="lib" path="docroot/WEB-INF/lib/omnifaces-3.4.1.jar" sourcepath="C:/Users/mark/.m2/repository/org/omnifaces/omnifaces/3.4.1/omnifaces-3.4.1-sources.jar"/>
+	<classpathentry kind="lib" path="docroot/WEB-INF/lib/primefaces-7.0.jar" />
+	<classpathentry kind="lib" path="docroot/WEB-INF/lib/omnifaces-3.4.1.jar" />
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/1.sources/MyHealth/build.xml
+++ b/1.sources/MyHealth/build.xml
@@ -6,6 +6,7 @@
 	<property environment="env" />
 	<property name="jboss.home" value="${env.JBOSS_HOME}" />
 	<property name="source" value="." />
+	<property name="java.encoding" value="UTF-8" />
 	<property name="sourcesrc" value="${source}/src" />
 	<property name="build" value="${source}/build" />
 	<property name="buildjar" value="${build}/jar" />
@@ -27,7 +28,7 @@
 		</fileset>
 	</path>

-	<target name="all" depends="clean, init, ear" />
+	<target name="all" depends="clean, init, deployear" />

 	<target name="init" description="inicialitzacions is relevant: the structure created
 		copy files and directories there. xml ">
@@ -48,7 +49,8 @@
 	<target name="compileEjb" depends="init">
 		<copy file="${sourcesrc}/META-INF/persistence.xml" todir="${buildjar}/META-INF" />
 		<copy file="${sourcesrc}/log4j.properties" todir="${buildjar}" />
-		<javac srcdir="${sourcesrc}" destdir="${buildjar}" includes="ejb/**/*.java, jpa/**/*.java, TO/**/*.java" classpathref="jboss.classpath" includeantruntime="true" />
+		<javac encoding="${java.encoding}" srcdir="${sourcesrc}" destdir="${buildjar}" includes="ejb/**/*.java, jpa/**/*.java, TO/**/*.java, common/**/*.java" classpathref="jboss.classpath"
+			includeantruntime="true" />
 	</target>

 	<!-- Update the EJB jar file and create if not exist -->
@@ -61,7 +63,7 @@
 		<copy todir="${buildwar}">
 			<fileset dir="${docroot}" />
 		</copy>
-		<javac srcdir="${sourcesrc}" destdir="${buildwar}/WEB-INF/classes" includes="managedbean/**/*.java" includeantruntime="true">
+		<javac encoding="${java.encoding}" srcdir="${sourcesrc}" destdir="${buildwar}/WEB-INF/classes" includes="managedbean/**/*.java" includeantruntime="true">
 			<classpath>
 				<path refid="jboss.classpath" />
 				<path refid="lib.dir" />
@@ -70,6 +72,7 @@
 		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/ejb" />
 		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/jpa" />
 		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/TO" />
+		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/common" />
 	</target>
 	<!-- <war destfile="${build.dir}/CrunchifyRESTJerseyExample.war" webxml="WebContent/WEB-INF/web.xml"> -->
 	<!-- <classes dir="${build.dir}" /> -->
@@ -79,7 +82,8 @@

 	<!-- Update the WAR file and create if not exist -->
 	<target name="deployWar" depends="compileWar">
-		<jar jarfile="${dist}/MyHealth.war" basedir="${buildwar}" excludes="/WEB-INF/classes/ejb/*.*, /WEB-INF/classes/jpa/*.*, /WEB-INF/classes/TO/*.*" update="yes" />
+		<jar jarfile="${dist}/MyHealth.war" basedir="${buildwar}" excludes="/WEB-INF/classes/ejb/*.*, /WEB-INF/classes/jpa/*.*, /WEB-INF/classes/TO/*.*, /WEB-INF/classes/common/*.*"
+			update="yes" />
 	</target>

 	<!-- Update the application ear file and created if not exist -->
--- a/1.sources/MyHealth/docroot/error.xhtml
+++ b/1.sources/MyHealth/docroot/error.xhtml
@@ -1,7 +1,8 @@
 <?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">
@@ -9,24 +10,29 @@
 			<div class="ui-g ui-fluid">
 				<div class="ui-g-2 ui-md-2" />
 				<div class="ui-g-8 ui-md-8">
-					<p:panel id="ErrorPanel" header="Se ha producido un error inesperado">
+					<p:panel id="ErrorPanel">
+						<f:facet name="header">
+							<p:outputLabel value="Se ha producido un error de autorización" rendered="#{param.type == 'auth'}" />
+							<p:outputLabel value="Se ha producido un error desconocido" rendered="#{param.type == null}" />
+						</f:facet>
 						<div class="ui-g ui-fluid">
 							<div class="ui-g-12">La acción que estaba realizando a causado un error inesperado en el sistema. A continuación podrá ver un descripción detallada del error para que
 								pueda comunicarlo al equipo de soporte.</div>

 							<div class="ui-g-12" style="font-weight: bold;">
-								Descripción del error
+								<!-- 								<p:outputLabel value="No está autorizado a acceder a la página solicitada. Por favor, utilice el menú principal de la aplicación." rendered="#{param.type == 'auth'}" /> -->
+								<!-- 								<p:outputLabel value="Se ha producido un error desconocido. Si vuelve a repetirse, por favor, contacte con el equipo de soporte." rendered="#{param.type == null}" /> -->
 							</div>

 							<div class="ui-g-12">
-								<h:messages fatalClass="ErrorMessage" showDetail="true" showSummary="true" globalOnly="true" />
+								<p:messages id="errorMessage" showDetail="true" closable="false" autoupdate="true" showSummary="true" showIcon="true" />
 							</div>

-							<div class="ui-g-5" />
-							<div class="ui-g-2">
+							<div class="ui-g-4" />
+							<div class="ui-g-4">
 								<p:button value="Ir a la página principal" outcome="home" icon="pi pi-home" />
 							</div>
-							<div class="ui-g-5" />
+							<div class="ui-g-4" />
 						</div>
 					</p:panel>
 				</div>
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -14,26 +14,26 @@
 	    function handleLoginRequest(xhr, status, args) {
 	        if(args.validationFailed || !args.loggedIn) {
 	            PF('dlgLogin').jq.effect("shake", {times:5}, 100);
-	            //PF('Login').attr("disabled", false);
+	            PF('btnLogin').enable();
 	        }
 	        else {
+	        	PF('btnLogin').enable();
 	            PF('dlgLogin').hide();
 	        }
 	    }
 	    
 	    function startLogin() {
-	    	//PF('Login').attr("disabled", true);
+	    	PF('btnLogin').disable();
 	    }
 </h:outputScript>
 <h:body>
 	<div id="layout">
 		<div id="top" class="top">
-			<!-- 			<h1 class="Titulo">myHealth Site</h1> -->
+			<p:growl id="messages" globalOnly="true" sticky="false" showDetail="true" life="15000" />
 			<h:graphicImage library="images" name="logo-small.png" />
 		</div>
 		<hr />
 		<div id="menuDiv">
-			<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>
@@ -49,15 +49,15 @@
 					<div class="ui-g ui-fluid">
 						<div class="ui-g-12">
 							<h:outputLabel for="username" value="Usuario:" />
-							<p:inputText id="username" value="#{loginView.username}" />
+							<p:inputText id="username" value="#{loginView.username}" placeholder="Escriba su código CIP o NP" />
 						</div>
 						<div class="ui-g-12">

 							<h:outputLabel for="password" value="Contraseña:" />
-							<p:password id="password" value="#{loginView.password}" />
+							<p:password id="password" value="#{loginView.password}" placeholder="Contraseña" />
 						</div>
 						<div class="ui-g-6">
-							<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
+							<p:commandButton widgetVar="btnLogin" value="Login" update="messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
 								oncomplete="handleLoginRequest(xhr, status, args)" />
 						</div>
 						<div class="ui-g-6">
--- a/1.sources/MyHealth/docroot/home.xhtml
+++ b/1.sources/MyHealth/docroot/home.xhtml
@@ -11,35 +11,52 @@
 	<ui:define name="content">
 		<h:form>
 			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-
 			<p:panel header="Pagina principal">
-				<p:panelGrid>
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
 						<p:outputLabel for="selectorTema" value="Cambio de tema" />
-					<p:themeSwitcher id="selectorTema" style="width:165px" value="#{sessionPreferences.currentTheme}">
+					</div>
+					<div class="ui-g-6 ui-md-6">
+						<p:themeSwitcher id="selectorTema" style="width:300px" value="#{sessionPreferences.currentTheme}">
 							<f:selectItem itemLabel="Seleccione un tema" itemValue="" noSelectionOption="true" />
 							<f:selectItems value="#{home.themes}" var="theme" itemLabel="#{theme.displayName}" itemValue="#{theme.name}" />
 							<p:ajax listener="#{sessionPreferences.updateCurrentTheme}" />
 						</p:themeSwitcher>
-				</p:panelGrid>
-				<h:panelGrid columns="2">
+					</div>
+					<div class="ui-g-4 ui-md-1" />
+
+					<div class="ui-g-4 ui-md-4" />
+					<div class="ui-g-4 ui-md-4 ">
+						<p:commandButton value="Usar tema en este sesión" update="mesgs" action="#{sessionPreferences.updateCurrentTheme}" icon="pi pi-save" />
+					</div>
+					<div class="ui-g-4 ui-md-4" />
+
+					<div class="ui-g-2 ui-md-2">
+						<div class="ui-inputgroup">
+							<p:calendar pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
+							<p:commandButton value="Fecha" />
+						</div>
+					</div>
+					<div class="ui-g-10 ui-md-10" />
+
+					<div class="ui-g-2 ui-md-2">
 						<h:outputLabel value="Fecha" />
-					<p:calendar pattern="dd/MM/yyyy" />
+						<p:calendar pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
+					</div>
+					<div class="ui-g-10 ui-md-10" />
+					
+					<div class="ui-g-12">
 						<h:outputLabel value="Rich Text Editor" />
+					</div>
+					<div class="ui-g-12 ui-md-12">
 						<p:editor />
-				</h:panelGrid>
-				<h:panelGroup>
-					<h:panelGrid columns="2">
+					</div>
+
+					<div class="ui-g-12 ui-md-12">
 						<h:outputLabel value="Logeado como:" />
 						<p:inputText readonly="true" value="#{home.userName}" />
-					</h:panelGrid>
-				</h:panelGroup>
-			</p:panel>
-			<p:panel>
-				<h:panelGroup>
-					<h:panelGrid columns="1">
-						<p:commandButton value="Usar tema en este sesión" update="mesgs" action="#{sessionPreferences.updateCurrentTheme}" icon="pi pi-save" />
-					</h:panelGrid>
-				</h:panelGroup>
+					</div>
+				</div>
 			</p:panel>
 		</h:form>
 	</ui:define>
--- a/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml
+++ b/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml
@@ -0,0 +1,85 @@
+<?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="TestForm">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:panel id="panelPendingQuestions" header="Listado de preguntas pendientes de respuesta">
+				<div class="ui-g ui-fluid">
+
+					<div class="ui-g-4 ui-md-4">
+						<p:outputLabel for="campo" value="Etiqueta para campo de formulario:" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo" value="Valor del campo del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:message for="campo" display="text" />
+					</div>
+
+					<div class="ui-g-4 ui-md-4">
+						<p:outputLabel for="campo2" value="Etiqueta para campo 2 de formulario:" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo2" value="Valor del campo 2 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:message for="campo" display="text" />
+					</div>
+
+					<div class="ui-g-4 ui-md-4">
+						<p:outputLabel for="campo3" value="Etiqueta para campo 3 de formulario:" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo3" value="Valor del campo 3 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:message for="campo" display="text" />
+					</div>
+
+					<p:dataTable widgetVar="dtPendingQuestions" var="qs" value="#{PendingQuestions.lazyDataModelQuestionList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom" paginatorAlwaysVisible="true"
+						paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,40">
+						<p:column headerText="Id" width="60px;">
+							<h:outputText value="#{qs.id}" />
+						</p:column>
+
+						<p:column headerText="Title" width="auto">
+							<h:outputText value="#{qs.title}"/>
+						</p:column>
+
+						<p:column headerText="Patient" width="auto">
+							<h:outputText value="#{qs.patient.displayName}" />
+						</p:column>
+
+						<p:column headerText="Status" width="90px;">
+							<h:outputText value="#{qs.status}" />
+						</p:column>
+						<p:column headerText="Acción" width="80px;">
+							<h:outputText value="Responder" />
+						</p:column>
+
+						<f:facet name="paginatorBottomLeft">
+							<p:commandButton type="button" icon="pi pi-refresh" onclick="PF('dtPendingQuestions').getPaginator().setPage(0);" />
+						</f:facet>
+					</p:dataTable>
+
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4" />
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="TestForm" action="#{BeanName.actionMethod}" 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>
+			</p:panel>
+		</h:form>
+	</ui:define>
+</ui:composition>
+</html>
--- a/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/AddFamilyDoctor.xhtml
@@ -1,39 +0,0 @@
-<?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="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>
-			</p:panel>
-		</h:form>
-	</ui:define>
-</ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/profile/AddPatient.xhtml
+++ b/1.sources/MyHealth/docroot/profile/AddPatient.xhtml
@@ -1,38 +0,0 @@
-<?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="frmRegisterUser">
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-
-			<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>
-</ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/AddSpecialistDoctor.xhtml
@@ -1,37 +0,0 @@
-<?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="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>
-			</p:panel>
-		</h:form>
-	</ui:define>  </ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
@@ -44,10 +44,11 @@
 					</div>
 					<div class="ui-g-4 ui-md-4">
 						<p:autoComplete id="newFamilyDocAC" dropdown="true" required="true" value="#{ChangeFD.newFamilyDoctor}" completeMethod="#{ChangeFD.completeFamilyDoctor}" var="fd"
-							itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia">
+							itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia"
+							placeholder="Seleccione su nuevo médico de familia o teclee para buscar...">
 							<o:converter converterId="omnifaces.ListConverter" list="#{ChangeFD.familyDoctorList}" />
 							<p:column headerText="Num. Prof.">
-								<h:outputText value="#{fd.id}" />
+								<h:outputText value="#{fd.professionalNumber}" />
 							</p:column>
 							<p:column headerText="Nombre">
 								<h:outputText value="#{fd.name}" />
--- a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
@@ -44,10 +44,15 @@
 					</div>
 					<div class="ui-g-4 ui-md-4">
 						<p:autoComplete id="newCenter" dropdown="true" required="true" value="#{ChangeCAP.newCenter}" completeMethod="#{ChangeCAP.completePrimaryHealCareCenter}" var="phc"
-							itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria">
+							itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria"
+							placeholder="Seleccione una CAP o teclee para buscar...">
 							<o:converter converterId="omnifaces.ListConverter" list="#{ChangeCAP.phcList}" />
-							<p:column headerText="Nombre"><h:outputText value="#{phc.name}" /></p:column>
-							<p:column headerText="Localización"><h:outputText value="#{phc.location}" /></p:column>
+							<p:column headerText="Nombre">
+								<h:outputText value="#{phc.name}" />
+							</p:column>
+							<p:column headerText="Localización">
+								<h:outputText value="#{phc.location}" />
+							</p:column>
 						</p:autoComplete>
 					</div>
 					<div class="ui-g-4 ui-md-4">
--- a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
+++ b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
@@ -46,34 +46,35 @@
 			<h:form id="frmRegisterUser" rendered="#{not RegisterUser.registered}">
 				<h:outputScript>
 				    function handleRequest(xhr, status, args) {
-				    	/*
-				        if(args.specs) {
-				        	$('#panCentros').slideUp();
-				            $('#panEspecialidades').slideDown();
+				    	var nif = PF('nifButton');
+				    	if ( args.NIFisDupe == false ) {
+				    		nif.jq.children(".ui-icon").removeClass("pi pi-times");
+				    		nif.jq.removeClass('red-button');
+
+							nif.jq.children(".ui-icon").addClass("pi pi-check");
+				    		nif.jq.addClass('green-button');
 				    	}
-				        else if (args.caps) {
-				        	$('#panEspecialidades').slideUp();
-				            $('#panCentros').slideDown();
-				        } else if (args.pats) {
-				            $('#panCentros').slideUp();
-				            $('#panEspecialidades').slideUp();
+				    	else if (nif.jq.hasClass('red-button') == false) {
+							nif.jq.children(".ui-icon").removeClass("pi pi-check");
+				    		nif.jq.removeClass('green-button');
+
+				    		nif.jq.children(".ui-icon").addClass("pi pi-times");
+				    		nif.jq.addClass('red-button');
 			    		}
-				        */
 				    }
 				</h:outputScript>
-				<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+				<p:messages id="mesgs" globalOnly="true" showDetail="true" closable="true" autoupdate="true" />
 				<p:panel id="tipoUsuario" header="Especifique el tipo de usuario que desea registrarse">
 					<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">
+						<div class="ui-g-10 ui-md-10">
 							<p:selectOneButton id="selUsertype" value="#{RegisterUser.userType}" required="true" unselectable="false" requiredMessage="Debe especificar un tipo de usuario">
 								<f:selectItems value="#{RegisterUser.availableUserTypes}" var="item" itemLabel="#{item.userTypename}" />
-								<p:ajax listener="#{RegisterUser.onUserTypeChange}" update="panCombos" oncomplete="handleRequest(xhr, status, args)" />
+								<p:ajax listener="#{RegisterUser.onUserTypeChange}" update="panCombos" />
 							</p:selectOneButton>
 						</div>
-						<div class="ui-g-4 ui-md-4" />
 					</div>
 				</p:panel>
 				<br />
@@ -83,10 +84,15 @@
 							<p:outputLabel value="NIF:" for="nif" />
 						</div>
 						<div class="ui-g-4 ui-md-4">
-							<p:inputText id="nif" value="#{RegisterUser.nif}" validator="nifValidator" maxlength="20" required="true" requiredMessage="Por favor, indque su NIF" />
+							<div class="ui-inputgroup">
+								<p:inputText id="nif" value="#{RegisterUser.nif}" validator="nifValidator" maxlength="20" required="true" requiredMessage="Por favor, indque su NIF">
+									<p:ajax event="blur" update="nifmsg" listener="#{RegisterUser.hadleNIFValueChange}" oncomplete="handleRequest(xhr, status, args)" />
+								</p:inputText>
+								<p:commandButton widgetVar="nifButton" icon="pi pi-times" styleClass="red-button" />
+							</div>
 						</div>
 						<div class="ui-g-6 ui-md-6">
-							<p:message for="nif" display="text" showDetail="true" showSummary="true" />
+							<p:message id="nifmsg" for="nif" />
 						</div>

 						<div class="ui-g-2 ui-md-2">
@@ -114,12 +120,12 @@
 						</div>
 						<div class="ui-g-4 ui-md-4">
 							<p:inputText id="email" value="#{RegisterUser.email}" required="true" maxlength="120" validator="emailValidator"
-								validatorMessage="La dirección #{RegisterUser.email} no es válida" requiredMessage="Por favor, especifique su correo electrónico">
+								validatorMessage="La dirección de correo electrónico #{RegisterUser.email} no es válida" requiredMessage="Por favor, especifique su correo electrónico">
 								<f:validateRegex pattern="[\w\.-]*[a-zA-Z0-9_]@[\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]" />
 							</p:inputText>
 						</div>
 						<div class="ui-g-6 ui-md-6">
-							<p:message for="email" display="text" showDetail="true" showSummary="true" />
+							<p:message for="email" />
 						</div>
 						<div class="ui-g-2 ui-md-2">
 							<p:outputLabel value="Contraseña" for="password" />
@@ -148,8 +154,9 @@
 									<p:outputLabel value="Centro:" for="selPHC" />
 								</div>
 								<div class="ui-g-4 ui-md-4">
-									<p:autoComplete id="selPHC" dropdown="true" value="#{RegisterUser.primaryHealthCareCenter}" completeMethod="#{RegisterUser.completePrimaryHealCareCenter}" var="phc"
-										itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria">
+									<p:autoComplete id="selPHC" dropdown="true" required="true" value="#{RegisterUser.primaryHealthCareCenter}" completeMethod="#{RegisterUser.completePrimaryHealCareCenter}"
+										var="phc" itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria"
+										placeholder="Seleccione una CAP o teclee para buscar...">
 										<o:converter converterId="omnifaces.ListConverter" list="#{RegisterUser.phcList}" />
 										<p:column headerText="Nombre">
 											<h:outputText value="#{phc.name}" />
@@ -169,8 +176,9 @@
 									<p:outputLabel value="Especialidad médica:" for="selMS" />
 								</div>
 								<div class="ui-g-4 ui-md-4">
-									<p:autoComplete id="selMS" dropdown="true" value="#{RegisterUser.medicalSpecialty}" completeMethod="#{RegisterUser.completeMedicalSpecialty}" var="ms"
-										itemLabel="#{ms.displayName}" itemValue="#{ms}" forceSelection="true" requiredMessage="Por favor, selecciona una especialidad médica">
+									<p:autoComplete id="selMS" dropdown="true" required="true" value="#{RegisterUser.medicalSpecialty}" completeMethod="#{RegisterUser.completeMedicalSpecialty}" var="ms"
+										itemLabel="#{ms.displayName}" itemValue="#{ms}" forceSelection="true" requiredMessage="Por favor, selecciona una especialidad médica"
+										placeholder="Seleccione una especialidad médica o teclee para buscar...">
 										<o:converter converterId="omnifaces.ListConverter" list="#{RegisterUser.medicalSpecialtiesList}" />
 										<p:column headerText="Nombre">
 											<h:outputText value="#{ms.name}" />
--- a/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ShowFamilyDoctor.xhtml
@@ -1,38 +0,0 @@
-<?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="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>
-			</p:panel>
-		</h:form>
-	</ui:define>
-</ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ShowPaciente.xhtml
@@ -1,38 +0,0 @@
-<?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="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>
-</html>
--- a/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ShowSpecialistDoctor.xhtml
@@ -1,38 +0,0 @@
-<?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="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>
-			</p:panel>
-		</h:form>
-	</ui:define>
-  </ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateFamilyDoctor.xhtml
@@ -1,39 +0,0 @@
-<?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="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>
-			</p:panel>
-		</h:form>
-	</ui:define>
-</ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdatePatient.xhtml
@@ -1,39 +0,0 @@
-<?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="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>
-			</p:panel>
-		</h:form>
-	</ui:define>
-  </ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
@@ -7,6 +7,25 @@
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
 		<h:form id="frmUpdateProfile">
+			<h:outputScript>
+			    function handleRequest(xhr, status, args) {
+			    	var nif = PF('nifButton');
+			    	if ( args.NIFisDupe == false ) {
+			    		nif.jq.children(".ui-icon").removeClass("pi pi-times");
+			    		nif.jq.removeClass('red-button');
+
+						nif.jq.children(".ui-icon").addClass("pi pi-check");
+			    		nif.jq.addClass('green-button');
+			    	}
+			    	else if (nif.jq.hasClass('red-button') == false) {
+						nif.jq.children(".ui-icon").removeClass("pi pi-check");
+			    		nif.jq.removeClass('green-button');
+
+			    		nif.jq.children(".ui-icon").addClass("pi pi-times");
+			    		nif.jq.addClass('red-button');
+		    		}
+			    }
+			</h:outputScript>
 			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />

 			<p:panel id="tipoUsuario" header="Tipo de usuario registrado">
@@ -14,13 +33,12 @@
 					<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">
+					<div class="ui-g-10 ui-md-10">
 						<p:selectOneButton id="selUsertype" value="#{UpdateProfile.userType}" disabled="true" required="true" unselectable="false"
 							requiredMessage="Debe especificar un tipo de usuario">
 							<f:selectItems value="#{UpdateProfile.userTypes}" var="item" itemLabel="#{item.userTypename}" itemValue="#{item.name}" />
 						</p:selectOneButton>
 					</div>
-					<div class="ui-g-4 ui-md-4"></div>
 				</div>
 			</p:panel>
 			<br />
@@ -31,7 +49,7 @@
 						<p:outputLabel value="Número de Profesional:" rendered="#{UpdateProfile.userTypeDoctor}" for="cipCode" />
 					</div>
 					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="cipCode" value="#{UpdateProfile.cipCode}" disabled="true" required="true" requiredMessage="Es necesario un código de identificación" />
+						<p:inputText id="cipCode" value="#{UpdateProfile.cipCode}" readonly="true" required="true" requiredMessage="Es necesario un código de identificación" />
 					</div>
 					<div class="ui-g-6 ui-md-6">
 						<p:message for="cipCode" display="text" />
@@ -41,10 +59,15 @@
 						<p:outputLabel value="NIF:" for="nif" />
 					</div>
 					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="nif" value="#{UpdateProfile.nif}" validator="nifValidator" required="true"  maxlength="50" requiredMessage="Por favor, indque su NIF" />
+						<div class="ui-inputgroup">
+							<p:inputText id="nif" value="#{UpdateProfile.nif}" validator="nifValidator" maxlength="20" required="true" requiredMessage="Por favor, indque su NIF">
+								<p:ajax event="blur" update="nifmsg" listener="#{UpdateProfile.hadleNIFValueChange}" oncomplete="handleRequest(xhr, status, args)" />
+							</p:inputText>
+							<p:commandButton widgetVar="nifButton" icon="pi pi-check" styleClass="green-button" />
+						</div>
 					</div>
 					<div class="ui-g-6 ui-md-6">
-						<p:message for="nif" display="text" />
+						<p:message id="nifmsg" for="nif" display="text" />
 					</div>

 					<div class="ui-g-2 ui-md-2">
@@ -71,8 +94,8 @@
 						<p:outputLabel value="Correo electrónico:" for="email" />
 					</div>
 					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="email" value="#{UpdateProfile.email}" required="true" maxlength="120" validator="emailValidator" validatorMessage="La dirección #{RegisterUser.email} no es válida"
-							requiredMessage="Por favor, especifique su correo electrónico">
+						<p:inputText id="email" value="#{UpdateProfile.email}" required="true" maxlength="120" validator="emailValidator"
+							validatorMessage="La dirección #{RegisterUser.email} no es válida" requiredMessage="Por favor, especifique su correo electrónico">
 							<f:validateRegex pattern="[\w\.-]*[a-zA-Z0-9_]@[\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]" />
 						</p:inputText>
 					</div>
@@ -156,11 +179,12 @@
 							<p:outputLabel value="Médico de familia:" for="FamilyDoc" />
 						</div>
 						<div class="ui-g-4 ui-md-4">
-							<p:autoComplete id="FamilyDoc" disabled="true" dropdown="true" required="true" value="#{UpdateProfile.familyDoctor}" completeMethod="#{UpdateProfile.completeFamilyDoctor}"
-								var="fd" itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia">
+							<p:autoComplete id="FamilyDoc" readonly="true" dropdown="true" required="true" value="#{UpdateProfile.familyDoctor}" completeMethod="#{UpdateProfile.completeFamilyDoctor}"
+								var="fd" itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia"
+								placeholder="Seleccione su médico de familia a través de la opción de cambiar médico de familia...">
 								<o:converter converterId="omnifaces.ListConverter" list="#{UpdateProfile.familyDoctorList}" />
 								<p:column headerText="Num. Prof.">
-									<h:outputText value="#{fd.id}" />
+									<h:outputText value="#{fd.professionalNumber}" />
 								</p:column>
 								<p:column headerText="Nombre">
 									<h:outputText value="#{fd.name}" />
--- a/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateSpecialistDoctor.xhtml
@@ -1,38 +0,0 @@
-<?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="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>
-			</p:panel>
-		</h:form>
-	</ui:define>
-  </ui:composition>
-</html>
--- a/1.sources/MyHealth/docroot/resources/css/estilos.css
+++ b/1.sources/MyHealth/docroot/resources/css/estilos.css
@@ -10,3 +10,25 @@ BODY {
 	padding: 0 !important;
 	margin: 0 !important;
 }
+
+.green-button.ui-button.ui-state-default {
+	background-color: #5cb85c;
+	border-color: #5cb85c;
+	color: #fff;
+}
+
+.green-button.ui-button.ui-state-default:enabled:hover, .green-button.ui-button.ui-state-default:focus {
+	background-color: #4cae4c;
+	border-color: #5cb85c;
+}
+
+.red-button.ui-button.ui-state-default {
+	background-color: #d9534f;
+	border-color: #d9534f;
+	color: #fff;
+}
+
+.red-button.ui-button.ui-state-default:enabled:hover, .red-button.ui-button.ui-state-default:focus {
+	background-color: #d43f3a;
+	border-color: #d9534f;
+}
--- a/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
+++ b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
@@ -2,54 +2,26 @@
 <!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">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">

 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
-		<h:form id="TestForm">
+		<h:form id="frmManageSpecialties">
 			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-			<p:panel id="PanelUnderConstruction" header="Pagina en construcción de Administrador">
+			<p:panel id="PanelMS" header="Página Gestión de Especialidades">
 				<div class="ui-g ui-fluid">
-
-					<div class="ui-g-4 ui-md-4">
-						<p:outputLabel for="campo" value="Etiqueta para campo de formulario:" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="campo" value="Valor del campo del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:message for="campo" display="text" />
-					</div>
-
-					<div class="ui-g-4 ui-md-4">
-						<p:outputLabel for="campo2" value="Etiqueta para campo 2 de formulario:" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="campo2" value="Valor del campo 2 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:message for="campo" display="text" />
-					</div>
-
-					<div class="ui-g-4 ui-md-4">
-						<p:outputLabel for="campo3" value="Etiqueta para campo 3 de formulario:" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="campo3" value="Valor del campo 3 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:message for="campo" display="text" />
-					</div>
-
-					<div class="ui-g-12 ui-g-nopad">
-						<div class="ui-g-4 ui-md-4" />
-						<div class="ui-g-2 ui-md-2 ">
-							<p:commandButton validateClient="true" value="Guardar" update="TestForm" action="#{BeanName.actionMethod}" icon="pi pi-check" />
-						</div>
 					<div class="ui-g-2 ui-md-2">
-							<p:button value="Volver" outcome="/home" icon="pi pi-home" />
+						<p:autoComplete id="specialty" dropdown="true" required="true"
+							value="#{SystemAdmin.medicalSpecialty}" completeMethod="#{SystemAdmin.completeMedicalSpecialty}" var="ms"
+							placeholder="----- Selecciona una especialidad -----" itemLabel="#{ms.name}" itemValue="#{ms.name}" forceSelection="true">
+							<o:converter converterId="omnifaces.ListConverter" list="#{RegisterUser.medicalSpecialtiesList}" />
+							<p:column>
+								<h:outputText value="#{ms.name}" />
+							</p:column>
+						</p:autoComplete>
 					</div>
-						<div class="ui-g-4 ui-md-4" />
+					<div class="ui-g-4 ui-md-4">
+						<p:message for="specialty" />
 					</div>
 				</div>
 			</p:panel>
--- a/1.sources/MyHealth/src/TO/FamilyDoctorTO.java
+++ b/1.sources/MyHealth/src/TO/FamilyDoctorTO.java
@@ -86,7 +86,7 @@ public class FamilyDoctorTO implements Serializable {
 	}
 	
 	public String getDisplayName() {
-		return String.format("[%d] %s %s", this.id, this.name, this.surname);
+		return String.format("[%s] %s %s", this.professionalNumber, this.name, this.surname);
 	}

 	public PrimaryHealthCareCenterTO getPrimaryHealthCareCenter() {
--- a/1.sources/MyHealth/src/TO/LoggedUserTO.java
+++ b/1.sources/MyHealth/src/TO/LoggedUserTO.java
@@ -60,8 +60,8 @@ public class LoggedUserTO implements Serializable {
 		return userType;
 	}

-	public void setUserType(UserType userType) {
-		this.userType = userType;
+	public void setUserType(UserType value) {
+		this.userType = value;
 	}

 }
--- a/1.sources/MyHealth/src/TO/MedicalTestTO.java
+++ b/1.sources/MyHealth/src/TO/MedicalTestTO.java
@@ -1,12 +1,13 @@
 package TO;

 import java.io.Serializable;
+import java.util.Date;

 import javax.xml.bind.annotation.XmlRootElement;

 /**
 * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
+ * @author Roberto Orden Erena <rorden@uoc.edu>
 *
 */
@XmlRootElement(name = "MedicalTest")
@@ -14,10 +15,93 @@ public class MedicalTestTO implements Serializable {

 	private static final long serialVersionUID = 1L;

+	private int id;
+	private Date date;
+	private long time;
+	private String observations;
+	private String highresimage;
+	private MedicalTestType type;
+	private PatientTO patient;
+	private SpecialistDoctorTO specialistDoctor;
 	
-	public MedicalTestTO() {
-		super();
+	public static enum MedicalTestType {
+		BLOD_TEST, MAGNETIC_RESONANCE, TAC
 	}

+	public MedicalTestTO(int id, Date date, int time, String observations, String highresimage, MedicalTestType type,
+			PatientTO patiend, SpecialistDoctorTO specialistDoctor) {
+		this.setId(id);
+		this.setDate(date);
+		this.setTime(time);
+		this.setObservations(observations);
+		this.setHighresimage(highresimage);
+		this.setType(type);
+		this.setPatient(patiend);
+		this.setSpecialistDoctor(specialistDoctor);
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public long getTime() {
+		return time;
+	}
+
+	public void setTime(long time) {
+		this.time = time;
+	}
+
+	public String getObservations() {
+		return observations;
+	}
+
+	public void setObservations(String observations) {
+		this.observations = observations;
+	}
+
+	public String getHighresimage() {
+		return highresimage;
+	}
+
+	public void setHighresimage(String highresimage) {
+		this.highresimage = highresimage;
+	}
+
+	public MedicalTestType getType() {
+		return type;
+	}
+
+	public void setType(MedicalTestType type) {
+		this.type = type;
+	}
+
+	public PatientTO getPatient() {
+		return patient;
+	}
+
+	public void setPatient(PatientTO patient) {
+		this.patient = patient;
+	}
+
+	public SpecialistDoctorTO getSpecialistDoctor() {
+		return specialistDoctor;
+	}
+
+	public void setSpecialistDoctor(SpecialistDoctorTO specialistDoctor) {
+		this.specialistDoctor = specialistDoctor;
+	}

 }
--- a/1.sources/MyHealth/src/TO/PatientTO.java
+++ b/1.sources/MyHealth/src/TO/PatientTO.java
@@ -90,6 +90,10 @@ public class PatientTO implements Serializable {
 		this.id = id;
 	}

+	public String getDisplayName() {
+		return String.format("[%s] %s %s", this.personalIdentificationCode, this.name, this.surname);
+	}
+	
 	public FamilyDoctorTO getFamilyDoctor() {
 		return familyDoctor;
 	}
--- a/1.sources/MyHealth/src/TO/QuestionTO.java
+++ b/1.sources/MyHealth/src/TO/QuestionTO.java
@@ -0,0 +1,100 @@
+package TO;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import common.QuestionStatus;
+
+/**
+ * 
+ * @author Roberto Orden Erena <rorden@uoc.edu>
+ *
+ */
+@XmlRootElement(name = "Question")
+public class QuestionTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private int id;
+	private String title;
+	private String message;
+	private QuestionStatus status;
+	private String response;
+	private PatientTO patient;
+	private FamilyDoctorTO fdoctor;
+	
+
+	public QuestionTO() {
+		super();
+	}
+
+	public QuestionTO(int id, String title, String message, QuestionStatus status, PatientTO patient,
+			FamilyDoctorTO fdoctor, String response) {
+		super();
+		this.id = id;
+		this.title = title;
+		this.message = message;
+		this.status = status;
+		this.patient = patient;
+		this.fdoctor = fdoctor;
+		this.response = response;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public QuestionStatus getStatus() {
+		return status;
+	}
+
+	public void setStatus(QuestionStatus status) {
+		this.status = status;
+	}
+
+	public PatientTO getPatient() {
+		return patient;
+	}
+
+	public void setPatient(PatientTO patient) {
+		this.patient = patient;
+	}
+
+	public FamilyDoctorTO getDoctor() {
+		return fdoctor;
+	}
+
+	public void setDoctor(FamilyDoctorTO fdoctor) {
+		this.fdoctor = fdoctor;
+	}
+
+	public String getResponse() {
+		return response;
+	}
+
+	public void setResponse(String response) {
+		this.response = response;
+	}
+
+}
--- a/1.sources/MyHealth/src/TO/SpecialistDoctorTO.java
+++ b/1.sources/MyHealth/src/TO/SpecialistDoctorTO.java
@@ -85,6 +85,10 @@ public class SpecialistDoctorTO implements Serializable {
 		this.id = id;
 	}

+	public String getDisplayName() {
+		return String.format("[%s] %s %s", this.professionalNumber, this.name, this.surname);
+	}
+	
 	public MedicalSpecialtyTO getMedicalSpecialty() {
 		return medicalSpecialty;
 	}
--- a/1.sources/MyHealth/src/common/Constants.java
+++ b/1.sources/MyHealth/src/common/Constants.java
@@ -9,4 +9,6 @@ public class Constants {
 	public static final int MAX_ITEMS_AUTOCOMPLETE_SEARCH = 200;
 	public static final String PROFESSIONAL_NUMBER_PREFIX = "PRO#";
 	public static final String PERSONAL_IDENTIFICATION_CODE_PREFIX = "PAT#";
+	
+	public static final int DEFAULT_TABLE_GRID_PAGE_SIZE = 20;
 }
--- a/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
@@ -6,23 +6,27 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
 import javax.persistence.TypedQuery;

-import org.jboss.security.auth.spi.Users.User;
-
 import TO.FamilyDoctorTO;
 import TO.MedicalSpecialtyTO;
 import TO.PatientTO;
 import TO.PrimaryHealthCareCenterTO;
+import TO.QuestionTO;
 import TO.SpecialistDoctorTO;
 import common.Utils;
 import jpa.FamilyDoctorJPA;
 import jpa.MedicalSpecialtyJPA;
 import jpa.PatientJPA;
 import jpa.PrimaryHealthCareCenterJPA;
+import jpa.QuestionJPA;
 import jpa.SpecialistDoctorJPA;

+/***
+ * 
+ * @author Marcos García Núñez (mgarcianun@uoc.edu)
+ *
+ */
@Stateless
 public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 	// Persistence Unit Context
@@ -30,7 +34,9 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 	private EntityManager entman;

 	/**
-	 * Metodo que devuelve todas las especialidades medicas
+	 * Metodo que devuelve todas las especialidades medicas registradas en el sistema
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
 	 */
 	public List<MedicalSpecialtyTO> listAllMedicalSpecialities() {
 		return this.listMedicalSpecialitiesPaged(0, 0);
@@ -39,14 +45,26 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 	/**
 	 * Metodo que devuelve las especialidades médicas de forma paginada
 	 * 
-	 * Acepta como parametro la página (comenzando en 0) y el número de elementos de
-	 * cada página
+	 * Acepta como parametro la página (comenzando en 0) y el número de elementos de cada página.
 	 * 
+	 * si pageSize == 0, entonces se devuelven todas las especialidades registradas (Se ignora el parámetro).
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
 	 */
 	public List<MedicalSpecialtyTO> listMedicalSpecialitiesPaged(int pageNumber, int pageSize) {
 		return listMedicalSpecialitiesFiltered(null, pageNumber, pageSize);
 	}

+	/**
+	 * Método que devuelve una lista de espcialidades médicas que tienen una coincidencia parcial en el nombre o en la descripción con el termino de búsqueda (searchTerm)
+	 * especificado.
+	 * 
+	 * Además permite la paginacción de datos. Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * Si serachTerm es nulo o cadena vacía entonces no se tiene en cuenta el parámetro y devuelven todas las especialidades existentes.
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
+	 */
 	public List<MedicalSpecialtyTO> listMedicalSpecialitiesFiltered(String searchTerm, int pageNumber, int pageSize) {
 		String strQuery = "SELECT ms from MedicalSpecialtyJPA ms %s order by ms.name, ms.description";
 		String strFilter = "";
@@ -79,14 +97,36 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return allSpecialities;
 	}

+	/**
+	 * Método que devuelve todos los CAPs registrados en el sistema
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
+	 */
 	public List<PrimaryHealthCareCenterTO> listAllCAPs() {
 		return this.listCAPsPaged(0, 0);
 	}

+	/**
+	 * Método que devuelve una lista de CAPs (Centros de Atención Primarios) de forma paginada
+	 * 
+	 * Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
+	 */
 	public List<PrimaryHealthCareCenterTO> listCAPsPaged(int pageNumber, int pageSize) {
 		return this.listCAPsFiltered(null, pageNumber, pageSize);
 	}

+	/**
+	 * Método que devuelve una lista de CAPs (Centros de Atención Primarios) que tienen una coincidencia parcial en el nombre o en la localización con el termino de búsqueda
+	 * (searchTerm) especificado.
+	 * 
+	 * Además permite la paginacción de datos. Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * Si serachTerm es nulo o cadena vacía entonces no se tiene en cuenta el parámetro y devuelven todos los CAPs existentes.
+	 * 
+	 * @return Devuelve una Lista de PrimaryHealthCareCenterTO (Transfer Objects).
+	 */
 	public List<PrimaryHealthCareCenterTO> listCAPsFiltered(String searchTerm, int pageNumber, int pageSize) {
 		String strQuery = "SELECT phc from PrimaryHealthCareCenterJPA phc %s order by phc.name, phc.location";
 		String strFilter = "";
@@ -119,14 +159,35 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return allCAPs;
 	}

+	/**
+	 * Método que devuelve una lista con todos los médicos de familia registrados en el sistema.
+	 * 
+	 * @return Devuelve una Lista de FamilyDoctorTO (Transfer Objects).
+	 */
 	public List<FamilyDoctorTO> listAllFamilyDoctors() {
 		return this.listFamilyDoctorsPaged(0, 0);
 	}

+	/**
+	 * Método que devuelve una lista con todos los médicos de familia registrados en el sistema de forma paginada.
+	 * 
+	 * Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * @return Devuelve una Lista de FamilyDoctorTO (Transfer Objects).
+	 */
 	public List<FamilyDoctorTO> listFamilyDoctorsPaged(int pageNumber, int pageSize) {
 		return this.listFamilyDoctorsFiltered(null, pageNumber, pageSize);
 	}

+	/**
+	 * Método que devuelve una lista de médicos de familia que tienen una coincidencia parcial en el nombre o en los apellidos con el termino de búsqueda (searchTerm) especificado.
+	 * 
+	 * Además permite la paginacción de datos. Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * Si serachTerm es nulo o cadena vacía entonces no se tiene en cuenta el parámetro y devuelven todos los registros existentes.
+	 * 
+	 * @return Devuelve una Lista de FamilyDoctorTO (Transfer Objects).
+	 */
 	public List<FamilyDoctorTO> listFamilyDoctorsFiltered(String searchTerm, int pageNumber, int pageSize) {
 		String strQuery = "SELECT fd FROM FamilyDoctorJPA fd %s order by fd.name, fd.surname";
 		String strFilter = "";
@@ -159,6 +220,11 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return allFDTOs;
 	}

+	/**
+	 * Método que convierte un objecto de tipo MedicalSpecialtyJPA (JPA) a su equivalente MedicalSpecialtyTO (Tranfer Object)
+	 * 
+	 * @return MedicalSpecialtyTO (Transfer Object de una especialidad médica)
+	 */
 	public MedicalSpecialtyTO getPOJOforMedicalSpecialtyJPA(MedicalSpecialtyJPA ms) {
 		MedicalSpecialtyTO msTO = null;

@@ -169,6 +235,11 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return msTO;
 	}

+	/**
+	 * Método que convierte un objecto de tipo PrimaryHealthCareCenterJPA (JPA) a su equivalente PrimaryHealthCareCenterTO (Tranfer Object)
+	 * 
+	 * @return PrimaryHealthCareCenterTO (Transfer Object de un CAP)
+	 */
 	public PrimaryHealthCareCenterTO getPOJOforPrimaryHealthCareCenterJPA(PrimaryHealthCareCenterJPA phc) {
 		PrimaryHealthCareCenterTO phcTO = null;

@@ -179,6 +250,14 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return phcTO;
 	}

+	/**
+	 * Método que convierte un objecto de tipo SpecialistDoctorJPA (JPA) a su equivalente SpecialistDoctorTO (Tranfer Object)
+	 * 
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object de un médico especialista)
+	 */
 	public SpecialistDoctorTO getPOJOforSpecialistDoctorJPA(SpecialistDoctorJPA sd, int nestedProps) {
 		SpecialistDoctorTO sdTO = null;

@@ -188,12 +267,21 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 				ms = sd.getMedicalSpecialty();

 			nestedProps--;
-			sdTO = new SpecialistDoctorTO(sd.getId(), sd.getProfessionalNumber(), sd.getNif(), sd.getName(), sd.getSurname(), sd.getPassword(), sd.getEmail(), this.getPOJOforMedicalSpecialtyJPA(ms));
+			sdTO = new SpecialistDoctorTO(sd.getId(), sd.getProfessionalNumber(), sd.getNif(), sd.getName(), sd.getSurname(), sd.getPassword(), sd.getEmail(),
+					this.getPOJOforMedicalSpecialtyJPA(ms));
 		}

 		return sdTO;
 	}

+	/**
+	 * Método que convierte un objecto de tipo FamilyDoctorJPA (JPA) a su equivalente FamilyDoctorTO (Tranfer Object)
+	 *
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object de un médico especialista)
+	 */
 	public FamilyDoctorTO getPOJOforFamilyDoctorJPA(FamilyDoctorJPA fd, int nestedProps) {
 		FamilyDoctorTO fdTO = null;

@@ -203,12 +291,21 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 				phc = fd.getPrimaryHealthCareCenter();

 			nestedProps--;
-			fdTO = new FamilyDoctorTO(fd.getId(), fd.getProfessionalNumber(), fd.getNif(), fd.getName(), fd.getSurname(), fd.getPassword(), fd.getEmail(), this.getPOJOforPrimaryHealthCareCenterJPA(phc));
+			fdTO = new FamilyDoctorTO(fd.getId(), fd.getProfessionalNumber(), fd.getNif(), fd.getName(), fd.getSurname(), fd.getPassword(), fd.getEmail(),
+					this.getPOJOforPrimaryHealthCareCenterJPA(phc));
 		}

 		return fdTO;
 	}

+	/**
+	 * Método que convierte un objecto de tipo PatientJPA (JPA) a su equivalente PatientTO (Tranfer Object)
+	 * 
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return PatientTO (Transfer Object de un médico especialista)
+	 */
 	public PatientTO getPOJOforPatientJPA(PatientJPA pat, int nestedProps) {
 		PatientTO paTO = null;

@@ -218,58 +315,168 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 				fd = pat.getFamilyDoctor();

 			nestedProps--;
-			paTO = new PatientTO(pat.getId(), pat.getPersonalIdentificationCode(), pat.getNif(), pat.getName(), pat.getSurname(), pat.getPassword(), pat.getEmail(), this.getPOJOforFamilyDoctorJPA(fd, nestedProps));
+			paTO = new PatientTO(pat.getId(), pat.getPersonalIdentificationCode(), pat.getNif(), pat.getName(), pat.getSurname(), pat.getPassword(), pat.getEmail(),
+					this.getPOJOforFamilyDoctorJPA(fd, nestedProps));
 		}

 		return paTO;
 	}

+	/**
+	 * Método que recupera un paciente a partir de su Identificador (Id) de base de datos.
+	 * 
+	 * @return PatientTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public PatientTO findPatientById(int patientId) {
 		// Recuperamos propiedades anidadas 1 nivel!
 		return this.getPOJOforPatientJPA(entman.find(PatientJPA.class, patientId), 1);
 	}

-
-	public PatientJPA findPatientByCode(String code) {
+	/**
+	 * Método que recupera un paciente a partir de su CIP (Código de Identificación de Paciente)
+	 * 
+	 * @return PatientTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public PatientTO findPatientByCode(String code) {
 		TypedQuery<PatientJPA> query = entman.createQuery("from PatientJPA pat where pat.personalIdentificationCode=:code", PatientJPA.class);
-		
+		query.setMaxResults(1);
 		query.setParameter("code", code);

 		List<PatientJPA> results = query.getResultList();
 		if (results.size() > 0)
-			return results.get(0);
+			return this.getPOJOforPatientJPA(results.get(0), 1);
 		else
-			return null;	}	
+			return null;
+	}

+	/**
+	 * Método que recupera un paciente a partir de su NIF
+	 * 
+	 * @return PatientTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public PatientTO findPatientByNif(String searchedNIF) {
+		TypedQuery<PatientJPA> query = entman.createQuery("from PatientJPA pat where pat.nif=:nif", PatientJPA.class);
+		query.setMaxResults(1);
+		query.setParameter("nif", searchedNIF);
+
+		List<PatientJPA> results = query.getResultList();
+		if (results.size() > 0)
+			return this.getPOJOforPatientJPA(results.get(0), 1);
+		else
+			return null;
+	}
+
+	/**
+	 * Método que recupera un médico de familia a partir de su Identificador (Id) de base de datos.
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public FamilyDoctorTO findFamilyDoctorById(int ProfessionalNumberId) {
 		return this.getPOJOforFamilyDoctorJPA(entman.find(FamilyDoctorJPA.class, ProfessionalNumberId), 1);
 	}

-	public FamilyDoctorJPA findFamilyDoctorByCode(String code) {
+	/**
+	 * Método que recupera un médico de familia a partir de su NP (Número de profesional)
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public FamilyDoctorTO findFamilyDoctorByCode(String code) {
 		TypedQuery<FamilyDoctorJPA> query = entman.createQuery("from FamilyDoctorJPA d where d.professionalNumber=:code", FamilyDoctorJPA.class);

 		query.setParameter("code", code);

 		List<FamilyDoctorJPA> results = query.getResultList();
 		if (results.size() > 0)
-			return results.get(0);
+			return this.getPOJOforFamilyDoctorJPA(results.get(0), 1);
 		else
 			return null;
 	}

+	/**
+	 * Método que recupera un médico de familia a partir de su NIF
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public FamilyDoctorTO findFamilyDoctorByNif(String searchedNIF) {
+		TypedQuery<FamilyDoctorJPA> query = entman.createQuery("from FamilyDoctorJPA d where d.nif=:nif", FamilyDoctorJPA.class);
+		query.setMaxResults(1);
+		query.setParameter("nif", searchedNIF);
+
+		List<FamilyDoctorJPA> results = query.getResultList();
+		if (results.size() > 0)
+			return this.getPOJOforFamilyDoctorJPA(results.get(0), 1);
+		else
+			return null;
+	}
+
+	/**
+	 * Método que recupera un médico especialista a partir de su Identificador (Id) de base de datos.
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public SpecialistDoctorTO findSpecialistDoctorById(int ProfessionalNumberId) {
 		return this.getPOJOforSpecialistDoctorJPA(entman.find(SpecialistDoctorJPA.class, ProfessionalNumberId), 1);
 	}

-	public SpecialistDoctorJPA findSpecialistDoctorByCode(String code) {
+	/**
+	 * Método que recupera un médico especialista a partir de su NP (Número de profesional)
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public SpecialistDoctorTO findSpecialistDoctorByCode(String code) {
 		TypedQuery<SpecialistDoctorJPA> query = entman.createQuery("from SpecialistDoctorJPA d where d.professionalNumber=:code", SpecialistDoctorJPA.class);

 		query.setParameter("code", code);

 		List<SpecialistDoctorJPA> results = query.getResultList();
 		if (results.size() > 0)
-			return results.get(0);
+			return this.getPOJOforSpecialistDoctorJPA(results.get(0), 1);
 		else
 			return null;
 	}
+
+	/**
+	 * Método que recupera un médico especialista a partir de su NIF
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public SpecialistDoctorTO findSpecialistDoctorByNif(String searchedNIF) {
+		TypedQuery<SpecialistDoctorJPA> query = entman.createQuery("from SpecialistDoctorJPA d where d.nif=:nif", SpecialistDoctorJPA.class);
+		query.setMaxResults(1);
+		query.setParameter("nif", searchedNIF);
+
+		List<SpecialistDoctorJPA> results = query.getResultList();
+		if (results.size() > 0)
+			return this.getPOJOforSpecialistDoctorJPA(results.get(0), 1);
+		else
+			return null;
+	}
+
+	/**
+	 * Método que convierte un objecto de tipo QuestionJPA (JPA) a su equivalente QuestionTO (Tranfer Object)
+	 *
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return QuestionTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public QuestionTO getPOJOforQuestionJPA(QuestionJPA qs, int nestedProps) {
+		QuestionTO qsTO = null;
+
+		if (qs != null) {
+			FamilyDoctorJPA fd = null;
+			PatientJPA pat = null;
+			if (nestedProps > 0) {
+				fd = qs.getFamilyDoctor();
+				pat = qs.getPatient();
+			}
+
+			nestedProps--;
+			qsTO = new QuestionTO(qs.getId(), qs.getTitle(), qs.getMessage(), qs.getStatus(), this.getPOJOforPatientJPA(pat, nestedProps),
+					this.getPOJOforFamilyDoctorJPA(fd, nestedProps), qs.getResponse());
+		}
+
+		return qsTO;
+	}
+
 }
--- a/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java
+++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java
@@ -1,6 +1,5 @@
 package ejb.common;

-import java.util.Collection;
 import java.util.List;

 import javax.ejb.Local;
@@ -9,11 +8,13 @@ import TO.FamilyDoctorTO;
 import TO.MedicalSpecialtyTO;
 import TO.PatientTO;
 import TO.PrimaryHealthCareCenterTO;
+import TO.QuestionTO;
 import TO.SpecialistDoctorTO;
 import jpa.FamilyDoctorJPA;
 import jpa.MedicalSpecialtyJPA;
 import jpa.PatientJPA;
 import jpa.PrimaryHealthCareCenterJPA;
+import jpa.QuestionJPA;
 import jpa.SpecialistDoctorJPA;

 /**
@@ -44,15 +45,21 @@ public interface CommonFacadeLocal {

 	public PatientTO findPatientById(int patientId);

-	public PatientJPA findPatientByCode(String code);
+	public PatientTO findPatientByCode(String code);
+
+	public PatientTO findPatientByNif(String searchValue);

 	public FamilyDoctorTO findFamilyDoctorById(int ProfessionalNumberId);

-	public FamilyDoctorJPA findFamilyDoctorByCode(String code);
+	public FamilyDoctorTO findFamilyDoctorByCode(String code);
+	
+	public FamilyDoctorTO findFamilyDoctorByNif(String searchValue);

 	public SpecialistDoctorTO findSpecialistDoctorById(int ProfessionalNumberId);

-	public SpecialistDoctorJPA findSpecialistDoctorByCode(String code);
+	public SpecialistDoctorTO findSpecialistDoctorByCode(String code);
+	
+	public SpecialistDoctorTO findSpecialistDoctorByNif(String searchValue);

 	public MedicalSpecialtyTO getPOJOforMedicalSpecialtyJPA(MedicalSpecialtyJPA ms);

@@ -64,4 +71,5 @@ public interface CommonFacadeLocal {

 	public PatientTO getPOJOforPatientJPA(PatientJPA pat, int nestedProps);

+	public QuestionTO getPOJOforQuestionJPA(QuestionJPA qs, int nestedProps);
 }
--- a/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java
+++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java
@@ -42,14 +42,20 @@ public interface CommonFacadeRemote {

 	public PatientTO findPatientById(int patientId);

-	public PatientJPA findPatientByCode(String code);
+	public PatientTO findPatientByCode(String code);
+
+	public PatientTO findPatientByNif(String searchValue);

 	public FamilyDoctorTO findFamilyDoctorById(int ProfessionalNumberId);

-	public FamilyDoctorJPA findFamilyDoctorByCode(String code);
+	public FamilyDoctorTO findFamilyDoctorByCode(String code);
+	
+	public FamilyDoctorTO findFamilyDoctorByNif(String searchValue);

 	public SpecialistDoctorTO findSpecialistDoctorById(int ProfessionalNumberId);

-	public SpecialistDoctorJPA findSpecialistDoctorByCode(String code);
+	public SpecialistDoctorTO findSpecialistDoctorByCode(String code);
+	
+	public SpecialistDoctorTO findSpecialistDoctorByNif(String searchValue);

 }
--- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
@@ -1,26 +1,189 @@
 package ejb.medicalTest;

+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;

+import TO.LoggedUserTO;
+import TO.MedicalSpecialtyTO;
+import TO.MedicalTestTO.MedicalTestType;
+import TO.QuestionTO;
+import common.QuestionStatus;
+import common.UserType;
+import ejb.common.CommonFacadeLocal;
+import jpa.FamilyDoctorJPA;
+import jpa.PatientJPA;
+import jpa.QuestionJPA;
+import managedbean.common.SessionUtils;

 /**
 * EJB Session Bean Class para la Practica 2, Ejercicio 1 (ISCSD) Implementa los
 * métodos de la capa de negocio que implementan la logica de negocio y la
 * interacción con la capa de persistencia.
 * 
- * @author mark
+ * Tanto los pacientes como los médicos deben acceder a la vista de pruebas
+ * médicas.
+ * 
+ * @author rorden
 *
 */
@Stateless
 public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
-
 	// Persistence Unit Context
 	@PersistenceContext(unitName = "MyHealth")
-	private EntityManager entman;
+	EntityManager entman;

-	public void ejbMethod(String parameter)	{
+	@EJB
+	CommonFacadeLocal commonServices;

+	// *********************************************************************
+	// QUESTION_RESPONSE
+
+	/**
+	 * Realizar una pregunta al médico por un paciente
+	 * 
+	 * @param professionalNumber
+	 * @param title
+	 * @param message
+	 */
+	@Override
+	public void askQuestion(int professionalNumber, String title, String message) {
+		if (SessionUtils.getUserType() == UserType.PATIENT) {
+			LoggedUserTO user = SessionUtils.getloggedOnUser();
+			// 0. Conseguir el paciente en sesión
+			PatientJPA patient = entman.find(PatientJPA.class, user.getId());
+			// 1. Buscar el médico de familia con ese professionalNumber
+			FamilyDoctorJPA fdoctor = entman.find(FamilyDoctorJPA.class, professionalNumber);
+			// 2. Crear un objeto de Question para ese médico desde el paciente en sesión
+			QuestionJPA question = new QuestionJPA(0, title, message, QuestionStatus.PENDING, patient, fdoctor, null);
+			// 3. Guardar
+			entman.persist(question);
 		}
+	}
+
+	/**
+	 * El médico responde a una pregunta
+	 * 
+	 * @param question
+	 * @param response
+	 */
+	@Override
+	public void answerQuestion(String question, String response) {
+	}
+
+	public List<QuestionTO> listAllPendingQuestions(int familyDoctorId) {
+		return null;
+	}
+
+	public Long getPendingQuestionsCount(int familyDoctorId) {
+		TypedQuery<Long> query = entman.createQuery("SELECT count(1) from QuestionJPA q where q.status=:status and q.familyDoctor.id=:docId", Long.class);
+		query.setParameter("status", QuestionStatus.PENDING);
+		query.setParameter("docId", familyDoctorId);
+
+		return query.getSingleResult();
+	}
+	
+	public List<QuestionTO> listPendingQuestionsPaged(int familyDoctorId, int pageNumber, int pageSize) {
+		TypedQuery<QuestionJPA> query = entman.createQuery("SELECT q from QuestionJPA q where q.status=:status and q.familyDoctor.id=:docId order by q.title", QuestionJPA.class);
+		query.setParameter("status", QuestionStatus.PENDING);
+		query.setParameter("docId", familyDoctorId);
+
+		if (pageSize > 0) {
+			query.setFirstResult(pageNumber * pageSize);
+			query.setMaxResults(pageSize);
+		}
+
+		List<QuestionJPA> allJPA = query.getResultList();
+		List<QuestionTO> pendingQuestions = new ArrayList<QuestionTO>();
+
+		for (QuestionJPA item : allJPA) {
+			pendingQuestions.add(commonServices.getPOJOforQuestionJPA(item, 1));
+		}
+
+		return pendingQuestions;
+	}
+
+	/**
+	 * Recuperar una pregunta por su String
+	 * 
+	 * @param question
+	 */
+	@Override
+	public void getQuestion(String question) {
+	}
+
+	// *********************************************************************
+	// MEDICAL_TEST
+
+	/**
+	 * Añadir pruebas médicas a una cita
+	 * 
+	 * Sólo médicos especialistas pueden gestionar pruebas médicas en el sistema.
+	 * 
+	 * @param idMedicalTest
+	 * @param date
+	 * @param time
+	 * @param testType      Pudiera llegar a ser: Análisis de sangre, resonancias
+	 *                      magnéticas y TAC
+	 * @param observations
+	 */
+	@Override
+	public void addMedicalTest(int idMedicalTest, Date date, long time, MedicalTestType testType, String observations) {
+	}
+
+	/**
+	 * Recuperar una prueba médica por ID
+	 * 
+	 * Pueden ser consultas por médicos de familia
+	 * 
+	 * @param idMedicalTest
+	 */
+	@Override
+	public void getMedicalTest(int idMedicalTest) {
+	}
+
+	/**
+	 * Añadir una imagen a una prueba médica
+	 * 
+	 * @param idMedicalTest
+	 * @param image
+	 */
+	@Override
+	public void addImage(int idMedicalTest, String image) {
+	}
+
+	/**
+	 * Actualizar/Pisar una imagen a una prueba médica
+	 * 
+	 * @param idMedicalTest
+	 * @param image
+	 */
+	@Override
+	public void updateImage(int idMedicalTest, String image) {
+	}
+
+	/**
+	 * Eliminar una imagen a una prueba médica
+	 * 
+	 * @param idMedicalTest
+	 */
+	@Override
+	public void removeImage(int idMedicalTest) {
+	}
+
+	/**
+	 * Listar médicos con una especialidad concreta
+	 * 
+	 * @param speciality
+	 */
+	@Override
+	public void findSpecialistDoctorByMedicalSpeciality(MedicalSpecialtyTO speciality) {
+	}
+
 }
--- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
+++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
@@ -1,18 +1,113 @@
 package ejb.medicalTest;

+import java.util.Date;
+import java.util.List;
+
 import javax.ejb.Remote;

+import TO.MedicalSpecialtyTO;
+import TO.MedicalTestTO.MedicalTestType;
+import TO.QuestionTO;
+
 /**
 * Interfaz remota del EJB Definimos los métodos que estarán disponibles para
 * los clientes del EJB
 * 
- * @author mark
+ * @author rorden
 *
 */
@Remote
 public interface MedicalTestFacadeRemote {
+
+	// *********************************************************************
+	// QUESTION RESPONSE
+
 	/**
-	 * Definimos la interfaz remota
+	 * Realizar una pregunta al médico por un paciente
+	 * 
+	 * @param professionalNumber
+	 * @param title
+	 * @param message
 	 */
-	public void ejbMethod(String parameter);
+	public void askQuestion(int professionalNumber, String title, String message);
+
+	/**
+	 * El médico responde a una pregunta
+	 * 
+	 * @param question
+	 * @param response
+	 */
+	public void answerQuestion(String question, String response);
+
+	/**
+	 * Recuperar las preguntas sin respuesta para un médico
+	 * 
+	 * De utilidad para paciente y médico de familia. No para médico especialista.
+	 * 
+	 * @param familydoctorid
+	 */
+	public List<QuestionTO> listAllPendingQuestions(int familyDoctorId);
+
+	public Long getPendingQuestionsCount(int familyDoctorId);
+	
+	public List<QuestionTO> listPendingQuestionsPaged(int familyDoctorId, int pageNumber, int pageSize);
+	
+	/**
+	 * Recuperar una pregunta por su String
+	 * 
+	 * @param question
+	 */
+	public void getQuestion(String question);
+
+	// ********************************************************************* MEDICAL
+	// TEST
+
+	/**
+	 * Añadir una prueba médica a un paciente
+	 * 
+	 * @param idMedicalTest
+	 * @param date
+	 * @param time
+	 * @param testType      Pudiera llegar a ser: Análisis de sangre, resonancias
+	 *                      magnéticas y TAC
+	 * @param observations
+	 */
+	public void addMedicalTest(int id, Date date, long time, MedicalTestType testType, String observations);
+
+	/**
+	 * Recuperar una prueba médica por ID
+	 * 
+	 * @param idMedicalTest
+	 */
+	public void getMedicalTest(int idPatient);
+
+	/**
+	 * Añadir una imagen a una prueba médica
+	 * 
+	 * @param idMedicalTest
+	 * @param image
+	 */
+	public void addImage(int idMedicalTest, String image);
+
+	/**
+	 * Actualizar/Pisar una imagen a una prueba médica
+	 * 
+	 * @param idMedicalTest
+	 * @param image
+	 */
+	public void updateImage(int idMedicalTest, String image);
+
+	/**
+	 * Eliminar una imagen a una prueba médica
+	 * 
+	 * @param idMedicalTest
+	 */
+	public void removeImage(int idMedicalTest);
+
+	/**
+	 * Listar médicos con una especialidad concreta
+	 * 
+	 * @param speciality
+	 */
+	public void findSpecialistDoctorByMedicalSpeciality(MedicalSpecialtyTO speciality);
 }
--- a/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
@@ -32,19 +32,42 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 	@PersistenceContext(unitName = "MyHealth")
 	private EntityManager entman;

+	//Propiedad que permite el acceso local a los métodos del EJB de servicios comunes (para recuperar entidades, etc).
 	@EJB
 	CommonFacadeLocal commonServices;

+	/**
+	 * Método que genera un nuevo número de profesional, basando en la secuencia de base de datos. Los números de profesional son únicos y comunes para médicos de familia y médicos
+	 * especialistas.
+	 * 
+	 * Si un número de profesional no se utiliza no se vuelve a reutilizar, por lo que pueden existir huecos en la númeración.
+	 * 
+	 * @return String con el número número de profesional generado.
+	 */
 	private String getNextProfessionalNumber() {
 		Query q = entman.createNativeQuery("select nextval('myhealth.profesionalnumber')");
 		return Constants.PROFESSIONAL_NUMBER_PREFIX.concat(String.valueOf(q.getSingleResult()));
 	}

+	/**
+	 * Método que genera un nuevo Código de Identificación de Paciente (CIP) basado en una secuencia de base de datos. Los códigos CIP son únicos, y si un CIP no se utiliza tras
+	 * haber sido generado, no se vuelve a reutilizar.
+	 * 
+	 * @return String con el CIP gnerado
+	 */
 	private String getNextPersonalIdentificationCode() {
-		Query q = entman.createNativeQuery("select nextval('myhealth.profesionalnumber')");
+		Query q = entman.createNativeQuery("select nextval('myhealth.codigoidentificacionpaciente')");
 		return Constants.PERSONAL_IDENTIFICATION_CODE_PREFIX.concat(String.valueOf(q.getSingleResult()));
 	}

+	/**
+	 * Cambia el médico de familia asignado a un paciente. Recibe como parametros el identificador del paciente y el identificador del nuevo médico de familia
+	 * 
+	 * Si el identificador de paciente no corresponde a ningún paciente registrado se lanza una excepción. Si el identificador del médico de familia no corresponde a ningún médico
+	 * de familia se lanza una excepción.
+	 * 
+	 * @return PatientTO (Transfer Object del paciente al que se la ha cambiado el médico de familia).
+	 */
 	public PatientTO changeFamilyDoctor(int patientId, int newDoctor) throws Exception {
 		PatientJPA pat = entman.find(PatientJPA.class, patientId);
 		if (pat == null) {
@@ -63,15 +86,37 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforPatientJPA(pat, 1);
 	}

+	/**
+	 * Registra un nuevo paciente en el sistema Recibe como parametros el nif del paciente, el nombre, los apellidos, la contraseña y la dirección de correo electronico.
+	 * 
+	 * El método genera un nuevo CIP (código de identificación de paciente) y lo asigna al nuevo paciente. El médico se familia queda está establecido a null, y deberá ser
+	 * seleccionado por el paciente una vez registrado en el sistema.
+	 * 
+	 * La contraseña recibida se encrypta con el algoritmo MD5.
+	 * 
+	 * @return PatientTO Transfer Object correspondiente al paciente registrado.
+	 */
 	public PatientTO registerPatient(int id, String nif, String name, String surname, String password, String email) {
-		PatientTO paTO = null;
-
 		PatientJPA pat = new PatientJPA(this.getNextPersonalIdentificationCode(), nif, name, surname, HashUtils.hashMD5(password), email, null);
 		entman.persist(pat);

 		return this.commonServices.getPOJOforPatientJPA(pat, 1);
 	}

+	/**
+	 * Registra un nuevo médico especialista en el sistema.
+	 * 
+	 * Recibe como parametros el nif, el nombre, los apellidos, la contraseña, la dirección de correo electronico y la especialidad.
+	 * 
+	 * El método genera un nuevo NIP (Número de Identificación de Profesional) y lo asigna al nuevo médico.
+	 * 
+	 * La contraseña recibida se encrypta con el algoritmo MD5.
+	 * 
+	 * El médoto comprueba que la especialidad médica recibida exista en el sistema en el momento de asignarla al nuevo médico, si la especialidad especificada no se encuentra se
+	 * lanza una excepción.
+	 * 
+	 * @return SpecialistDoctorTO Transfer Object correspondiente al médico especialista registrado.
+	 */
 	public SpecialistDoctorTO registerSpecialistDoctor(int id, String nif, String name, String surname, String password, String email, MedicalSpecialtyTO specialty)
 			throws Exception {
 		MedicalSpecialtyJPA ms = entman.find(MedicalSpecialtyJPA.class, specialty.getId());
@@ -85,9 +130,20 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforSpecialistDoctorJPA(sd, 1);
 	}

+	/**
+	 * Registra un nuevo médico de familia en el sistema.
+	 * 
+	 * Recibe como parametros el nif, el nombre, los apellidos, la contraseña, la dirección de correo electronico y el CAP (Centro Médico de Primaria).
+	 * 
+	 * El método genera un nuevo NIP (Número de Identificación de Profesional) y lo asigna al nuevo médico.
+	 * 
+	 * La contraseña recibida se encrypta con el algoritmo MD5.
+	 * 
+	 * El médoto comprueba que el CAP recibido exista en el sistema en el momento de asignarlo al nuevo médico, si el CAP no se encuentra se lanza una excepción.
+	 * 
+	 * @return FamilyDoctorTO Transfer Object correspondiente al médico de familia registrado.
+	 */
 	public FamilyDoctorTO registerFamilyDoctor(int id, String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterTO cap) throws Exception {
-		FamilyDoctorTO fdTO = null;
-
 		PrimaryHealthCareCenterJPA phcC = entman.find(PrimaryHealthCareCenterJPA.class, cap.getId());
 		if (phcC == null) {
 			throw new Exception("No se encuentra el centro de atención primaria con identificador: " + cap.getName());
@@ -99,6 +155,18 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return commonServices.getPOJOforFamilyDoctorJPA(fd, 1);
 	}

+	/**
+	 * Actualiza los datos personales de un paciente
+	 * 
+	 * Recibe como parametros el id del paciente a actualizar, el nif, el nombre, los apellidos, *la contraseña, la dirección de correo electronico (El medico de familia asignado
+	 * no se modifica).
+	 * 
+	 * El id de paciente recibido se busca en el sistema para realizar la actualización de datos, sino se encuentra se lanza una excepción.
+	 * 
+	 * La contraseña recibida solo se actualiza si se recibe el parámetro (no es nulo ni cadena vacía). La contraseña recibida se encrypta con el algoritmo MD5
+	 * 
+	 * @return PatientTO Transfer Object correspondiente al paciente actualizado..
+	 */
 	public PatientTO updatePatientData(int id, String nif, String name, String surname, String password, String email) throws Exception {
 		PatientJPA pat = entman.find(PatientJPA.class, id);

@@ -119,6 +187,20 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforPatientJPA(pat, 1);
 	}

+	/**
+	 * Actualiza los datos personales de un médico especialista
+	 * 
+	 * Recibe como parametros el id del médico a actualizar, nif, el nombre, los apellidos, *la contraseña, la dirección de correo electronico y la especialidad médcia que se debe
+	 * asignar.
+	 * 
+	 * El id del médico recibido se busca en el sistema para realizar la actualización de datos, sino se encuentra se lanza una excepción.
+	 * 
+	 * La contraseña recibida solo se actualiza si se recibe el parámetro (no es nulo ni cadena vacía). La contraseña recibida se encrypta con el algoritmo MD5
+	 * 
+	 * El método comprueba que la especialidad recibida existe en el sistema, en caso contrario lanza una excepción.
+	 * 
+	 * @return SpecialistDoctorTO Transfer Object correspondiente al médico especialista que se ha actualizado.
+	 */
 	public SpecialistDoctorTO updateSpecialistDoctorData(int id, String nif, String name, String surname, String password, String email, MedicalSpecialtyTO specialty)
 			throws Exception {
 		SpecialistDoctorJPA sd = entman.find(SpecialistDoctorJPA.class, id);
@@ -145,6 +227,20 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforSpecialistDoctorJPA(sd, 1);
 	}

+	/**
+	 * Actualiza los datos personales de un médico de familia
+	 * 
+	 * Recibe como parametros el id del médico a actualizar, nif, el nombre, los apellidos, *la contraseña, la dirección de correo electronico, y el CAP al cual está asignado el
+	 * médico de familia.
+	 * 
+	 * El id del médico recibido se busca en el sistema para realizar la actualización de datos, sino se encuentra se lanza una excepción.
+	 * 
+	 * La contraseña recibida solo se actualiza si se recibe el parámetro (no es nulo ni cadena vacía). La contraseña recibida se encrypta con el algoritmo MD5
+	 * 
+	 * El método comprueba que el CAP recibida existe en el sistema, en caso contrario lanza una excepción.
+	 * 
+	 * @return FamilyDoctorTO Transfer Object correspondiente al médico de familia que se ha actualizado.
+	 */
 	public FamilyDoctorTO updateFamilyDoctorData(int id, String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterTO phcTO) throws Exception {
 		FamilyDoctorJPA fd = entman.find(FamilyDoctorJPA.class, id);
 		if (fd == null) {
@@ -170,6 +266,17 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforFamilyDoctorJPA(fd, 1);
 	}

+	/***
+	 * Cambia el CAP (Centro de Atención Primaria) asignado a un médico de familia.
+	 * 
+	 * Recibe como parametros el identificador del médico y el identificador del nuevo CAP a asginar.
+	 * 
+	 * Si el identificador del médico no corresponde a ningún médico de familia registrado se lanza una excepción.
+	 * 
+	 * Si el identificador del CAP no corresponde a ningún CAP registrado en el sistema se lanza una excpeción.
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del médico de familia al que se la ha cambiado el CAP).
+	 */
 	public FamilyDoctorTO changePrimaryHealthCareCenter(int professionalId, PrimaryHealthCareCenterTO newCenter) throws Exception {
 		FamilyDoctorTO fdTO = null;

--- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java
@@ -5,15 +5,15 @@ import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;

+import TO.FamilyDoctorTO;
 import TO.LoggedUserTO;
+import TO.PatientTO;
+import TO.SpecialistDoctorTO;
 import common.Constants;
 import common.HashUtils;
 import common.UserType;
 import ejb.common.CommonFacadeLocal;
 import jpa.AdministratorJPA;
-import jpa.FamilyDoctorJPA;
-import jpa.PatientJPA;
-import jpa.SpecialistDoctorJPA;

 /**
 * 
@@ -61,20 +61,20 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote {
 		if (userCode.startsWith(Constants.PERSONAL_IDENTIFICATION_CODE_PREFIX)) {
 			// Si el identificador de usuario es de tipo paciente, intentamos realizar el
 			// login.
-			PatientJPA pat = this.commonServices.findPatientByCode(userCode);
+			PatientTO pat = this.commonServices.findPatientByCode(userCode);
 			if (pat != null) {
 				usr = new LoggedUserTO(String.valueOf(pat.getId()), pat.getName(), pat.getPassword(), UserType.PATIENT);
 			}
 		} else if (userCode.startsWith(Constants.PROFESSIONAL_NUMBER_PREFIX)) {
 			// Si el identificador de usuario es de tipo profesional, intentamos realizar el
 			// login, primero como médico de familia, después como especialista
-			FamilyDoctorJPA fd = this.commonServices.findFamilyDoctorByCode(userCode);
+			FamilyDoctorTO fd = this.commonServices.findFamilyDoctorByCode(userCode);

 			if (fd != null) {
 				usr = new LoggedUserTO(String.valueOf(fd.getId()), fd.getName(), fd.getPassword(), UserType.FAMILY_DOCTOR);
 			} else {
 				// No era un código de médico de familia, intenamos logearlo como especialista
-				SpecialistDoctorJPA sd = this.commonServices.findSpecialistDoctorByCode(userCode);
+				SpecialistDoctorTO sd = this.commonServices.findSpecialistDoctorByCode(userCode);

 				if (sd != null) {
 					usr = new LoggedUserTO(String.valueOf(sd.getId()), sd.getName(), sd.getPassword(), UserType.SPECIALIST_DOCTOR);
--- a/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
+++ b/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
@@ -1,7 +1,7 @@
 package jpa;

 import java.io.Serializable;
-import java.util.Collection;
+import java.util.List;

 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -28,7 +28,7 @@ public class FamilyDoctorJPA implements Serializable {

 	@Id
 	@Column(updatable = false)
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
 	@Column(nullable = false, unique = true)
 	private String professionalNumber;
@@ -39,9 +39,9 @@ public class FamilyDoctorJPA implements Serializable {
 	private String email;
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@JoinColumn(name = "FamilyDoctorId")
-	private Collection<PatientJPA> patients;
+	private List<PatientJPA> patients;
 	@ManyToOne
-	@JoinColumn (name="PrimaryHealthCareCenterId")
+	@JoinColumn(name = "PrimaryHealthCareCenterId")
 	private PrimaryHealthCareCenterJPA primaryHealthCareCenter;

 	/**
@@ -111,19 +111,21 @@ public class FamilyDoctorJPA implements Serializable {

 	/**
 	 * Metodos para get/set de relaciones (pacientes)
+	 * 
 	 * @return
 	 */
-	public Collection<PatientJPA> getPatients() {
+	public List<PatientJPA> getPatients() {
 		return patients;
 	}

-	public void setPatients(Collection<PatientJPA> patients) {
+	public void setPatients(List<PatientJPA> patients) {
 		this.patients = patients;
 	}

 	public PrimaryHealthCareCenterJPA getPrimaryHealthCareCenter() {
 		return primaryHealthCareCenter;
 	}
+
 	public void setPrimaryHealthCareCenter(PrimaryHealthCareCenterJPA center) {
 		this.primaryHealthCareCenter = center;
 	}
--- a/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
+++ b/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
@@ -0,0 +1,134 @@
+package jpa;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import common.TestType;
+
+/**
+ * Los nombres de los decortadores relacionados con la BBDD pueden estar en
+ * camelCase, snakeCase o como se quiera, puesto que en persistence.xml se tiene
+ * dicho que se convierta a minúsculas.
+ * 
+ * Lo uso en minúsculas para mejorar la trazabilidad de los campos.
+ * 
+ * @author Roberto Orden Erena <rorden@uoc.edu>
+ *
+ */
+@Entity
+@Table(name = "myhealth.medicaltest")
+public class MedicalTestJPA implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private int id;
+	private Date date;
+	private long time;
+	private String observations;
+	private String highresimage;
+	@Enumerated(EnumType.STRING)
+	@Column(name = "type") // Con esto podríamos cambiar los nombres de las propiedades de la clase y
+							// mantener la relación con la BBDD a través de JPA
+	private TestType type;
+
+	@ManyToOne
+	@JoinColumn(name = "patientid")
+	private PatientJPA patient;
+
+	@ManyToOne
+	@JoinColumn(name = "specialistdoctorid")
+	private SpecialistDoctorJPA specialistDoctor;
+
+	public MedicalTestJPA() {
+		super();
+	}
+
+	public MedicalTestJPA(int id, Date date, long time, String observations, String highresimage, TestType type, PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
+		this.id = id;
+		this.date = date;
+		this.time = time;
+		this.observations = observations;
+		this.highresimage = highresimage;
+		this.type = type;
+		this.patient = patient;
+		this.specialistDoctor = specialistDoctor;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public long getTime() {
+		return time;
+	}
+
+	public void setTime(long time) {
+		this.time = time;
+	}
+
+	public String getObservations() {
+		return observations;
+	}
+
+	public void setObservations(String observations) {
+		this.observations = observations;
+	}
+
+	public String getHighresimage() {
+		return highresimage;
+	}
+
+	public void setHighresimage(String highresimage) {
+		this.highresimage = highresimage;
+	}
+
+	public TestType getType() {
+		return type;
+	}
+
+	public void setType(TestType type) {
+		this.type = type;
+	}
+
+	public PatientJPA getPatient() {
+		return patient;
+	}
+
+	public void setPatient(PatientJPA patient) {
+		this.patient = patient;
+	}
+
+	public SpecialistDoctorJPA getSpecialistDoctor() {
+		return specialistDoctor;
+	}
+
+	public void setSpecialistDoctor(SpecialistDoctorJPA specialistDoctor) {
+		this.specialistDoctor = specialistDoctor;
+	}
+
+}
--- a/1.sources/MyHealth/src/jpa/QuestionJPA.java
+++ b/1.sources/MyHealth/src/jpa/QuestionJPA.java
@@ -0,0 +1,115 @@
+package jpa;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import common.QuestionStatus;
+
+/**
+ * 
+ * @author Marcos García Núñez (mgarcianun@uoc.edu)
+ * @author Roberto Orden Erena <rorden@uoc.edu>
+ *
+ */
+@Entity
+@Table(name = "MyHealth.Question")
+public class QuestionJPA implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private int id;
+	private String title;
+	private String message;
+	@Enumerated(EnumType.STRING)
+	private QuestionStatus status;
+	private String response;
+
+	@ManyToOne
+	@JoinColumn(name = "patientid")
+	private PatientJPA patient;
+
+	@ManyToOne
+	@JoinColumn(name = "familydoctorid")
+	private FamilyDoctorJPA familyDoctor;
+
+	public QuestionJPA() {
+	}
+
+	public QuestionJPA(int id, String title, String message, QuestionStatus status, PatientJPA patient, FamilyDoctorJPA familydoctor, String response) {
+		this.id = id;
+		this.title = title;
+		this.message = message;
+		this.status = status;
+		this.patient = patient;
+		this.familyDoctor = familydoctor;
+		this.response = response;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public PatientJPA getPatient() {
+		return patient;
+	}
+
+	public void setPatient(PatientJPA patient) {
+		this.patient = patient;
+	}
+
+	public QuestionStatus getStatus() {
+		return status;
+	}
+
+	public void setStatus(QuestionStatus status) {
+		this.status = status;
+	}
+
+	public FamilyDoctorJPA getFamilyDoctor() {
+		return familyDoctor;
+	}
+
+	public void setFamilyDoctor(FamilyDoctorJPA familyDoc) {
+		this.familyDoctor = familyDoc;
+	}
+
+	public String getResponse() {
+		return response;
+	}
+
+	public void setResponse(String response) {
+		this.response = response;
+	}
+
+}
--- a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
+++ b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
@@ -2,7 +2,11 @@
 package managedbean.common;

 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.List;

+import javax.faces.application.FacesMessage;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -14,6 +18,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;

+import org.primefaces.model.menu.DefaultSeparator;
+import org.primefaces.model.menu.DefaultSubMenu;
+
+import common.UserType;
+
@WebFilter(filterName = "AuthFilter", urlPatterns = { "*.xhtml" })
 public class AuthorizationFilter implements Filter {

@@ -34,10 +43,100 @@ public class AuthorizationFilter implements Filter {
 			HttpSession ses = req.getSession(false);

 			String reqURI = req.getRequestURI();
-			if (reqURI.indexOf("/login.xhtml") >= 0 || reqURI.indexOf("/RegisterUser.xhtml") >= 0 || reqURI.indexOf("/home.xhtml") >= 0 || reqURI.indexOf("/public/") >= 0
-					||  reqURI.contains("javax.faces.resource") || SessionUtils.isLogedIn(ses) == true)
+
+			// Para recursos publicos permitimos el acceso
+			if (reqURI.indexOf("/login.xhtml") >= 0 || reqURI.indexOf("/profile/RegisterUser.xhtml") >= 0 || reqURI.indexOf("/home.xhtml") >= 0
+					|| reqURI.indexOf("/error.xhtml") >= 0 || reqURI.indexOf("/public/") >= 0 || reqURI.contains("javax.faces.resource")) {
 				chain.doFilter(request, response);
-			else
+				return;
+			}
+
+			// Si el usuario está logeado comprobamos si está autorizado a ver la página
+			// solicitada.
+			if (SessionUtils.isLogedIn(ses) == true) {
+				UserType tipoUsuario = SessionUtils.getUserType(ses);
+				boolean authorized = false;
+
+				switch (tipoUsuario) {
+				case ADMINISTRATOR:
+					if (reqURI.indexOf("/systemAdmin/ManageSpecialties") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/systemAdmin/ManageHealthCareCenters") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/systemAdmin/ListDoctorsByCenter") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/visit/VisitView") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/visit/UpdateVisit") > 0)
+						authorized = true;
+					break;
+				case PATIENT:
+					if (reqURI.indexOf("/visit/VisitView") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/visit/AddVisit") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/visit/UpdateVisit") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/visit/CancelVisit") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/AddQuestion") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/ViewMedicalTest") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/MedicalTests") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/SearchSpecialistBySpecialty") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/profile/UpdateProfile") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/profile/ChangeFamilyDoctor") > 0)
+						authorized = true;
+					break;
+				case FAMILY_DOCTOR:
+					if (reqURI.indexOf("/visit/VisitView") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/visit/VisitAddResult") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/visit/VisitViewSchedules") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/MedicalTests") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/AnswerQuestion") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/PendingQuestions") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/ViewMedicalTest") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/profile/UpdateProfile") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/profile/ChangePrimaryHealthCareCenter") > 0)
+						authorized = true;
+					break;
+				case SPECIALIST_DOCTOR:
+					if (reqURI.indexOf("/medicaltest/MedicalTests") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/AddMedicalTest") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/ViewMedicalTest") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/medicaltest/AddImageToMedicalTest") > 0)
+						authorized = true;
+					if (reqURI.indexOf("/profile/UpdateProfile") > 0)
+						authorized = true;
+					break;
+				}
+
+				if (authorized == true) {
+					chain.doFilter(request, response);
+					return;
+				} else {
+					SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR, "No está autorizado a acceder a la página solicitada. Por favor, utilice el menú principal de la aplicación.", String.format("Se ha producido una expción de autorización, su usuario no está autorizado a acceder a la página: (%s).", reqURI));
+					resp.sendRedirect(req.getContextPath() + "/error.xhtml?type=auth");
+					return;
+				}
+
+			}
+
 			resp.sendRedirect(req.getContextPath() + "/login.xhtml");
 		} catch (Exception e) {
 			System.out.println(e.getMessage());
--- a/1.sources/MyHealth/src/managedbean/common/ManagedBeanBase.java
+++ b/1.sources/MyHealth/src/managedbean/common/ManagedBeanBase.java
@@ -95,17 +95,29 @@ public class ManagedBeanBase {
 	protected void addFacesMessageKeep(FacesMessage.Severity severity, String summary, String detail) {
 		FacesContext context = FacesContext.getCurrentInstance();

-		this.addFacesMessage(FacesContext.getCurrentInstance(), severity, summary, detail);
+		this.addFacesMessage(FacesContext.getCurrentInstance(), null, severity, summary, detail);

 		context.getExternalContext().getFlash().setKeepMessages(true);
 	}

 	protected void addFacesMessage(FacesMessage.Severity severity, String summary, String detail) {
-		this.addFacesMessage(FacesContext.getCurrentInstance(), severity, summary, detail);
+		this.addFacesMessage(FacesContext.getCurrentInstance(), null, severity, summary, detail);
 	}
 	
-	protected void addFacesMessage(FacesContext context, FacesMessage.Severity severity, String summary, String detail) {
-		context.addMessage(null, new FacesMessage(severity, summary, detail));
+	protected void addFacesMessage(String clientId, FacesMessage.Severity severity, String summary, String detail) {
+		this.addFacesMessage(FacesContext.getCurrentInstance(), clientId, severity, summary, detail);
+	}
+
+	protected void addFacesMessage(FacesContext context, String clientId, FacesMessage.Severity severity, String summary, String detail) {
+		this.addFacesMessage(context, clientId, new FacesMessage(severity, summary, detail));
+	}
+	
+	protected void addFacesMessage(FacesMessage facesMsg, String clientId) {
+		this.addFacesMessage(FacesContext.getCurrentInstance(), clientId, facesMsg);
+	}
+	
+	protected void addFacesMessage(FacesContext context, String clientId, FacesMessage facesMsg) {
+		context.addMessage(clientId, facesMsg);
 	}

 	protected void manageException(Exception ex) {
--- a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
+++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
@@ -104,7 +104,7 @@ public class MenuMBean implements Serializable {
 					subMenu.addElement(createMenuItem("Responder pregunta", "fa fa-comments", "/medicaltest/MedicalTests", null));

 				if (tipoUsuario == UserType.FAMILY_DOCTOR)
-					subMenu.addElement(createMenuItem("Ver preguntas pendientes", "fa fa-comments-o", "/medicaltest/MedicalTests", null));
+					subMenu.addElement(createMenuItem("Ver preguntas pendientes", "fa fa-comments-o", "/medicaltest/PendingQuestions", null));

 				model.addElement(subMenu);
 			}
@@ -114,9 +114,9 @@ public class MenuMBean implements Serializable {
 		subMenu = new DefaultSubMenu("Gestionar perfil", "fa fa-gears");
 		if (SessionUtils.isLogedIn() == 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));
+//			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 {
--- a/1.sources/MyHealth/src/managedbean/common/SessionUtils.java
+++ b/1.sources/MyHealth/src/managedbean/common/SessionUtils.java
@@ -1,6 +1,7 @@

 package managedbean.common;

+import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -14,6 +15,7 @@ public class SessionUtils {
 	public static final String SESSION_VAR_USERID = "userId";
 	public static final String SESSION_VAR_USERTYPE = "userType";
 	public static final String SESSION_VAR_USER = "loggedOnUser";
+	public static final String SESSION_VAR_MESSAGE = "facesMessage";

 	public static HttpSession getSession() {
 		FacesContext ctx = FacesContext.getCurrentInstance();
@@ -72,7 +74,10 @@ public class SessionUtils {
 	}

 	public static UserType getUserType() {
-		HttpSession session = getSession();
+		return getUserType(getSession());
+	}
+
+	public static UserType getUserType(HttpSession session) {
 		if (session != null && session.getAttribute(SessionUtils.SESSION_VAR_USERTYPE) != null)
 			return UserType.class.cast(session.getAttribute(SessionUtils.SESSION_VAR_USERTYPE));
 		else
@@ -86,4 +91,24 @@ public class SessionUtils {
 		else
 			return null;
 	}
+
+	public static FacesMessage getMessage() {
+		HttpSession session = getSession();
+		if (session != null && session.getAttribute(SessionUtils.SESSION_VAR_MESSAGE) != null) {
+			FacesMessage msg = FacesMessage.class.cast(session.getAttribute(SessionUtils.SESSION_VAR_MESSAGE));
+			session.removeAttribute(SessionUtils.SESSION_VAR_MESSAGE);
+			return msg;
+		} else
+			return null;
+	}
+
+	public static void addMessage(FacesMessage.Severity severity, String summary, String detail) {
+		addMessage(getSession(), severity, summary, detail);
+	}
+
+	public static void addMessage(HttpSession session, FacesMessage.Severity severity, String summary, String detail) {
+		if (session != null)
+			session.setAttribute(SessionUtils.SESSION_VAR_MESSAGE, new FacesMessage(severity, summary, detail));
+	}
+
 }
--- a/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java
+++ b/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java
@@ -1,5 +1,11 @@
 package managedbean.common;

+import TO.FamilyDoctorTO;
+import TO.PatientTO;
+import TO.SpecialistDoctorTO;
+import common.UserType;
+import ejb.common.CommonFacadeRemote;
+
 /***
 * 
 * @author Marcos García Núñez (mgarcianun@uoc.edu)
@@ -47,4 +53,51 @@ public class ValidationUtils {
 		return false;
 	}

+	/**
+	 * Comprueba si un NIF existe para un tipo de usuario. * No se permite que el
+	 * mismo NIF esté registrado como médico de familia y como especialista. * Se
+	 * permite que el mismo NIF esté registrado como paciente y como médico (de
+	 * familia o especialista)
+	 * 
+	 * @param remoteSvc Servicio Remoto para recuperar datos.
+	 * @param userType  Tipo de usuario a comprobar
+	 * @param nif       NIF a comprobar.
+	 * @param id        Parámetro opcional, id del usuario actual (si encuentra el
+	 *                  mismo nif y el usuario coincide no se devuelve la
+	 *                  coincidencia)
+	 * @return true si el NIF ya estaba registrado para un usuario diferente.
+	 */
+	public static boolean checkIfNifAlreadyRegistered(CommonFacadeRemote remoteSvc, UserType userType, String nif, Integer id) {
+		boolean nifExists = false;
+
+		switch (userType) {
+		case ADMINISTRATOR:
+			break;
+		case FAMILY_DOCTOR:
+		case SPECIALIST_DOCTOR:
+			FamilyDoctorTO fd = remoteSvc.findFamilyDoctorByNif(nif);
+
+			if (fd == null) {
+				// Si el nif no está en uso para un médico de familia, reivsamos si está en uso
+				// para los especialistas
+				SpecialistDoctorTO sd = remoteSvc.findSpecialistDoctorByNif(nif);
+
+				if (sd != null && (id == null || sd.getId() != id))
+					nifExists = true;
+			} else if (id == null || fd.getId() != id)
+				// Si se trata de un usuario diferente, entonces está repetido
+				nifExists = true;
+
+			break;
+		case PATIENT:
+			PatientTO pat = remoteSvc.findPatientByNif(nif);
+
+			// Si se trata de un usuario diferente, entonces está repetido
+			if (pat != null && (id == null || pat.getId() != id))
+				nifExists = true;
+			break;
+		}
+
+		return nifExists;
+	}
 }
--- a/1.sources/MyHealth/src/managedbean/common/homeMBean.java
+++ b/1.sources/MyHealth/src/managedbean/common/homeMBean.java
@@ -5,6 +5,7 @@ import java.util.List;

 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
+import javax.faces.application.FacesMessage;
 import javax.inject.Named;

 import common.UserType;
@@ -16,7 +17,7 @@ import common.UserType;
 */
@Named("home")
@RequestScoped
-public class homeMBean implements Serializable {
+public class homeMBean extends ManagedBeanBase implements Serializable {

 	private static final long serialVersionUID = 1L;
 	private boolean isLogedIn;
@@ -31,6 +32,12 @@ public class homeMBean implements Serializable {
 		userName = SessionUtils.getUserName();
 		userId = SessionUtils.getUserId();
 		userType = SessionUtils.getUserType();
+		
+		FacesMessage message = SessionUtils.getMessage();
+
+		if (message != null) {
+			this.addFacesMessage(message, null);
+		}
 	}

 	public List<Theme> getThemes() {
--- a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java
+++ b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java
@@ -1,51 +1,27 @@
 package managedbean.medicalTest;

 import java.io.Serializable;
-import java.util.Properties;

-import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;

-import ejb.medicalTest.MedicalTestFacadeRemote;
+import managedbean.common.ManagedBeanBase;

-/**
- * ManagedBEan que gestiona la edición y actualización de una especialidad
- * médica.
- * 
- * @author mark
- *
- */
@Named("MedicalTestMBean")
@RequestScoped
-public class MedicalTestMBean implements Serializable {
+public class MedicalTestMBean extends ManagedBeanBase implements Serializable {

 	private static final long serialVersionUID = 1L;

-	@EJB
-	private MedicalTestFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public MedicalTestMBean() throws Exception {
-		initializeAdminFacadeRemote();
+	public MedicalTestMBean() {
 	}

-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	private void initializeAdminFacadeRemote() throws Exception {
-		Properties props = System.getProperties();
-		Context ctx = new InitialContext(props);
-		remoteManager = (MedicalTestFacadeRemote) ctx
-				.lookup("java:app/myHealth.jar/MedicalTestFacadeBean!ejb.component.MedicalTestFacadeRemote");
-	}
+	@PostConstruct
+	public void init() {
+		// Inicialización de variables y propiedades van aquí.

+		// Como realizar llamadas al EJB Remoto
+		// this.getRemoteManagerSystemAdmin().MetodoEJB
+	}
 }
--- a/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java
+++ b/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java
@@ -0,0 +1,53 @@
+package managedbean.medicalTest;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.faces.view.ViewScoped;
+import javax.inject.Named;
+
+import org.primefaces.model.LazyDataModel;
+import org.primefaces.model.SortOrder;
+
+import TO.QuestionTO;
+import common.Constants;
+import ejb.medicalTest.MedicalTestFacadeRemote;
+import managedbean.common.ManagedBeanBase;
+import managedbean.common.SessionUtils;
+
+@Named("PendingQuestions")
+@ViewScoped
+public class PendingQuestionsMBean extends ManagedBeanBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private int familyDoctorId;
+	private LazyDataModel<QuestionTO> lazyDataModelQuestionList;
+
+	public PendingQuestionsMBean() {
+	}
+
+	@PostConstruct
+	public void init() {
+		// Inicialización de variables y propiedades van aquí.
+		this.familyDoctorId = Integer.valueOf(SessionUtils.getUserId());
+
+		this.lazyDataModelQuestionList = new LazyDataModel<QuestionTO>() {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public List<QuestionTO> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
+				Long totalRowCount = getRemoteManagerMedicalTest().getPendingQuestionsCount(familyDoctorId);
+				this.setRowCount(totalRowCount.intValue());
+
+				return getRemoteManagerMedicalTest().listPendingQuestionsPaged(familyDoctorId, (first / pageSize), pageSize);
+			}
+		};
+	}
+
+	public LazyDataModel<QuestionTO> getLazyDataModelQuestionList() {
+		return lazyDataModelQuestionList;
+	}
+}
--- a/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/AddFamilyDoctorMBean.java
@@ -1,29 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named("AddFamilyDoctorMBean")
-@RequestScoped
-public class AddFamilyDoctorMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public AddFamilyDoctorMBean() {
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/AddPatientMBean.java
@@ -1,112 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.inject.Named;
-
-import managedbean.common.ManagedBeanBase;
-
-/**
- * ManagedBEan que gestiona la edición y actualización de una especialidad
- * médica.
- * 
- * @author mark
- *
- */
-@Named("addPatientMBean")
-@RequestScoped
-public class AddPatientMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	private String id;
-	private String nif;
-	private String name;
-	private String surname;
-	private String password;
-	private String passwordRepeat;
-	private String email;
-	private String primaryHealthCareCenter;
-	private String medicalSpecialty;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public AddPatientMBean() {
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getSurname() {
-		return surname;
-	}
-
-	public void setSurname(String surname) {
-		this.surname = surname;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getNif() {
-		return nif;
-	}
-
-	public void setNif(String nif) {
-		this.nif = nif;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public void save() {
-		FacesMessage msg;
-		
-		try {
-			
-			
-			msg = new FacesMessage(FacesMessage.SEVERITY_INFO, "Alta realizada", "El usuario " + name + " " + surname + " se ha registrado correctamente.");
-		} catch (Exception e) {
-			msg = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Error", "Se ha producido un error inesperado: " + e.getLocalizedMessage());
-		}
-		
-		FacesContext.getCurrentInstance().addMessage(null, msg);
-	}
-
-	public String getPasswordRepeat() {
-		return passwordRepeat;
-	}
-
-	public void setPasswordRepeat(String passwordRepeat) {
-		this.passwordRepeat = passwordRepeat;
-	}
-}
--- a/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/AddSpecialistDoctorMBean.java
@@ -1,34 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
-import ejb.profile.ProfileFacadeRemote;
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named( "AddSpecialistDoctorMBean")
-@RequestScoped
-public class AddSpecialistDoctorMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private ProfileFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public AddSpecialistDoctorMBean() {
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
@@ -128,6 +128,16 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable {
 		return this.medicalSpecialitiesList;
 	}
 	
+	public void hadleNIFValueChange() {
+		boolean isDupe = false;
+		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, null) == true) {
+			isDupe = true;	
+			this.addFacesMessage("frmRegisterUser:nif", FacesMessage.SEVERITY_WARN, "NIF duplicado", "El nif indicado pertenece a otro usuario previamente registrado");
+		}
+		
+		PrimeFaces.current().ajax().addCallbackParam("NIFisDupe", isDupe);
+	}
+
 	public boolean isPatient() {
 		return (this.userType == UserType.PATIENT);
 	}
@@ -199,6 +209,10 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable {
 			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "El NIF indicado no es válido", "Por favor, especifique un NIF válido.");
 			error++;
 		}
+		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, null) == true) {
+			this.addFacesMessage("frmRegisterUser:nif", FacesMessage.SEVERITY_WARN, "NIF duplicado", "El nif indicado pertenece a otro usuario previamente registrado");
+			error++;
+		}

 		if (error == 0) {
 			try {
--- a/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/ShowFamilyDoctorMBean.java
@@ -1,50 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import ejb.profile.ProfileFacadeRemote;
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named( "ShowFamilyDoctorMBean")
-@RequestScoped
-public class ShowFamilyDoctorMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private ProfileFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public ShowFamilyDoctorMBean() throws Exception {
-		initializeAdminFacadeRemote();
-	}
-
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/ShowPatientMBean.java
@@ -1,49 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import ejb.profile.ProfileFacadeRemote;
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named("ShowPatientMBean")
-@RequestScoped
-public class ShowPatientMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private ProfileFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public ShowPatientMBean() throws Exception {
-		initializeAdminFacadeRemote();
-	}
-
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/ShowSpecialistDoctorMBean.java
@@ -1,50 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import ejb.profile.ProfileFacadeRemote;
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named( "ShowSpecialistDoctorMBean")
-@RequestScoped
-public class ShowSpecialistDoctorMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private ProfileFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public ShowSpecialistDoctorMBean() throws Exception {
-		initializeAdminFacadeRemote();
-	}
-
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/UpdateFamilyDoctorMBean.java
@@ -1,49 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import ejb.profile.ProfileFacadeRemote;
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named("UpdateFamilyDoctorMBean")
-@RequestScoped
-public class UpdateFamilyDoctorMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private ProfileFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public UpdateFamilyDoctorMBean() throws Exception {
-		initializeAdminFacadeRemote();
-	}
-
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/UpdatePatientMBean.java
@@ -1,49 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import ejb.profile.ProfileFacadeRemote;
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named("UpdatePatientMBean")
-@RequestScoped
-public class UpdatePatientMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private ProfileFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public UpdatePatientMBean() throws Exception {
-		initializeAdminFacadeRemote();
-	}
-
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
@@ -113,7 +113,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 		this.id = pat.getId();
 		this.cipCode = pat.getPersonalIdentificationCode();
 		this.name = pat.getName();
-		this.surname = pat.getName();
+		this.surname = pat.getSurname();
 		this.nif = pat.getNif();
 		this.email = pat.getEmail();
 		this.currentPassword = pat.getPassword();
@@ -124,7 +124,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 		this.id = fd.getId();
 		this.cipCode = fd.getProfessionalNumber();
 		this.name = fd.getName();
-		this.surname = fd.getName();
+		this.surname = fd.getSurname();
 		this.nif = fd.getNif();
 		this.email = fd.getEmail();
 		this.currentPassword = fd.getPassword();
@@ -135,7 +135,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 		this.id = sd.getId();
 		this.cipCode = sd.getProfessionalNumber();
 		this.name = sd.getName();
-		this.surname = sd.getName();
+		this.surname = sd.getSurname();
 		this.nif = sd.getNif();
 		this.email = sd.getEmail();
 		this.currentPassword = sd.getPassword();
@@ -172,6 +172,16 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 		return this.medicalSpecialitiesList;
 	}

+	public void hadleNIFValueChange() {
+		boolean isDupe = false;
+		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, this.id) == true) {
+			isDupe = true;	
+			this.addFacesMessage("frmUpdateProfile:nif", FacesMessage.SEVERITY_WARN, "NIF duplicado", "El nif indicado pertenece a otro usuario previamente registrado");
+		}
+		
+		PrimeFaces.current().ajax().addCallbackParam("NIFisDupe", isDupe);		
+	}
+	
 	public List<FamilyDoctorTO> getFamilyDoctorList() {
 		return familyDoctorList;
 	}
@@ -261,6 +271,10 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "El NIF indicado no es válido", "Por favor, especifique un NIF válido.");
 			error++;
 		}
+		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, this.id) == true) {
+			this.addFacesMessage("frmUpdateProfile:nif", FacesMessage.SEVERITY_WARN, "NIF duplicado", "El nif indicado pertenece a otro usuario previamente registrado");
+			error++;
+		}		
 		if (changePassword == true) {
 			// el usuario queire cambiar el password Comprobamos que el password
 			// especificado coincide con el guardado
--- a/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/UpdateSpecialistDoctorMBean.java
@@ -1,49 +0,0 @@
-package managedbean.profile;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import ejb.profile.ProfileFacadeRemote;
-import managedbean.common.ManagedBeanBase;
-
-/***
- * 
- * @author Marcos García Núñez (mgarcianun@uoc.edu)
- *
- */
-@Named("UpdateSpecialistDoctorMBean")
-@RequestScoped
-public class UpdateSpecialistDoctorMBean extends ManagedBeanBase implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private ProfileFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public UpdateSpecialistDoctorMBean() throws Exception {
-		initializeAdminFacadeRemote();
-	}
-
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
-	}
-
-}
--- a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
+++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
@@ -42,10 +42,11 @@ public class LoginMBean extends ManagedBeanBase {

 	public String login() {
 		boolean loggedIn = false;
+		String viewRedirect = "";

 		LoggedUserTO usr = null;

-		if (username != null && password != null) {
+		if (username != null && password != null && username.equals("") == false && password.equals("") == false) {
 			try {
 				usr = this.getRemoteManagerSystemAdmin().login(username, password);

@@ -54,8 +55,7 @@ public class LoginMBean extends ManagedBeanBase {
 					SessionUtils.CreateSession(usr);

 					this.addFacesMessageKeep(FacesMessage.SEVERITY_INFO, "Login correcto", "Bienvenido " + usr.getName());
-
-					return ("/home?faces-redirect=true");
+					viewRedirect = "/home?faces-redirect=true";
 				} else
 					this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
 			} catch (Exception ex) {
@@ -66,8 +66,7 @@ public class LoginMBean extends ManagedBeanBase {
 			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");

 		PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn);
-
-		return "";
+		return viewRedirect;
 	}

 	// logout event, invalidate session
--- a/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java
+++ b/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java
@@ -1,50 +1,71 @@
 package managedbean.systemAdmin;

 import java.io.Serializable;
-import java.util.Properties;
+import java.util.List;

-import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
+import javax.faces.application.FacesMessage;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;

-import ejb.systemAdmin.SystemAdminFacadeRemote;
+import TO.LoggedUserTO;
+import TO.MedicalSpecialtyTO;
+import common.Constants;
+import common.UserType;
+import managedbean.common.ManagedBeanBase;
+import managedbean.common.SessionUtils;

-/**
- * ManagedBEan que gestiona la edición y actualización de una especialidad
- * médica.
- * 
- * @author mark
- *
- */
-@Named("SystemAdminMBean")
+@Named("SystemAdmin")
@RequestScoped
-public class SystemAdminMBean implements Serializable {
+public class SystemAdminMBean extends ManagedBeanBase implements Serializable {

 	private static final long serialVersionUID = 1L;
 	
-	@EJB
-	private SystemAdminFacadeRemote remoteManager;
+	private String lastUIQuery;
+	private MedicalSpecialtyTO medicalSpecialty;
+	private List<MedicalSpecialtyTO> medicalSpecialitiesList;

-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public SystemAdminMBean() throws Exception {
-		initializeAdminFacadeRemote();
+	public SystemAdminMBean() {
 	}

-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
+	@PostConstruct
+	public void init() {	
+		// Recuperamos el usuario logeado actual
+		LoggedUserTO usr = null;
+		this.lastUIQuery = "";
+		
+		try {
+			usr = SessionUtils.getloggedOnUser();
+
+			if (usr == null)
+				this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Sesión no válida",
+						"Su sesión actual no es válida, por favor cierre su sesión y vuelva a logearse en el sistema.");
+			else {
+				this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH);
+			}
+		} catch (Exception e) {
+			this.manageException(e);
+		}
 	}

+	public List<MedicalSpecialtyTO> getMedicalSpecialtiesList() {
+		return medicalSpecialitiesList;
+	}
+	
+	public List<MedicalSpecialtyTO> completeMedicalSpecialty(String query) {
+		if (query != null && query.equals(this.lastUIQuery) == false) {
+			this.lastUIQuery = query;
+			// Recuperamos las 200 primeras coincidencias
+			this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesFiltered(query, 0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH);
+		}
+		return this.medicalSpecialitiesList;
+	}
+
+	public MedicalSpecialtyTO getMedicalSpecialty() {
+		return medicalSpecialty;
+	}
+
+	public void setMedicalSpecialty(MedicalSpecialtyTO value) {
+		this.medicalSpecialty = value;
+	}
 }
--- a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
@@ -1,50 +1,28 @@
 package managedbean.visit;

 import java.io.Serializable;
-import java.util.Properties;

-import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;

-import ejb.visit.VisitFacadeRemote;
+import managedbean.common.ManagedBeanBase;

-/**
- * ManagedBEan que gestiona la edición y actualización de una especialidad
- * médica.
- * 
- * @author mark
- *
- */
@Named("VisitMBean")
@RequestScoped
-public class VisitMBean implements Serializable {
+public class VisitMBean extends ManagedBeanBase implements Serializable {

 	private static final long serialVersionUID = 1L;

-	@EJB
-	private VisitFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public VisitMBean() throws Exception {
-		initializeAdminFacadeRemote();
+	public VisitMBean() {
 	}

-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	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");
+	@PostConstruct
+	public void init() {
+		// Inicialización de variables y propiedades van aquí.
+
+		// Como realizar llamadas al EJB Remoto
+		// this.getRemoteManagerSystemAdmin().MetodoEJB
 	}

 }
--- a/2.database/01.CreateTables.sql
+++ b/2.database/01.CreateTables.sql
@@ -1,40 +1,88 @@
-/*
-DROP TABLE myhealth.Administrator;
-DROP TABLE myhealth.FamilyDoctor;
-DROP TABLE myhealth.MedicalSpecialty;
-DROP TABLE myhealth.MedicalTest;
-DROP TABLE myhealth.Patient;
-DROP TABLE myhealth.PrimaryHealthCareCenter;
-DROP TABLE myhealth.Question;
-DROP TABLE myhealth.Response;
-DROP TABLE myhealth.SpecialistDoctor;
-DROP TABLE myhealth.Visit;
+DO
+$$
+begin

-DROP SEQUENCE myhealth.ProfesionalNumber;
-DROP SEQUENCE myhealth.CodigoIdentificacionPaciente
+IF NOT EXISTS(SELECT schema_name FROM information_schema.schemata WHERE schema_name = 'myhealth') THEN
+        CREATE SCHEMA myhealth;
+END IF;
+
+IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='usrmyhealth') THEN
+        create user usrmyhealth with encrypted password 'myhealth.123';
+END IF;
+
+IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='USER') THEN
+        create user "USER" with encrypted password 'PASSWORD';
+END IF;
+
+GRANT ALL ON SCHEMA myhealth TO "USER";
+GRANT ALL ON SCHEMA myhealth TO usrmyhealth;
+
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='administrator') THEN
+	drop table myhealth.administrator;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='medicaltest') THEN
+	drop table myhealth.medicaltest;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='question') THEN
+	drop table myhealth.question;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='response') THEN
+	drop table myhealth.response;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='visit') THEN
+	drop table myhealth.visit;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='patient') THEN
+	drop table myhealth.patient;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='familydoctor') THEN
+	drop table myhealth.familydoctor;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='primaryhealthcarecenter') THEN
+	drop table myhealth.primaryhealthcarecenter;
+end if;
+
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='specialistdoctor') THEN
+	drop table myhealth.specialistdoctor;
+end if;
+if exists (SELECT 1 FROM pg_tables WHERE schemaname='myhealth' and tablename='medicalspecialty') THEN
+	drop table myhealth.medicalspecialty;
+end if;
+
+/*
+drop table myhealth.administrator;
+drop table myhealth.familydoctor;
+drop table myhealth.medicalspecialty;
+drop table myhealth.medicaltest;
+drop table myhealth.patient;
+drop table myhealth.primaryhealthcarecenter;
+drop table myhealth.question;
+drop table myhealth.response;
+drop table myhealth.specialistdoctor;
+drop table myhealth.visit;
 */

+if exists (SELECT 1 FROM pg_sequences WHERE schemaname='myhealth' and sequencename='profesionalnumber') THEN
+	drop sequence myhealth.profesionalnumber;
+end if;
+
+if exists (SELECT 1 FROM pg_sequences WHERE schemaname='myhealth' and sequencename='codigoidentificacionpaciente') THEN
+	drop sequence myhealth.codigoidentificacionpaciente;
+end if;
+
 CREATE SEQUENCE myhealth.ProfesionalNumber
    INCREMENT 1
    START 1000
    MINVALUE 1000
    CACHE 1;

-ALTER SEQUENCE myhealth.ProfesionalNumber OWNER TO "USER";
-	
 CREATE SEQUENCE myhealth.CodigoIdentificacionPaciente
    INCREMENT 1
    START 1000
    MINVALUE 1000
    CACHE 1;

-ALTER SEQUENCE myhealth.CodigoIdentificacionPaciente OWNER TO "USER";
-
-
 -- Table: myhealth.administrator
-
-- DROP TABLE myhealth.administrator;
-
 CREATE TABLE myhealth.administrator
 (
    email VARCHAR(120) COLLATE pg_catalog."default" NOT NULL,
@@ -43,95 +91,7 @@ CREATE TABLE myhealth.administrator
 )
 TABLESPACE pg_default;

-ALTER TABLE myhealth.administrator
-    OWNER to "USER";
-    
-- Table: myhealth.familydoctor
-
-- DROP TABLE myhealth.familydoctor;
-
-CREATE TABLE myhealth.familydoctor
-(
-    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    professionalnumber VARCHAR(15) NOT NULL COLLATE pg_catalog."default",
-    password VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
-    nif VARCHAR(50) NOT NULL COLLATE pg_catalog."default",
-    name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
-    surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
-    email VARCHAR(120) COLLATE pg_catalog."default",
-    primaryhealthcarecenterid integer,
-    CONSTRAINT familydoctor_pkey PRIMARY KEY (id)
-)
-TABLESPACE pg_default;
-
-CREATE UNIQUE INDEX family_doctor_professionaln_index
-    ON myhealth.familydoctor (professionalnumber);
-
-ALTER TABLE myhealth.familydoctor
-    OWNER to "USER";
-
-- Table: myhealth.medicalspecialty
-
-- DROP TABLE myhealth.medicalspecialty;
-
-CREATE TABLE myhealth.medicalspecialty
-(
-    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    name VARCHAR(50) COLLATE pg_catalog."default" NOT NULL UNIQUE,
-    description VARCHAR(1000) COLLATE pg_catalog."default",
-    CONSTRAINT medicalspecialty_pkey PRIMARY KEY (id)
-)
-TABLESPACE pg_default;
-
-ALTER TABLE myhealth.medicalspecialty
-    OWNER to "USER";
-
-- Table: myhealth.medicaltest
-
-- DROP TABLE myhealth.medicaltest;
-
-CREATE TABLE myhealth.medicaltest
-(
-    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    date date,
-    "time" abstime,
-    observations TEXT COLLATE pg_catalog."default",
-    highresimage TEXT,
-    type INTEGER,
-    patientid INTEGER NOT NULL,
-    specialistdoctorid INTEGER NOT NULL,
-    CONSTRAINT medicaltest_pkey PRIMARY KEY (id)
-)
-TABLESPACE pg_default;
-
-ALTER TABLE myhealth.medicaltest
-    OWNER to "USER";
-    
-- Table: myhealth.patient
-
-- DROP TABLE myhealth.patient;
-
-CREATE TABLE myhealth.patient
-(
-    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    personalIdentificationCode VARCHAR(15) NOT NULL COLLATE pg_catalog."default",
-    password VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
-    nif VARCHAR(50) NOT NULL COLLATE pg_catalog."default",
-    name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
-    surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
-    email VARCHAR(120) COLLATE pg_catalog."default",
-    familydoctorid INTEGER,
-    CONSTRAINT patient_pkey PRIMARY KEY (id)
-)
-TABLESPACE pg_default;
-
-ALTER TABLE myhealth.patient
-    OWNER to "USER";
-
 -- Table: myhealth.primaryhealthcarecenter
-
-- DROP TABLE myhealth.primaryhealthcarecenter;
-
 CREATE TABLE myhealth.primaryhealthcarecenter
 (
 	id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -141,47 +101,53 @@ CREATE TABLE myhealth.primaryhealthcarecenter
 )
 TABLESPACE pg_default;

-ALTER TABLE myhealth.primaryhealthcarecenter
-    OWNER to "USER";
-    
-- Table: myhealth.question
-
-- DROP TABLE myhealth.question;
-
-CREATE TABLE myhealth.question
+-- Table: myhealth.familydoctor
+CREATE TABLE myhealth.familydoctor
 (
-    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    title VARCHAR(512) COLLATE pg_catalog."default" NOT NULL,
-    message TEXT COLLATE pg_catalog."default" NOT NULL,
-    status INTEGER,
-    patientid INTEGER NOT NULL,
-    CONSTRAINT question_pkey PRIMARY KEY (id)
+    id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    professionalnumber VARCHAR(15) NOT NULL COLLATE pg_catalog."default",
+    password VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
+    nif VARCHAR(50) NOT NULL COLLATE pg_catalog."default",
+    name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
+    surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
+    email VARCHAR(120) COLLATE pg_catalog."default",
+    primaryhealthcarecenterid integer REFERENCES myhealth.primaryhealthcarecenter(id) ,
+    CONSTRAINT familydoctor_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;

-ALTER TABLE myhealth.question
-    OWNER to "USER";
+CREATE UNIQUE INDEX family_doctor_professionaln_index
+    ON myhealth.familydoctor (professionalnumber);

-- Table: myhealth.response
-
-- DROP TABLE myhealth.response;
-
-CREATE TABLE myhealth.response
+-- Table: myhealth.medicalspecialty
+CREATE TABLE myhealth.medicalspecialty
 (
    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    response TEXT COLLATE pg_catalog."default",
-    questionid INTEGER NOT NULL,
-    CONSTRAINT response_pkey PRIMARY KEY (id)
+    name VARCHAR(50) COLLATE pg_catalog."default" NOT NULL UNIQUE,
+    description VARCHAR(1000) COLLATE pg_catalog."default",
+    CONSTRAINT medicalspecialty_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;
   
-ALTER TABLE myhealth.response
-    OWNER to "USER";
+-- Table: myhealth.patient 
+CREATE TABLE myhealth.patient
+(
+    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    personalIdentificationCode VARCHAR(15) NOT NULL COLLATE pg_catalog."default",
+    password VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
+    nif VARCHAR(50) NOT NULL COLLATE pg_catalog."default",
+    name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
+    surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
+    email VARCHAR(120) COLLATE pg_catalog."default",
+    familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
+    CONSTRAINT patient_pkey PRIMARY KEY (id)
+)
+TABLESPACE pg_default;
+
+CREATE UNIQUE INDEX patient_pic_index
+    ON myhealth.patient (personalIdentificationCode);

 -- Table: myhealth.specialistdoctor
-
-- DROP TABLE myhealth.specialistdoctor;
-
 CREATE TABLE myhealth.specialistdoctor
 (
    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -191,7 +157,7 @@ CREATE TABLE myhealth.specialistdoctor
    name VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
    surname VARCHAR(100) NOT NULL COLLATE pg_catalog."default",
    email VARCHAR(120) COLLATE pg_catalog."default",
-    medicalspecialtyid INTEGER,
+    medicalspecialtyid INTEGER REFERENCES myhealth.medicalspecialty(id),
    CONSTRAINT specialistdoctor_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;
@@ -199,13 +165,7 @@ TABLESPACE pg_default;
 CREATE UNIQUE INDEX specialistdoctor_professionaln_index
    ON myhealth.specialistdoctor (professionalnumber);

-ALTER TABLE myhealth.specialistdoctor
-    OWNER to "USER";
-
 -- Table: myhealth.visit
-
-- DROP TABLE myhealth.visit;
-
 CREATE TABLE myhealth.visit
 (
    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -213,12 +173,62 @@ CREATE TABLE myhealth.visit
    "time" abstime NOT NULL,
    observations TEXT COLLATE pg_catalog."default",
    result TEXT COLLATE pg_catalog."default",
-    patientid INTEGER NOT NULL,
-    familydoctorid INTEGER NOT NULL,
+    patientid INTEGER REFERENCES myhealth.patient(id),
+    familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
    CONSTRAINT visit_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;

-ALTER TABLE myhealth.visit
-    OWNER to "USER";
+-- Table: myhealth.question
+CREATE TABLE myhealth.question
+(
+    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    title VARCHAR(512) COLLATE pg_catalog."default" NOT NULL,
+    message TEXT COLLATE pg_catalog."default" NOT NULL,
+    status VARCHAR(20) NOT NULL,
+    response TEXT COLLATE pg_catalog."default",
+    patientid INTEGER REFERENCES myhealth.patient(id) NOT NULL,
+    familydoctorid INTEGER REFERENCES myhealth.familydoctor(id) NOT NULL,
+    CONSTRAINT question_pkey PRIMARY KEY (id)
+)
+TABLESPACE pg_default;

+-- Table: myhealth.medicaltest
+CREATE TABLE myhealth.medicaltest
+(
+    id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    date date NOT NULL,
+    "time" abstime NOT NULL,
+    observations TEXT COLLATE pg_catalog."default",
+    highresimage TEXT,
+    type VARCHAR(30) NOT NULL,
+    patientid INTEGER REFERENCES myhealth.patient(id) NOT NULL,
+    specialistdoctorid INTEGER REFERENCES myhealth.specialistdoctor(id) NOT NULL,
+    CONSTRAINT medicaltest_pkey PRIMARY KEY (id)
+)
+TABLESPACE pg_default;
+
+-- Permisos
+ALTER TABLE myhealth.administrator              OWNER to "USER";
+ALTER TABLE myhealth.primaryhealthcarecenter    OWNER to "USER";
+ALTER TABLE myhealth.familydoctor               OWNER to "USER";
+ALTER TABLE myhealth.medicalspecialty           OWNER to "USER";
+ALTER TABLE myhealth.patient                    OWNER to "USER";
+ALTER TABLE myhealth.specialistdoctor           OWNER to "USER";
+ALTER TABLE myhealth.visit                      OWNER to "USER";
+ALTER TABLE myhealth.question                   OWNER to "USER";
+ALTER TABLE myhealth.medicaltest                OWNER to "USER";
+
+-- Permisos para la máquina de PRE (usuario: usrmyhealth)
+GRANT ALL ON myhealth.administrator              to usrmyhealth;
+GRANT ALL ON myhealth.primaryhealthcarecenter    to usrmyhealth;
+GRANT ALL ON myhealth.familydoctor               to usrmyhealth;
+GRANT ALL ON myhealth.medicalspecialty           to usrmyhealth;
+GRANT ALL ON myhealth.patient                    to usrmyhealth;
+GRANT ALL ON myhealth.specialistdoctor           to usrmyhealth;
+GRANT ALL ON myhealth.visit                      to usrmyhealth;
+GRANT ALL ON myhealth.question                   to usrmyhealth;
+GRANT ALL ON myhealth.medicaltest                to usrmyhealth;
+
+END;
+$$
--- a/Datos_prueba.sql
+++ b/Datos_prueba.sql
@@ -1,61 +1,109 @@
 --Inserta usuarios administradores (contraseña Hash MD5 'admin' para todos)
-insert into myhealth.administrator (email, password) values ('admin@example.com', '21232F297A57A5A743894A0E4A801FC3');
-insert into myhealth.administrator (email, password) values ('marcos@example.com', '21232F297A57A5A743894A0E4A801FC3');
+insert into myhealth.administrator (email, password) values 
+('admin@example.com', '21232F297A57A5A743894A0E4A801FC3')
+,('marcos@example.com', '21232F297A57A5A743894A0E4A801FC3');

 -- Insertar Algunos centros médicos
 INSERT INTO myhealth.primaryhealthcarecenter(name, location) VALUES
-('CENTRO SAUDE A DOBLADA',' CALLE RUA FAISAN S/N '),
-('CENTRO SAUDE BEMBRIVE',' CARRETERA BEMBRIVE 259 '),
-('CENTRO SAUDE BOLIVIA',' CALLE PIZARRO 22 '),
-('CENTRO SAUDE CASCO VELLO',' PLAZA CONSTITUCION 7 '),
-('CENTRO SAUDE COIA',' CALLE PONTEAREAS S/N '),
-('CENTRO SAUDE COLMEIRO',' CALLE PINTOR COLMEIRO 11 '),
-('CENTRO SAUDE CORUXO',' CALLE RUA JOSE RIVAS CARRASQUEIRA S/N '),
-('CENTRO SAUDE LAVADORES',' TRAVESIA BARREIRO 1 36 '),
-('CENTRO SAUDE LOPEZ MORA',' CALLE LOPEZ MORA 54 '),
-('CENTRO SAUDE MATAMA',' CAMINO CAMIÑO BABIO-AS CARNEIRAS S/N '),
-('CENTRO SAUDE NICOLAS PEÑA',' CAMINO CAMIÑO REGUEIRO S/N '),
-('CENTRO SAUDE ROSALIA DE CASTRO-BEIRAMAR',' CALLE ROSALIA DE CASTRO 21 '),
-('CENTRO SAUDE RUA CUBA',' CALLE CUBA 10 '),
-('CENTRO SAUDE SAN PAIO DE NAVIA',' CALLE POZA CABALO S/N '),
-('CENTRO SAUDE SARDOMA',' CALLE RUA CANTEIRA DE BALIN 76 '),
-('CENTRO SAUDE TEIS',' CALLE ANGELA IGLESIAS REBOLLAR S/N ');
+('Centro Saude A Doblada',' Calle Rua Faisan S/N')
+,('Centro Saude Bembrive',' Carretera Bembrive 259')
+,('Centro Saude Bolivia',' Calle Pizarro 22')
+,('Centro Saude Casco Vello',' Plaza Constitucion 7')
+,('Centro Saude Coia',' Calle Ponteareas S/N')
+,('Centro Saude Colmeiro',' Calle Pintor Colmeiro 11')
+,('Centro Saude Coruxo',' Calle Rua Jose Rivas Carrasqueira S/N')
+,('Centro Saude Lavadores',' Travesia Barreiro 1 36')
+,('Centro Saude Lopez Mora',' Calle Lopez Mora 54')
+,('Centro Saude Matama',' Camino Camiño Babio-As Carneiras S/N')
+,('Centro Saude Nicolas Peña',' Camino Camiño Regueiro S/N')
+,('Centro Saude Rosalia De Castro-Beiramar',' Calle Rosalia De Castro 21')
+,('Centro Saude Rua Cuba',' Calle Cuba 10')
+,('Centro Saude San Paio De Navia',' Calle Poza Cabalo S/N')
+,('Centro Saude Sardoma',' Calle Rua Canteira De Balin 76')
+,('Centro Saude Teis',' Calle Angela Iglesias Rebollar S/N');

 -- Inserta Especialidades médicas
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Alergologia','Especialidad médica de Alergologia');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía cardiaca','Especialidad médica de Cirugía cardiaca');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía general','Especialidad médica de Cirugía general');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía plastica','Especialidad médica de Cirugía plastica');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía de mama','Especialidad médica de Cirugía de mama');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía maxilofacial','Especialidad médica de Cirugía maxilofacial');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Cirugía vascular','Especialidad médica de Cirugía vascular');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Dermatología','Especialidad médica de Dermatología');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Endocrinología y nutrición','Especialidad médica de Endocrinología y nutrición');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Gastroenterología- digestivo','Especialidad médica de Gastroenterología- digestivo');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Neurocirugía','Especialidad médica de Neurocirugía');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Oftalmología','Especialidad médica de Oftalmología');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Otorrinolaringologia','Especialidad médica de Otorrinolaringologia');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Oncología','Especialidad médica de Oncología');
-insert into MyHealth.MedicalSpecialty(name, description)
-values ('Pediatría','Especialidad médica de Pediatría');
+insert into MyHealth.MedicalSpecialty(name, description) values 
+('Alergologia','Especialidad médica de Alergologia')
+,('Cirugía cardiaca','Especialidad médica de Cirugía cardiaca')
+,('Cirugía general','Especialidad médica de Cirugía general')
+,('Cirugía plastica','Especialidad médica de Cirugía plastica')
+,('Cirugía de mama','Especialidad médica de Cirugía de mama')
+,('Cirugía maxilofacial','Especialidad médica de Cirugía maxilofacial')
+,('Cirugía vascular','Especialidad médica de Cirugía vascular')
+,('Dermatología','Especialidad médica de Dermatología')
+,('Endocrinología y nutrición','Especialidad médica de Endocrinología y nutrición')
+,('Gastroenterología- digestivo','Especialidad médica de Gastroenterología- digestivo')
+,('Neurocirugía','Especialidad médica de Neurocirugía')
+,('Oftalmología','Especialidad médica de Oftalmología')
+,('Otorrinolaringologia','Especialidad médica de Otorrinolaringologia')
+,('Oncología','Especialidad médica de Oncología')
+,('Pediatría','Especialidad médica de Pediatría');
+
+-- Insertar médicos de familia
+INSERT INTO myhealth.familydoctor(professionalnumber, password, nif, surname, email, name, primaryhealthcarecenterid) VALUES 
+('PRO#100','912EC803B2CE49E4A541068D495AB570','95874388S','Moran Ortiz', 'Xian@example.ecom','Xian', 1)
+,('PRO#101','912EC803B2CE49E4A541068D495AB570','59546140Z','Zambrano Rivas', 'Belen@example.ecom','Belen', 2)
+,('PRO#102','912EC803B2CE49E4A541068D495AB570','16354100L','Cuevas Luque', 'Fernando@example.ecom','Fernando', 3)
+,('PRO#103','912EC803B2CE49E4A541068D495AB570','32662259M','Becerra Muñiz', 'Luis@example.ecom','Luis', 4)
+,('PRO#104','912EC803B2CE49E4A541068D495AB570','70600712G','Aznar Silva', 'Ana@example.ecom','Ana', 5)
+,('PRO#105','912EC803B2CE49E4A541068D495AB570','08003806J','Galvez Sancho', 'Alfonso@example.ecom','Alfonso', 6)
+,('PRO#106','912EC803B2CE49E4A541068D495AB570','19567288S','Criado Marti', 'Jordi@example.ecom','Jordi', 7)
+,('PRO#107','912EC803B2CE49E4A541068D495AB570','95413653Q','Estevez Mena', 'Barbara@example.ecom','Barbara', 8)
+,('PRO#108','912EC803B2CE49E4A541068D495AB570','90914444K','Godoy Alcaide', 'Amalia@example.ecom','Amalia', 9)
+,('PRO#109','912EC803B2CE49E4A541068D495AB570','05709869G','Lucas Wang', 'Carmelo@example.ecom','Carmelo', 10);
+
+-- Insertar médicos especialistas
+INSERT INTO myhealth.specialistdoctor(professionalnumber, password, nif, surname, email, name, medicalspecialtyid) VALUES 
+('PRO#110','912EC803B2CE49E4A541068D495AB570','87719252N','Vazquez Cruz', 'Luciano@example.ecom','Luciano', 1)
+,('PRO#111','912EC803B2CE49E4A541068D495AB570','79412306E','Alcaide Mesa', 'Gregorio@example.ecom','Gregorio', 2)
+,('PRO#112','912EC803B2CE49E4A541068D495AB570','45727688P','Herranz Soria', 'Candida@example.ecom','Candida', 3)
+,('PRO#113','912EC803B2CE49E4A541068D495AB570','65061962E','Galvez Vives', 'Nora@example.ecom','Nora', 4)
+,('PRO#114','912EC803B2CE49E4A541068D495AB570','07359870P','Rojas Alonso', 'Anton@example.ecom','Anton', 5)
+,('PRO#115','912EC803B2CE49E4A541068D495AB570','14117403A','Lorente Carmona', 'Sheila@example.ecom','Sheila', 6)
+,('PRO#116','912EC803B2CE49E4A541068D495AB570','79864477J','Gonzalo Bonet', 'Nicolas@example.ecom','Nicolas', 7)
+,('PRO#117','912EC803B2CE49E4A541068D495AB570','22761129F','Bonet Ariza', 'Aroa@example.ecom','Aroa', 8)
+,('PRO#118','912EC803B2CE49E4A541068D495AB570','99693813Z','Soria Singh', 'Cristian@example.ecom','Cristian', 9)
+,('PRO#119','912EC803B2CE49E4A541068D495AB570','04431824T','Requena Calderon', 'Ferran@example.ecom','Ferran', 10)
+,('PRO#120','912EC803B2CE49E4A541068D495AB570','27476123R','Angulo Zamora', 'Ana@example.ecom','Ana', 11);
+ 
+--Insertar Pacientes
+INSERT INTO myhealth.patient(personalidentificationcode, password, nif, surname, email, name, familydoctorid) VALUES 
+('PAT#100','912EC803B2CE49E4A541068D495AB570','97758900E','Singh Vila', 'Soledad@example.ecom','Soledad', 1)
+,('PAT#101','912EC803B2CE49E4A541068D495AB570','Z9518183Y','Jimenez Merino', 'Ainhoa@example.ecom','Ainhoa', 2)
+,('PAT#102','912EC803B2CE49E4A541068D495AB570','97758900E','Jesus Chen Barba', 'Abel@example.ecom','Abel', 3)
+,('PAT#103','912EC803B2CE49E4A541068D495AB570','95014341F','Lorenzo Tapia Navas', 'Francisco@example.ecom','Francisco', 4)
+,('PAT#104','912EC803B2CE49E4A541068D495AB570','17873499S','Gimenez Gutierrez', 'Teodora@example.ecom','Teodora', 5)
+,('PAT#105','912EC803B2CE49E4A541068D495AB570','07320674G','Escobar Marquez', 'Jorge@example.ecom','Jorge', 6)
+,('PAT#106','912EC803B2CE49E4A541068D495AB570','63888801E','Marin Reina', 'Marti@example.ecom','Marti', 7)
+,('PAT#107','912EC803B2CE49E4A541068D495AB570','36676167E','Bosch Zapata', 'Abril@example.ecom','Abril', 8)
+,('PAT#108','912EC803B2CE49E4A541068D495AB570','73569670F','Bosch Zapata', 'Esperanza@example.ecom','Esperanza', 9)
+,('PAT#109','912EC803B2CE49E4A541068D495AB570','53986482P','Carretero Ayala', 'Eduardo@example.ecom','Eduardo', 10);
+
+INSERT INTO myhealth.question(title, message, status, response, patientid, familydoctorid) VALUES 
+('titulo de la pregunta número 1', 'Doctor, tengo dolor en la articulación numero 1', 1, null,  1,  1)
+,('titulo de la pregunta número 2', 'Doctor, tengo dolor en la articulación numero 2', 1, null,  2,  1)
+,('titulo de la pregunta número 3', 'Doctor, tengo dolor en la articulación numero 3', 1, null,  3,  1)
+,('titulo de la pregunta número 4', 'Doctor, tengo dolor en la articulación numero 4', 1, null,  4,  1)
+,('titulo de la pregunta número 5', 'Doctor, tengo dolor en la articulación numero 5', 1, null,  5,  1)
+,('titulo de la pregunta número 6', 'Doctor, tengo dolor en la articulación numero 6', 1, null,  6,  1)
+,('titulo de la pregunta número 7', 'Doctor, tengo dolor en la articulación numero 7', 1, null,  7,  1)
+,('titulo de la pregunta número 8', 'Doctor, tengo dolor en la articulación numero 8', 1, null,  8,  1)
+,('titulo de la pregunta número 9', 'Doctor, tengo dolor en la articulación numero 9', 1, null,  9,  1)
+,('titulo de la pregunta número 10', 'Doctor, tengo dolor en la articulación numero 10', 1, null,  10,  1)
+,('titulo de la pregunta número 11', 'Doctor, tengo dolor en la articulación numero 11', 1, null,  1,  1)
+,('titulo de la pregunta número 12', 'Doctor, tengo dolor en la articulación numero 12', 1, null,  2,  1)
+,('titulo de la pregunta número 13', 'Doctor, tengo dolor en la articulación numero 13', 1, null,  3,  1)
+,('titulo de la pregunta número 14', 'Doctor, tengo dolor en la articulación numero 14', 1, null,  4,  1)
+,('titulo de la pregunta número 15', 'Doctor, tengo dolor en la articulación numero 15', 1, null,  5,  1)
+,('titulo de la pregunta número 16', 'Doctor, tengo dolor en la articulación numero 16', 1, null,  6,  1)
+,('titulo de la pregunta número 17', 'Doctor, tengo dolor en la articulación numero 17', 1, null,  7,  1)
+,('titulo de la pregunta número 18', 'Doctor, tengo dolor en la articulación numero 18', 1, null,  8,  1)
+,('titulo de la pregunta número 19', 'Doctor, tengo dolor en la articulación numero 19', 1, null,  9,  1)
+,('titulo de la pregunta número 20', 'Doctor, tengo dolor en la articulación numero 20', 1, null,  10,  1)
+,('titulo de la pregunta número 21', 'Doctor, tengo dolor en la articulación numero 21', 1, null,  8,  1)
+,('titulo de la pregunta número 22', 'Doctor, tengo dolor en la articulación numero 22', 1, null,  9,  1)
+,('titulo de la pregunta número 23', 'Doctor, tengo dolor en la articulación numero 23', 1, null,  10,  1);
+
+

-INSERT INTO myhealth.primaryhealthcarecenter(name, location)
-	VALUES ('Centro A', 'Descripción centro A');
-INSERT INTO myhealth.primaryhealthcarecenter(name, location)
-	VALUES ('Centro Medico Azul', 'Descripción centro medico azul');
-INSERT INTO myhealth.primaryhealthcarecenter(name, location)
-	VALUES ('Centro Medico 23', 'Descripción centro medico 23');
--- a/2.database/model.mwb
+++ b/2.database/model.mwb
--- a/2.database/model.png
+++ b/2.database/model.png
--- a/3.docs/.project
+++ b/3.docs/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>3.docs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
--- a/3.docs/PDS_Practica_4_Grupo2.docx
+++ b/3.docs/PDS_Practica_4_Grupo2.docx
--- a/3.docs/PDS_Practica_4_Grupo_2_Informe
+++ b/3.docs/PDS_Practica_4_Grupo_2_Informe
--- a/3.docs/roe_dudas_reunion_9_dic-2019.md
+++ b/3.docs/roe_dudas_reunion_9_dic-2019.md
@@ -0,0 +1,3 @@
+# Dudas para la reunión
+
+1. en las anotaciones  de los JPA aparece el nombre del schema y la tabla con mayusculas y en el script de creación de database en minúsculas. ¿Qué formato de los dos?
--- a/4.config/createApplicationUser.sh
+++ b/4.config/createApplicationUser.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/expect -f
+#
+# This Expect script was generated by autoexpect on Wed Dec 18 17:32:33 2019
+# Expect and autoexpect were both written by Don Libes, NIST.
+#
+# Note that autoexpect does not guarantee a working script.  It
+# necessarily has to guess about certain things.  Two reasons a script
+# might fail are:
+#
+# 1) timing - A surprising number of programs (rn, ksh, zsh, telnet,
+# etc.) and devices discard or ignore keystrokes that arrive "too
+# quickly" after prompts.  If you find your new script hanging up at
+# one spot, try adding a short sleep just before the previous send.
+# Setting "force_conservative" to 1 (see below) makes Expect do this
+# automatically - pausing briefly before sending each character.  This
+# pacifies every program I know of.  The -c flag makes the script do
+# this in the first place.  The -C flag allows you to define a
+# character to toggle this mode off and on.
+
+set force_conservative 0  ;# set to 1 to force conservative mode even if
+			  ;# script wasn't run conservatively originally
+if {$force_conservative} {
+	set send_slow {1 .1}
+	proc send {ignore arg} {
+		sleep .1
+		exp_send -s -- $arg
+	}
+}
+
+#
+# 2) differing output - Some programs produce different output each time
+# they run.  The "date" command is an obvious example.  Another is
+# ftp, if it produces throughput statistics at the end of a file
+# transfer.  If this causes a problem, delete these patterns or replace
+# them with wildcards.  An alternative is to use the -p flag (for
+# "prompt") which makes Expect only look for the last line of output
+# (i.e., the prompt).  The -P flag allows you to define a character to
+# toggle this mode off and on.
+#
+# Read the man page for more info.
+#
+# -Don
+
+
+set timeout -1
+spawn ./add-user.sh
+match_max 100000
+expect -exact "\r
+What type of user do you wish to add? \r
+ a) Management User (mgmt-users.properties) \r
+ b) Application User (application-users.properties)\r
+(a): "
+send -- "b\r"
+expect -exact "b\r
+\r
+Enter the details of the new user to add.\r
+Using realm 'ApplicationRealm' as discovered from the existing property files.\r
+Username : "
+send -- "USER\r"
+expect -exact "USER\r
+Password recommendations are listed below. To modify these restrictions edit the add-user.properties configuration file.\r
+ - The password should be different from the username\r
+ - The password should not be one of the following restricted values {root, admin, administrator}\r
+ - The password should contain at least 8 characters, 1 alphabetic character(s), 1 digit(s), 1 non-alphanumeric symbol(s)\r
+Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+WFLYDM0101: Password should have at least 1 digit.\r
+Are you sure you want to use the password entered yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Re-enter Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+What groups do you want this user to belong to? (Please enter a comma separated list, or leave blank for none)\[  \]: "
+send -- " User,Trainer,Administrator"
+expect -exact " User,Trainer,Administrator"
+send -- "\r"
+expect -exact "\r
+About to add user 'USER' for realm 'ApplicationRealm'\r
+Is this correct yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Added user 'USER' to file '/opt/jboss/wildfly/standalone/configuration/application-users.properties'\r
+Added user 'USER' to file '/opt/jboss/wildfly/domain/configuration/application-users.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/standalone/configuration/application-roles.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/domain/configuration/application-roles.properties'\r
+Is this new user going to be used for one AS process to connect to another AS process? \r
+e.g. for a slave host controller connecting to the master or for a Remoting connection for server to server EJB calls.\r
+yes/no? "
+send -- "Y\r"
+expect eof
--- a/4.config/createManagementUser.sh
+++ b/4.config/createManagementUser.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/expect -f
+#
+# This Expect script was generated by autoexpect on Wed Dec 18 17:37:57 2019
+# Expect and autoexpect were both written by Don Libes, NIST.
+#
+# Note that autoexpect does not guarantee a working script.  It
+# necessarily has to guess about certain things.  Two reasons a script
+# might fail are:
+#
+# 1) timing - A surprising number of programs (rn, ksh, zsh, telnet,
+# etc.) and devices discard or ignore keystrokes that arrive "too
+# quickly" after prompts.  If you find your new script hanging up at
+# one spot, try adding a short sleep just before the previous send.
+# Setting "force_conservative" to 1 (see below) makes Expect do this
+# automatically - pausing briefly before sending each character.  This
+# pacifies every program I know of.  The -c flag makes the script do
+# this in the first place.  The -C flag allows you to define a
+# character to toggle this mode off and on.
+
+set force_conservative 0  ;# set to 1 to force conservative mode even if
+			  ;# script wasn't run conservatively originally
+if {$force_conservative} {
+	set send_slow {1 .1}
+	proc send {ignore arg} {
+		sleep .1
+		exp_send -s -- $arg
+	}
+}
+
+#
+# 2) differing output - Some programs produce different output each time
+# they run.  The "date" command is an obvious example.  Another is
+# ftp, if it produces throughput statistics at the end of a file
+# transfer.  If this causes a problem, delete these patterns or replace
+# them with wildcards.  An alternative is to use the -p flag (for
+# "prompt") which makes Expect only look for the last line of output
+# (i.e., the prompt).  The -P flag allows you to define a character to
+# toggle this mode off and on.
+#
+# Read the man page for more info.
+#
+# -Don
+
+
+set timeout -1
+spawn ./add-user.sh
+match_max 100000
+expect -exact "\r
+What type of user do you wish to add? \r
+ a) Management User (mgmt-users.properties) \r
+ b) Application User (application-users.properties)\r
+(a): "
+send -- "A\r"
+expect -exact "A\r
+\r
+Enter the details of the new user to add.\r
+Using realm 'ManagementRealm' as discovered from the existing property files.\r
+Username : "
+send -- "USER\r"
+expect -exact "USER\r
+Password recommendations are listed below. To modify these restrictions edit the add-user.properties configuration file.\r
+ - The password should be different from the username\r
+ - The password should not be one of the following restricted values {root, admin, administrator}\r
+ - The password should contain at least 8 characters, 1 alphabetic character(s), 1 digit(s), 1 non-alphanumeric symbol(s)\r
+Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+WFLYDM0101: Password should have at least 1 digit.\r
+Are you sure you want to use the password entered yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Re-enter Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+What groups do you want this user to belong to? (Please enter a comma separated list, or leave blank for none)\[  \]: "
+send -- " User,Trainer,Administrator"
+expect -exact " User,Trainer,Administrator"
+send -- "\r"
+expect -exact "\r
+About to add user 'USER' for realm 'ManagementRealm'\r
+Is this correct yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Added user 'USER' to file '/opt/jboss/wildfly/standalone/configuration/mgmt-users.properties'\r
+Added user 'USER' to file '/opt/jboss/wildfly/domain/configuration/mgmt-users.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/standalone/configuration/mgmt-groups.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/domain/configuration/mgmt-groups.properties'\r
+Is this new user going to be used for one AS process to connect to another AS process? \r
+e.g. for a slave host controller connecting to the master or for a Remoting connection for server to server EJB calls.\r
+yes/no? "
+send -- "Y\r"
+expect eof
--- a/4.config/module.xml
+++ b/4.config/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="org.postgresql">
+<resources>
+<resource-root path="postgresql-9.4.1209.jar"/>
+</resources>
+<dependencies>
+<module name="javax.api"/>
+<module name="javax.transaction.api"/>
+</dependencies>
+</module>
--- a/4.config/postgresql-9.4.1209.jar
+++ b/4.config/postgresql-9.4.1209.jar
--- a/4.config/standalone.xml
+++ b/4.config/standalone.xml
@@ -0,0 +1,524 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:8.0">
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jdr"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.jsf"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.pojo"/>
+        <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.sar"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.jboss.as.webservices"/>
+        <extension module="org.jboss.as.weld"/>
+        <extension module="org.wildfly.extension.batch.jberet"/>
+        <extension module="org.wildfly.extension.bean-validation"/>
+        <extension module="org.wildfly.extension.core-management"/>
+        <extension module="org.wildfly.extension.discovery"/>
+        <extension module="org.wildfly.extension.ee-security"/>
+        <extension module="org.wildfly.extension.elytron"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+        <extension module="org.wildfly.extension.request-controller"/>
+        <extension module="org.wildfly.extension.security.manager"/>
+        <extension module="org.wildfly.extension.undertow"/>
+    </extensions>
+    <management>
+        <security-realms>
+            <security-realm name="ManagementRealm">
+                <authentication>
+                    <local default-user="$local" skip-group-loading="true"/>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+            <security-realm name="ApplicationRealm">
+                <server-identities>
+                    <ssl>
+                        <keystore path="application.keystore" relative-to="jboss.server.config.dir" keystore-password="password" alias="server" key-password="password" generate-self-signed-certificate-host="localhost"/>
+                    </ssl>
+                </server-identities>
+                <authentication>
+                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
+                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization>
+                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+        </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
+        <management-interfaces>
+            <http-interface security-realm="ManagementRealm">
+                <http-upgrade enabled="true"/>
+                <socket-binding http="management-http"/>
+            </http-interface>
+        </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
+    </management>
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:6.0">
+            <console-handler name="CONSOLE">
+                <level name="INFO"/>
+                <formatter>
+                    <named-formatter name="COLOR-PATTERN"/>
+                </formatter>
+            </console-handler>
+            <periodic-rotating-file-handler name="FILE" autoflush="true">
+                <formatter>
+                    <named-formatter name="PATTERN"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+                <append value="true"/>
+            </periodic-rotating-file-handler>
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.jboss.as.config">
+                <level name="DEBUG"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
+            <root-logger>
+                <level name="INFO"/>
+                <handlers>
+                    <handler name="CONSOLE"/>
+                    <handler name="FILE"/>
+                </handlers>
+            </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:batch-jberet:2.0">
+            <default-job-repository name="in-memory"/>
+            <default-thread-pool name="batch"/>
+            <job-repository name="in-memory">
+                <in-memory/>
+            </job-repository>
+            <thread-pool name="batch">
+                <max-threads count="10"/>
+                <keepalive-time time="30" unit="seconds"/>
+            </thread-pool>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:datasources:5.0">
+            <datasources>
+                <datasource jta="false" jndi-name="java:jboss/postgresDS" pool-name="postgresDS" enabled="true" use-java-context="true" use-ccm="false">
+                    <connection-url>jdbc:postgresql://postgres:5432/myhealth</connection-url>
+                    <driver-class>org.postgresql.Driver</driver-class>
+                    <driver>postgresql</driver>
+                    <security>
+                        <user-name>USER</user-name>
+                        <password>PASSWORD</password>
+                    </security>
+                </datasource>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
+                    <driver>h2</driver>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                </datasource>
+                <drivers>
+                    <driver name="postgresql" module="org.postgresql">
+                        <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
+                    </driver>
+                    <driver name="h2" module="com.h2database.h2">
+                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:ee:4.0">
+            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+            </concurrent>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:ejb3:5.0">
+            <session-bean>
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
+                <singleton default-access-timeout="5000"/>
+            </session-bean>
+            <pools>
+                <bean-instance-pools>
+                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                </bean-instance-pools>
+            </pools>
+            <caches>
+                <cache name="simple"/>
+                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
+            </caches>
+            <passivation-stores>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
+            </passivation-stores>
+            <async thread-pool-name="default"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
+            </timer-service>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default">
+                <channel-creation-options>
+                    <option name="READ_TIMEOUT" value="${prop.remoting-connector.read.timeout:20}" type="xnio"/>
+                    <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
+                </channel-creation-options>
+            </remote>
+            <thread-pools>
+                <thread-pool name="default">
+                    <max-threads count="10"/>
+                    <keepalive-time time="100" unit="milliseconds"/>
+                </thread-pool>
+            </thread-pools>
+            <default-security-domain value="other"/>
+            <default-missing-method-permissions-deny-access value="true"/>
+            <log-system-exceptions value="true"/>
+        </subsystem>
+        <subsystem xmlns="urn:wildfly:elytron:4.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+            <providers>
+                <aggregate-providers name="combined-providers">
+                    <providers name="elytron"/>
+                    <providers name="openssl"/>
+                </aggregate-providers>
+                <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
+                <provider-loader name="openssl" module="org.wildfly.openssl"/>
+            </providers>
+            <audit-logging>
+                <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
+            </audit-logging>
+            <security-domains>
+                <security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
+                    <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
+                    <realm name="local"/>
+                </security-domain>
+                <security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
+                    <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
+                    <realm name="local" role-mapper="super-user-mapper"/>
+                </security-domain>
+            </security-domains>
+            <security-realms>
+                <identity-realm name="local" identity="$local"/>
+                <properties-realm name="ApplicationRealm">
+                    <users-properties path="application-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ApplicationRealm"/>
+                    <groups-properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </properties-realm>
+                <properties-realm name="ManagementRealm">
+                    <users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
+                    <groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </properties-realm>
+            </security-realms>
+            <mappers>
+                <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
+                    <permission-mapping>
+                        <principal name="anonymous"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                    <permission-mapping match-all="true">
+                        <permission-set name="login-permission"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                </simple-permission-mapper>
+                <constant-realm-mapper name="local" realm-name="local"/>
+                <simple-role-decoder name="groups-to-roles" attribute="groups"/>
+                <constant-role-mapper name="super-user-mapper">
+                    <role name="SuperUser"/>
+                </constant-role-mapper>
+            </mappers>
+            <permission-sets>
+                <permission-set name="login-permission">
+                    <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
+                </permission-set>
+                <permission-set name="default-permissions">
+                    <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
+                    <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
+                    <permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
+                </permission-set>
+            </permission-sets>
+            <http>
+                <http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="DIGEST">
+                            <mechanism-realm realm-name="ManagementRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </http-authentication-factory>
+                <provider-http-server-mechanism-factory name="global"/>
+            </http>
+            <sasl>
+                <sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                        <mechanism mechanism-name="DIGEST-MD5">
+                            <mechanism-realm realm-name="ApplicationRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </sasl-authentication-factory>
+                <sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                        <mechanism mechanism-name="DIGEST-MD5">
+                            <mechanism-realm realm-name="ManagementRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </sasl-authentication-factory>
+                <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
+                    <properties>
+                        <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+                    </properties>
+                </configurable-sasl-server-factory>
+                <mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
+                    <filters>
+                        <filter provider-name="WildFlyElytron"/>
+                    </filters>
+                </mechanism-provider-filtering-sasl-server-factory>
+                <provider-sasl-server-factory name="global"/>
+            </sasl>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:7.0">
+            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
+                <local-cache name="default">
+                    <transaction mode="BATCH"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+                <local-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="local-query">
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps"/>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:io:3.0">
+            <worker name="default"/>
+            <buffer-pool name="default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:5.0">
+            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+            <bean-validation enabled="true"/>
+            <default-workmanager>
+                <short-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+            <cached-connection-manager/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
+            <expose-resolved-model/>
+            <expose-expression-model/>
+            <remoting-connector/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:mail:3.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
+                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+            </mail-session>
+        </subsystem>
+        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
+        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:1.0" security-enabled="false"/>
+        <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
+            <remote-naming/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:4.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:5.0"/>
+        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security:2.0">
+            <security-domains>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="Remoting" flag="optional">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                        <login-module code="RealmDirect" flag="required">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                    </authentication>
+                </security-domain>
+                <security-domain name="jboss-web-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="jaspitest" cache-type="default">
+                    <authentication-jaspi>
+                        <login-module-stack name="dummy">
+                            <login-module code="Dummy" flag="optional"/>
+                        </login-module-stack>
+                        <auth-module code="Dummy"/>
+                    </authentication-jaspi>
+                </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
+            <deployment-permissions>
+                <maximum-set>
+                    <permission class="java.security.AllPermission"/>
+                </maximum-set>
+            </deployment-permissions>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:transactions:5.0">
+            <core-environment node-identifier="${jboss.tx.node.id:1}">
+                <process-id>
+                    <uuid/>
+                </process-id>
+            </core-environment>
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:undertow:7.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other">
+            <buffer-cache name="default"/>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"/>
+                <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                    <http-invoker security-realm="ApplicationRealm"/>
+                </host>
+            </server>
+            <servlet-container name="default">
+                <jsp-config/>
+                <websockets/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
+            </handlers>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:webservices:2.0">
+            <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+            <endpoint-config name="Standard-Endpoint-Config"/>
+            <endpoint-config name="Recording-Endpoint-Config">
+                <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+                    <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+                </pre-handler-chain>
+            </endpoint-config>
+            <client-config name="Standard-Client-Config"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
+    </profile>
+    <interfaces>
+        <interface name="management">
+            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+        </interface>
+        <interface name="public">
+            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+        </interface>
+    </interfaces>
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
+        <socket-binding name="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+        <outbound-socket-binding name="mail-smtp">
+            <remote-destination host="localhost" port="25"/>
+        </outbound-socket-binding>
+    </socket-binding-group>
+</server>
--- a/29
+++ b/29
@@ -0,0 +1,29 @@
+FROM jboss/wildfly:14.0.1.Final
+
+# User root user to install software
+USER root
+RUN yum -y install expect
+RUN yum -y install postgresql
+RUN yum -y install ant
+
+# Compile and copy .ear to deployments
+ADD ./1.sources/  /opt/jboss/
+RUN cd /opt/jboss/MyHealth && ant
+RUN mv /opt/jboss/MyHealth/dist/MyHealth.ear /opt/jboss/wildfly/standalone/deployments
+
+# Switch back to jboss user
+USER jboss
+
+ADD ./4.config/createApplicationUser.sh /opt/jboss/wildfly/bin/
+ADD ./4.config/createManagementUser.sh /opt/jboss/wildfly/bin/
+
+RUN cd /opt/jboss/wildfly/bin && ./createApplicationUser.sh 
+RUN cd /opt/jboss/wildfly/bin && ./createManagementUser.sh
+
+RUN mkdir /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/
+RUN mkdir /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/main
+ADD ./4.config/postgresql-9.4.1209.jar /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/main
+ADD ./4.config/module.xml /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/main
+ADD ./4.config/standalone.xml /opt/jboss/wildfly/standalone/configuration/standalone.xml
+
+CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,23 @@
+version: '3'
+services:
+    postgres:
+        image: postgres:10.11-alpine
+        ports:
+            - "5432:5432"
+        environment:
+            - POSTGRES_USER=USER
+            - POSTGRES_PASSWORD=PASSWORD
+            - POSTGRES_DB=myhealth
+        volumes:
+            - ./2.database/01.CreateTables.sql:/docker-entrypoint-initdb.d/init.sql
+    wildfly:
+        build: .
+        ports:
+            - "8080:8080"
+        environment:
+            - DB_USER=USER
+            - DB_PASS=PASSWORD
+            - JBOSS_HOME=/opt/jboss/wildfly
+        depends_on:
+            - postgres
+
Author	SHA1	Message	Date
Gabriel Paradiso	d179280321	copilar codigo con ant y deployar ultima version	2019-12-20 00:35:35 +01:00
Gabriel Paradiso	904976f2cb	conectarse a la db correcta	2019-12-19 23:57:02 +01:00
Gabriel Paradiso	3adff14da6	add jboss user creation scripts	2019-12-19 23:38:16 +01:00
Gabriel Paradiso	bece7c58d2	utilizar docker para ejecutar una version ya compilada, pendiente compilar y configurar usuario de jboss	2019-12-19 23:38:16 +01:00
Gabriel Paradiso	cf2140d6c7	cambiar tipo de datos para highresimage a TEXT	2019-12-19 23:36:03 +01:00
Marcos Garcia Nuñez	310578241e	Especificación de la codificación de los ficheros para que funcione la compilación con ant en Windows.	2019-12-18 19:22:18 +01:00
Marcos Garcia Nuñez	cc4415968b	Script con datos de prueba para Question.	2019-12-18 17:03:48 +01:00
Marcos Garcia Nuñez	48d182abdd	Ampliado campo de tipo de usuario para evitar Word Wrap con pantallas de poca resolución.	2019-12-18 16:46:12 +01:00
Marcos Garcia Nuñez	b61c57d290	Comprobación visual con botón de nif válido y/o duplicado (inputGroup)	2019-12-17 23:43:41 +01:00
Marcos Garcia Nuñez	96a2c3dcf6	Incluidos placeholders	2019-12-17 23:43:04 +01:00
Marcos Garcia Nuñez	42d0041b30	Incluidos placeholders	2019-12-17 23:42:58 +01:00
Marcos Garcia Nuñez	5d0dc435e8	Placeholder para login y quitados comentarios innecesarios.	2019-12-17 23:42:42 +01:00
Marcos Garcia Nuñez	528f099891	Merge branch 'master' of https://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git	2019-12-17 20:40:03 +01:00
Marcos Garcia Nuñez	0741c7d766	Añadidos comentarios a todos los métodos.	2019-12-17 20:39:54 +01:00
dalvarezgon	e07117adf0	Versión inicial página de gestión de especialidades	2019-12-17 20:24:07 +01:00
Marcos Garcia Nuñez	3b0640304e	Añadidos Comentarios a todos los métdos.	2019-12-17 20:10:36 +01:00
Marcos Garcia Nuñez	2a0ee44ffa	Proyecto de eclipse para los documentos.	2019-12-17 20:10:14 +01:00
Marcos Garcia Nuñez	16ed46f6cd	Subida inicial de los informes a entregar: * Informe sobre la implementación y despliegue. * Informe de testing.	2019-12-17 18:17:19 +01:00
Gabriel Paradiso	df127c89fd	change image type to TEXT	2019-12-17 10:31:05 +01:00
Marcos Garcia Nuñez	c3e1fbe9ae	Corregido error al editar datos del perfil de usuario (No se mostraba el apellido).	2019-12-17 00:08:33 +01:00
Marcos Garcia Nuñez	ea98690703	Actualizado script de Creación de BBD para unificar la gestión de permisos al final. Incluidos permisos para usuario de la máquina de PRE.	2019-12-17 00:00:03 +01:00
Marcos Garcia Nuñez	e04bbf6f35	Pagina home con layout fluid y tabla de datos con botón refresh.	2019-12-16 23:15:18 +01:00
Marcos Garcia Nuñez	63101a301b	Enumerados cambiados a string. Varios campos a not null.	2019-12-16 22:08:58 +01:00
Marcos Garcia Nuñez	9bfdebbea4	Ejemplo de paginación (Listado de preguntas pendientes) con primefaces utilizando LazyDataModel, con recarga automática de la página solicitada.	2019-12-16 22:02:27 +01:00
Marcos Garcia Nuñez	dcbebe5253	Corregido error al realizar logina (la ventana se agitaba aún con login correcto).	2019-12-16 15:57:02 +01:00
Marcos Garcia Nuñez	48c04a6681	Beans esqueleto actualizados.	2019-12-15 23:19:49 +01:00
Marcos Garcia Nuñez	2e5ae9bb6c	Cambiada variable de entorno en build.xml a env.JBOSS_HOME para que pueda realizarse el despliegue automático en la máquina de PRE (azure).	2019-12-15 23:12:16 +01:00
Marcos Garcia Nuñez	ae79658a23	Corregido error en la validación del NIF para médicos especialistas.	2019-12-15 23:07:34 +01:00
Roberto Orden Erena	bc1e05ab36	Elimino el modelo de Workbench y actualizo el ERM autogenerado por DBVIsualizer	2019-12-15 21:03:02 +01:00
Roberto Orden Erena	fbe7b34a32	Updates	2019-12-15 20:53:51 +01:00
Roberto Orden Erena	91f6bc396b	Merge branch 'master' into rorden	2019-12-15 19:45:30 +01:00
Roberto Orden Erena	a71df2baa9	Merge branch 'master' of http://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git	2019-12-15 19:45:22 +01:00
Marcos Garcia Nuñez	f55ebe3bb9	Corregido error: Se utilizaba la secuencia equivocada para genear los código CIP de pacientes.	2019-12-15 19:52:23 +01:00
Marcos Garcia Nuñez	5a3ed35c16	Implementada comprobación de NIFs duplicados para pacientes y todos los médicos.	2019-12-15 19:32:30 +01:00
Marcos Garcia Nuñez	7193ffd250	Metodos para busqueda de pacientes, médicos de familia y medicos especialistas por NIF.	2019-12-15 19:31:41 +01:00
Roberto Orden Erena	6eb1bda423	QuestionTO y QuestionJPA updated	2019-12-15 19:24:41 +01:00
Roberto Orden Erena	e5900a8d0f	- Creado Question transferObject -- Se le ha añadido la relación con FamilyDoctor inexistente en el diseño inicial -- Tiene integrado en formato String la response en lugar de un objeto (tabla en BBDD) - Modificado MedicalTest transferObject -- Se le ha creado el tipo de dato de prueba médica (en lugar de un entero sin más sentido en BL) - Actualizado el diseño de BBDD -- Con las restricciones/características anteriormente comentadas -- Todas las tablas tienen una PK como INT AI, excepto administrator - Se actualiza la interfaz para Remoto y el EJB	2019-12-15 18:17:32 +01:00
Marcos Garcia Nuñez	1bfd7317e6	Implementación de mensajes de error que se muestran en la pagina de error. El mensaje de error se envía a través de la sesión.	2019-12-15 14:10:09 +01:00
Marcos Garcia Nuñez	b5a41958a2	Implementada seguridad por URL para cada tipo de usuario.	2019-12-15 12:28:56 +01:00
Marcos Garcia Nuñez	4dc6828257	Restaurada opción de registro de usuarios en el menú.	2019-12-15 12:28:12 +01:00
Marcos Garcia Nuñez	697a4d3c17	Corregido error (referncia a primerfaces)	2019-12-15 12:27:57 +01:00
Marcos Garcia Nuñez	d39a82718e	Formato de Datos de prueba (Camel Case)	2019-12-15 12:27:31 +01:00
Marcos Garcia Nuñez	f776128be0	Eliminadas paginas y managed beans innecesarios.	2019-12-14 19:59:09 +01:00
Marcos Garcia Nuñez	598e4cce71	Cambiado displayName.	2019-12-14 19:58:12 +01:00
Marcos Garcia Nuñez	5276ff017e	Campos de solo lectura en lugar de deshabilitados.	2019-12-14 19:57:49 +01:00
Marcos Garcia Nuñez	516a5d0701	Mostrar codigo personal en display name.	2019-12-14 19:57:25 +01:00
Marcos Garcia Nuñez	16d7cea829	Quitadas páginas no utilizadas del menú para el registro individual.	2019-12-14 19:56:52 +01:00
Marcos Garcia Nuñez	5098e51496	Mostrar identificador de profesional en displayname.	2019-12-14 19:56:22 +01:00
Marcos Garcia Nuñez	4c2c991e7c	Mostrar identificador de profesional en la lista desplegable.	2019-12-14 19:55:56 +01:00
Marcos Garcia Nuñez	92af30a5f3	Corrección de espacios en los datos de los juegos de pruebas.	2019-12-14 19:55:07 +01:00
Marcos Garcia Nuñez	d4c1e18ab1	Datos de prueba de paciente, medico especialista y medico de familia.	2019-12-14 19:17:00 +01:00
Roberto Orden Erena	7854ca85bc	Merge branch 'master' into rorden	2019-12-14 17:35:46 +01:00
Roberto Orden Erena	ad8cd521c6	Actualización del build de ant para que contemple el despliegue del eat	2019-12-14 17:35:26 +01:00
Roberto Orden Erena	301d1de126	Update	2019-12-14 11:53:58 +01:00
Roberto Orden Erena	ddf9145718	Merge branch 'master' into rorden	2019-12-14 11:23:42 +01:00
Roberto Orden Erena	9136d53f2c	Update	2019-12-14 11:23:06 +01:00
Marcos Garcia Nuñez	2b1ab687ae	Cambio en el script de ant: Eliminación de clases que van en el JAR del ejb.	2019-12-13 20:21:17 +01:00
Marcos Garcia Nuñez	b64a8de964	Corrección de error al generar war.	2019-12-13 20:08:20 +01:00
Marcos Garcia Nuñez	8140eb19aa	Corregido error que impedia el correcto funcionamiento de login. No se incluían en el jar las clases comunes del paquete common.	2019-12-13 19:18:53 +01:00
Marcos Garcia Nuñez	f31803f4f4	Cambio Nombre parámetro.	2019-12-13 19:18:24 +01:00
Marcos Garcia Nuñez	d28b0fdc81	Merge branch 'master' of https://pdp-pds.eimt.uoc.edu/pds19-grupo2/myhealth.git	2019-12-13 18:27:21 +01:00
Marcos Garcia Nuñez	c33bbf0de6	Script co comprobación de existencia de objetos, para poder ejecutar despliegue automático en base de datos.	2019-12-13 18:26:55 +01:00
Gabriel Paradiso Silva	18cb6daebd	Merge branch 'unique_index_doctors' into 'master' agregar indices unicos para family doctor y specialist See merge request pds19-grupo2/myhealth!1	2019-12-13 17:33:22 +01:00
Roberto Orden Erena	239e9b7640	Merge branch 'master' into rorden	2019-12-10 20:00:44 +01:00
Roberto Orden Erena	2542b3c170	Dudas para la reu próxima	2019-12-09 22:30:20 +01:00
Roberto Orden Erena	e27bd81d38	TO y JPA	2019-12-09 22:30:13 +01:00