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

Alteração Pricing Mantis 4596. 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@32025 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2013-11-13 13:47:20 +00:00
parent 2ffbee6e22
commit c354ae2951
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
View File

@ -215,9 +215,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
private Button btnNovoOcupaAntecipa; private Button btnNovoOcupaAntecipa;
private Button btnApagarOcupaAntecipa; private Button btnApagarOcupaAntecipa;
private Button btnModificarOcupaAntecipa; private Button btnModificarOcupaAntecipa;
private Button btnNovoAnticipacion;
private Button btnApagarAnticipacion;
private Button btnModificarAnticipacion;
private Button btnNovoTipoServicio; private Button btnNovoTipoServicio;
private Button btnApagarTipoServicio; private Button btnApagarTipoServicio;
private Button btnModificarTipoServicio; private Button btnModificarTipoServicio;
@ -425,82 +422,82 @@ public class EditarPricingController extends MyGenericForwardComposer {
if (pricing.getPricingId() != null) { if (pricing.getPricingId() != null) {
pricing = pricingService.obtenerID(pricing.getPricingId()); pricing = pricingService.obtenerID(pricing.getPricingId());
lsPricingVigencia = pricing.getPricingVigenciaList(buscarPricingInativosAtivos); lsPricingVigencia = pricing.getPricingVigenciaList();
pricingVigenciaList.setData(lsPricingVigencia); pricingVigenciaList.setData(lsPricingVigencia);
if (lsPricingVigencia.size() > 0) { if (lsPricingVigencia.size() > 0) {
pricingVigenciaList.setSelectedIndex(0); pricingVigenciaList.setSelectedIndex(0);
} }
lsPricingImporte = pricing.getPricingImporteList(buscarPricingInativosAtivos); lsPricingImporte = pricing.getPricingImporteList();
pricingImporteList.setData(lsPricingImporte); pricingImporteList.setData(lsPricingImporte);
if (lsPricingImporte.size() > 0) { if (lsPricingImporte.size() > 0) {
pricingImporteList.setSelectedIndex(0); pricingImporteList.setSelectedIndex(0);
} }
lsPricingMarca = pricing.getPricingMarcaList(buscarPricingInativosAtivos); lsPricingMarca = pricing.getPricingMarcaList();
pricingMarcaList.setData(lsPricingMarca); pricingMarcaList.setData(lsPricingMarca);
if (lsPricingMarca.size() > 0) { if (lsPricingMarca.size() > 0) {
pricingMarcaList.setSelectedIndex(0); pricingMarcaList.setSelectedIndex(0);
} }
lsPricingClase = pricing.getPricingClaseList(buscarPricingInativosAtivos); lsPricingClase = pricing.getPricingClaseList();
pricingClaseList.setData(lsPricingClase); pricingClaseList.setData(lsPricingClase);
if (lsPricingClase.size() > 0) { if (lsPricingClase.size() > 0) {
pricingClaseList.setSelectedIndex(0); pricingClaseList.setSelectedIndex(0);
} }
lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList(buscarPricingInativosAtivos); lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList();
pricingOcupaAntecipaList.setData(lsPricingOcupaAntecipa); pricingOcupaAntecipaList.setData(lsPricingOcupaAntecipa);
if (lsPricingOcupaAntecipa.size() > 0) { if (lsPricingOcupaAntecipa.size() > 0) {
pricingOcupaAntecipaList.setSelectedIndex(0); pricingOcupaAntecipaList.setSelectedIndex(0);
} }
lsPricingTipoServicio = pricing.getPricingTipoServicioList(buscarPricingInativosAtivos); lsPricingTipoServicio = pricing.getPricingTipoServicioList();
pricingTipoServicioList.setData(lsPricingTipoServicio); pricingTipoServicioList.setData(lsPricingTipoServicio);
if (lsPricingTipoServicio.size() > 0) { if (lsPricingTipoServicio.size() > 0) {
pricingTipoServicioList.setSelectedIndex(0); pricingTipoServicioList.setSelectedIndex(0);
} }
lsPricingPuntoVenta = pricing.getPricingPuntoventaList(buscarPricingInativosAtivos); lsPricingPuntoVenta = pricing.getPricingPuntoventaList();
pricingPuntoVentaList.setData(lsPricingPuntoVenta); pricingPuntoVentaList.setData(lsPricingPuntoVenta);
if (lsPricingPuntoVenta.size() > 0) { if (lsPricingPuntoVenta.size() > 0) {
pricingPuntoVentaList.setSelectedIndex(0); pricingPuntoVentaList.setSelectedIndex(0);
} }
lsPricingCategoria = pricing.getPricingCategoriaList(buscarPricingInativosAtivos); lsPricingCategoria = pricing.getPricingCategoriaList();
pricingCategoriaList.setData(lsPricingCategoria); pricingCategoriaList.setData(lsPricingCategoria);
if (lsPricingCategoria.size() > 0) { if (lsPricingCategoria.size() > 0) {
pricingCategoriaList.setSelectedIndex(0); pricingCategoriaList.setSelectedIndex(0);
} }
lsPricingRuta = pricing.getPricingRutaList(buscarPricingInativosAtivos); lsPricingRuta = pricing.getPricingRutaList();
pricingRutaList.setData(lsPricingRuta); pricingRutaList.setData(lsPricingRuta);
if (lsPricingRuta.size() > 0) { if (lsPricingRuta.size() > 0) {
pricingRutaList.setSelectedIndex(0); pricingRutaList.setSelectedIndex(0);
} }
lsPricingMercado = pricing.getPricingMercadoList(buscarPricingInativosAtivos); lsPricingMercado = pricing.getPricingMercadoList();
pricingMercadoList.setData(lsPricingMercado); pricingMercadoList.setData(lsPricingMercado);
lsPricingTipoPtoVta = pricing.getPricingTipoptovtaList(buscarPricingInativosAtivos); lsPricingTipoPtoVta = pricing.getPricingTipoptovtaList();
pricingTipoPtoVtaList.setData(lsPricingTipoPtoVta); pricingTipoPtoVtaList.setData(lsPricingTipoPtoVta);
if (lsPricingTipoPtoVta.size() > 0) { if (lsPricingTipoPtoVta.size() > 0) {
pricingTipoPtoVtaList.setSelectedIndex(0); pricingTipoPtoVtaList.setSelectedIndex(0);
} }
lsPricingCorrida = pricing.getPricingCorridaList(buscarPricingInativosAtivos); lsPricingCorrida = pricing.getPricingCorridaList();
pricingCorridaList.setData(lsPricingCorrida); pricingCorridaList.setData(lsPricingCorrida);
lsPricingDia = pricing.getPricingDiaList(buscarPricingInativosAtivos); lsPricingDia = pricing.getPricingDiaList();
pricingDiaList.setData(lsPricingDia); pricingDiaList.setData(lsPricingDia);
lsPricingAsiento = pricing.getPricingAsientoList(buscarPricingInativosAtivos); lsPricingAsiento = pricing.getPricingAsientoList();
pricingAsientoList.setData(lsPricingAsiento); pricingAsientoList.setData(lsPricingAsiento);
lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList(buscarPricingInativosAtivos); lsPricingOcupaAntecipa = pricing.getPricingOcupaAntecipaList();
pricingOcupaAntecipaList.setData(lsPricingOcupaAntecipa); pricingOcupaAntecipaList.setData(lsPricingOcupaAntecipa);
lsPricingTipoServicio = pricing.getPricingTipoServicioList(buscarPricingInativosAtivos); lsPricingTipoServicio = pricing.getPricingTipoServicioList();
pricingTipoServicioList.setData(lsPricingTipoServicio); pricingTipoServicioList.setData(lsPricingTipoServicio);
if (pricing.getIndtransferible() == Boolean.FALSE) { if (pricing.getIndtransferible() == Boolean.FALSE) {
@ -956,7 +953,7 @@ public class EditarPricingController extends MyGenericForwardComposer {
// Se for por porcentage eu desativo todos os importes // Se for por porcentage eu desativo todos os importes
if (radioPor.isChecked()) { if (radioPor.isChecked()) {
pricing = pricingService.obtenerID(pricing.getPricingId()); pricing = pricingService.obtenerID(pricing.getPricingId());
for (PricingImporte pi : pricing.getPricingImporteList(Pricing.ATIVO)) { for (PricingImporte pi : pricing.getPricingImporteList()) {
pricingImporteService.borrar(pi); pricingImporteService.borrar(pi);
} }
} }
@ -1048,7 +1045,7 @@ public class EditarPricingController extends MyGenericForwardComposer {
for (Object o : listPVigencia) { for (Object o : listPVigencia) {
pricing = pricingService.obtenerID(pricing.getPricingId()); pricing = pricingService.obtenerID(pricing.getPricingId());
lsPricingVigencia = pricing.getPricingVigenciaList(Pricing.ATIVO); lsPricingVigencia = pricing.getPricingVigenciaList();
PricingVigencia pVigencia = (PricingVigencia) o; PricingVigencia pVigencia = (PricingVigencia) o;
lsPricingVigencia.remove(pVigencia); lsPricingVigencia.remove(pVigencia);
@ -2065,9 +2062,6 @@ public class EditarPricingController extends MyGenericForwardComposer {
btnNovoOcupaAntecipa.setDisabled(desativar); btnNovoOcupaAntecipa.setDisabled(desativar);
btnApagarOcupaAntecipa.setDisabled(desativar); btnApagarOcupaAntecipa.setDisabled(desativar);
btnModificarOcupaAntecipa.setDisabled(desativar); btnModificarOcupaAntecipa.setDisabled(desativar);
btnNovoAnticipacion.setDisabled(desativar);
btnApagarAnticipacion.setDisabled(desativar);
btnModificarAnticipacion.setDisabled(desativar);
btnNovoTipoServicio.setDisabled(desativar); btnNovoTipoServicio.setDisabled(desativar);
btnApagarTipoServicio.setDisabled(desativar); btnApagarTipoServicio.setDisabled(desativar);
btnModificarTipoServicio.setDisabled(desativar); btnModificarTipoServicio.setDisabled(desativar);

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java
View File

@ -127,7 +127,7 @@ public class EditarPricingCorridaController extends MyGenericForwardComposer {
public void onClick$btnAdicionarCorrida(Event ev) throws Exception { public void onClick$btnAdicionarCorrida(Event ev) throws Exception {
try { try {
List<PricingCorrida> lsPricingViagem = (pricing.getPricingCorridaList(Pricing.ATIVO) == null) ? new ArrayList<PricingCorrida>() : pricing.getPricingCorridaList(Pricing.ATIVO); List<PricingCorrida> lsPricingViagem = (pricing.getPricingCorridaList() == null) ? new ArrayList<PricingCorrida>() : pricing.getPricingCorridaList();
List<Object> ls = corridaList.getSelectedsItens(); List<Object> ls = corridaList.getSelectedsItens();
if (!ls.isEmpty()) { if (!ls.isEmpty()) {
for (Object o : ls) { for (Object o : ls) {

4
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java
View File

@ -54,9 +54,9 @@ public class RenderPricing implements ListitemRenderer {
Integer pricingInativoAtivo = p.getActivo(); Integer pricingInativoAtivo = p.getActivo();
SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm"); SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm");
if (!p.getPricingVigenciaList(pricingInativoAtivo).isEmpty()) { if (!p.getPricingVigenciaList().isEmpty()) {
String data = ""; String data = "";
for (PricingVigencia pv : p.getPricingVigenciaList(pricingInativoAtivo)) { for (PricingVigencia pv : p.getPricingVigenciaList()) {
data = data + dt.format(pv.getFecinicioviaje()) + " a " + dt.format(pv.getFecfinviaje()) + " ou "; data = data + dt.format(pv.getFecinicioviaje()) + " a " + dt.format(pv.getFecfinviaje()) + " ou ";
} }
data = data.substring(0, data.length() - 3); data = data.substring(0, data.length() - 3);