From 9d1a4f25fbdb9713d119685b4bd7717056a11f3e Mon Sep 17 00:00:00 2001 From: thiago Date: Mon, 17 Jul 2017 20:27:39 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#9293=20-=20Cadastro=20de=20param?= =?UTF-8?q?etro=20para=20permiss=C3=A3o=20de=20cobran=C3=A7as(multa,=20dif?= =?UTF-8?q?eren=C3=A7a=20maior=20e=20diferen=C3=A7a=20menor)=20em=20remarc?= =?UTF-8?q?a=C3=A7=C3=A3o(Transferencia).?= 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@71453 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EditarOrgaoConcedenteController.java | 115 +++++++++++++++++- .../render/RenderOrgaoCancelacion.java | 21 +++- web/WEB-INF/i3-label_es_MX.label | 5 + web/WEB-INF/i3-label_pt_BR.label | 6 + web/gui/catalogos/editarOrgaoConcedente.zul | 50 ++++++-- 5 files changed, 178 insertions(+), 19 deletions(-) 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 45fd52872..d1448858e 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 @@ -15,6 +15,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Checkbox; import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; +import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; @@ -51,7 +52,7 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { @Autowired private ClaseServicioService claseServicioService; - + @Autowired private CategoriaService categoriaService; @@ -76,11 +77,20 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { private List lsOrgaoCancelacion; private List lsClasseIndicePeajes; - + private Combobox cmbCategoria; - + private List lsCategorias; + private Radio radMultaTransferenciaSim; + private Radio radMultaTransferenciaNao; + + private Radio radDevolucaoTransferenciaSim; + private Radio radDevolucaoTransferenciaNao; + + private Radio radCobrancaTransferenciaSim; + private Radio radCobrancaTransferenciaNao; + public OrgaoConcedente getOrgaoConcedente() { return orgaoConcedente; } @@ -109,9 +119,9 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { txtIndicePeaje.setValue(orgaoConcedente.getIndicePeaje() != null ? orgaoConcedente.getIndicePeaje().toString().replace(".", ",") : ""); txtNome.focus(); - + lsCategorias = categoriaService.obtenerTodasCategoriasVisibles(); - + } public void onClick$btnSalvar(Event ev) throws InterruptedException { @@ -169,6 +179,9 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { oc.setFecmodif(Calendar.getInstance().getTime()); oc.setTiempolimite(new Integer(txtTiempoLimite.getValue())); oc.setIndnaopermitetransferencia(chkIndnaopermitetransferencia.isChecked()); + oc.setIndMultaTransferencia(radMultaTransferenciaSim.isChecked()); + oc.setIndDevolucaoTransferencia(radDevolucaoTransferenciaSim.isChecked()); + oc.setIndCobrancaTransferencia(radCobrancaTransferenciaSim.isChecked()); if (StringUtils.isNotBlank(txtTiempoLimiteCambio.getValue())) { oc.setTiempolimiteCambio(new Integer(txtTiempoLimiteCambio.getValue())); @@ -271,5 +284,95 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer { public void setLsCategorias(List lsCategorias) { this.lsCategorias = lsCategorias; } - + + /** + * @return the radMultaTransferenciaSim + */ + public Radio getRadMultaTransferenciaSim() { + return radMultaTransferenciaSim; + } + + /** + * @param radMultaTransferenciaSim + * the radMultaTransferenciaSim to set + */ + public void setRadMultaTransferenciaSim(Radio radMultaTransferenciaSim) { + this.radMultaTransferenciaSim = radMultaTransferenciaSim; + } + + /** + * @return the radMultaTransferenciaNao + */ + public Radio getRadMultaTransferenciaNao() { + return radMultaTransferenciaNao; + } + + /** + * @param radMultaTransferenciaNao + * the radMultaTransferenciaNao to set + */ + public void setRadMultaTransferenciaNao(Radio radMultaTransferenciaNao) { + this.radMultaTransferenciaNao = radMultaTransferenciaNao; + } + + /** + * @return the radDevolucaoTransferenciaSim + */ + public Radio getRadDevolucaoTransferenciaSim() { + return radDevolucaoTransferenciaSim; + } + + /** + * @param radDevolucaoTransferenciaSim + * the radDevolucaoTransferenciaSim to set + */ + public void setRadDevolucaoTransferenciaSim(Radio radDevolucaoTransferenciaSim) { + this.radDevolucaoTransferenciaSim = radDevolucaoTransferenciaSim; + } + + /** + * @return the radDevolucaoTransferenciaNao + */ + public Radio getRadDevolucaoTransferenciaNao() { + return radDevolucaoTransferenciaNao; + } + + /** + * @param radDevolucaoTransferenciaNao + * the radDevolucaoTransferenciaNao to set + */ + public void setRadDevolucaoTransferenciaNao(Radio radDevolucaoTransferenciaNao) { + this.radDevolucaoTransferenciaNao = radDevolucaoTransferenciaNao; + } + + /** + * @return the radCobrancaTransferenciaSim + */ + public Radio getRadCobrancaTransferenciaSim() { + return radCobrancaTransferenciaSim; + } + + /** + * @param radCobrancaTransferenciaSim + * the radCobrancaTransferenciaSim to set + */ + public void setRadCobrancaTransferenciaSim(Radio radCobrancaTransferenciaSim) { + this.radCobrancaTransferenciaSim = radCobrancaTransferenciaSim; + } + + /** + * @return the radCobrancaTransferenciaNao + */ + public Radio getRadCobrancaTransferenciaNao() { + return radCobrancaTransferenciaNao; + } + + /** + * @param radCobrancaTransferenciaNao + * the radCobrancaTransferenciaNao to set + */ + public void setRadCobrancaTransferenciaNao(Radio radCobrancaTransferenciaNao) { + this.radCobrancaTransferenciaNao = radCobrancaTransferenciaNao; + } + } \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java index 0cb651c49..258bab4fb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java @@ -11,7 +11,8 @@ import com.rjconsultores.ventaboletos.entidad.OrgaoCancelacion; public class RenderOrgaoCancelacion implements ListitemRenderer { - public void render(Listitem lstm, Object o) throws Exception { + @Override + public void render(Listitem lstm, Object o) throws Exception { OrgaoCancelacion orgaoCancelacion = (OrgaoCancelacion) o; DecimalFormat df = new DecimalFormat("#0.00"); @@ -21,7 +22,7 @@ public class RenderOrgaoCancelacion implements ListitemRenderer { lc = new Listcell(df.format(orgaoCancelacion.getPorcmulta())); lc.setParent(lstm); lc.setStyle("text-align:right"); - + lc = new Listcell(df.format(orgaoCancelacion.getPorccambio())); lc.setParent(lstm); lc.setStyle("text-align:right"); @@ -37,11 +38,23 @@ public class RenderOrgaoCancelacion implements ListitemRenderer { lc = new Listcell(orgaoCancelacion.getTiempolimiteCambio() != null ? orgaoCancelacion.getTiempolimiteCambio().toString() : ""); lc.setParent(lstm); lc.setStyle("text-align:right"); - + lc = new Listcell(orgaoCancelacion.getPorcCambioEmbarcado() != null ? df.format(orgaoCancelacion.getPorcCambioEmbarcado()): ""); lc.setParent(lstm); lc.setStyle("text-align:right"); - + + lc = new Listcell(orgaoCancelacion.getIndMultaTransferencia() != null && orgaoCancelacion.getIndMultaTransferencia() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO")); + lc.setParent(lstm); + lc.setStyle("text-align:center"); + + lc = new Listcell(orgaoCancelacion.getIndDevolucaoTransferencia() != null && orgaoCancelacion.getIndDevolucaoTransferencia() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO")); + lc.setParent(lstm); + lc.setStyle("text-align:center"); + + lc = new Listcell(orgaoCancelacion.getIndCobrancaTransferencia() != null && orgaoCancelacion.getIndCobrancaTransferencia() ? Labels.getLabel("MSG.SI") : Labels.getLabel("MSG.NO")); + lc.setParent(lstm); + lc.setStyle("text-align:center"); + lstm.setAttribute("data", orgaoCancelacion); } } diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index e7c9d6d9a..5aa379e6e 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -5339,6 +5339,11 @@ editarOrgaoConcedenteController.tiempoLimite.label=Tiempo Limite Embarcado editarOrgaoConcedenteController.tiempoLimiteCambio.label=Tiempo Limite Cambio editarOrgaoConcedenteController.indnaopermitetransferencia.label=No Permite Cambio editarOrgaoConcedenteController.MSG.indicePeajeZeroInvalido = El Índice de Peaje no puede ser igual a cero +editarOrgaoConcedenteController.si.label=SI +editarOrgaoConcedenteController.no.label=NO +editarOrgaoConcedenteController.indMultaTransferencia.label=Cambio misma corrida - Multa +editarOrgaoConcedenteController.indDevolucaoTransferencia.label=Cambio misma corrida - Devolver Diferenza +editarOrgaoConcedenteController.indCobrancaTransferencia.label=Cambio misma corrida - Cobrar Diferenza # Busqueda Indice Tarifa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 6823b05a3..33b46b09b 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -5404,6 +5404,12 @@ editarOrgaoConcedenteController.tiempoLimite.label=Tempo Limite Embarcado editarOrgaoConcedenteController.tiempoLimiteCambio.label=Tempo Limite Troca editarOrgaoConcedenteController.indnaopermitetransferencia.label=Não Permite Transferência editarOrgaoConcedenteController.MSG.indicePeajeZeroInvalido = O Índice do pedágio não pode ser igual à zero +editarOrgaoConcedenteController.si.label=SIM +editarOrgaoConcedenteController.no.label=NÃO +editarOrgaoConcedenteController.indMultaTransferencia.label=Remarcação mesmo serviço - Multa +editarOrgaoConcedenteController.indDevolucaoTransferencia.label=Remarcação mesmo serviço - Devolver Diferença +editarOrgaoConcedenteController.indCobrancaTransferencia.label=Remarcação mesmo serviço - Cobrar Diferença + # Busqueda Coeficiente Tarifa diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul index f0a42a0b0..b6f7a83e6 100644 --- a/web/gui/catalogos/editarOrgaoConcedente.zul +++ b/web/gui/catalogos/editarOrgaoConcedente.zul @@ -6,8 +6,8 @@ @@ -180,6 +180,32 @@ width="60%" maxlength="60" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" /> + + + + + + @@ -205,19 +231,25 @@ multiple="false"> + label="${c:l('editarOrgaoConcedenteController.empresa.label')}" width="100px"/> + label="${c:l('editarOrgaoConcedenteController.porcMulta.label')}" width="120px" /> + label="${c:l('editarOrgaoConcedenteController.porcCambio.label')}" width="130px" /> + label="${c:l('editarOrgaoConcedenteController.tiempoLimite.label')}" width="170px" /> + label="${c:l('editarOrgaoConcedenteController.indnaopermitetransferencia.label')}" width="170px" /> + label="${c:l('editarOrgaoConcedenteController.tiempoLimiteCambio.label')}" width="130px" /> + label="${c:l('editarOrgaoConcedenteController.porcCambioEmbarcado.label')}" width="160px" /> + + +