From b61c57d29083afaae54f5b73decf59db740f12ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garcia=20Nu=C3=B1ez?= <mgarcianun@uoc.edu>
Date: Tue, 17 Dec 2019 23:43:41 +0100
Subject: [PATCH] =?UTF-8?q?Comprobaci=C3=B3n=20visual=20con=20bot=C3=B3n?=
 =?UTF-8?q?=20de=20nif=20v=C3=A1lido=20y/o=20duplicado=20(inputGroup)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docroot/profile/RegisterUser.xhtml        | 45 +++++++++++--------
 .../docroot/profile/UpdateProfile.xhtml       | 31 +++++++++++--
 .../docroot/resources/css/estilos.css         | 22 +++++++++
 .../profile/RegisterUserMBean.java            |  7 ++-
 .../profile/UpdateProfileMBean.java           |  7 ++-
 5 files changed, 87 insertions(+), 25 deletions(-)

diff --git a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
index 9965d46..d9fb7e9 100644
--- a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
+++ b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
@@ -46,19 +46,21 @@
 			<h:form id="frmRegisterUser" rendered="#{not RegisterUser.registered}">
 				<h:outputScript>
 				    function handleRequest(xhr, status, args) {
-				    	/*
-				        if(args.specs) {
-				        	$('#panCentros').slideUp();
-				            $('#panEspecialidades').slideDown();
-				        }
-				        else if (args.caps) {
-				        	$('#panEspecialidades').slideUp();
-				            $('#panCentros').slideDown();
-				        } else if (args.pats) {
-				            $('#panCentros').slideUp();
-				            $('#panEspecialidades').slideUp();
-				        }
-				        */
+				    	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" globalOnly="true" showDetail="true" closable="true" autoupdate="true" />
@@ -70,7 +72,7 @@
 						<div class="ui-g-6 ui-md-6">
 							<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" />
@@ -83,9 +85,12 @@
 							<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">
-								<p:ajax event="blur" update="nifmsg" listener="#{RegisterUser.hadleNIFValueChange}" />
-							</p:inputText>
+							<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 id="nifmsg" for="nif" />
@@ -151,7 +156,8 @@
 								</div>
 								<div class="ui-g-4 ui-md-4">
 									<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">
+										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}" />
@@ -172,7 +178,8 @@
 								</div>
 								<div class="ui-g-4 ui-md-4">
 									<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">
+										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}" />
diff --git a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
index 14eef16..d0a50d0 100644
--- 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">
@@ -41,9 +60,12 @@
 						<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">
-							<p:ajax event="blur" update="nifmsg" listener="#{UpdateProfile.hadleNIFValueChange}" />
-						</p:inputText>
+						<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 id="nifmsg" for="nif" display="text" />
@@ -159,7 +181,8 @@
 						</div>
 						<div class="ui-g-4 ui-md-4">
 							<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">
+								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.professionalNumber}" />
diff --git a/1.sources/MyHealth/docroot/resources/css/estilos.css b/1.sources/MyHealth/docroot/resources/css/estilos.css
index f88cc78..8f4b5d7 100644
--- a/1.sources/MyHealth/docroot/resources/css/estilos.css
+++ b/1.sources/MyHealth/docroot/resources/css/estilos.css
@@ -9,4 +9,26 @@ BODY {
 .nopadding {
 	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;
 }
\ No newline at end of file
diff --git a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
index 60896c1..fecac39 100644
--- a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
@@ -129,8 +129,13 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable {
 	}
 	
 	public void hadleNIFValueChange() {
-		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, null) == true)
+		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() {
diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
index 0ca06df..291d4fd 100644
--- a/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
@@ -173,8 +173,13 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 	}
 
 	public void hadleNIFValueChange() {
-		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, this.id) == true)
+		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() {