From fe0221d90c5949026b9873e2ed167efacd8a932b Mon Sep 17 00:00:00 2001
From: Fabio <fabio.fbarreto@totvs.com.br>
Date: Tue, 2 Jul 2024 17:43:05 -0300
Subject: [PATCH] Cadastro de contratos corporativos fixes bug#AL-4276

---
 pom.xml                                       |  4 +-
 .../EditarContratoController.java             | 42 +++++++++----------
 .../negcorporativos/editarContrato.zul        | 26 ++++++------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b4982de0..7ad576e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.98.0</version>
+	<version>1.98.1</version>
 	<packaging>war</packaging> 
   
 	<properties>
-		<modelWeb.version>1.73.0</modelWeb.version>
+		<modelWeb.version>1.73.1</modelWeb.version>
 		<flyway.version>1.56.0</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarContratoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarContratoController.java
index 611c598d4..0095f7252 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarContratoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarContratoController.java
@@ -55,8 +55,6 @@ public class EditarContratoController extends MyGenericForwardComposer {
 	private ContratoCorporativo contrato;
 	private MyListbox contratoList;
 	
-	private ClienteCorporativo cliente;
-	
 	//Contrato	
 	private Textbox txtNumContrato;
 	private Datebox datInicial;
@@ -77,13 +75,13 @@ public class EditarContratoController extends MyGenericForwardComposer {
 	private Checkbox chkExigeExcedente;
 	
 	//Cliente
-	private Label lblEmail;
-	private Label lblTelefone;
-	private Label lblLogradouro;
-	private Label lblNumero;
-	private Label lblCEP;
-	private Label lblComplemento;
-	private Label lblBairro;
+	private Label lblClienteEmail;
+	private Label lblClienteTelefone;
+	private Label lblClienteLogradouro;
+	private Label lblClienteNumero;
+	private Label lblClienteCEP;
+	private Label lblClienteComplemento;
+	private Label lblClienteBairro;
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {			
@@ -97,9 +95,7 @@ public class EditarContratoController extends MyGenericForwardComposer {
 		preencheCombo();
 		preencheRadios();
 		preencheCheckBox();
-		
-		cliente = cmbCliente.getSelectedCliente();
-		
+		preencheDadosCliente();
 	}
 
 	public void onClick$btnSalvar(Event ev) throws InterruptedException {
@@ -191,19 +187,23 @@ public class EditarContratoController extends MyGenericForwardComposer {
 	}
 	
 	public void onChange$cmbCliente(Event ev) {
+		preencheDadosCliente();
+	}
+
+	private void preencheDadosCliente() {
 		if( cmbCliente.getSelectedItem() != null ) {
-			cliente = cmbCliente.getSelectedCliente();
-			lblEmail.setValue(cliente.getEmail());			
-			lblTelefone.setValue(cliente.getTelefone());
-			lblLogradouro.setValue(cliente.getLogradouro());
-			lblNumero.setValue(cliente.getNumero());
-			lblCEP.setValue(cliente.getCep());
-			lblComplemento.setValue(cliente.getComplemento());
-			lblBairro.setValue(cliente.getBairro());
+			ClienteCorporativo cliente = cmbCliente.getSelectedCliente();
+			lblClienteEmail.setValue(cliente.getEmail());			
+			lblClienteTelefone.setValue(cliente.getTelefone());
+			lblClienteLogradouro.setValue(cliente.getLogradouro());
+			lblClienteNumero.setValue(cliente.getNumero());
+			lblClienteCEP.setValue(cliente.getCep());
+			lblClienteComplemento.setValue(cliente.getComplemento());
+			lblClienteBairro.setValue(cliente.getBairro());
 		}
 	}
 	
-	private void preencheCombo() {		
+	private void preencheCombo() {
 		cmbCliente.setSelectedCliente(contrato.getClienteCorporativoId());
 		cmbRepresentante.setSelectedUsuario(contrato.getUsuarioRepId());
 		
diff --git a/web/gui/configuraciones_comerciales/negcorporativos/editarContrato.zul b/web/gui/configuraciones_comerciales/negcorporativos/editarContrato.zul
index 0f2be8228..948a987bd 100644
--- a/web/gui/configuraciones_comerciales/negcorporativos/editarContrato.zul
+++ b/web/gui/configuraciones_comerciales/negcorporativos/editarContrato.zul
@@ -45,7 +45,7 @@
 							<row >
 								<label value="${c:l('label.grupoContrato')}" />
 								<combobox id="cmbGrupo" 
-									buttonVisible="true" constraint="no empty"
+									buttonVisible="true"
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 									model="@{winEditarContrato$composer.lsGrupo}"
 									mold="rounded" width="95%" />
@@ -65,19 +65,19 @@
 							<row>
 								<label id="lbNumContrato" value="${c:l('label.numContrato')}" />
 								<longbox id="txtNumContrato"
-									constraint="no negative,no empty" maxlength="9" width="100px" 
+									constraint="no negative" maxlength="9" width="100px" 
 									value="@{winEditarContrato$composer.contrato.numContrato}" />
 							</row>
 							<row>
 								<label id="lbValor" value="${c:l('label.valorContrato')}" />
 								<decimalbox id="txtValor" maxlength="12" format="0.00"
-									constraint="no negative,no empty" width="100px" 
+									constraint="no negative" width="100px" 
 									value="@{winEditarContrato$composer.contrato.valorContrato}" />
 							</row>	
 							<row>
 								<label id="lbPercentual" value="${c:l('label.percentualBonus')}" />
 								<decimalbox id="txtBonus" maxlength="6" format="0.00"
-									constraint="no negative,no empty" width="100px" 
+									constraint="no negative" width="100px" 
 									value="@{winEditarContrato$composer.contrato.percentualBonus}" />
 							</row>
 							<row>
@@ -88,7 +88,7 @@
 							<row >
 								<label value="${c:l('label.representante')}" />
 								<combobox id="cmbRepresentante" 
-									buttonVisible="true" constraint="no empty"
+									buttonVisible="true" 
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario"
 									mold="rounded" width="95%" />
 							</row>
@@ -176,37 +176,37 @@
 							<row >
 								<label value="${c:l('label.clienteCorporativo')}" />
 								<combobox id="cmbCliente" 
-									buttonVisible="true" constraint="no empty"
+									buttonVisible="true" 
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxClienteCorporativo"
 									mold="rounded" width="95%" />
 							</row>
 							<row>
 								<label value="${c:l('label.email')}" />
-								<label id="lblEmail" value="@{winEditarContrato$composer.cliente.email}" />
+								<label id="lblClienteEmail" />
 							</row>
 							<row>
 								<label value="${c:l('label.telefone')}" />
-								<label id="lblTelefone" value="@{winEditarContrato$composer.cliente.telefone}" />
+								<label id="lblClienteTelefone" />
 							</row>
 							<row>
 								<label value="${c:l('label.logradouro')}" />
-								<label id="lblLogradouro" value="@{winEditarContrato$composer.cliente.logradouro}" />
+								<label id="lblClienteLogradouro" />
 							</row>
 							<row>
 								<label value="${c:l('label.numero')}" />
-								<label id="lblNumero" value="@{winEditarContrato$composer.cliente.numero}" />
+								<label id="lblClienteNumero"  />
 							</row>
 							<row>
 								<label value="${c:l('label.cep')}" />
-								<label id="lblCEP" value="@{winEditarContrato$composer.cliente.cep}" />
+								<label id="lblClienteCEP"  />
 							</row>
 							<row>
 								<label value="${c:l('label.complemento')}" />
-								<label id="lblComplemento" value="@{winEditarContrato$composer.cliente.complemento}" />
+								<label id="lblClienteComplemento" />
 							</row>							
 							<row>
 								<label value="${c:l('label.bairro')}" />
-								<label id="lblBairro" value="@{winEditarContrato$composer.cliente.bairro}" />
+								<label id="lblClienteBairro" />
 							</row>
 						</rows>