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

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
master
valdir 2021-07-27 19:35:10 +00:00
parent aafb615963
commit dc81f8a9fc
6 changed files with 145 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingEspecificoController.java
View File

@ -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);

40
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
View File

@ -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;
@ -137,6 +138,19 @@ public class EditarPricingEspecificoController extends PricingController {
private List<PricingEspecificoCanalVendas> 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 {
lsCategoria = getCategoriaService().obtenerTodos();
@ -189,9 +203,21 @@ public class EditarPricingEspecificoController extends PricingController {
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<PricingEspecificoOcupacion> pricingEspecificoOcupacionList = new ArrayList<PricingEspecificoOcupacion>();
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) {

16
web/WEB-INF/i3-label_es_MX.label
View File

@ -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

16
web/WEB-INF/i3-label_pt_BR.label
View File

@ -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

3
web/gui/pricing/busquedaPricingEspecifico.zul
View File

@ -74,6 +74,9 @@
<combobox id="cmbTipoServicio" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
mold="rounded" buttonVisible="true" width="90%"
model="@{winBusquedaPricingEspecifico$composer.lsClaseServicio}"/>
<label value="${c:l('editarPricingController.windowCodServico.title')}"/>
<intbox id="txtCodigoServico" width="90%" />
</row>
</rows>
</grid>

65
web/gui/pricing/editarPricingEspecifico.zul
View File

@ -9,7 +9,7 @@
<window id="winEditarPricingEspecifico" border="normal"
apply="${editarPricingEspecificoController}" width="600px"
contentStyle="overflow:auto"
title="${c:l('editarPricingController.window.title')}">
title="${c:l('editarPricingController.window.title')}" sizable="true">
<toolbar>
<hbox spacing="5px" style="padding:1px" align="right">
@ -51,8 +51,8 @@
<tabpanel>
<grid>
<columns>
<column width="40%" />
<column width="60%" />
<column width="30%" />
<column width="70%" />
</columns>
<rows>
<row>
@ -79,6 +79,65 @@
format="dd/MM/yyyy HH:mm" mold="rounded" />
</row>
<row>
<label
value="${c:l('editarPricingController.lhdataInicioViagem.label')}" />
<datebox width="200px" id="inicioDataViagem"
value="@{winEditarPricingEspecifico$composer.pricingEspecifico.dataInicioViagem}"
format="dd/MM/yyyy HH:mm" mold="rounded" />
</row>
<row>
<label
value="${c:l('editarPricingController.lhdataFimViagem.label')}" />
<datebox width="200px" id="fimDataViagem"
value="@{winEditarPricingEspecifico$composer.pricingEspecifico.dataFimViagem}"
format="dd/MM/yyyy HH:mm" mold="rounded" />
</row>
<row>
<label
value="${c:l('editarPricingController.lhdataInicioVenda.label')}" />
<datebox width="200px" id="inicioDataVenda"
value="@{winEditarPricingEspecifico$composer.pricingEspecifico.dataInicioVenda}"
format="dd/MM/yyyy HH:mm" mold="rounded" />
</row>
<row>
<label
value="${c:l('editarPricingController.lhdataFimVenda.label')}" />
<datebox width="200px" id="fimDataVenda"
value="@{winEditarPricingEspecifico$composer.pricingEspecifico.dataFimVenda}"
format="dd/MM/yyyy HH:mm" mold="rounded" />
</row>
<row >
<label value="${c:l('editarPricingController.lhDiaDaSemana.label')}" />
<hlayout>
<label value="${c:l('editarPricingController.lhDomingo.label')}" />
<checkbox id="chkDomingo"/>
<label value="${c:l('editarPricingController.lhSegunda.label')}" />
<checkbox id="chkSegunda"/>
<label value="${c:l('editarPricingController.lhTerca.label')}" />
<checkbox id="chkTerca"/>
<label value="${c:l('editarPricingController.lhQuarta.label')}" />
<checkbox id="chkQuarta"/>
<label value="${c:l('editarPricingController.lhQuinta.label')}" />
<checkbox id="chkQuinta"/>
<label value="${c:l('editarPricingController.lhSexta.label')}" />
<checkbox id="chkSexta"/>
<label value="${c:l('editarPricingController.lhSabado.label')}" />
<checkbox id="chkSabado"/>
</hlayout>
</row>
<row>
<label
value="${c:l('editarPricingController.lhCorridaId.labelLH')}" />