From 1ccb0dc04bcc412a9c31c39aacc8cf8336d4d7cd Mon Sep 17 00:00:00 2001 From: emerson Date: Wed, 8 May 2019 17:57:49 +0000 Subject: [PATCH] =?UTF-8?q?fixes=20bug#0014171=20dev:=20valdir=20qua:=20ma?= =?UTF-8?q?rcelo=20Implementa=C3=A7=C3=A3o=20do=20parametro=20para=20valid?= =?UTF-8?q?a=C3=A7=C3=A3o=20do=20documento=20monitrip.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@93000 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EditarOrgaoConcedenteController.java | 25 +++++++++++++++++++ web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + web/gui/catalogos/editarOrgaoConcedente.zul | 8 +++++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java index a9b9680c2..76637245b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java @@ -19,6 +19,7 @@ import org.zkoss.zul.Checkbox; import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Radio; +import org.zkoss.zul.Row; import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; @@ -31,6 +32,8 @@ import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.ClaseServicioService; import com.rjconsultores.ventaboletos.service.OrgaoCancelacionService; import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEmpresa; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; @@ -112,9 +115,13 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { private List lsOrgaoEmpParam; + private Checkbox chkIndNomDocObligatorio; + private Checkbox chkIndValDocObligatorioMonitrip; private Checkbox chkIndemitesegundavia; private Checkbox chkInddoiscupomembarque; private Checkbox chkIndNaoRestringe2ViaBPe; + + private Row rowIndValDocObligatorioMonitrip; public OrgaoConcedente getOrgaoConcedente() { return orgaoConcedente; @@ -179,7 +186,14 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { } }); + configuraChkIndValDocObligatorioMonitrip(); + } + private void configuraChkIndValDocObligatorioMonitrip() { + chkIndNomDocObligatorio.addEventListener("onClick", new OnClickNomDocObligatorio()); + rowIndValDocObligatorioMonitrip.setVisible(ApplicationProperties.getInstance() + .isCustomHabilitado(CustomEnum.IS_VALIDA_DOCUMENTACAO_MONITRIP.getDescricao())); + chkIndValDocObligatorioMonitrip.setDisabled(chkIndValDocObligatorioMonitrip.isVisible() && !orgaoConcedente.getIndNomDocObligatorio()); } public void onClick$btnSalvar(Event ev) throws InterruptedException { @@ -537,5 +551,16 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { this.txtCodEmpresa = txtCodEmpresa; } + private final class OnClickNomDocObligatorio implements EventListener { + + @Override + public void onEvent(Event arg0) throws Exception { + chkIndValDocObligatorioMonitrip.setDisabled(!(chkIndValDocObligatorioMonitrip.isVisible() && chkIndNomDocObligatorio.isChecked())); + if (chkIndValDocObligatorioMonitrip.isVisible() && !chkIndNomDocObligatorio.isChecked()) { + chkIndValDocObligatorioMonitrip.setChecked(false); + orgaoConcedente.setIndValDocObligatorioMonitrip(false); + } + } + } } \ No newline at end of file diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 98d74528e..09c215417 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5705,6 +5705,7 @@ busquedaOrgaoConcedenteController.btnPesquisa.label = Buscar busquedaOrgaoConcedenteController.indDefaultSeguro.label = Seguro default busquedaOrgaoConcedenteController.indSubSeguro.label = Sub seguro busquedaOrgaoConcedenteController.indNomDocObligatorio.label=Doc. Obligatorio +busquedaOrgaoConcedenteController.indValidaDocObligatorioMonitrip.label=Valida Doc. Obligatorio Monitrip busquedaOrgaoConcedenteController.indicePeaje.label = Índice Peaje busquedaOrgaoConcedenteController.idadeIdoso.label = Edad Estimada de Mayor busquedaOrgaoConcedenteController.indUtilizaICMS.label=Utiliza ICMS para cálculo de preço diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 80d556132..9908846f1 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5951,6 +5951,7 @@ busquedaOrgaoConcedenteController.btnPesquisa.label = Buscar busquedaOrgaoConcedenteController.indDefaultSeguro.label = Seguro Default busquedaOrgaoConcedenteController.indSubSeguro.label = Sub Seguro busquedaOrgaoConcedenteController.indNomDocObligatorio.label=Doc. Obrigatorio +busquedaOrgaoConcedenteController.indValidaDocObligatorioMonitrip.label=Valida Doc. Obrigatória Monitrip busquedaOrgaoConcedenteController.indicePeaje.label = Índice Pedágio busquedaOrgaoConcedenteController.classe.label=Classe busquedaOrgaoConcedenteController.idadeIdoso.label = Idade Considerada Idoso diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul index c91451bcd..a827d935e 100644 --- a/web/gui/catalogos/editarOrgaoConcedente.zul +++ b/web/gui/catalogos/editarOrgaoConcedente.zul @@ -58,9 +58,15 @@ + +