From dc81f8a9fcbe8d675123fcf39b4909d459c73afd Mon Sep 17 00:00:00 2001 From: valdir Date: Tue, 27 Jul 2021 19:35:10 +0000 Subject: [PATCH] 0022356: ESPEC 2021 - Melhorias do pricing especifico SPRINT 2 bug#22356 dev:valdevir qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108040 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../BusquedaPricingEspecificoController.java | 9 ++- .../EditarPricingEspecificoController.java | 40 ++++++++++++ web/WEB-INF/i3-label_es_MX.label | 16 +++++ web/WEB-INF/i3-label_pt_BR.label | 16 +++++ web/gui/pricing/busquedaPricingEspecifico.zul | 3 + web/gui/pricing/editarPricingEspecifico.zul | 65 ++++++++++++++++++- 6 files changed, 145 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingEspecificoController.java index 68ae035c3..7086631f3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingEspecificoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingEspecificoController.java @@ -41,6 +41,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zul.Combobox; import org.zkoss.zul.Datebox; +import org.zkoss.zul.Intbox; import org.zkoss.zul.Paging; import org.zkoss.zul.Textbox; @@ -84,6 +85,7 @@ public class BusquedaPricingEspecificoController extends MyGenericForwardCompose private Datebox fechaInicio; private Datebox fechaFin; private Textbox txtNombrePricing; + private Intbox txtCodigoServico; @Override public void doAfterCompose(Component comp) throws Exception { @@ -157,7 +159,7 @@ public class BusquedaPricingEspecificoController extends MyGenericForwardCompose } if (tipoPuntoVenta != null) { - pricingSearch.addFilterEqual("tipoPtovta", tipoPuntoVenta); + pricingSearch.addFilterEqual("pricingEspecificoCanalVendasList.tipoPtovta", tipoPuntoVenta); } if (marca != null) { @@ -180,6 +182,11 @@ public class BusquedaPricingEspecificoController extends MyGenericForwardCompose pricingSearch.addFilterILike("nombPricing", "%" + nomePricing + "%"); } + Integer codServico = txtCodigoServico.getValue(); + if (codServico != null) { + pricingSearch.addFilterEqual("corridaId", codServico); + } + pricingSearch.addSortAsc("nombPricing"); plwPricingEspecifico.init(pricingSearch, pricingList, pagingPricing); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java index 4be7d94d2..58f04235d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java @@ -25,6 +25,7 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zul.Button; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Combobox; import org.zkoss.zul.Datebox; import org.zkoss.zul.Radio; @@ -136,6 +137,19 @@ public class EditarPricingEspecificoController extends PricingController { private List pricingEspecificoADesativarCategoria; private List pricingEspecificoADesativarCanal; + + private Datebox inicioDataViagem; + private Datebox fimDataViagem; + private Datebox inicioDataVenda; + private Datebox fimDataVenda; + + private Checkbox chkDomingo; + private Checkbox chkSegunda; + private Checkbox chkTerca; + private Checkbox chkQuarta; + private Checkbox chkQuinta; + private Checkbox chkSexta; + private Checkbox chkSabado; @Override public void doAfterCompose(Component comp) throws Exception { @@ -188,10 +202,22 @@ public class EditarPricingEspecificoController extends PricingController { pricingListEspCanal.setData(pricingEspecifico.getPricingEspecificoCanalListActivos()); pricingListEspCategoria.setData(pricingEspecifico.getPricingEspecificoCategoriaList()); } + + atualizarDiasSemana(); fechaInicio.focus(); } + private void atualizarDiasSemana() { + chkDomingo.setChecked(pricingEspecifico.getDomingo()); + chkSegunda.setChecked(pricingEspecifico.getSegunda()); + chkTerca.setChecked(pricingEspecifico.getTerca()); + chkQuarta.setChecked(pricingEspecifico.getQuarta()); + chkQuinta.setChecked(pricingEspecifico.getQuinta()); + chkSexta.setChecked(pricingEspecifico.getSexta()); + chkSabado.setChecked(pricingEspecifico.getSabado()); + } + public void verPricingEspecificoOcupacion(PricingEspecificoOcupacion especificoOcupacion, Boolean isEdicao) { Map args = new HashMap(); @@ -500,6 +526,10 @@ public class EditarPricingEspecificoController extends PricingController { fechaInicio.getValue(); fechaFin.getValue(); tarifaAbierto.getValue(); + inicioDataViagem.getValue(); + fimDataViagem.getValue(); + inicioDataVenda.getValue(); + fimDataVenda.getValue(); List pricingEspecificoOcupacionList = new ArrayList(); for (Object o : pricingListEspOcupacion.getData()) { @@ -607,11 +637,21 @@ public class EditarPricingEspecificoController extends PricingController { return; } + if (rdExibirVendaSi.isChecked()) { pricingEspecifico.setExibeVenda(Boolean.TRUE); } else { pricingEspecifico.setExibeVenda(Boolean.FALSE); } + + pricingEspecifico.setDomingo(chkDomingo.isChecked()); + pricingEspecifico.setSegunda(chkSegunda.isChecked()); + pricingEspecifico.setTerca(chkTerca.isChecked()); + pricingEspecifico.setQuarta(chkQuarta.isChecked()); + pricingEspecifico.setQuinta(chkQuinta.isChecked()); + pricingEspecifico.setSexta(chkSexta.isChecked()); + pricingEspecifico.setSabado(chkSabado.isChecked()); + if (pricingEspecifico.getCorridaId() != null) { CorridaCtrl corridaCtrlId = corridaCtrlService.obtenerID(pricingEspecifico.getCorridaId()); if (corridaCtrlId == null) { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 76eeeac3b..5e24b1ef0 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -3558,6 +3558,7 @@ editarPricingController.windowImporte.title = Valor editarPricingController.windowMarca.title = Marca editarPricingController.windowClase.title = Tipo clase editarPricingController.windowTipoServicio.title = Tipo clase +editarPricingController.windowCodServico.title = Cod. Servicio editarPricingController.windowFormaPago.title = Forma de Pago editarPricingController.windowPuntoVenta.title = Punto de venta editarPricingController.windowTipoPtoVta.title = Canal venta @@ -3599,6 +3600,21 @@ editarPricingController.lhFechaHoraInicio.label = Fecha y hora início editarPricingController.lhFechaHoraInicioLH.label = Fecha início editarPricingController.lhFechaHoraFin.label = Fecha y hora fin editarPricingController.lhFechaHoraFin.labelLH = Fecha fin + +editarPricingController.lhdataInicioViagem.label= Data Início Viagem +editarPricingController.lhdataFimViagem.label= Data Fim Viagem +editarPricingController.lhdataInicioVenda.label= Data Início Venda +editarPricingController.lhdataFimVenda.label= Data Fim Venda + +editarPricingController.lhDiaDaSemana.label= Dias da Semana +editarPricingController.lhDomingo.label= Dom +editarPricingController.lhSegunda.label= Seg +editarPricingController.lhTerca.label= Ter +editarPricingController.lhQuarta.label= Qua +editarPricingController.lhQuinta.label= Qui +editarPricingController.lhSexta.label= Sex +editarPricingController.lhSabado.label= Sab + editarPricingController.lhPorcSen.label = Porcentaje ida editarPricingController.lhPorcRed.label = Porcentaje viaje ida y regreso editarPricingController.lhCantDias.label = Días de anticipación diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index f3e801157..9b0bde95b 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -3849,6 +3849,7 @@ editarPricingController.windowImporte.title = Valor editarPricingController.windowMarca.title = Marca editarPricingController.windowClase.title = Tipo Classe editarPricingController.windowTipoServicio.title = Tipo Classe +editarPricingController.windowCodServico.title = Cod. Serviço editarPricingController.windowFormaPago.title = Forma de Pagamento editarPricingController.windowPuntoVenta.title = Ponto Venda editarPricingController.windowTipoPtoVta.title = Canal Venda @@ -3891,6 +3892,21 @@ editarPricingController.lhFechaHoraInicio.label = Data e Hora Início editarPricingController.lhFechaHoraInicioLH.label = Data Início editarPricingController.lhFechaHoraFin.label = Data e Hora Fim editarPricingController.lhFechaHoraFin.labelLH = Data Fim + +editarPricingController.lhdataInicioViagem.label= Início Data Viagem +editarPricingController.lhdataFimViagem.label= Fim Data Viagem +editarPricingController.lhdataInicioVenda.label= Início Data Venda +editarPricingController.lhdataFimVenda.label= Fim Data Venda + +editarPricingController.lhDiaDaSemana.label= Dias da Semana +editarPricingController.lhDomingo.label= Dom +editarPricingController.lhSegunda.label= Seg +editarPricingController.lhTerca.label= Ter +editarPricingController.lhQuarta.label= Qua +editarPricingController.lhQuinta.label= Qui +editarPricingController.lhSexta.label= Sex +editarPricingController.lhSabado.label= Sab + editarPricingController.lhPorcSen.label = Porcentagem Ida editarPricingController.lhPorcRed.label = Porcentagem Viagem Ida e Volta editarPricingController.lhCantDias.label = Dias de Antecipação diff --git a/web/gui/pricing/busquedaPricingEspecifico.zul b/web/gui/pricing/busquedaPricingEspecifico.zul index 51706adaa..57c62e030 100644 --- a/web/gui/pricing/busquedaPricingEspecifico.zul +++ b/web/gui/pricing/busquedaPricingEspecifico.zul @@ -74,6 +74,9 @@ + +