Corrección de error en el alta de usuarios y formato de la pantalla de
login de usuarios.
This commit is contained in:
Marcos Garcia Nuñez
@@ -11,6 +11,10 @@
|
||||
<from-outcome>RegisterUser</from-outcome>
|
||||
<to-view-id>/profile/RegisterUser.xhtml</to-view-id>
|
||||
</navigation-case>
|
||||
<navigation-case>
|
||||
<from-outcome>RegisterUserResult</from-outcome>
|
||||
<to-view-id>/profile/RegisterUserResult.xhtml</to-view-id>
|
||||
</navigation-case>
|
||||
<navigation-case>
|
||||
<from-outcome>AddPatient</from-outcome>
|
||||
<to-view-id>/profile/AddPatient.xhtml</to-view-id>
|
||||
|
||||
@@ -1,25 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
|
||||
xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
|
||||
|
||||
<ui:composition template="./header.xhtml">
|
||||
<ui:composition template="./header.xhtml">
|
||||
<ui:define name="content">
|
||||
<h:form id="errorForm">
|
||||
<div align="center">
|
||||
<h1>Se ha producido un error</h1>
|
||||
<hr/>
|
||||
<div>Descripcion del error:</div>
|
||||
<div>
|
||||
<h:messages fatalClass="ErrorMessage" showDetail="true" showSummary="true" globalOnly="true">
|
||||
</h:messages>
|
||||
<h:form id="errorForm">
|
||||
<div align="center">
|
||||
<h1>Se ha producido un error</h1>
|
||||
<hr />
|
||||
<div>Descripcion del error:</div>
|
||||
<div>
|
||||
<h:messages fatalClass="ErrorMessage" showDetail="true" showSummary="true" globalOnly="true" />
|
||||
</div>
|
||||
</div>
|
||||
<p align="center">
|
||||
<h:button value="Volver al inicio" outcome="home?refresh=1" />
|
||||
</p>
|
||||
</h:form>
|
||||
<div class="ui-g-12 ui-g-nopad">
|
||||
<div class="ui-g-4 ui-md-5"></div>
|
||||
<div class="ui-g-2 ui-md-2">
|
||||
|
||||
</div>
|
||||
<div class="ui-g-4 ui-md-5"></div>
|
||||
</div>
|
||||
<div class="ui-g-12 ui-g-nopad">
|
||||
<div class="ui-g-4 ui-md-5"></div>
|
||||
<div class="ui-g-2 ui-md-2">
|
||||
<p:button value="Ir a la página principal" outcome="home" icon="pi pi-home" />
|
||||
</div>
|
||||
<div class="ui-g-4 ui-md-5"></div>
|
||||
</div>
|
||||
</h:form>
|
||||
</ui:define>
|
||||
</ui:composition>
|
||||
</ui:composition>
|
||||
</html>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</div>
|
||||
<hr />
|
||||
<div id="menuDiv">
|
||||
<p:growl id="messages" sticky="false" showDetail="true" life="15000" />
|
||||
<p:growl id="messages" sticky="false" showDetail="true" life="15000" />
|
||||
<p:ajaxStatus style="width:32px; height:32px; position:fixed; right:32px; bottom:32px">
|
||||
<f:facet name="start">
|
||||
<i id="loginSpin" class="pi pi-spin pi-spinner" style="font-size: 3em"></i>
|
||||
@@ -46,19 +46,25 @@
|
||||
|
||||
<h:form id="frmLogin">
|
||||
|
||||
<p:dialog header="Acceder al sistema" widgetVar="dlgLogin" resizable="false" modal="true" closeOnEscape="true">
|
||||
<h:panelGrid columns="2" cellpadding="5">
|
||||
<h:outputLabel for="username" value="Username:" />
|
||||
<p:inputText id="username" value="#{loginView.username}" />
|
||||
<p:dialog header="Acceder al sistema" width="350px" widgetVar="dlgLogin" resizable="false" modal="true" closeOnEscape="true">
|
||||
<div class="ui-g ui-fluid">
|
||||
<div class="ui-g-12">
|
||||
<h:outputLabel for="username" value="Usuario:" />
|
||||
<p:inputText id="username" value="#{loginView.username}" />
|
||||
</div>
|
||||
<div class="ui-g-12">
|
||||
|
||||
<h:outputLabel for="password" value="Password:" />
|
||||
<p:password id="password" value="#{loginView.password}" />
|
||||
|
||||
<f:facet name="footer">
|
||||
<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()" oncomplete="handleLoginRequest(xhr, status, args)"/>
|
||||
<h:outputLabel for="password" value="Contraseña:" />
|
||||
<p:password id="password" value="#{loginView.password}" />
|
||||
</div>
|
||||
<div class="ui-g-6">
|
||||
<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
|
||||
oncomplete="handleLoginRequest(xhr, status, args)" />
|
||||
</div>
|
||||
<div class="ui-g-6">
|
||||
<p:commandButton value="Cancel" icon="pi pi-ban" onclick="PF('dlgLogin').hide();" />
|
||||
</f:facet>
|
||||
</h:panelGrid>
|
||||
</div>
|
||||
</div>
|
||||
</p:dialog>
|
||||
</h:form>
|
||||
<h:form id="frmMenu">
|
||||
|
||||
@@ -23,23 +23,33 @@
|
||||
<ui:composition template="./header.xhtml">
|
||||
<ui:define name="content">
|
||||
<h:form>
|
||||
<h:outputLink value="javascript:void(0)" onclick="PF('dlg').show();" title="login">
|
||||
<h:outputText>Login</h:outputText>
|
||||
</h:outputLink>
|
||||
<div class="ui-g ui-fluid">
|
||||
<div class="ui-g-4 ui-md-4" />
|
||||
<div class="ui-g-4 ui-md-4">
|
||||
<p:panel id="LoginPanel" header="Acceder al sistema">
|
||||
<div class="ui-g ui-fluid">
|
||||
<div class="ui-g-12">
|
||||
<h:outputLabel for="username" value="Usuario:" />
|
||||
<p:inputText id="username" value="#{loginView.username}" />
|
||||
</div>
|
||||
|
||||
<p:growl id="growl" sticky="true" showDetail="true" life="3000" />
|
||||
<div class="ui-g-12">
|
||||
<h:outputLabel for="password" value="Contraseña:" />
|
||||
<p:password id="password" value="#{loginView.password}" />
|
||||
</div>
|
||||
|
||||
<h:panelGrid columns="2" cellpadding="5">
|
||||
<h:outputLabel for="username" value="Username:" />
|
||||
<p:inputText id="username" value="#{loginView.username}" required="true" label="username" />
|
||||
|
||||
<h:outputLabel for="password" value="Password:" />
|
||||
<p:password id="password" value="#{loginView.password}" required="true" label="password" />
|
||||
|
||||
<f:facet name="footer">
|
||||
<p:commandButton value="Login" update="growl" action="#{loginView.login}" oncomplete="handleLoginRequest(xhr, status, args)" />
|
||||
</f:facet>
|
||||
</h:panelGrid>
|
||||
<div class="ui-g-6">
|
||||
<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
|
||||
oncomplete="handleLoginRequest(xhr, status, args)" />
|
||||
</div>
|
||||
<div class="ui-g-6">
|
||||
<p:button value="Volver" outcome="home" icon="pi pi-home" />
|
||||
</div>
|
||||
</div>
|
||||
</p:panel>
|
||||
</div>
|
||||
<div class="ui-g-4 ui-md-4" />
|
||||
</div>
|
||||
</h:form>
|
||||
</ui:define>
|
||||
</ui:composition>
|
||||
|
||||
44
1.sources/MyHealth/docroot/profile/RegisterUserResult.xhtml
Normal file
44
1.sources/MyHealth/docroot/profile/RegisterUserResult.xhtml
Normal file
@@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
|
||||
xmlns:p="http://primefaces.org/ui">
|
||||
|
||||
<ui:composition template="../header.xhtml">
|
||||
<ui:define name="content">
|
||||
<h:form id="frmRegisterUserResult">
|
||||
<div class="ui-g-4 ui-md-4" />
|
||||
<div class="ui-g-4 ui-md-4">
|
||||
|
||||
<p:panel id="DatosPersonales" header="El registro se ha realizado correctamente">
|
||||
<div class="ui-g ui-fluid">
|
||||
|
||||
<div class="ui-g-12">
|
||||
Se ha registrado correctamente, el sistema le ha asignado un <b> <p:outputLabel value="Código de Identificación Personal (CIP)" rendered="#{registerUser.patient}" /> <p:outputLabel
|
||||
value="Número de Profesional" rendered="#{registerUser.familyDoctor or registerUser.specialistDoctor}" />
|
||||
</b> , por favor recuerdelo ya que deberá utilizarlo para logearse en el sistema.
|
||||
</div>
|
||||
|
||||
<div class="ui-g-12">
|
||||
<p:outputLabel value="Su Código de Identificación Personal (CIP) es" rendered="#{registerUser.patient}" />
|
||||
<p:outputLabel value="Número de Profesional es" rendered="#{registerUser.familyDoctor or registerUser.specialistDoctor}" />
|
||||
</div>
|
||||
|
||||
<div class="ui-g-12" style="font-size: larger;font-weight: bold; text-align:center;">
|
||||
<p:outputLabel value="#{registerUser.id}" />
|
||||
</div>
|
||||
|
||||
<div class="ui-g-2"></div>
|
||||
<div class="ui-g-8">
|
||||
<p:button value="Ir a la página principal" outcome="home" icon="pi pi-home" />
|
||||
</div>
|
||||
<div class="ui-g-2"></div>
|
||||
</div>
|
||||
|
||||
</p:panel>
|
||||
</div>
|
||||
<div class="ui-g-4 ui-md-4" />
|
||||
</h:form>
|
||||
</ui:define>
|
||||
</ui:composition>
|
||||
</html>
|
||||
@@ -30,7 +30,8 @@
|
||||
<p:outputLabel value="Tipo de usuario:" for="selUsertype" />
|
||||
</div>
|
||||
<div class="ui-g-6 ui-md-6">
|
||||
<p:selectOneButton id="selUsertype" value="#{registerUser.userType}" disabled="true" required="true" unselectable="false" requiredMessage="Debe especificar un tipo de usuario">
|
||||
<p:selectOneButton id="selUsertype" value="#{registerUser.userType}" disabled="true" required="true" unselectable="false"
|
||||
requiredMessage="Debe especificar un tipo de usuario">
|
||||
<f:selectItems value="#{registerUser.userTypes}" var="item" itemLabel="#{item.userTypename}" itemValue="#{item.name}" />
|
||||
</p:selectOneButton>
|
||||
</div>
|
||||
@@ -40,9 +41,9 @@
|
||||
<p:panel id="DatosPersonales" header="Actualizar datos personales">
|
||||
<div class="ui-g ui-fluid">
|
||||
<div class="ui-g-2 ui-md-2">
|
||||
<h:outputLabel value="value = 10" rendered="#{row == 10}" />
|
||||
<p:outputLabel value="Código de Identificación Personal (CIP):" rendered="#{registerUser.patient}" for="id" />
|
||||
<p:outputLabel value="Número de Profesional:" rendered="#{registerUser.familyDoctor or registerUser.specialistDoctor}" for="id" />
|
||||
<h:outputLabel value="value = 10" rendered="#{row == 10}" />
|
||||
<p:outputLabel value="Código de Identificación Personal (CIP):" rendered="#{registerUser.patient}" for="id" />
|
||||
<p:outputLabel value="Número de Profesional:" rendered="#{registerUser.familyDoctor or registerUser.specialistDoctor}" for="id" />
|
||||
</div>
|
||||
<div class="ui-g-4 ui-md-4">
|
||||
<p:inputText id="id" value="#{registerUser.id}" disabled="true" required="true" requiredMessage="Por favor, indque su identificador" />
|
||||
@@ -50,7 +51,7 @@
|
||||
<div class="ui-g-6 ui-md-6">
|
||||
<p:message for="id" display="text" />
|
||||
</div>
|
||||
|
||||
|
||||
<div class="ui-g-2 ui-md-2">
|
||||
<p:outputLabel value="NIF:" for="nif" />
|
||||
</div>
|
||||
@@ -116,7 +117,8 @@
|
||||
<p:outputLabel value="Centro:" for="selPHC" />
|
||||
</div>
|
||||
<div class="ui-g-4 ui-md-4">
|
||||
<p:selectOneMenu id="selPHC" value="#{registerUser.primaryHealthCareCenter}" converter="omnifaces.SelectItemsConverter" required="#{registerUser.familyDoctor}" requiredMessage="Por favor, selecciona un centro de antención primaria">
|
||||
<p:selectOneMenu id="selPHC" value="#{registerUser.primaryHealthCareCenter}" converter="omnifaces.SelectItemsConverter" required="#{registerUser.familyDoctor}"
|
||||
requiredMessage="Por favor, selecciona un centro de antención primaria">
|
||||
<f:selectItem itemLabel="Seleccione un centro de antención primario..." itemValue="" noSelectionOption="true" />
|
||||
<f:selectItems value="#{registerUser.phcList}" var="phc" itemLabel="#{phc.location}" itemValue="#{phc}" />
|
||||
<p:column>#{phc.name}</p:column>
|
||||
@@ -133,7 +135,8 @@
|
||||
<p:outputLabel value="Especialidad médica:" for="selMS" />
|
||||
</div>
|
||||
<div class="ui-g-4 ui-md-4">
|
||||
<p:selectOneMenu id="selMS" value="#{registerUser.medicalSpecialty}" converter="omnifaces.SelectItemsConverter" required="#{registerUser.specialistDoctor}" requiredMessage="Por favor, seleccione una especialidad médica" >
|
||||
<p:selectOneMenu id="selMS" value="#{registerUser.medicalSpecialty}" converter="omnifaces.SelectItemsConverter" required="#{registerUser.specialistDoctor}"
|
||||
requiredMessage="Por favor, seleccione una especialidad médica">
|
||||
<f:selectItem itemLabel="Seleccione una especialidad médica..." itemValue="" noSelectionOption="true" />
|
||||
<f:selectItems value="#{registerUser.medicalSpecialtiesList}" var="ms" itemLabel="#{ms.description}" itemValue="#{ms}" />
|
||||
<p:column>#{ms.name}</p:column>
|
||||
|
||||
Reference in New Issue
Block a user