fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cadastro de contratos corporativos fixes bug#AL-4276

master
Fabio 2024-07-02 17:43:05 -03:00
parent ccc89b34ca
commit fe0221d90c
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.98.0</version> <version>1.98.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.73.0</modelWeb.version> <modelWeb.version>1.73.1</modelWeb.version>
<flyway.version>1.56.0</flyway.version> <flyway.version>1.56.0</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

42
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarContratoController.java
View File

@ -55,8 +55,6 @@ public class EditarContratoController extends MyGenericForwardComposer {
private ContratoCorporativo contrato; private ContratoCorporativo contrato;
private MyListbox contratoList; private MyListbox contratoList;
private ClienteCorporativo cliente;
//Contrato //Contrato
private Textbox txtNumContrato; private Textbox txtNumContrato;
private Datebox datInicial; private Datebox datInicial;
@ -77,13 +75,13 @@ public class EditarContratoController extends MyGenericForwardComposer {
private Checkbox chkExigeExcedente; private Checkbox chkExigeExcedente;
//Cliente //Cliente
private Label lblEmail; private Label lblClienteEmail;
private Label lblTelefone; private Label lblClienteTelefone;
private Label lblLogradouro; private Label lblClienteLogradouro;
private Label lblNumero; private Label lblClienteNumero;
private Label lblCEP; private Label lblClienteCEP;
private Label lblComplemento; private Label lblClienteComplemento;
private Label lblBairro; private Label lblClienteBairro;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -97,9 +95,7 @@ public class EditarContratoController extends MyGenericForwardComposer {
preencheCombo(); preencheCombo();
preencheRadios(); preencheRadios();
preencheCheckBox(); preencheCheckBox();
preencheDadosCliente();
cliente = cmbCliente.getSelectedCliente();
} }
public void onClick$btnSalvar(Event ev) throws InterruptedException { public void onClick$btnSalvar(Event ev) throws InterruptedException {
@ -191,19 +187,23 @@ public class EditarContratoController extends MyGenericForwardComposer {
} }
public void onChange$cmbCliente(Event ev) { public void onChange$cmbCliente(Event ev) {
preencheDadosCliente();
}
private void preencheDadosCliente() {
if( cmbCliente.getSelectedItem() != null ) { if( cmbCliente.getSelectedItem() != null ) {
cliente = cmbCliente.getSelectedCliente(); ClienteCorporativo cliente = cmbCliente.getSelectedCliente();
lblEmail.setValue(cliente.getEmail()); lblClienteEmail.setValue(cliente.getEmail());
lblTelefone.setValue(cliente.getTelefone()); lblClienteTelefone.setValue(cliente.getTelefone());
lblLogradouro.setValue(cliente.getLogradouro()); lblClienteLogradouro.setValue(cliente.getLogradouro());
lblNumero.setValue(cliente.getNumero()); lblClienteNumero.setValue(cliente.getNumero());
lblCEP.setValue(cliente.getCep()); lblClienteCEP.setValue(cliente.getCep());
lblComplemento.setValue(cliente.getComplemento()); lblClienteComplemento.setValue(cliente.getComplemento());
lblBairro.setValue(cliente.getBairro()); lblClienteBairro.setValue(cliente.getBairro());
} }
} }
private void preencheCombo() { private void preencheCombo() {
cmbCliente.setSelectedCliente(contrato.getClienteCorporativoId()); cmbCliente.setSelectedCliente(contrato.getClienteCorporativoId());
cmbRepresentante.setSelectedUsuario(contrato.getUsuarioRepId()); cmbRepresentante.setSelectedUsuario(contrato.getUsuarioRepId());

26
web/gui/configuraciones_comerciales/negcorporativos/editarContrato.zul
View File

@ -45,7 +45,7 @@
<row > <row >
<label value="${c:l('label.grupoContrato')}" /> <label value="${c:l('label.grupoContrato')}" />
<combobox id="cmbGrupo" <combobox id="cmbGrupo"
buttonVisible="true" constraint="no empty" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winEditarContrato$composer.lsGrupo}" model="@{winEditarContrato$composer.lsGrupo}"
mold="rounded" width="95%" /> mold="rounded" width="95%" />
@ -65,19 +65,19 @@
<row> <row>
<label id="lbNumContrato" value="${c:l('label.numContrato')}" /> <label id="lbNumContrato" value="${c:l('label.numContrato')}" />
<longbox id="txtNumContrato" <longbox id="txtNumContrato"
constraint="no negative,no empty" maxlength="9" width="100px" constraint="no negative" maxlength="9" width="100px"
value="@{winEditarContrato$composer.contrato.numContrato}" /> value="@{winEditarContrato$composer.contrato.numContrato}" />
</row> </row>
<row> <row>
<label id="lbValor" value="${c:l('label.valorContrato')}" /> <label id="lbValor" value="${c:l('label.valorContrato')}" />
<decimalbox id="txtValor" maxlength="12" format="0.00" <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}" /> value="@{winEditarContrato$composer.contrato.valorContrato}" />
</row> </row>
<row> <row>
<label id="lbPercentual" value="${c:l('label.percentualBonus')}" /> <label id="lbPercentual" value="${c:l('label.percentualBonus')}" />
<decimalbox id="txtBonus" maxlength="6" format="0.00" <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}" /> value="@{winEditarContrato$composer.contrato.percentualBonus}" />
</row> </row>
<row> <row>
@ -88,7 +88,7 @@
<row > <row >
<label value="${c:l('label.representante')}" /> <label value="${c:l('label.representante')}" />
<combobox id="cmbRepresentante" <combobox id="cmbRepresentante"
buttonVisible="true" constraint="no empty" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxUsuario"
mold="rounded" width="95%" /> mold="rounded" width="95%" />
</row> </row>
@ -176,37 +176,37 @@
<row > <row >
<label value="${c:l('label.clienteCorporativo')}" /> <label value="${c:l('label.clienteCorporativo')}" />
<combobox id="cmbCliente" <combobox id="cmbCliente"
buttonVisible="true" constraint="no empty" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxClienteCorporativo" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxClienteCorporativo"
mold="rounded" width="95%" /> mold="rounded" width="95%" />
</row> </row>
<row> <row>
<label value="${c:l('label.email')}" /> <label value="${c:l('label.email')}" />
<label id="lblEmail" value="@{winEditarContrato$composer.cliente.email}" /> <label id="lblClienteEmail" />
</row> </row>
<row> <row>
<label value="${c:l('label.telefone')}" /> <label value="${c:l('label.telefone')}" />
<label id="lblTelefone" value="@{winEditarContrato$composer.cliente.telefone}" /> <label id="lblClienteTelefone" />
</row> </row>
<row> <row>
<label value="${c:l('label.logradouro')}" /> <label value="${c:l('label.logradouro')}" />
<label id="lblLogradouro" value="@{winEditarContrato$composer.cliente.logradouro}" /> <label id="lblClienteLogradouro" />
</row> </row>
<row> <row>
<label value="${c:l('label.numero')}" /> <label value="${c:l('label.numero')}" />
<label id="lblNumero" value="@{winEditarContrato$composer.cliente.numero}" /> <label id="lblClienteNumero" />
</row> </row>
<row> <row>
<label value="${c:l('label.cep')}" /> <label value="${c:l('label.cep')}" />
<label id="lblCEP" value="@{winEditarContrato$composer.cliente.cep}" /> <label id="lblClienteCEP" />
</row> </row>
<row> <row>
<label value="${c:l('label.complemento')}" /> <label value="${c:l('label.complemento')}" />
<label id="lblComplemento" value="@{winEditarContrato$composer.cliente.complemento}" /> <label id="lblClienteComplemento" />
</row> </row>
<row> <row>
<label value="${c:l('label.bairro')}" /> <label value="${c:l('label.bairro')}" />
<label id="lblBairro" value="@{winEditarContrato$composer.cliente.bairro}" /> <label id="lblClienteBairro" />
</row> </row>
</rows> </rows>