rodrigo 2013-07-10 14:26:21 +00:00
parent b0ab6441af
commit 369102e551
24 changed files with 3535 additions and 3363 deletions

View File

@ -87,7 +87,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/CustomAdmVenta"/> <classpathentry combineaccessrules="false" kind="src" path="/CustomAdmVenta"/>
<classpathentry combineaccessrules="false" kind="src" path="/modelWeb"/> <classpathentry combineaccessrules="false" kind="src" path="/modelWeb"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/groovy-all-1.7.5.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/groovy-all-1.7.5.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-4.5.0.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/jfreechart-1.0.12.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/jfreechart-1.0.12.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/poi-3.8-20120326.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/poi-3.8-20120326.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/poi-ooxml-3.8-20120326.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/poi-ooxml-3.8-20120326.jar"/>

View File

@ -19,6 +19,7 @@ import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox; import org.zkoss.zul.Combobox;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
@ -28,7 +29,6 @@ import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.PricingService; import com.rjconsultores.ventaboletos.service.PricingService;
import com.rjconsultores.ventaboletos.service.UsuarioEmpresaService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
@ -44,14 +44,13 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricing;
@Scope("prototype") @Scope("prototype")
public class BusquedaPricingController extends MyGenericForwardComposer { public class BusquedaPricingController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired @Autowired
private transient PagedListWrapper<Pricing> plwPricingPunto; private transient PagedListWrapper<Pricing> plwPricingPunto;
@Autowired @Autowired
private PricingService pricingService; private PricingService pricingService;
@Autowired @Autowired
private EmpresaService empresaService; private EmpresaService empresaService;
@Autowired
private UsuarioEmpresaService usuarioEmpresaService;
private MyListbox pricingList; private MyListbox pricingList;
private Paging pagingPricing; private Paging pagingPricing;
private List<Pricing> lsPricing; private List<Pricing> lsPricing;
@ -60,178 +59,9 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
private Textbox txtNome; private Textbox txtNome;
private Datebox fechaInicio; private Datebox fechaInicio;
private Datebox fechaFin; private Datebox fechaFin;
private Checkbox chkBuscarInativos;
private static Logger log = Logger.getLogger(BusquedaPricingController.class); private static Logger log = Logger.getLogger(BusquedaPricingController.class);
@Override
public void doAfterCompose(Component comp) throws Exception {
lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
super.doAfterCompose(comp);
pricingList.setItemRenderer(new RenderPricing());
pricingList.addEventListener("onDoubleClick", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
Pricing pricing = (Pricing) pricingList.getSelected();
verPricing(pricing);
}
});
lsPricing = new ArrayList<Pricing>();
refreshLista();
}
public void onClick$btnPesquisa(Event ev) throws InterruptedException {
refreshLista();
}
public void onClick$btnRefresh(Event ev) {
refreshLista();
}
public void onClick$btnNovo(Event ev) {
verPricing(new Pricing());
}
private void refreshLista() {
Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa
.getSelectedItem().getValue() : null);
HibernateSearchObject<Pricing> pricingSearch = new HibernateSearchObject<Pricing>(
Pricing.class, pagingPricing.getPageSize());
if (empresa != null) {
pricingSearch.addFilterEqual("empresa", empresa);
}else{
pricingSearch.addFilterIn("empresa", lsEmpresa);
}
if (!txtNome.getValue().isEmpty()) {
pricingSearch.addFilterILike("nombPricing", txtNome.getValue()
+ "%");
}
Calendar calendar = Calendar.getInstance();
Calendar calendar1 = Calendar.getInstance();
if((fechaInicio.getValue() != null)&&(fechaFin.getValue() != null)){
calendar.setTime(fechaInicio.getValue());
calendar.set(Calendar.HOUR_OF_DAY,0);
calendar.set(Calendar.MINUTE,0);
calendar.set(Calendar.SECOND,0);
calendar.set(Calendar.MILLISECOND,0);
calendar1.setTime(fechaFin.getValue());
calendar1.set(Calendar.HOUR_OF_DAY,23);
calendar1.set(Calendar.MINUTE,59);
calendar1.set(Calendar.SECOND,59);
calendar1.set(Calendar.MILLISECOND,999);
pricingSearch.addFilterGreaterOrEqual("pricingVigenciaList.fecinicioviaje", calendar.getTime());
pricingSearch.addFilterLessOrEqual("pricingVigenciaList.fecfinviaje",calendar1.getTime());
}else{
if (fechaInicio.getValue() != null){
calendar.setTime(fechaInicio.getValue());
calendar.set(Calendar.HOUR_OF_DAY,0);
calendar.set(Calendar.MINUTE,0);
calendar.set(Calendar.SECOND,0);
calendar1.setTime(fechaInicio.getValue());
calendar1.set(Calendar.HOUR_OF_DAY,23);
calendar1.set(Calendar.MINUTE,59);
calendar1.set(Calendar.SECOND,59);
pricingSearch.addFilterGreaterThan("pricingVigenciaList.fecinicioviaje", calendar.getTime()).addFilterLessThan("pricingVigenciaList.fecinicioviaje",calendar1.getTime());
}else if (fechaFin.getValue() != null){
calendar.setTime(fechaFin.getValue());
calendar.set(Calendar.HOUR_OF_DAY,0);
calendar.set(Calendar.MINUTE,0);
calendar.set(Calendar.SECOND,0);
calendar1.setTime(fechaFin.getValue());
calendar1.set(Calendar.HOUR_OF_DAY,23);
calendar1.set(Calendar.MINUTE,59);
calendar1.set(Calendar.SECOND,59);
pricingSearch.addFilterGreaterThan("pricingVigenciaList.fecfinviaje",calendar.getTime()).addFilterLessThan("pricingVigenciaList.fecfinviaje",calendar1.getTime());
}
}
pricingSearch.addFilterEqual("activo", Boolean.TRUE);
pricingSearch.addSortAsc("nombPricing");
pricingSearch.addFetch("pricingVigenciaList");
plwPricingPunto.init(pricingSearch, pricingList, pagingPricing);
if (pricingList.getData().length == 0) {
try {
Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels
.getLabel("busquedaPricingController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException ex) {
}
}
}
private void verPricing(Pricing pricing) {
if (pricing == null) {
return;
}
Map args = new HashMap();
args.put("pricing", pricing);
args.put("gravarNovo", pricing.getPricingId() == null);
args.put("pricingList", pricingList);
openWindow("/gui/pricing/editarPricing.zul",
Labels.getLabel("editarPricingController.window.title"), args,
MODAL);
}
public void onClick$btnApagar(Event ev) {
try {
Pricing p = (Pricing) pricingList.getSelected();
if (p != null) {
int resp = Messagebox
.show(Labels
.getLabel("editarPricingController.MSG.borrarPergunta"),
Labels.getLabel("busquedaPricingController.window.title"),
Messagebox.YES | Messagebox.NO,
Messagebox.QUESTION);
if (resp == Messagebox.YES) {
pricingService.borrar(p);
Messagebox
.show(Labels
.getLabel("editarPricingController.MSG.borrarOK"),
Labels.getLabel("busquedaPricingController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
pricingList.removeItem(p);
}
} else {
Messagebox
.show(Labels
.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("busquedaPricingController.window.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error("Erro ao eliminar Pricing: " + ex);
}
}
public List<Pricing> getLsPricing() { public List<Pricing> getLsPricing() {
return lsPricing; return lsPricing;
} }
@ -248,14 +78,6 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
this.pagingPricing = pagingPricing; this.pagingPricing = pagingPricing;
} }
public PagedListWrapper<Pricing> getPlwPricingPunto() {
return plwPricingPunto;
}
public void setPlwPricingPunto(PagedListWrapper<Pricing> plwPricingPunto) {
this.plwPricingPunto = plwPricingPunto;
}
public MyListbox getPricingList() { public MyListbox getPricingList() {
return pricingList; return pricingList;
} }
@ -312,5 +134,162 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
this.fechaFin = fechaFin; this.fechaFin = fechaFin;
} }
@Override
public void doAfterCompose(Component comp) throws Exception {
lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
super.doAfterCompose(comp);
pricingList.setItemRenderer(new RenderPricing());
pricingList.addEventListener("onDoubleClick", new EventListener() {
@Override
public void onEvent(Event event) throws Exception {
Pricing pricing = (Pricing) pricingList.getSelected();
verPricing(pricing);
}
});
lsPricing = new ArrayList<Pricing>();
refreshLista();
}
public void onClick$btnPesquisa(Event ev) throws InterruptedException {
refreshLista();
}
public void onClick$btnRefresh(Event ev) {
refreshLista();
}
public void onClick$btnNovo(Event ev) {
verPricing(new Pricing());
}
private void refreshLista() {
Empresa empresa = (Empresa) (cmbEmpresa.getSelectedItem() != null ? cmbEmpresa.getSelectedItem().getValue() : null);
HibernateSearchObject<Pricing> pricingSearch = new HibernateSearchObject<Pricing>(
Pricing.class, pagingPricing.getPageSize());
if (empresa != null) {
pricingSearch.addFilterEqual("empresa", empresa);
} else {
pricingSearch.addFilterIn("empresa", lsEmpresa);
}
if (!txtNome.getValue().isEmpty()) {
pricingSearch.addFilterILike("nombPricing", txtNome.getValue() + "%");
}
Calendar calendar = Calendar.getInstance();
Calendar calendar1 = Calendar.getInstance();
if ((fechaInicio.getValue() != null) && (fechaFin.getValue() != null)) {
calendar.setTime(fechaInicio.getValue());
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
calendar1.setTime(fechaFin.getValue());
calendar1.set(Calendar.HOUR_OF_DAY, 23);
calendar1.set(Calendar.MINUTE, 59);
calendar1.set(Calendar.SECOND, 59);
calendar1.set(Calendar.MILLISECOND, 999);
pricingSearch.addFilterGreaterOrEqual("pricingVigenciaList.fecinicioviaje", calendar.getTime());
pricingSearch.addFilterLessOrEqual("pricingVigenciaList.fecfinviaje", calendar1.getTime());
} else {
if (fechaInicio.getValue() != null) {
calendar.setTime(fechaInicio.getValue());
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar1.setTime(fechaInicio.getValue());
calendar1.set(Calendar.HOUR_OF_DAY, 23);
calendar1.set(Calendar.MINUTE, 59);
calendar1.set(Calendar.SECOND, 59);
pricingSearch.addFilterGreaterThan("pricingVigenciaList.fecinicioviaje", calendar.getTime()).addFilterLessThan("pricingVigenciaList.fecinicioviaje", calendar1.getTime());
} else if (fechaFin.getValue() != null) {
calendar.setTime(fechaFin.getValue());
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar1.setTime(fechaFin.getValue());
calendar1.set(Calendar.HOUR_OF_DAY, 23);
calendar1.set(Calendar.MINUTE, 59);
calendar1.set(Calendar.SECOND, 59);
pricingSearch.addFilterGreaterThan("pricingVigenciaList.fecfinviaje", calendar.getTime()).addFilterLessThan("pricingVigenciaList.fecfinviaje", calendar1.getTime());
}
}
Boolean buscarInativos = chkBuscarInativos.isChecked();
if (buscarInativos) {
pricingSearch.addFilterEqual("activo", Pricing.INATIVO);
} else {
pricingSearch.addFilterEqual("activo", Pricing.ATIVO);
}
pricingSearch.addSortAsc("nombPricing");
pricingSearch.addFetch("pricingVigenciaList");
plwPricingPunto.init(pricingSearch, pricingList, pagingPricing);
if (pricingList.getData().length == 0) {
try {
Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels
.getLabel("busquedaPricingController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException ex) {
}
}
}
@SuppressWarnings({ "rawtypes", "unchecked" })
private void verPricing(Pricing pricing) {
if (pricing == null) {
return;
}
Map args = new HashMap();
args.put("pricing", pricing);
args.put("gravarNovo", pricing.getPricingId() == null);
args.put("pricingList", pricingList);
args.put("buscarPricingInativosAtivos", chkBuscarInativos.isChecked() ? Pricing.INATIVO : Pricing.ATIVO);
openWindow("/gui/pricing/editarPricing.zul",
Labels.getLabel("editarPricingController.window.title"), args, MODAL);
}
public void onClick$btnApagar(Event ev) {
try {
Pricing p = (Pricing) pricingList.getSelected();
if (p != null) {
int resp = Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarPergunta"),
Labels.getLabel("busquedaPricingController.window.title"),
Messagebox.YES | Messagebox.NO,
Messagebox.QUESTION);
if (resp == Messagebox.YES) {
pricingService.borrar(p);
Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarOK"),
Labels.getLabel("busquedaPricingController.window.title"),
Messagebox.OK, Messagebox.INFORMATION);
pricingList.removeItem(p);
}
} else {
Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("busquedaPricingController.window.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error("Erro ao eliminar Pricing: " + ex);
}
}
} }

View File

@ -36,154 +36,155 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
@Scope("prototype") @Scope("prototype")
public class EditarPricingAnticipacionController extends MyGenericForwardComposer { public class EditarPricingAnticipacionController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingAnticipacionService pricingAnticipacionService; @Autowired
private PricingAnticipacion pricingAnticipacion; private PricingAnticipacionService pricingAnticipacionService;
private MyListbox pricingAnticipacionList; private PricingAnticipacion pricingAnticipacion;
private Intbox anticipacioninicial; private MyListbox pricingAnticipacionList;
private Intbox anticipacionfinal; private Intbox anticipacioninicial;
private MyTextboxDecimal porcentaje; private Intbox anticipacionfinal;
private Pricing pricing; private MyTextboxDecimal porcentaje;
private ConstraintPorcentagem ct; private Pricing pricing;
private static Logger log = Logger.getLogger(EditarPricingAnticipacionController.class); private ConstraintPorcentagem ct;
private static Logger log = Logger.getLogger(EditarPricingAnticipacionController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
ct = new ConstraintPorcentagem(); ct = new ConstraintPorcentagem();
pricing = (Pricing) Executions.getCurrent().getArg().get("pricing"); pricing = (Pricing) Executions.getCurrent().getArg().get("pricing");
pricingAnticipacion = (PricingAnticipacion) Executions.getCurrent().getArg().get("pricingAnticipacion"); pricingAnticipacion = (PricingAnticipacion) Executions.getCurrent().getArg().get("pricingAnticipacion");
pricingAnticipacionList = (MyListbox) Executions.getCurrent().getArg().get("pricingAnticipacionList"); pricingAnticipacionList = (MyListbox) Executions.getCurrent().getArg().get("pricingAnticipacionList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
} }
public void onClick$btnAdicionarAnticipacion(Event ev) throws Exception { public void onClick$btnAdicionarAnticipacion(Event ev) throws Exception {
anticipacioninicial.getValue(); anticipacioninicial.getValue();
anticipacionfinal.getValue(); anticipacionfinal.getValue();
porcentaje.getValue(); porcentaje.getValue();
if (anticipacioninicial.getValue() > 100) { if (anticipacioninicial.getValue() > 100) {
Messagebox.show(Labels.getLabel("editarPricingController.anticipacionPorcentaje.value"), Messagebox.show(Labels.getLabel("editarPricingController.anticipacionPorcentaje.value"),
Labels.getLabel("editarPricingController.windowAnticipacion.title"), Labels.getLabel("editarPricingController.windowAnticipacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else if (anticipacionfinal.getValue() > 100) { } else if (anticipacionfinal.getValue() > 100) {
Messagebox.show(Labels.getLabel("editarPricingController.anticipacionPorcentaje.value"), Messagebox.show(Labels.getLabel("editarPricingController.anticipacionPorcentaje.value"),
Labels.getLabel("editarPricingController.windowAnticipacion.title"), Labels.getLabel("editarPricingController.windowAnticipacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else if (anticipacionfinal.getValue() < anticipacioninicial.getValue()) { } else if (anticipacionfinal.getValue() < anticipacioninicial.getValue()) {
Messagebox.show(Labels.getLabel("editarPricingController.anticipacionErrada.value"), Messagebox.show(Labels.getLabel("editarPricingController.anticipacionErrada.value"),
Labels.getLabel("editarPricingController.windowAnticipacion.title"), Labels.getLabel("editarPricingController.windowAnticipacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
Integer min = pricingAnticipacion.getCantdiasmin(); Integer min = pricingAnticipacion.getCantdiasmin();
Integer max = pricingAnticipacion.getCantdiasmax(); Integer max = pricingAnticipacion.getCantdiasmax();
// Boolean podeSalvar = pricingAnticipacionService.podeSalvar(pricing, // Boolean podeSalvar = pricingAnticipacionService.podeSalvar(pricing,
// min, max); // min, max);
boolean existe = true; boolean existe = true;
List<PricingAnticipacion> lsPricingAnticipacion = pricingAnticipacionService.obtenerPorPricing(pricingAnticipacion.getPricing()); List<PricingAnticipacion> lsPricingAnticipacion = pricingAnticipacionService.obtenerPorPricing(pricingAnticipacion.getPricing());
if (pricingAnticipacion != null) { if (pricingAnticipacion != null) {
lsPricingAnticipacion.remove(pricingAnticipacion); lsPricingAnticipacion.remove(pricingAnticipacion);
} }
for (PricingAnticipacion po : lsPricingAnticipacion) { for (PricingAnticipacion po : lsPricingAnticipacion) {
if (po.getActivo()) { if (po.getActivo().equals(Pricing.ATIVO)) {
boolean traslapa = TraslaparUtil.intersectNum( boolean traslapa = TraslaparUtil.intersectNum(
po.getCantdiasmin().longValue(), po.getCantdiasmax().longValue(), po.getCantdiasmin().longValue(), po.getCantdiasmax().longValue(),
min.longValue(), max.longValue()); min.longValue(), max.longValue());
if (traslapa) { if (traslapa) {
existe = false; existe = false;
} }
} }
} }
if (existe) { if (existe) {
if (pricingAnticipacion.getPricinganticipacionId() != null) { if (pricingAnticipacion.getPricinganticipacionId() != null) {
pricingAnticipacionService.actualizacion(pricingAnticipacion); pricingAnticipacionService.actualizacion(pricingAnticipacion);
pricingAnticipacionList.updateItem(pricingAnticipacion); pricingAnticipacionList.updateItem(pricingAnticipacion);
} else { } else {
pricingAnticipacionService.suscribir(pricingAnticipacion); pricingAnticipacionService.suscribir(pricingAnticipacion);
pricingAnticipacionList.addItem(pricingAnticipacion); pricingAnticipacionList.addItemNovo(pricingAnticipacion);
} }
closeWindow(); closeWindow();
} else { } else {
Messagebox.show(Labels.getLabel("editarPricingController.anticipacionErrada"), Messagebox.show(Labels.getLabel("editarPricingController.anticipacionErrada"),
Labels.getLabel("editarPricingController.windowAnticipacion.title"), Labels.getLabel("editarPricingController.windowAnticipacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} }
} }
public void onClick$btnRemoverAnticipacion(Event ev) { public void onClick$btnRemoverAnticipacion(Event ev) {
try { try {
PricingAnticipacion pAnticipacion = (PricingAnticipacion) pricingAnticipacionList.getSelected(); PricingAnticipacion pAnticipacion = (PricingAnticipacion) pricingAnticipacionList.getSelected();
if (pAnticipacion != null) { if (pAnticipacion != null) {
int resp = Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarPerguntaAnticipacion"), int resp = Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarPerguntaAnticipacion"),
Labels.getLabel("editarPricingController.windowAnticipacion.title"), Labels.getLabel("editarPricingController.windowAnticipacion.title"),
Messagebox.YES | Messagebox.NO, Messagebox.YES | Messagebox.NO,
Messagebox.QUESTION); Messagebox.QUESTION);
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingAnticipacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingAnticipacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingAnticipacion.setFecmodif(Calendar.getInstance().getTime()); pricingAnticipacion.setFecmodif(Calendar.getInstance().getTime());
pricingAnticipacion.setActivo(Boolean.FALSE); pricingAnticipacion.setActivo(Pricing.EXCLUIDO);
pricingAnticipacionList.removeItem(pricingAnticipacion); pricingAnticipacionList.removeItem(pricingAnticipacion);
pricingAnticipacionService.borrar(pricingAnticipacion); pricingAnticipacionService.borrar(pricingAnticipacion);
closeWindow(); closeWindow();
} }
} else { } else {
Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowAnticipacion.title"), Labels.getLabel("editarPricingController.windowAnticipacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public PricingAnticipacion getPricingAnticipacion() { public PricingAnticipacion getPricingAnticipacion() {
return pricingAnticipacion; return pricingAnticipacion;
} }
public void setPricingAnticipacion(PricingAnticipacion pricingAnticipacion) { public void setPricingAnticipacion(PricingAnticipacion pricingAnticipacion) {
this.pricingAnticipacion = pricingAnticipacion; this.pricingAnticipacion = pricingAnticipacion;
} }
public MyListbox getPricingAnticipacionList() { public MyListbox getPricingAnticipacionList() {
return pricingAnticipacionList; return pricingAnticipacionList;
} }
public void setPricingAnticipacionList(MyListbox pricingAnticipacionList) { public void setPricingAnticipacionList(MyListbox pricingAnticipacionList) {
this.pricingAnticipacionList = pricingAnticipacionList; this.pricingAnticipacionList = pricingAnticipacionList;
} }
public PricingAnticipacionService getPricingAnticipacionService() { public PricingAnticipacionService getPricingAnticipacionService() {
return pricingAnticipacionService; return pricingAnticipacionService;
} }
public void setPricingAnticipacionService( public void setPricingAnticipacionService(
PricingAnticipacionService pricingAnticipacionService) { PricingAnticipacionService pricingAnticipacionService) {
this.pricingAnticipacionService = pricingAnticipacionService; this.pricingAnticipacionService = pricingAnticipacionService;
} }
/** /**
* @return the ct * @return the ct
*/ */
public ConstraintPorcentagem getCt() { public ConstraintPorcentagem getCt() {
return ct; return ct;
} }
/** /**
* @param ct * @param ct
* the ct to set * the ct to set
*/ */
public void setCt(ConstraintPorcentagem ct) { public void setCt(ConstraintPorcentagem ct) {
this.ct = ct; this.ct = ct;
} }
} }

View File

@ -16,9 +16,9 @@ import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Decimalbox;
import org.zkoss.zul.Intbox; import org.zkoss.zul.Intbox;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingAsiento; import com.rjconsultores.ventaboletos.entidad.PricingAsiento;
import com.rjconsultores.ventaboletos.service.PricingAsientoService; import com.rjconsultores.ventaboletos.service.PricingAsientoService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@ -35,130 +35,131 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
@Scope("prototype") @Scope("prototype")
public class EditarPricingAsientoController extends MyGenericForwardComposer { public class EditarPricingAsientoController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingAsientoService pricingAsientoService; @Autowired
private PricingAsiento pricingAsiento; private PricingAsientoService pricingAsientoService;
private MyListbox pricingAsientoList; private PricingAsiento pricingAsiento;
private MyTextboxDecimal porcentaje; private MyListbox pricingAsientoList;
private Intbox numeasiento; private MyTextboxDecimal porcentaje;
private ConstraintPorcentagem ct; private Intbox numeasiento;
private static Logger log = Logger.getLogger(EditarPricingAsientoController.class); private ConstraintPorcentagem ct;
private static Logger log = Logger.getLogger(EditarPricingAsientoController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
ct = new ConstraintPorcentagem(); ct = new ConstraintPorcentagem();
pricingAsiento = (PricingAsiento) Executions.getCurrent().getArg().get("pricingAsiento"); pricingAsiento = (PricingAsiento) Executions.getCurrent().getArg().get("pricingAsiento");
pricingAsientoList = (MyListbox) Executions.getCurrent().getArg().get("pricingAsientoList"); pricingAsientoList = (MyListbox) Executions.getCurrent().getArg().get("pricingAsientoList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
} }
public void onClick$btnAdicionarAsiento(Event ev) throws Exception { public void onClick$btnAdicionarAsiento(Event ev) throws Exception {
numeasiento.getValue(); numeasiento.getValue();
porcentaje.getValue(); porcentaje.getValue();
List<PricingAsiento> lsAsientos = pricingAsientoService.obtenerPricingCategoria(pricingAsiento.getPricing(), numeasiento.getValue()); List<PricingAsiento> lsAsientos = pricingAsientoService.obtenerPricingCategoria(pricingAsiento.getPricing(), numeasiento.getValue());
try { try {
boolean exite = true; boolean exite = true;
if (lsAsientos.isEmpty()) { if (lsAsientos.isEmpty()) {
exite = false; exite = false;
} else { } else {
for (PricingAsiento a : lsAsientos) { for (PricingAsiento a : lsAsientos) {
if (a.getPricingasientoId().equals(pricingAsiento.getPricingasientoId())) { if (a.getPricingasientoId().equals(pricingAsiento.getPricingasientoId())) {
exite = false; exite = false;
} }
} }
} }
if (!exite) { if (!exite) {
if (pricingAsiento.getPricingasientoId() != null) { if (pricingAsiento.getPricingasientoId() != null) {
pricingAsientoService.actualizacion(pricingAsiento); pricingAsientoService.actualizacion(pricingAsiento);
pricingAsientoList.updateItem(pricingAsiento); pricingAsientoList.updateItem(pricingAsiento);
} else { } else {
pricingAsientoService.suscribir(pricingAsiento); pricingAsientoService.suscribir(pricingAsiento);
pricingAsientoList.addItem(pricingAsiento); pricingAsientoList.addItemNovo(pricingAsiento);
} }
closeWindow(); closeWindow();
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Registro.Existe"), Labels.getLabel("MSG.Registro.Existe"),
Labels.getLabel("editarPricingController.windowCategoria.title"), Labels.getLabel("editarPricingController.windowCategoria.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public void onClick$btnRemoverAsiento(Event ev) {
try {
PricingAsiento pAsiento = (PricingAsiento) pricingAsientoList.getSelected();
if (pAsiento != null) {
int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaAsiento"),
Labels.getLabel("editarPricingController.windowAsiento.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
public void onClick$btnRemoverAsiento(Event ev) { if (resp == Messagebox.YES) {
try { pricingAsiento.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
PricingAsiento pAsiento = (PricingAsiento) pricingAsientoList.getSelected(); pricingAsiento.setFecmodif(Calendar.getInstance().getTime());
if (pAsiento != null) { pricingAsiento.setActivo(Pricing.INATIVO);
int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaAsiento"),
Labels.getLabel("editarPricingController.windowAsiento.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) { pricingAsientoList.removeItem(pricingAsiento);
pricingAsiento.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingAsientoService.borrar(pricingAsiento);
pricingAsiento.setFecmodif(Calendar.getInstance().getTime()); closeWindow();
pricingAsiento.setActivo(Boolean.FALSE); }
} else {
Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowAsiento.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error(ex);
}
pricingAsientoList.removeItem(pricingAsiento); }
pricingAsientoService.borrar(pricingAsiento);
closeWindow();
}
} else {
Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowAsiento.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error(ex);
}
} public PricingAsiento getPricingAsiento() {
return pricingAsiento;
}
public PricingAsiento getPricingAsiento() { public void setPricingAsiento(PricingAsiento pricingAsiento) {
return pricingAsiento; this.pricingAsiento = pricingAsiento;
} }
public void setPricingAsiento(PricingAsiento pricingAsiento) { public MyListbox getPricingAsientoList() {
this.pricingAsiento = pricingAsiento; return pricingAsientoList;
} }
public MyListbox getPricingAsientoList() { public void setPricingAsientoList(MyListbox pricingAsientoList) {
return pricingAsientoList; this.pricingAsientoList = pricingAsientoList;
} }
public void setPricingAsientoList(MyListbox pricingAsientoList) { public PricingAsientoService getPricingAsientoService() {
this.pricingAsientoList = pricingAsientoList; return pricingAsientoService;
} }
public PricingAsientoService getPricingAsientoService() { public void setPricingAsientoService(PricingAsientoService pricingAsientoService) {
return pricingAsientoService; this.pricingAsientoService = pricingAsientoService;
} }
public void setPricingAsientoService(PricingAsientoService pricingAsientoService) { /**
this.pricingAsientoService = pricingAsientoService; * @return the ct
} */
public ConstraintPorcentagem getCt() {
return ct;
}
/** /**
* @return the ct * @param ct
*/ * the ct to set
public ConstraintPorcentagem getCt() { */
return ct; public void setCt(ConstraintPorcentagem ct) {
} this.ct = ct;
}
/**
* @param ct the ct to set
*/
public void setCt(ConstraintPorcentagem ct) {
this.ct = ct;
}
} }

View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.Categoria;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingCategoria; import com.rjconsultores.ventaboletos.entidad.PricingCategoria;
import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.CategoriaService;
import com.rjconsultores.ventaboletos.service.PricingCategoriaService; import com.rjconsultores.ventaboletos.service.PricingCategoriaService;
@ -100,7 +101,7 @@ public class EditarPricingCategoriaController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingCategoria.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingCategoria.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingCategoria.setFecmodif(Calendar.getInstance().getTime()); pricingCategoria.setFecmodif(Calendar.getInstance().getTime());
pricingCategoria.setActivo(Boolean.FALSE); pricingCategoria.setActivo(Pricing.INATIVO);
pricingCategoriaList.removeItem(pricingCategoria); pricingCategoriaList.removeItem(pricingCategoria);
pricingCategoriaService.borrar(pricingCategoria); pricingCategoriaService.borrar(pricingCategoria);

View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingClase; import com.rjconsultores.ventaboletos.entidad.PricingClase;
import com.rjconsultores.ventaboletos.service.ClaseServicioService; import com.rjconsultores.ventaboletos.service.ClaseServicioService;
import com.rjconsultores.ventaboletos.service.PricingClaseService; import com.rjconsultores.ventaboletos.service.PricingClaseService;
@ -32,139 +33,138 @@ import org.zkoss.zul.Combobox;
@Scope("prototype") @Scope("prototype")
public class EditarPricingClaseController extends MyGenericForwardComposer { public class EditarPricingClaseController extends MyGenericForwardComposer {
@Autowired @Autowired
private PricingClaseService pricingClaseService; private PricingClaseService pricingClaseService;
@Autowired @Autowired
private ClaseServicioService claseServicioService; private ClaseServicioService claseServicioService;
private List<ClaseServicio> lsClase; private List<ClaseServicio> lsClase;
private PricingClase pricingClase; private PricingClase pricingClase;
private MyListbox pricingClaseList; private MyListbox pricingClaseList;
private Combobox cmbClase; private Combobox cmbClase;
private static Logger log = Logger.getLogger(EditarPricingClaseController.class); private static Logger log = Logger.getLogger(EditarPricingClaseController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
lsClase = claseServicioService.obtenerTodos(); lsClase = claseServicioService.obtenerTodos();
pricingClase = (PricingClase) Executions.getCurrent().getArg().get("pricingClase"); pricingClase = (PricingClase) Executions.getCurrent().getArg().get("pricingClase");
pricingClaseList = (MyListbox) Executions.getCurrent().getArg().get("pricingClaseList"); pricingClaseList = (MyListbox) Executions.getCurrent().getArg().get("pricingClaseList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
cmbClase.focus();
}
cmbClase.focus(); public void onClick$btnAdicionarClase(Event ev) throws Exception {
} cmbClase.getValue();
public void onClick$btnAdicionarClase(Event ev) throws Exception { try {
cmbClase.getValue();
try { if (pricingClase.getClaseServicio() == null) {
Messagebox.show(
Labels.getLabel("MSG.Error.combobox"),
Labels.getLabel("editarPricingController.windowClase.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
} else {
if (pricingClase.getClaseServicio() == null) { Boolean existe = pricingClaseService.obtenerPricingClase(pricingClase.getPricing(), (ClaseServicio) cmbClase.getSelectedItem().getValue());
Messagebox.show( if (existe) {
Labels.getLabel("MSG.Error.combobox"), Messagebox.show(
Labels.getLabel("editarPricingController.windowClase.title"), Labels.getLabel("MSG.Registro.Existe"),
Messagebox.OK, Messagebox.EXCLAMATION); Labels.getLabel("editarPricingController.windowClase.title"),
} else { Messagebox.OK, Messagebox.EXCLAMATION);
} else {
if (pricingClase.getPricingclaseId() != null) {
pricingClaseService.actualizacion(pricingClase);
pricingClaseList.updateItem(pricingClase);
} else {
pricingClaseService.suscribir(pricingClase);
pricingClaseList.addItem(pricingClase);
}
closeWindow();
}
}
} catch (Exception ex) {
log.error(ex);
}
}
Boolean existe = pricingClaseService.obtenerPricingClase(pricingClase.getPricing(), (ClaseServicio) cmbClase.getSelectedItem().getValue()); public void onClick$btnRemoverClase(Event ev) {
if (existe) { try {
Messagebox.show( PricingClase pClase = (PricingClase) pricingClaseList.getSelected();
Labels.getLabel("MSG.Registro.Existe"), if (pClase != null) {
Labels.getLabel("editarPricingController.windowClase.title"), int resp = Messagebox.show(
Messagebox.OK, Messagebox.EXCLAMATION); Labels.getLabel("editarPricingController.MSG.borrarPerguntaClase"),
} else { Labels.getLabel("editarPricingController.windowClase.title"),
if (pricingClase.getPricingclaseId() != null) { Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
pricingClaseService.actualizacion(pricingClase);
pricingClaseList.updateItem(pricingClase);
} else {
pricingClaseService.suscribir(pricingClase);
pricingClaseList.addItem(pricingClase);
}
closeWindow();
}
}
} catch (Exception ex) {
log.error(ex);
}
}
public void onClick$btnRemoverClase(Event ev) { if (resp == Messagebox.YES) {
try { pricingClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
PricingClase pClase = (PricingClase) pricingClaseList.getSelected(); pricingClase.setFecmodif(Calendar.getInstance().getTime());
if (pClase != null) { pricingClase.setActivo(Pricing.INATIVO);
int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaClase"),
Labels.getLabel("editarPricingController.windowClase.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) { pricingClaseList.removeItem(pricingClase);
pricingClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingClaseService.borrar(pricingClase);
pricingClase.setFecmodif(Calendar.getInstance().getTime()); closeWindow();
pricingClase.setActivo(Boolean.FALSE); }
} else {
Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowClase.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error(ex);
}
pricingClaseList.removeItem(pricingClase); }
pricingClaseService.borrar(pricingClase);
closeWindow();
}
} else {
Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowClase.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error(ex);
}
} public PricingClase getPricingClase() {
return pricingClase;
}
public PricingClase getPricingClase() { public void setPricingClase(PricingClase pricingClase) {
return pricingClase; this.pricingClase = pricingClase;
} }
public void setPricingClase(PricingClase pricingClase) { public MyListbox getPricingClaseList() {
this.pricingClase = pricingClase; return pricingClaseList;
} }
public MyListbox getPricingClaseList() { public void setPricingClaseList(MyListbox pricingClaseList) {
return pricingClaseList; this.pricingClaseList = pricingClaseList;
} }
public void setPricingClaseList(MyListbox pricingClaseList) { public PricingClaseService getPricingClaseService() {
this.pricingClaseList = pricingClaseList; return pricingClaseService;
} }
public PricingClaseService getPricingClaseService() { public void setPricingClaseService(PricingClaseService pricingClaseService) {
return pricingClaseService; this.pricingClaseService = pricingClaseService;
} }
public void setPricingClaseService(PricingClaseService pricingClaseService) { public ClaseServicioService getClaseServicioService() {
this.pricingClaseService = pricingClaseService; return claseServicioService;
} }
public ClaseServicioService getClaseServicioService() { public void setClaseServicioService(ClaseServicioService claseServicioService) {
return claseServicioService; this.claseServicioService = claseServicioService;
} }
public void setClaseServicioService(ClaseServicioService claseServicioService) { public static Logger getLog() {
this.claseServicioService = claseServicioService; return log;
} }
public static Logger getLog() { public static void setLog(Logger log) {
return log; EditarPricingClaseController.log = log;
} }
public static void setLog(Logger log) { public List<ClaseServicio> getLsClase() {
EditarPricingClaseController.log = log; return lsClase;
} }
public List<ClaseServicio> getLsClase() { public void setLsClase(List<ClaseServicio> lsClase) {
return lsClase; this.lsClase = lsClase;
} }
public void setLsClase(List<ClaseServicio> lsClase) {
this.lsClase = lsClase;
}
} }

View File

@ -35,7 +35,6 @@ import com.rjconsultores.ventaboletos.service.PricingCorridaService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEditarPricingCorrida; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEditarPricingCorrida;
/** /**
@ -46,216 +45,215 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEditarPricingCo
@Scope("prototype") @Scope("prototype")
public class EditarPricingCorridaController extends MyGenericForwardComposer { public class EditarPricingCorridaController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private transient PagedListWrapper<Corrida> plwCorrida; @Autowired
@Autowired private PricingCorridaService pricingCorridaService;
private PricingCorridaService pricingCorridaService; @Autowired
@Autowired private CorridaCtrlService corridaCtrlService;
private CorridaCtrlService corridaCtrlService; @Autowired
@Autowired private CorridaService corridaService;
private CorridaService corridaService; @Autowired
@Autowired private ClaseServicioService claseServicioService;
private ClaseServicioService claseServicioService; private List<ClaseServicio> lsClaseServicio;
private List<ClaseServicio> lsClaseServicio; private Pricing pricing;
private Pricing pricing; private MyListbox pricingCorridaList;
private MyListbox pricingCorridaList; private MyListbox corridaList;
private MyListbox corridaList; private Intbox idCorrida;
private Intbox idCorrida; private Combobox cmbParadaOrigem;
private Combobox cmbParadaOrigem; private Combobox cmbParadaDestino;
private Combobox cmbParadaDestino; private Combobox cmbTipoServicio;
private Combobox cmbTipoServicio; private Timebox timeInicio;
private Timebox timeInicio; private Timebox timeFin;
private Timebox timeFin; private static Logger log = Logger.getLogger(EditarPricingCorridaController.class);
private static Logger log = Logger.getLogger(EditarPricingCorridaController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
lsClaseServicio = claseServicioService.buscarTodosExceto(-1); lsClaseServicio = claseServicioService.buscarTodosExceto(-1);
super.doAfterCompose(comp); super.doAfterCompose(comp);
pricing = (Pricing) Executions.getCurrent().getArg().get("pricing"); pricing = (Pricing) Executions.getCurrent().getArg().get("pricing");
pricingCorridaList = (MyListbox) Executions.getCurrent().getArg().get("pricingCorridaList"); pricingCorridaList = (MyListbox) Executions.getCurrent().getArg().get("pricingCorridaList");
corridaList.setItemRenderer(new RenderEditarPricingCorrida()); corridaList.setItemRenderer(new RenderEditarPricingCorrida());
} }
private void refreshLista() throws InterruptedException { private void refreshLista() throws InterruptedException {
Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem(); Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem();
Parada origem = null; Parada origem = null;
if (cbiOrigem != null) { if (cbiOrigem != null) {
origem = (Parada) cbiOrigem.getValue(); origem = (Parada) cbiOrigem.getValue();
} }
Comboitem cbiDestino = cmbParadaDestino.getSelectedItem(); Comboitem cbiDestino = cmbParadaDestino.getSelectedItem();
Parada destino = null; Parada destino = null;
if (cbiDestino != null) { if (cbiDestino != null) {
destino = (Parada) cbiDestino.getValue(); destino = (Parada) cbiDestino.getValue();
} }
Comboitem cbiTipoServicio = cmbTipoServicio.getSelectedItem(); Comboitem cbiTipoServicio = cmbTipoServicio.getSelectedItem();
ClaseServicio claseServicio = null; ClaseServicio claseServicio = null;
if (cbiTipoServicio != null) { if (cbiTipoServicio != null) {
claseServicio = (ClaseServicio) cbiTipoServicio.getValue(); claseServicio = (ClaseServicio) cbiTipoServicio.getValue();
} }
corridaList.setData(corridaService.buscarDistinct(origem, destino, timeInicio.getValue(), timeFin.getValue(), claseServicio, idCorrida.getValue())); corridaList.setData(corridaService.buscarDistinct(origem, destino, timeInicio.getValue(), timeFin.getValue(), claseServicio, idCorrida.getValue()));
if (corridaList.getData().length == 0) { if (corridaList.getData().length == 0) {
Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels.getLabel("busquedaPricingController.window.title"), Messagebox.OK, Messagebox.INFORMATION); Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels.getLabel("busquedaPricingController.window.title"), Messagebox.OK, Messagebox.INFORMATION);
} }
} }
public void onClick$btnPesquisa(Event ev) throws InterruptedException { public void onClick$btnPesquisa(Event ev) throws InterruptedException {
cmbParadaOrigem.clearErrorMessage(); cmbParadaOrigem.clearErrorMessage();
cmbParadaDestino.clearErrorMessage(); cmbParadaDestino.clearErrorMessage();
cmbTipoServicio.clearErrorMessage(); cmbTipoServicio.clearErrorMessage();
if (idCorrida.getValue() == null) { if (idCorrida.getValue() == null) {
cmbParadaOrigem.setConstraint("no empty"); cmbParadaOrigem.setConstraint("no empty");
cmbParadaDestino.setConstraint("no empty"); cmbParadaDestino.setConstraint("no empty");
cmbTipoServicio.setConstraint("no empty"); cmbTipoServicio.setConstraint("no empty");
cmbParadaOrigem.getValue(); cmbParadaOrigem.getValue();
cmbParadaDestino.getValue(); cmbParadaDestino.getValue();
cmbTipoServicio.getValue(); cmbTipoServicio.getValue();
} }
refreshLista(); refreshLista();
} }
public void onClick$btnAdicionarCorrida(Event ev) throws Exception { public void onClick$btnAdicionarCorrida(Event ev) throws Exception {
try { try {
List<PricingCorrida> lsPricingViagem = (pricing.getPricingCorridaList() == null) ? new ArrayList<PricingCorrida>() : pricing.getPricingCorridaList(); List<PricingCorrida> lsPricingViagem = (pricing.getPricingCorridaList(Pricing.ATIVO) == null) ? new ArrayList<PricingCorrida>() : pricing.getPricingCorridaList(Pricing.ATIVO);
List<Object> ls = corridaList.getSelectedsItens(); List<Object> ls = corridaList.getSelectedsItens();
if (!ls.isEmpty()) { if (!ls.isEmpty()) {
for (Object o : ls) { for (Object o : ls) {
Boolean achou = Boolean.FALSE; Boolean achou = Boolean.FALSE;
Corrida corrida = (Corrida) o; Corrida corrida = (Corrida) o;
if (corrida.getCorridaCtrl() == null) { if (corrida.getCorridaCtrl() == null) {
CorridaCtrl cc = corridaCtrlService.obtenerID(corrida.getId().getCorridaId()); CorridaCtrl cc = corridaCtrlService.obtenerID(corrida.getId().getCorridaId());
if (cc != null) { if (cc != null) {
corrida.setCorridaCtrl(cc); corrida.setCorridaCtrl(cc);
} }
} }
for (PricingCorrida pc : lsPricingViagem) { for (PricingCorrida pc : lsPricingViagem) {
if (pc.getCorridaCtrl().getCorridaId().equals(corrida.getCorridaCtrl().getCorridaId())) { if (pc.getCorridaCtrl().getCorridaId().equals(corrida.getCorridaCtrl().getCorridaId())) {
achou = Boolean.TRUE; achou = Boolean.TRUE;
} }
} }
if (!achou) { if (!achou) {
PricingCorrida p = new PricingCorrida(); PricingCorrida p = new PricingCorrida();
p.setActivo(Boolean.TRUE); p.setActivo(Pricing.ATIVO);
p.setCorridaCtrl(corrida.getCorridaCtrl()); p.setCorridaCtrl(corrida.getCorridaCtrl());
p.setFecmodif(Calendar.getInstance().getTime()); p.setFecmodif(Calendar.getInstance().getTime());
p.setPricing(pricing); p.setPricing(pricing);
p.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); p.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
lsPricingViagem.add(p); lsPricingViagem.add(p);
} }
} }
pricing.setPricingCorridaList(lsPricingViagem); pricing.setPricingCorridaList(lsPricingViagem);
pricingCorridaList.setData(lsPricingViagem); pricingCorridaList.setData(lsPricingViagem);
closeWindow(); closeWindow();
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public MyListbox getPricingCorridaList() { public MyListbox getPricingCorridaList() {
return pricingCorridaList; return pricingCorridaList;
} }
public void setPricingCorridaList(MyListbox pricingCorridaList) { public void setPricingCorridaList(MyListbox pricingCorridaList) {
this.pricingCorridaList = pricingCorridaList; this.pricingCorridaList = pricingCorridaList;
} }
public PricingCorridaService getPricingCorridaService() { public PricingCorridaService getPricingCorridaService() {
return pricingCorridaService; return pricingCorridaService;
} }
public void setPricingCorridaService(PricingCorridaService pricingCorridaService) { public void setPricingCorridaService(PricingCorridaService pricingCorridaService) {
this.pricingCorridaService = pricingCorridaService; this.pricingCorridaService = pricingCorridaService;
} }
public CorridaCtrlService getCorridaCtrlService() { public CorridaCtrlService getCorridaCtrlService() {
return corridaCtrlService; return corridaCtrlService;
} }
public void setCorridaCtrlService(CorridaCtrlService corridaCtrlService) { public void setCorridaCtrlService(CorridaCtrlService corridaCtrlService) {
this.corridaCtrlService = corridaCtrlService; this.corridaCtrlService = corridaCtrlService;
} }
public Intbox getIdCorrida() { public Intbox getIdCorrida() {
return idCorrida; return idCorrida;
} }
public void setIdCorrida(Intbox idCorrida) { public void setIdCorrida(Intbox idCorrida) {
this.idCorrida = idCorrida; this.idCorrida = idCorrida;
} }
public Combobox getCmbParadaDestino() { public Combobox getCmbParadaDestino() {
return cmbParadaDestino; return cmbParadaDestino;
} }
public void setCmbParadaDestino(Combobox cmbParadaDestino) { public void setCmbParadaDestino(Combobox cmbParadaDestino) {
this.cmbParadaDestino = cmbParadaDestino; this.cmbParadaDestino = cmbParadaDestino;
} }
public Combobox getCmbParadaOrigem() { public Combobox getCmbParadaOrigem() {
return cmbParadaOrigem; return cmbParadaOrigem;
} }
public void setCmbParadaOrigem(Combobox cmbParadaOrigem) { public void setCmbParadaOrigem(Combobox cmbParadaOrigem) {
this.cmbParadaOrigem = cmbParadaOrigem; this.cmbParadaOrigem = cmbParadaOrigem;
} }
public MyListbox getCorridaList() { public MyListbox getCorridaList() {
return corridaList; return corridaList;
} }
public void setCorridaList(MyListbox corridaList) { public void setCorridaList(MyListbox corridaList) {
this.corridaList = corridaList; this.corridaList = corridaList;
} }
public List<ClaseServicio> getLsClaseServicio() { public List<ClaseServicio> getLsClaseServicio() {
return lsClaseServicio; return lsClaseServicio;
} }
public void setLsClaseServicio(List<ClaseServicio> lsClaseServicio) { public void setLsClaseServicio(List<ClaseServicio> lsClaseServicio) {
this.lsClaseServicio = lsClaseServicio; this.lsClaseServicio = lsClaseServicio;
} }
public Combobox getCmbTipoServicio() { public Combobox getCmbTipoServicio() {
return cmbTipoServicio; return cmbTipoServicio;
} }
public void setCmbTipoServicio(Combobox cmbTipoServicio) { public void setCmbTipoServicio(Combobox cmbTipoServicio) {
this.cmbTipoServicio = cmbTipoServicio; this.cmbTipoServicio = cmbTipoServicio;
} }
public Timebox getTimeFin() { public Timebox getTimeFin() {
return timeFin; return timeFin;
} }
public void setTimeFin(Timebox timeFin) { public void setTimeFin(Timebox timeFin) {
this.timeFin = timeFin; this.timeFin = timeFin;
} }
public Timebox getTimeInicio() { public Timebox getTimeInicio() {
return timeInicio; return timeInicio;
} }
public void setTimeInicio(Timebox timeInicio) { public void setTimeInicio(Timebox timeInicio) {
this.timeInicio = timeInicio; this.timeInicio = timeInicio;
} }
} }

View File

@ -4,6 +4,7 @@
*/ */
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingDia; import com.rjconsultores.ventaboletos.entidad.PricingDia;
import com.rjconsultores.ventaboletos.service.PricingDiaService; import com.rjconsultores.ventaboletos.service.PricingDiaService;
import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.DateUtil;
@ -214,7 +215,7 @@ public class EditarPricingDiaController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingDia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingDia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingDia.setFecmodif(Calendar.getInstance().getTime()); pricingDia.setFecmodif(Calendar.getInstance().getTime());
pricingDia.setActivo(Boolean.FALSE); pricingDia.setActivo(Pricing.INATIVO);
pricingDiaList.removeItem(pricingDia); pricingDiaList.removeItem(pricingDia);
pricingDiaService.borrar(pricingDia); pricingDiaService.borrar(pricingDia);

View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.Moneda;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingImporte; import com.rjconsultores.ventaboletos.entidad.PricingImporte;
import com.rjconsultores.ventaboletos.service.MonedaService; import com.rjconsultores.ventaboletos.service.MonedaService;
import com.rjconsultores.ventaboletos.service.PricingImporteService; import com.rjconsultores.ventaboletos.service.PricingImporteService;
@ -119,7 +120,7 @@ public class EditarPricingImporteController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingImporte.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingImporte.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingImporte.setFecmodif(Calendar.getInstance().getTime()); pricingImporte.setFecmodif(Calendar.getInstance().getTime());
pricingImporte.setActivo(Boolean.FALSE); pricingImporte.setActivo(Pricing.INATIVO);
pricingImporteList.removeItem(pricingImporte); pricingImporteList.removeItem(pricingImporte);
pricingImporteService.borrar(pricingImporte); pricingImporteService.borrar(pricingImporte);

View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Marca; import com.rjconsultores.ventaboletos.entidad.Marca;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingMarca; import com.rjconsultores.ventaboletos.entidad.PricingMarca;
import com.rjconsultores.ventaboletos.service.MarcaService; import com.rjconsultores.ventaboletos.service.MarcaService;
import com.rjconsultores.ventaboletos.service.PricingMarcaService; import com.rjconsultores.ventaboletos.service.PricingMarcaService;
@ -32,121 +33,122 @@ import org.zkoss.zul.Combobox;
@Scope("prototype") @Scope("prototype")
public class EditarPricingMarcaController extends MyGenericForwardComposer { public class EditarPricingMarcaController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingMarcaService pricingMarcaService; @Autowired
@Autowired private PricingMarcaService pricingMarcaService;
private MarcaService marcaService; @Autowired
private List<Marca> lsMarca; private MarcaService marcaService;
private PricingMarca pricingMarca; private List<Marca> lsMarca;
private MyListbox pricingMarcaList; private PricingMarca pricingMarca;
private Combobox cmbMarca; private MyListbox pricingMarcaList;
private static Logger log = Logger.getLogger(EditarPricingMarcaController.class); private Combobox cmbMarca;
private static Logger log = Logger.getLogger(EditarPricingMarcaController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
lsMarca = marcaService.buscarMarcaPorEmpresa(UsuarioLogado.getUsuarioLogado().getEmpresa()); lsMarca = marcaService.buscarMarcaPorEmpresa(UsuarioLogado.getUsuarioLogado().getEmpresa());
PricingMarca pm = (PricingMarca) Executions.getCurrent().getArg().get("pricingMarca"); PricingMarca pm = (PricingMarca) Executions.getCurrent().getArg().get("pricingMarca");
pricingMarca = (pm.getUsuarioId() == null) ? pm : pricingMarcaService.obtenerID(pm.getUsuarioId()); pricingMarca = (pm.getUsuarioId() == null) ? pm : pricingMarcaService.obtenerID(pm.getUsuarioId());
pricingMarcaList = (MyListbox) Executions.getCurrent().getArg().get("pricingMarcaList"); pricingMarcaList = (MyListbox) Executions.getCurrent().getArg().get("pricingMarcaList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
cmbMarca.focus(); cmbMarca.focus();
} }
public void onClick$btnAdicionarMarca(Event ev) throws Exception { public void onClick$btnAdicionarMarca(Event ev) throws Exception {
cmbMarca.getValue(); cmbMarca.getValue();
try { try {
if (pricingMarca.getMarca() == null) { if (pricingMarca.getMarca() == null) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error.combobox"), Labels.getLabel("MSG.Error.combobox"),
Labels.getLabel("editarPricingController.windowMarca.title"), Labels.getLabel("editarPricingController.windowMarca.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
Boolean existe = pricingMarcaService.obtenerPricingMarca(pricingMarca.getPricing(), (Marca) cmbMarca.getSelectedItem().getValue()); Boolean existe = pricingMarcaService.obtenerPricingMarca(pricingMarca.getPricing(), (Marca) cmbMarca.getSelectedItem().getValue());
if (existe) { if (existe) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Registro.Existe"), Labels.getLabel("MSG.Registro.Existe"),
Labels.getLabel("editarPricingController.windowMarca.title"), Labels.getLabel("editarPricingController.windowMarca.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
if (pricingMarca.getPricingmarcaId() != null) { if (pricingMarca.getPricingmarcaId() != null) {
pricingMarcaService.actualizacion(pricingMarca); pricingMarcaService.actualizacion(pricingMarca);
pricingMarcaList.updateItem(pricingMarca); pricingMarcaList.updateItem(pricingMarca);
} else { } else {
pricingMarcaService.suscribir(pricingMarca); pricingMarcaService.suscribir(pricingMarca);
pricingMarcaList.addItem(pricingMarca); pricingMarcaList.addItemNovo(pricingMarca);
} }
closeWindow(); closeWindow();
} }
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public void onClick$btnRemoverMarca(Event ev) { public void onClick$btnRemoverMarca(Event ev) {
try { try {
int resp = Messagebox.show( int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaMarca"), Labels.getLabel("editarPricingController.MSG.borrarPerguntaMarca"),
Labels.getLabel("editarPricingController.windowMarca.title"), Labels.getLabel("editarPricingController.windowMarca.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingMarca.setFecmodif(Calendar.getInstance().getTime()); pricingMarca.setFecmodif(Calendar.getInstance().getTime());
pricingMarca.setActivo(Boolean.FALSE); pricingMarca.setActivo(Pricing.INATIVO);
pricingMarcaList.removeItem(pricingMarca); pricingMarcaList.removeItem(pricingMarca);
pricingMarcaService.borrar(pricingMarca); pricingMarcaService.borrar(pricingMarca);
closeWindow(); closeWindow();
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public PricingMarca getPricingMarca() { public PricingMarca getPricingMarca() {
return pricingMarca; return pricingMarca;
} }
public void setPricingMarca(PricingMarca pricingMarca) { public void setPricingMarca(PricingMarca pricingMarca) {
this.pricingMarca = pricingMarca; this.pricingMarca = pricingMarca;
} }
public MyListbox getPricingMarcaList() { public MyListbox getPricingMarcaList() {
return pricingMarcaList; return pricingMarcaList;
} }
public void setPricingMarcaList(MyListbox pricingMarcaList) { public void setPricingMarcaList(MyListbox pricingMarcaList) {
this.pricingMarcaList = pricingMarcaList; this.pricingMarcaList = pricingMarcaList;
} }
public PricingMarcaService getPricingMarcaService() { public PricingMarcaService getPricingMarcaService() {
return pricingMarcaService; return pricingMarcaService;
} }
public void setPricingMarcaService(PricingMarcaService pricingMarcaService) { public void setPricingMarcaService(PricingMarcaService pricingMarcaService) {
this.pricingMarcaService = pricingMarcaService; this.pricingMarcaService = pricingMarcaService;
} }
public List<Marca> getLsMarca() { public List<Marca> getLsMarca() {
return lsMarca; return lsMarca;
} }
public void setLsMarca(List<Marca> lsMarca) { public void setLsMarca(List<Marca> lsMarca) {
this.lsMarca = lsMarca; this.lsMarca = lsMarca;
} }
public MarcaService getMarcaService() { public MarcaService getMarcaService() {
return marcaService; return marcaService;
} }
public void setMarcaService(MarcaService marcaService) { public void setMarcaService(MarcaService marcaService) {
this.marcaService = marcaService; this.marcaService = marcaService;
} }
} }

View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingMercado; import com.rjconsultores.ventaboletos.entidad.PricingMercado;
import com.rjconsultores.ventaboletos.service.ParadaService; import com.rjconsultores.ventaboletos.service.ParadaService;
import com.rjconsultores.ventaboletos.service.PricingMercadoService; import com.rjconsultores.ventaboletos.service.PricingMercadoService;
@ -32,200 +33,201 @@ import org.zkoss.zul.Combobox;
@Scope("prototype") @Scope("prototype")
public class EditarPricingMercadoController extends MyGenericForwardComposer { public class EditarPricingMercadoController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingMercadoService pricingMercadoService; @Autowired
@Autowired private PricingMercadoService pricingMercadoService;
private ParadaService paradaService; @Autowired
private PricingMercado pricingMercado; private ParadaService paradaService;
private MyListbox pricingMercadoList; private PricingMercado pricingMercado;
private Combobox cmbOrigen; private MyListbox pricingMercadoList;
private Combobox cmbDestino; private Combobox cmbOrigen;
private static Logger log = Logger.getLogger(EditarPricingMercadoController.class); private Combobox cmbDestino;
private static Logger log = Logger.getLogger(EditarPricingMercadoController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
pricingMercado = (PricingMercado) Executions.getCurrent().getArg().get("pricingMercado"); pricingMercado = (PricingMercado) Executions.getCurrent().getArg().get("pricingMercado");
pricingMercadoList = (MyListbox) Executions.getCurrent().getArg().get("pricingMercadoList"); pricingMercadoList = (MyListbox) Executions.getCurrent().getArg().get("pricingMercadoList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
if (pricingMercado.getPricingparadaId() != null) { if (pricingMercado.getPricingparadaId() != null) {
Parada origem = pricingMercado.getOrigen(); Parada origem = pricingMercado.getOrigen();
if (origem != null) { if (origem != null) {
cmbOrigen.setText(origem.getDescparada()); cmbOrigen.setText(origem.getDescparada());
} }
Parada destino = pricingMercado.getDestino(); Parada destino = pricingMercado.getDestino();
if (destino != null) { if (destino != null) {
cmbDestino.setText(destino.getDescparada()); cmbDestino.setText(destino.getDescparada());
} }
} }
} }
public void onClick$btnAdicionarMercado(Event ev) throws Exception { public void onClick$btnAdicionarMercado(Event ev) throws Exception {
cmbOrigen.getValue(); cmbOrigen.getValue();
cmbDestino.getValue(); cmbDestino.getValue();
try { try {
Parada origen = null; Parada origen = null;
if (cmbOrigen.getSelectedItem() == null) { if (cmbOrigen.getSelectedItem() == null) {
List<Parada> lsParadaOri = paradaService.buscar(cmbOrigen.getText().toUpperCase()); List<Parada> lsParadaOri = paradaService.buscar(cmbOrigen.getText().toUpperCase());
if (!lsParadaOri.isEmpty()) { if (!lsParadaOri.isEmpty()) {
origen = lsParadaOri.get(0); origen = lsParadaOri.get(0);
} }
} else { } else {
origen = (Parada) cmbOrigen.getSelectedItem().getValue(); origen = (Parada) cmbOrigen.getSelectedItem().getValue();
} }
Parada destino = null; Parada destino = null;
if (cmbDestino.getSelectedItem() == null) { if (cmbDestino.getSelectedItem() == null) {
List<Parada> lsParadaOri = paradaService.buscar(cmbDestino.getText().toUpperCase()); List<Parada> lsParadaOri = paradaService.buscar(cmbDestino.getText().toUpperCase());
if (!lsParadaOri.isEmpty()) { if (!lsParadaOri.isEmpty()) {
destino = lsParadaOri.get(0); destino = lsParadaOri.get(0);
} }
} else { } else {
destino = (Parada) cmbDestino.getSelectedItem().getValue(); destino = (Parada) cmbDestino.getSelectedItem().getValue();
} }
//Parada destino = (Parada) cmbDestino.getSelectedItem().getValue(); // Parada destino = (Parada) cmbDestino.getSelectedItem().getValue();
try { try {
if (origen == null) { if (origen == null) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error.combobox.origen"), Labels.getLabel("MSG.Error.combobox.origen"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else if (destino == null) { } else if (destino == null) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error.combobox.destino"), Labels.getLabel("MSG.Error.combobox.destino"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
Boolean existe = Boolean existe =
pricingMercadoService.obtenerPricingMercado(pricingMercado.getPricing(), pricingMercadoService.obtenerPricingMercado(pricingMercado.getPricing(),
origen, destino); origen, destino);
pricingMercado.setOrigen(origen); pricingMercado.setOrigen(origen);
pricingMercado.setDestino(destino); pricingMercado.setDestino(destino);
// id -1 identifica que é todas origens ou todos os destinos: // id -1 identifica que é todas origens ou todos os destinos:
if (origen.getParadaId().equals(-1) && destino.getParadaId().equals(-1)) { if (origen.getParadaId().equals(-1) && destino.getParadaId().equals(-1)) {
if (existe) { if (existe) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Registro.Existe"), Labels.getLabel("MSG.Registro.Existe"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
if (pricingMercado.getPricingparadaId() != null) { if (pricingMercado.getPricingparadaId() != null) {
pricingMercadoService.actualizacion(pricingMercado); pricingMercadoService.actualizacion(pricingMercado);
pricingMercadoList.updateItem(pricingMercado); pricingMercadoList.updateItem(pricingMercado);
} else { } else {
pricingMercadoService.suscribir(pricingMercado); pricingMercadoService.suscribir(pricingMercado);
pricingMercadoList.addItem(pricingMercado); pricingMercadoList.addItemNovo(pricingMercado);
} }
closeWindow(); closeWindow();
} }
} else { } else {
if (origen.equals(destino)) { if (origen.equals(destino)) {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarPricingController.MSG.mercadoIguais"), Labels.getLabel("editarPricingController.MSG.mercadoIguais"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
if (existe) { if (existe) {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarPricingController.MSG.mercadoExiste"), Labels.getLabel("editarPricingController.MSG.mercadoExiste"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
if (pricingMercado.getPricingparadaId() != null) { if (pricingMercado.getPricingparadaId() != null) {
pricingMercadoService.actualizacion(pricingMercado); pricingMercadoService.actualizacion(pricingMercado);
pricingMercadoList.updateItem(pricingMercado); pricingMercadoList.updateItem(pricingMercado);
} else { } else {
pricingMercadoService.suscribir(pricingMercado); pricingMercadoService.suscribir(pricingMercado);
pricingMercadoList.addItem(pricingMercado); pricingMercadoList.addItemNovo(pricingMercado);
} }
closeWindow(); closeWindow();
} }
} }
} }
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error("editarPricingController mercado:" + ex); log.error("editarPricingController mercado:" + ex);
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error"), Labels.getLabel("MSG.Error"),
Labels.getLabel("editarPricingController.windowCategoria.title"), Labels.getLabel("editarPricingController.windowCategoria.title"),
Messagebox.OK, Messagebox.ERROR); Messagebox.OK, Messagebox.ERROR);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error("Combobox PARADA " + ex); log.error("Combobox PARADA " + ex);
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error.combobox"), Labels.getLabel("MSG.Error.combobox"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} }
public void onClick$btnRemoverMercado(Event ev) { public void onClick$btnRemoverMercado(Event ev) {
try { try {
PricingMercado pMercado = (PricingMercado) pricingMercadoList.getSelected(); PricingMercado pMercado = (PricingMercado) pricingMercadoList.getSelected();
if (pMercado != null) { if (pMercado != null) {
int resp = Messagebox.show( int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaMercado"), Labels.getLabel("editarPricingController.MSG.borrarPerguntaMercado"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingMercado.setFecmodif(Calendar.getInstance().getTime()); pricingMercado.setFecmodif(Calendar.getInstance().getTime());
pricingMercado.setActivo(Boolean.FALSE); pricingMercado.setActivo(Pricing.INATIVO);
pricingMercadoList.removeItem(pricingMercado); pricingMercadoList.removeItem(pricingMercado);
pricingMercadoService.borrar(pricingMercado); pricingMercadoService.borrar(pricingMercado);
closeWindow(); closeWindow();
} }
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowMercado.title"), Labels.getLabel("editarPricingController.windowMercado.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public PricingMercado getPricingMercado() { public PricingMercado getPricingMercado() {
return pricingMercado; return pricingMercado;
} }
public void setPricingMercado(PricingMercado pricingMercado) { public void setPricingMercado(PricingMercado pricingMercado) {
this.pricingMercado = pricingMercado; this.pricingMercado = pricingMercado;
} }
public MyListbox getPricingMercadoList() { public MyListbox getPricingMercadoList() {
return pricingMercadoList; return pricingMercadoList;
} }
public void setPricingMercadoList(MyListbox pricingMercadoList) { public void setPricingMercadoList(MyListbox pricingMercadoList) {
this.pricingMercadoList = pricingMercadoList; this.pricingMercadoList = pricingMercadoList;
} }
public PricingMercadoService getPricingMercadoService() { public PricingMercadoService getPricingMercadoService() {
return pricingMercadoService; return pricingMercadoService;
} }
public void setPricingMercadoService(PricingMercadoService pricingMercadoService) { public void setPricingMercadoService(PricingMercadoService pricingMercadoService) {
this.pricingMercadoService = pricingMercadoService; this.pricingMercadoService = pricingMercadoService;
} }
public ParadaService getParadaService() { public ParadaService getParadaService() {
return paradaService; return paradaService;
} }
public void setParadaService(ParadaService paradaService) { public void setParadaService(ParadaService paradaService) {
this.paradaService = paradaService; this.paradaService = paradaService;
} }
} }

View File

@ -37,154 +37,156 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
@Scope("prototype") @Scope("prototype")
public class EditarPricingOcupacionController extends MyGenericForwardComposer { public class EditarPricingOcupacionController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingOcupacionService pricingOcupacionService; @Autowired
private PricingOcupacion pricingOcupacion; private PricingOcupacionService pricingOcupacionService;
private MyListbox pricingOcupacionList; private PricingOcupacion pricingOcupacion;
private Intbox ocupacioninicial; private MyListbox pricingOcupacionList;
private Intbox ocupacionfinal; private Intbox ocupacioninicial;
private MyTextboxDecimal porcentaje; private Intbox ocupacionfinal;
private Pricing pricing; private MyTextboxDecimal porcentaje;
private ConstraintPorcentagem ct; private Pricing pricing;
private static Logger log = Logger.getLogger(EditarPricingOcupacionController.class); private ConstraintPorcentagem ct;
private static Logger log = Logger.getLogger(EditarPricingOcupacionController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
ct = new ConstraintPorcentagem(); ct = new ConstraintPorcentagem();
pricing = (Pricing) Executions.getCurrent().getArg().get("pricing"); pricing = (Pricing) Executions.getCurrent().getArg().get("pricing");
pricingOcupacion = (PricingOcupacion) Executions.getCurrent().getArg().get("pricingOcupacion"); pricingOcupacion = (PricingOcupacion) Executions.getCurrent().getArg().get("pricingOcupacion");
pricingOcupacionList = (MyListbox) Executions.getCurrent().getArg().get("pricingOcupacionList"); pricingOcupacionList = (MyListbox) Executions.getCurrent().getArg().get("pricingOcupacionList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
} }
public void onClick$btnAdicionarOcupacion(Event ev) throws Exception { public void onClick$btnAdicionarOcupacion(Event ev) throws Exception {
ocupacioninicial.getValue(); ocupacioninicial.getValue();
ocupacionfinal.getValue(); ocupacionfinal.getValue();
porcentaje.getValue(); porcentaje.getValue();
if (ocupacioninicial.getValue() > 100) { if (ocupacioninicial.getValue() > 100) {
Messagebox.show(Labels.getLabel("editarPricingController.ocupacionPorcentaje.value"), Messagebox.show(Labels.getLabel("editarPricingController.ocupacionPorcentaje.value"),
Labels.getLabel("editarPricingController.windowOcupacion.title"), Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else if (ocupacionfinal.getValue() > 100) { } else if (ocupacionfinal.getValue() > 100) {
Messagebox.show(Labels.getLabel("editarPricingController.ocupacionPorcentaje.value"), Messagebox.show(Labels.getLabel("editarPricingController.ocupacionPorcentaje.value"),
Labels.getLabel("editarPricingController.windowOcupacion.title"), Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else if (ocupacionfinal.getValue() < ocupacioninicial.getValue()) { } else if (ocupacionfinal.getValue() < ocupacioninicial.getValue()) {
Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada.value"), Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada.value"),
Labels.getLabel("editarPricingController.windowOcupacion.title"), Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
BigDecimal min = pricingOcupacion.getOcupacioninicial(); BigDecimal min = pricingOcupacion.getOcupacioninicial();
BigDecimal max = pricingOcupacion.getOcupacionfinal(); BigDecimal max = pricingOcupacion.getOcupacionfinal();
// Boolean podeSalvar = pricingOcupacionService.podeSalvar(pricing, // Boolean podeSalvar = pricingOcupacionService.podeSalvar(pricing,
// min, max); // min, max);
boolean existe = true; boolean existe = true;
List<PricingOcupacion> lsPricingOcupacion = pricingOcupacionService.obtenerPorPricing(pricingOcupacion.getPricing()); List<PricingOcupacion> lsPricingOcupacion = pricingOcupacionService.obtenerPorPricing(pricingOcupacion.getPricing());
if (pricingOcupacion != null) { if (pricingOcupacion != null) {
lsPricingOcupacion.remove(pricingOcupacion); lsPricingOcupacion.remove(pricingOcupacion);
} }
for (PricingOcupacion po : lsPricingOcupacion) {
if (po.getActivo()) {
boolean traslapa = TraslaparUtil.intersectNum(
po.getOcupacioninicial(), po.getOcupacionfinal(),
min, max);
if (traslapa) {
existe = false;
}
}
}
if (existe) { for (PricingOcupacion po : lsPricingOcupacion) {
if (pricingOcupacion.getPricingocupacionId() != null) { if (po.getActivo().equals(Pricing.ATIVO)) {
pricingOcupacionService.actualizacion(pricingOcupacion); boolean traslapa = TraslaparUtil.intersectNum(
pricingOcupacionList.updateItem(pricingOcupacion); po.getOcupacioninicial(), po.getOcupacionfinal(),
} else { min, max);
pricingOcupacionService.suscribir(pricingOcupacion); if (traslapa) {
pricingOcupacionList.addItem(pricingOcupacion); existe = false;
} }
closeWindow(); }
} else { }
Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada"),
Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} if (existe) {
} if (pricingOcupacion.getPricingocupacionId() != null) {
pricingOcupacionService.actualizacion(pricingOcupacion);
pricingOcupacionList.updateItem(pricingOcupacion);
} else {
pricingOcupacionService.suscribir(pricingOcupacion);
pricingOcupacionList.addItemNovo(pricingOcupacion);
}
closeWindow();
} else {
Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada"),
Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
public void onClick$btnRemoverOcupacion(Event ev) { }
try { }
PricingOcupacion pOcupacion = (PricingOcupacion) pricingOcupacionList.getSelected();
if (pOcupacion != null) {
int resp = Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarPerguntaOcupacion"),
Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.YES | Messagebox.NO,
Messagebox.QUESTION);
if (resp == Messagebox.YES) { public void onClick$btnRemoverOcupacion(Event ev) {
pricingOcupacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); try {
pricingOcupacion.setFecmodif(Calendar.getInstance().getTime()); PricingOcupacion pOcupacion = (PricingOcupacion) pricingOcupacionList.getSelected();
pricingOcupacion.setActivo(Boolean.FALSE); if (pOcupacion != null) {
int resp = Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarPerguntaOcupacion"),
Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.YES | Messagebox.NO,
Messagebox.QUESTION);
pricingOcupacionList.removeItem(pricingOcupacion); if (resp == Messagebox.YES) {
pricingOcupacionService.borrar(pricingOcupacion); pricingOcupacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
closeWindow(); pricingOcupacion.setFecmodif(Calendar.getInstance().getTime());
} pricingOcupacion.setActivo(Pricing.INATIVO);
} else {
Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error(ex);
}
} pricingOcupacionList.removeItem(pricingOcupacion);
pricingOcupacionService.borrar(pricingOcupacion);
closeWindow();
}
} else {
Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowOcupacion.title"),
Messagebox.OK, Messagebox.EXCLAMATION);
}
} catch (Exception ex) {
log.error(ex);
}
public PricingOcupacion getPricingOcupacion() { }
return pricingOcupacion;
}
public void setPricingOcupacion(PricingOcupacion pricingOcupacion) { public PricingOcupacion getPricingOcupacion() {
this.pricingOcupacion = pricingOcupacion; return pricingOcupacion;
} }
public MyListbox getPricingOcupacionList() { public void setPricingOcupacion(PricingOcupacion pricingOcupacion) {
return pricingOcupacionList; this.pricingOcupacion = pricingOcupacion;
} }
public void setPricingOcupacionList(MyListbox pricingOcupacionList) { public MyListbox getPricingOcupacionList() {
this.pricingOcupacionList = pricingOcupacionList; return pricingOcupacionList;
} }
public PricingOcupacionService getPricingOcupacionService() { public void setPricingOcupacionList(MyListbox pricingOcupacionList) {
return pricingOcupacionService; this.pricingOcupacionList = pricingOcupacionList;
} }
public void setPricingOcupacionService( public PricingOcupacionService getPricingOcupacionService() {
PricingOcupacionService pricingOcupacionService) { return pricingOcupacionService;
this.pricingOcupacionService = pricingOcupacionService; }
}
/** public void setPricingOcupacionService(
* @return the ct PricingOcupacionService pricingOcupacionService) {
*/ this.pricingOcupacionService = pricingOcupacionService;
public ConstraintPorcentagem getCt() { }
return ct;
}
/** /**
* @param ct * @return the ct
* the ct to set */
*/ public ConstraintPorcentagem getCt() {
public void setCt(ConstraintPorcentagem ct) { return ct;
this.ct = ct; }
}
/**
* @param ct
* the ct to set
*/
public void setCt(ConstraintPorcentagem ct) {
this.ct = ct;
}
} }

View File

@ -4,6 +4,7 @@
*/ */
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta; import com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.service.PricingPuntoVentaService; import com.rjconsultores.ventaboletos.service.PricingPuntoVentaService;
@ -31,127 +32,128 @@ import org.zkoss.zul.Combobox;
@Scope("prototype") @Scope("prototype")
public class EditarPricingPuntoVentaController extends MyGenericForwardComposer { public class EditarPricingPuntoVentaController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingPuntoVentaService pricingPuntoVentaService; @Autowired
@Autowired private PricingPuntoVentaService pricingPuntoVentaService;
private PuntoVentaService puntoVentaService; @Autowired
private PricingPuntoVenta pricingPuntoVenta; private PuntoVentaService puntoVentaService;
private MyListbox pricingPuntoVentaList; private PricingPuntoVenta pricingPuntoVenta;
private Combobox cmbPuntoVenta; private MyListbox pricingPuntoVentaList;
private static Logger log = Logger.getLogger(EditarPricingPuntoVentaController.class); private Combobox cmbPuntoVenta;
private static Logger log = Logger.getLogger(EditarPricingPuntoVentaController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
pricingPuntoVenta = (PricingPuntoVenta) Executions.getCurrent().getArg().get("pricingPuntoVenta"); pricingPuntoVenta = (PricingPuntoVenta) Executions.getCurrent().getArg().get("pricingPuntoVenta");
pricingPuntoVentaList = (MyListbox) Executions.getCurrent().getArg().get("pricingPuntoVentaList"); pricingPuntoVentaList = (MyListbox) Executions.getCurrent().getArg().get("pricingPuntoVentaList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
if (pricingPuntoVenta.getPuntoVenta() != null) { if (pricingPuntoVenta.getPuntoVenta() != null) {
cmbPuntoVenta.setText(pricingPuntoVenta.getPuntoVenta().getNombpuntoventa()); cmbPuntoVenta.setText(pricingPuntoVenta.getPuntoVenta().getNombpuntoventa());
} }
cmbPuntoVenta.focus(); cmbPuntoVenta.focus();
} }
public void onClick$btnAdicionarPuntoVenta(Event ev) throws Exception { public void onClick$btnAdicionarPuntoVenta(Event ev) throws Exception {
cmbPuntoVenta.getValue(); cmbPuntoVenta.getValue();
try { try {
PuntoVenta pv = (PuntoVenta) cmbPuntoVenta.getSelectedItem().getValue(); PuntoVenta pv = (PuntoVenta) cmbPuntoVenta.getSelectedItem().getValue();
try { try {
Boolean existe = pricingPuntoVentaService.obtenerPricingPuntoVenta(pricingPuntoVenta.getPricing(), pv); Boolean existe = pricingPuntoVentaService.obtenerPricingPuntoVenta(pricingPuntoVenta.getPricing(), pv);
if (existe) { if (existe) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Registro.Existe"), Labels.getLabel("MSG.Registro.Existe"),
Labels.getLabel("editarPricingController.windowPuntoVenta.title"), Labels.getLabel("editarPricingController.windowPuntoVenta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
pricingPuntoVenta.setPuntoVenta(pv); pricingPuntoVenta.setPuntoVenta(pv);
if (pricingPuntoVenta.getPricingptovtaId() != null) { if (pricingPuntoVenta.getPricingptovtaId() != null) {
pricingPuntoVentaService.actualizacion(pricingPuntoVenta); pricingPuntoVentaService.actualizacion(pricingPuntoVenta);
pricingPuntoVentaList.updateItem(pricingPuntoVenta); pricingPuntoVentaList.updateItem(pricingPuntoVenta);
} else { } else {
pricingPuntoVentaService.suscribir(pricingPuntoVenta); pricingPuntoVentaService.suscribir(pricingPuntoVenta);
pricingPuntoVentaList.addItem(pricingPuntoVenta); pricingPuntoVentaList.addItemNovo(pricingPuntoVenta);
} }
closeWindow(); closeWindow();
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error("editarPricingController PuntoVenta: " + ex); log.error("editarPricingController PuntoVenta: " + ex);
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error"), Labels.getLabel("MSG.Error"),
Labels.getLabel("editarPricingController.windowPuntoVenta.title"), Labels.getLabel("editarPricingController.windowPuntoVenta.title"),
Messagebox.OK, Messagebox.ERROR); Messagebox.OK, Messagebox.ERROR);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error("Combobox PuntoVenta" + ex); log.error("Combobox PuntoVenta" + ex);
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error.combobox"), Labels.getLabel("MSG.Error.combobox"),
Labels.getLabel("editarPricingController.windowPuntoVenta.title"), Labels.getLabel("editarPricingController.windowPuntoVenta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} }
public void onClick$btnRemoverPuntoVenta(Event ev) { public void onClick$btnRemoverPuntoVenta(Event ev) {
try { try {
PricingPuntoVenta pPuntoVenta = (PricingPuntoVenta) pricingPuntoVentaList.getSelected(); PricingPuntoVenta pPuntoVenta = (PricingPuntoVenta) pricingPuntoVentaList.getSelected();
if (pPuntoVenta != null) { if (pPuntoVenta != null) {
int resp = Messagebox.show( int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaPuntoVenta"), Labels.getLabel("editarPricingController.MSG.borrarPerguntaPuntoVenta"),
Labels.getLabel("editarPricingController.windowPuntoVenta.title"), Labels.getLabel("editarPricingController.windowPuntoVenta.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingPuntoVenta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingPuntoVenta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingPuntoVenta.setFecmodif(Calendar.getInstance().getTime()); pricingPuntoVenta.setFecmodif(Calendar.getInstance().getTime());
pricingPuntoVenta.setActivo(Boolean.FALSE); pricingPuntoVenta.setActivo(Pricing.INATIVO);
pricingPuntoVentaList.removeItem(pricingPuntoVenta); pricingPuntoVentaList.removeItem(pricingPuntoVenta);
pricingPuntoVentaService.borrar(pricingPuntoVenta); pricingPuntoVentaService.borrar(pricingPuntoVenta);
closeWindow(); closeWindow();
} }
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowPuntoVenta.title"), Labels.getLabel("editarPricingController.windowPuntoVenta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public PricingPuntoVenta getPricingPuntoVenta() { public PricingPuntoVenta getPricingPuntoVenta() {
return pricingPuntoVenta; return pricingPuntoVenta;
} }
public void setPricingPuntoVenta(PricingPuntoVenta pricingPuntoVenta) { public void setPricingPuntoVenta(PricingPuntoVenta pricingPuntoVenta) {
this.pricingPuntoVenta = pricingPuntoVenta; this.pricingPuntoVenta = pricingPuntoVenta;
} }
public MyListbox getPricingPuntoVentaList() { public MyListbox getPricingPuntoVentaList() {
return pricingPuntoVentaList; return pricingPuntoVentaList;
} }
public void setPricingPuntoVentaList(MyListbox pricingPuntoVentaList) { public void setPricingPuntoVentaList(MyListbox pricingPuntoVentaList) {
this.pricingPuntoVentaList = pricingPuntoVentaList; this.pricingPuntoVentaList = pricingPuntoVentaList;
} }
public PricingPuntoVentaService getPricingPuntoVentaService() { public PricingPuntoVentaService getPricingPuntoVentaService() {
return pricingPuntoVentaService; return pricingPuntoVentaService;
} }
public void setPricingPuntoVentaService(PricingPuntoVentaService pricingPuntoVentaService) { public void setPricingPuntoVentaService(PricingPuntoVentaService pricingPuntoVentaService) {
this.pricingPuntoVentaService = pricingPuntoVentaService; this.pricingPuntoVentaService = pricingPuntoVentaService;
} }
public PuntoVentaService getPuntoVentaService() { public PuntoVentaService getPuntoVentaService() {
return puntoVentaService; return puntoVentaService;
} }
public void setPuntoVentaService(PuntoVentaService puntoVentaService) { public void setPuntoVentaService(PuntoVentaService puntoVentaService) {
this.puntoVentaService = puntoVentaService; this.puntoVentaService = puntoVentaService;
} }
} }

View File

@ -4,6 +4,7 @@
*/ */
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.Ruta;
import com.rjconsultores.ventaboletos.entidad.PricingRuta; import com.rjconsultores.ventaboletos.entidad.PricingRuta;
import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.service.RutaService;
@ -32,140 +33,141 @@ import org.zkoss.zul.Combobox;
@Scope("prototype") @Scope("prototype")
public class EditarPricingRutaController extends MyGenericForwardComposer { public class EditarPricingRutaController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingRutaService pricingRutaService; @Autowired
@Autowired private PricingRutaService pricingRutaService;
private RutaService rutaService; @Autowired
private List<Ruta> lsRuta; private RutaService rutaService;
private PricingRuta pricingRuta; private List<Ruta> lsRuta;
private MyListbox pricingRutaList; private PricingRuta pricingRuta;
private Combobox cmbRuta; private MyListbox pricingRutaList;
private static Logger log = Logger.getLogger(EditarPricingRutaController.class); private Combobox cmbRuta;
private static Logger log = Logger.getLogger(EditarPricingRutaController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
pricingRuta = (PricingRuta) Executions.getCurrent().getArg().get("pricingRuta"); pricingRuta = (PricingRuta) Executions.getCurrent().getArg().get("pricingRuta");
pricingRutaList = (MyListbox) Executions.getCurrent().getArg().get("pricingRutaList"); pricingRutaList = (MyListbox) Executions.getCurrent().getArg().get("pricingRutaList");
lsRuta = rutaService.obtenerPorEmpresa(pricingRuta.getPricing().getEmpresa()); lsRuta = rutaService.obtenerPorEmpresa(pricingRuta.getPricing().getEmpresa());
lsRuta.add(rutaService.obtenerID(-1)); lsRuta.add(rutaService.obtenerID(-1));
super.doAfterCompose(comp); super.doAfterCompose(comp);
cmbRuta.focus(); cmbRuta.focus();
} }
public void onClick$btnAdicionarRuta(Event ev) throws Exception { public void onClick$btnAdicionarRuta(Event ev) throws Exception {
cmbRuta.getValue(); cmbRuta.getValue();
try { try {
if (pricingRuta.getRuta() == null) { if (pricingRuta.getRuta() == null) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error.combobox"), Labels.getLabel("MSG.Error.combobox"),
Labels.getLabel("editarPricingController.windowRuta.title"), Labels.getLabel("editarPricingController.windowRuta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
Boolean existe = pricingRutaService.obtenerPricingRuta(pricingRuta.getPricing(), (Ruta) cmbRuta.getSelectedItem().getValue()); Boolean existe = pricingRutaService.obtenerPricingRuta(pricingRuta.getPricing(), (Ruta) cmbRuta.getSelectedItem().getValue());
if (existe) { if (existe) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Registro.Existe"), Labels.getLabel("MSG.Registro.Existe"),
Labels.getLabel("editarPricingController.windowRuta.title"), Labels.getLabel("editarPricingController.windowRuta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
if (pricingRuta.getPricingrutaId() != null) { if (pricingRuta.getPricingrutaId() != null) {
pricingRutaService.actualizacion(pricingRuta); pricingRutaService.actualizacion(pricingRuta);
pricingRutaList.updateItem(pricingRuta); pricingRutaList.updateItem(pricingRuta);
} else { } else {
pricingRutaService.suscribir(pricingRuta); pricingRutaService.suscribir(pricingRuta);
pricingRutaList.addItem(pricingRuta); pricingRutaList.addItemNovo(pricingRuta);
} }
closeWindow(); closeWindow();
} }
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public void onClick$btnRemoverRuta(Event ev) { public void onClick$btnRemoverRuta(Event ev) {
try { try {
PricingRuta pRuta = (PricingRuta) pricingRutaList.getSelected(); PricingRuta pRuta = (PricingRuta) pricingRutaList.getSelected();
if (pRuta != null) { if (pRuta != null) {
int resp = Messagebox.show( int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaRuta"), Labels.getLabel("editarPricingController.MSG.borrarPerguntaRuta"),
Labels.getLabel("editarPricingController.windowRuta.title"), Labels.getLabel("editarPricingController.windowRuta.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingRuta.setFecmodif(Calendar.getInstance().getTime()); pricingRuta.setFecmodif(Calendar.getInstance().getTime());
pricingRuta.setActivo(Boolean.FALSE); pricingRuta.setActivo(Pricing.INATIVO);
pricingRutaList.removeItem(pricingRuta); pricingRutaList.removeItem(pricingRuta);
pricingRutaService.borrar(pricingRuta); pricingRutaService.borrar(pricingRuta);
closeWindow(); closeWindow();
} }
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowRuta.title"), Labels.getLabel("editarPricingController.windowRuta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public PricingRuta getPricingRuta() { public PricingRuta getPricingRuta() {
return pricingRuta; return pricingRuta;
} }
public void setPricingRuta(PricingRuta pricingRuta) { public void setPricingRuta(PricingRuta pricingRuta) {
this.pricingRuta = pricingRuta; this.pricingRuta = pricingRuta;
} }
public MyListbox getPricingRutaList() { public MyListbox getPricingRutaList() {
return pricingRutaList; return pricingRutaList;
} }
public void setPricingRutaList(MyListbox pricingRutaList) { public void setPricingRutaList(MyListbox pricingRutaList) {
this.pricingRutaList = pricingRutaList; this.pricingRutaList = pricingRutaList;
} }
public PricingRutaService getPricingRutaService() { public PricingRutaService getPricingRutaService() {
return pricingRutaService; return pricingRutaService;
} }
public void setPricingRutaService(PricingRutaService pricingRutaService) { public void setPricingRutaService(PricingRutaService pricingRutaService) {
this.pricingRutaService = pricingRutaService; this.pricingRutaService = pricingRutaService;
} }
public List<Ruta> getLsRuta() { public List<Ruta> getLsRuta() {
return lsRuta; return lsRuta;
} }
public void setLsRuta(List<Ruta> lsRuta) { public void setLsRuta(List<Ruta> lsRuta) {
this.lsRuta = lsRuta; this.lsRuta = lsRuta;
} }
public RutaService getRutaService() { public RutaService getRutaService() {
return rutaService; return rutaService;
} }
public void setRutaService(RutaService rutaService) { public void setRutaService(RutaService rutaService) {
this.rutaService = rutaService; this.rutaService = rutaService;
} }
public Combobox getCmbRuta() { public Combobox getCmbRuta() {
return cmbRuta; return cmbRuta;
} }
public void setCmbRuta(Combobox cmbRuta) { public void setCmbRuta(Combobox cmbRuta) {
this.cmbRuta = cmbRuta; this.cmbRuta = cmbRuta;
} }
} }

View File

@ -4,6 +4,7 @@
*/ */
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta;
import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
import com.rjconsultores.ventaboletos.service.PricingTipoPtoVtaService; import com.rjconsultores.ventaboletos.service.PricingTipoPtoVtaService;
@ -32,130 +33,131 @@ import org.zkoss.zul.Combobox;
@Scope("prototype") @Scope("prototype")
public class EditarPricingTipoPtoVtaController extends MyGenericForwardComposer { public class EditarPricingTipoPtoVtaController extends MyGenericForwardComposer {
@Autowired private static final long serialVersionUID = 1L;
private PricingTipoPtoVtaService pricingTipoPtoVtaService; @Autowired
@Autowired private PricingTipoPtoVtaService pricingTipoPtoVtaService;
private TipoPuntoVentaService tipoPtoVtaService; @Autowired
private List<TipoPuntoVenta> lsTipoPtoVta; private TipoPuntoVentaService tipoPtoVtaService;
private PricingTipoPtoVta pricingTipoPtoVta; private List<TipoPuntoVenta> lsTipoPtoVta;
private MyListbox pricingTipoPtoVtaList; private PricingTipoPtoVta pricingTipoPtoVta;
private Combobox cmbTipoPtoVta; private MyListbox pricingTipoPtoVtaList;
private static Logger log = Logger.getLogger(EditarPricingTipoPtoVtaController.class); private Combobox cmbTipoPtoVta;
private static Logger log = Logger.getLogger(EditarPricingTipoPtoVtaController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
lsTipoPtoVta = tipoPtoVtaService.obtenerTodos(); lsTipoPtoVta = tipoPtoVtaService.obtenerTodos();
pricingTipoPtoVta = (PricingTipoPtoVta) Executions.getCurrent().getArg().get("pricingTipoPtoVta"); pricingTipoPtoVta = (PricingTipoPtoVta) Executions.getCurrent().getArg().get("pricingTipoPtoVta");
pricingTipoPtoVtaList = (MyListbox) Executions.getCurrent().getArg().get("pricingTipoPtoVtaList"); pricingTipoPtoVtaList = (MyListbox) Executions.getCurrent().getArg().get("pricingTipoPtoVtaList");
super.doAfterCompose(comp); super.doAfterCompose(comp);
cmbTipoPtoVta.focus(); cmbTipoPtoVta.focus();
} }
public void onClick$btnAdicionarTipoPtoVta(Event ev) throws Exception { public void onClick$btnAdicionarTipoPtoVta(Event ev) throws Exception {
cmbTipoPtoVta.getValue(); cmbTipoPtoVta.getValue();
try { try {
if (pricingTipoPtoVta.getTipoPtovta() == null) { if (pricingTipoPtoVta.getTipoPtovta() == null) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Error.combobox"), Labels.getLabel("MSG.Error.combobox"),
Labels.getLabel("editarPricingController.windowTipoPtoVta.title"), Labels.getLabel("editarPricingController.windowTipoPtoVta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
Boolean existe = pricingTipoPtoVtaService.obtenerPricingTipoPuntoVenta(pricingTipoPtoVta.getPricing(), (TipoPuntoVenta) cmbTipoPtoVta.getSelectedItem().getValue()); Boolean existe = pricingTipoPtoVtaService.obtenerPricingTipoPuntoVenta(pricingTipoPtoVta.getPricing(), (TipoPuntoVenta) cmbTipoPtoVta.getSelectedItem().getValue());
if (existe) { if (existe) {
Messagebox.show( Messagebox.show(
Labels.getLabel("MSG.Registro.Existe"), Labels.getLabel("MSG.Registro.Existe"),
Labels.getLabel("editarPricingController.windowTipoPtoVta.title"), Labels.getLabel("editarPricingController.windowTipoPtoVta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
if (pricingTipoPtoVta.getPricingtipoptovtaId() != null) { if (pricingTipoPtoVta.getPricingtipoptovtaId() != null) {
pricingTipoPtoVtaService.actualizacion(pricingTipoPtoVta); pricingTipoPtoVtaService.actualizacion(pricingTipoPtoVta);
pricingTipoPtoVtaList.updateItem(pricingTipoPtoVta); pricingTipoPtoVtaList.updateItem(pricingTipoPtoVta);
} else { } else {
pricingTipoPtoVtaService.suscribir(pricingTipoPtoVta); pricingTipoPtoVtaService.suscribir(pricingTipoPtoVta);
pricingTipoPtoVtaList.addItem(pricingTipoPtoVta); pricingTipoPtoVtaList.addItemNovo(pricingTipoPtoVta);
} }
closeWindow(); closeWindow();
} }
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public void onClick$btnRemoverTipoPtoVta(Event ev) { public void onClick$btnRemoverTipoPtoVta(Event ev) {
try { try {
PricingTipoPtoVta pTipoPtoVta = (PricingTipoPtoVta) pricingTipoPtoVtaList.getSelected(); PricingTipoPtoVta pTipoPtoVta = (PricingTipoPtoVta) pricingTipoPtoVtaList.getSelected();
if (pTipoPtoVta != null) { if (pTipoPtoVta != null) {
int resp = Messagebox.show( int resp = Messagebox.show(
Labels.getLabel("editarPricingController.MSG.borrarPerguntaTipoPtoVta"), Labels.getLabel("editarPricingController.MSG.borrarPerguntaTipoPtoVta"),
Labels.getLabel("editarPricingController.windowTipoPtoVta.title"), Labels.getLabel("editarPricingController.windowTipoPtoVta.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingTipoPtoVta.setFecmodif(Calendar.getInstance().getTime()); pricingTipoPtoVta.setFecmodif(Calendar.getInstance().getTime());
pricingTipoPtoVta.setActivo(Boolean.FALSE); pricingTipoPtoVta.setActivo(Pricing.INATIVO);
pricingTipoPtoVtaList.removeItem(pricingTipoPtoVta); pricingTipoPtoVtaList.removeItem(pricingTipoPtoVta);
pricingTipoPtoVtaService.borrar(pricingTipoPtoVta); pricingTipoPtoVtaService.borrar(pricingTipoPtoVta);
closeWindow(); closeWindow();
} }
} else { } else {
Messagebox.show( Messagebox.show(
Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.MSG.selectItem"),
Labels.getLabel("editarPricingController.windowTipoPtoVta.title"), Labels.getLabel("editarPricingController.windowTipoPtoVta.title"),
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} }
} catch (Exception ex) { } catch (Exception ex) {
log.error(ex); log.error(ex);
} }
} }
public PricingTipoPtoVta getPricingTipoPtoVta() { public PricingTipoPtoVta getPricingTipoPtoVta() {
return pricingTipoPtoVta; return pricingTipoPtoVta;
} }
public void setPricingTipoPtoVta(PricingTipoPtoVta pricingTipoPtoVta) { public void setPricingTipoPtoVta(PricingTipoPtoVta pricingTipoPtoVta) {
this.pricingTipoPtoVta = pricingTipoPtoVta; this.pricingTipoPtoVta = pricingTipoPtoVta;
} }
public MyListbox getPricingTipoPtoVtaList() { public MyListbox getPricingTipoPtoVtaList() {
return pricingTipoPtoVtaList; return pricingTipoPtoVtaList;
} }
public void setPricingTipoPtoVtaList(MyListbox pricingTipoPtoVtaList) { public void setPricingTipoPtoVtaList(MyListbox pricingTipoPtoVtaList) {
this.pricingTipoPtoVtaList = pricingTipoPtoVtaList; this.pricingTipoPtoVtaList = pricingTipoPtoVtaList;
} }
public PricingTipoPtoVtaService getPricingTipoPtoVtaService() { public PricingTipoPtoVtaService getPricingTipoPtoVtaService() {
return pricingTipoPtoVtaService; return pricingTipoPtoVtaService;
} }
public void setPricingTipoPtoVtaService(PricingTipoPtoVtaService pricingTipoPtoVtaService) { public void setPricingTipoPtoVtaService(PricingTipoPtoVtaService pricingTipoPtoVtaService) {
this.pricingTipoPtoVtaService = pricingTipoPtoVtaService; this.pricingTipoPtoVtaService = pricingTipoPtoVtaService;
} }
public List<TipoPuntoVenta> getLsTipoPtoVta() { public List<TipoPuntoVenta> getLsTipoPtoVta() {
return lsTipoPtoVta; return lsTipoPtoVta;
} }
public void setLsTipoPtoVta(List<TipoPuntoVenta> lsTipoPtoVta) { public void setLsTipoPtoVta(List<TipoPuntoVenta> lsTipoPtoVta) {
this.lsTipoPtoVta = lsTipoPtoVta; this.lsTipoPtoVta = lsTipoPtoVta;
} }
public TipoPuntoVentaService getTipoPtoVtaService() { public TipoPuntoVentaService getTipoPtoVtaService() {
return tipoPtoVtaService; return tipoPtoVtaService;
} }
public void setTipoPtoVtaService(TipoPuntoVentaService tipoPtoVtaService) { public void setTipoPtoVtaService(TipoPuntoVentaService tipoPtoVtaService) {
this.tipoPtoVtaService = tipoPtoVtaService; this.tipoPtoVtaService = tipoPtoVtaService;
} }
} }

View File

@ -4,6 +4,7 @@
*/ */
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.TipoServicio; import com.rjconsultores.ventaboletos.entidad.TipoServicio;
import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio; import com.rjconsultores.ventaboletos.entidad.PricingTipoServicio;
import com.rjconsultores.ventaboletos.service.TipoServicioService; import com.rjconsultores.ventaboletos.service.TipoServicioService;
@ -102,7 +103,7 @@ public class EditarPricingTipoServicioController extends MyGenericForwardCompose
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingTipoServicio.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingTipoServicio.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingTipoServicio.setFecmodif(Calendar.getInstance().getTime()); pricingTipoServicio.setFecmodif(Calendar.getInstance().getTime());
pricingTipoServicio.setActivo(Boolean.FALSE); pricingTipoServicio.setActivo(Pricing.EXCLUIDO);
pricingTipoServicioList.removeItem(pricingTipoServicio); pricingTipoServicioList.removeItem(pricingTipoServicio);
pricingTipoServicioService.borrar(pricingTipoServicio); pricingTipoServicioService.borrar(pricingTipoServicio);

View File

@ -16,11 +16,8 @@ import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida;
import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingVigencia; import com.rjconsultores.ventaboletos.entidad.PricingVigencia;
import com.rjconsultores.ventaboletos.service.PricingVigenciaService; import com.rjconsultores.ventaboletos.service.PricingVigenciaService;
@ -70,7 +67,6 @@ public class EditarPricingVigenciaController extends MyGenericForwardComposer {
} }
public void onClick$btnAdicionarVigencia(Event ev) throws Exception { public void onClick$btnAdicionarVigencia(Event ev) throws Exception {
fecinicioviaje.getValue(); fecinicioviaje.getValue();
fecfinviaje.getValue(); fecfinviaje.getValue();
fecinicioventa.getValue(); fecinicioventa.getValue();
@ -94,7 +90,6 @@ public class EditarPricingVigenciaController extends MyGenericForwardComposer {
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
try { try {
pricingVigencia.setFecinicioviaje(fecinicioviaje.getValue()); pricingVigencia.setFecinicioviaje(fecinicioviaje.getValue());
pricingVigencia.setFecfinviaje(fecfinviaje.getValue()); pricingVigencia.setFecfinviaje(fecfinviaje.getValue());
pricingVigencia.setFecinicioventa(fecinicioventa.getValue()); pricingVigencia.setFecinicioventa(fecinicioventa.getValue());
@ -102,14 +97,12 @@ public class EditarPricingVigenciaController extends MyGenericForwardComposer {
pricingVigencia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingVigencia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingVigencia.setFecmodif(Calendar.getInstance().getTime()); pricingVigencia.setFecmodif(Calendar.getInstance().getTime());
pricingVigencia.setActivo(Boolean.TRUE); pricingVigencia.setActivo(Pricing.ATIVO);
Date inicio = pricingVigencia.getFecinicioventa(); Date inicio = pricingVigencia.getFecinicioventa();
Date fim = pricingVigencia.getFecfinventa(); Date fim = pricingVigencia.getFecfinventa();
Boolean podeSalvar = Boolean podeSalvar = pricingVigenciaService.podeSalvar(pricing, pricingVigencia, inicio, fim);
pricingVigenciaService.podeSalvar(pricing, pricingVigencia,
inicio, fim);
if (pricingVigencia.getPricingvigenciaId() != null) { if (pricingVigencia.getPricingvigenciaId() != null) {
if (podeSalvar) { if (podeSalvar) {
pricingVigenciaService.actualizacion(pricingVigencia); pricingVigenciaService.actualizacion(pricingVigencia);
@ -124,7 +117,7 @@ public class EditarPricingVigenciaController extends MyGenericForwardComposer {
} else { } else {
if (podeSalvar) { if (podeSalvar) {
pricingVigenciaService.suscribir(pricingVigencia); pricingVigenciaService.suscribir(pricingVigencia);
pricingVigenciaList.addItem(pricingVigencia); pricingVigenciaList.addItemNovo(pricingVigencia);
closeWindow(); closeWindow();
} else { } else {
Messagebox.show( Messagebox.show(
@ -151,7 +144,7 @@ public class EditarPricingVigenciaController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) { if (resp == Messagebox.YES) {
pricingVigencia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); pricingVigencia.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingVigencia.setFecmodif(Calendar.getInstance().getTime()); pricingVigencia.setFecmodif(Calendar.getInstance().getTime());
pricingVigencia.setActivo(Boolean.FALSE); pricingVigencia.setActivo(Pricing.INATIVO);
pricingVigenciaList.removeItem(pricingVigencia); pricingVigenciaList.removeItem(pricingVigencia);
pricingVigenciaService.borrar(pricingVigencia); pricingVigenciaService.borrar(pricingVigencia);

View File

@ -20,48 +20,48 @@ import org.zkoss.zul.ListitemRenderer;
*/ */
public class RenderPricing implements ListitemRenderer { public class RenderPricing implements ListitemRenderer {
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
Pricing p = (Pricing) o; Pricing p = (Pricing) o;
Listcell lc = new Listcell(); Listcell lc = new Listcell();
if (p.getNombPricing() != null) { if (p.getNombPricing() != null) {
if (p.getPricingId() != null) { if (p.getPricingId() != null) {
lc = new Listcell(p.getPricingId().toString()); lc = new Listcell(p.getPricingId().toString());
} else { } else {
lc = new Listcell("-"); lc = new Listcell("-");
} }
lc.setParent(lstm); lc.setParent(lstm);
if (p.getNombPricing() != null) { if (p.getNombPricing() != null) {
lc = new Listcell(p.getNombPricing()); lc = new Listcell(p.getNombPricing());
} else { } else {
lc = new Listcell("-"); lc = new Listcell("-");
} }
lc.setParent(lstm); lc.setParent(lstm);
if (p.getEmpresa() != null) {
lc = new Listcell(p.getEmpresa().getNombempresa());
} else {
lc = new Listcell("-");
}
lc.setParent(lstm);
if (p.getEmpresa() != null) { Integer pricingInativoAtivo = p.getActivo();
lc = new Listcell(p.getEmpresa().getNombempresa()); SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm");
} else { if (!p.getPricingVigenciaList(pricingInativoAtivo).isEmpty()) {
lc = new Listcell("-"); String data = "";
} for (PricingVigencia pv : p.getPricingVigenciaList(pricingInativoAtivo)) {
lc.setParent(lstm); data = data + dt.format(pv.getFecinicioviaje()) + " a " + dt.format(pv.getFecfinviaje()) + " ou ";
}
SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm"); data = data.substring(0, data.length() - 3);
if (!p.getPricingVigenciaList().isEmpty()) { lc = new Listcell(data);
String data = ""; } else {
for(PricingVigencia pv : p.getPricingVigenciaList()){ lc = new Listcell("-");
data = data + dt.format( pv.getFecinicioviaje()) +" a "+ dt.format(pv.getFecfinviaje()) + " ou "; }
} lc.setParent(lstm);
data = data.substring(0,data.length()-3); }
lc = new Listcell(data); lstm.setAttribute("data", p);
} else { }
lc = new Listcell("-");
}
lc.setParent(lstm);
}
lstm.setAttribute("data", p);
}
} }

View File

@ -1804,6 +1804,7 @@ editarPricingCorridaController.lblFin.value = Hora Saida Fim
busquedaPricingController.window.title = Pricing busquedaPricingController.window.title = Pricing
busquedaPricingEspecificoController.window.title = Pricing Específico busquedaPricingEspecificoController.window.title = Pricing Específico
busquedaPricingController.lhEmpresa.label = Empresa busquedaPricingController.lhEmpresa.label = Empresa
busquedaPricingController.lhBuscarInativos.label = Buscar Inativos
busquedaPricingController.lhNome.label = Nome Pricing busquedaPricingController.lhNome.label = Nome Pricing
busquedaPricingController.lhDataInicioFimViagem.label = Período de Vigência busquedaPricingController.lhDataInicioFimViagem.label = Período de Vigência
busquedaPricingController.btnPesquisa.label = Pesquisa busquedaPricingController.btnPesquisa.label = Pesquisa
@ -1813,6 +1814,8 @@ busquedaPricingController.btnCerrar.tooltiptext = Fechar
#Pricing - busquedaPricingController #Pricing - busquedaPricingController
editarPricingController.MSG.porcentajeCero = Quando se informa o pricing por poltrona ou ocupação, a porcentagem principal tem que ser zero editarPricingController.MSG.porcentajeCero = Quando se informa o pricing por poltrona ou ocupação, a porcentagem principal tem que ser zero
editarPricingController.lhCorridaId.labelLH = Serviço editarPricingController.lhCorridaId.labelLH = Serviço
editarPricingController.MSG.inativarPergunta = Deseja realmente inativar esse pricing?
editarPricingController.MSG.inativarOK = Pricing desativado com sucesso.
editarPricingController.window.title = Pricing editarPricingController.window.title = Pricing
editarPricingController.windowEspecifico.title = Pricing Específico editarPricingController.windowEspecifico.title = Pricing Específico
editarPricingController.windowVigencia.title = Filtros editarPricingController.windowVigencia.title = Filtros
@ -1836,6 +1839,10 @@ editarPricingController.windowAsiento.title = Poltrona
editarPricingController.windowAnticipacion.title = Antecipação editarPricingController.windowAnticipacion.title = Antecipação
editarPricingController.windowTipoServicio.title = Tipo classe editarPricingController.windowTipoServicio.title = Tipo classe
editarPricingController.btnApagar.tooltiptext = Eliminar editarPricingController.btnApagar.tooltiptext = Eliminar
editarPricingController.btnAtivar.tooltiptext = Ativar
editarPricingController.MSG.ativarPergunta = Deseja realmente ativar esse pricing?
editarPricingController.MSG.ativarOK = Pricing ativado com sucesso.
editarPricingController.btnInativar.tooltiptext = Inativar
editarPricingController.btnSalvar.tooltiptext = Salvar editarPricingController.btnSalvar.tooltiptext = Salvar
editarPricingController.btnFechar.tooltiptext = Fechar editarPricingController.btnFechar.tooltiptext = Fechar
editarPricingController.tarifia.label = Tarifa editarPricingController.tarifia.label = Tarifa

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -5,74 +5,89 @@
<?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?> <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaPricing" title="${c:l('busquedaPricingController.window.title')}" <window id="winBusquedaPricing"
apply="${busquedaPricingController}" contentStyle="overflow:auto" title="${c:l('busquedaPricingController.window.title')}"
height="520px" width="720px" border="normal" > apply="${busquedaPricingController}" contentStyle="overflow:auto"
<toolbar> height="520px" width="720px" border="normal">
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px" <toolbar>
tooltiptext="${c:l('busquedaPricingController.btnRefresh.tooltiptext')}" /> <button id="btnRefresh" image="/gui/img/refresh.png"
<separator orient="vertical" /> width="35px"
<button id="btnApagar" height="20" tooltiptext="${c:l('busquedaPricingController.btnRefresh.tooltiptext')}" />
image="/gui/img/remove.png" width="35px" <separator orient="vertical" />
tooltiptext="${c:l('editarPricingController.btnApagarPricing.tooltiptext')}"/> <button id="btnApagar" height="20"
<button id="btnNovo" image="/gui/img/add.png" width="35px" image="/gui/img/remove.png" width="35px"
tooltiptext="${c:l('busquedaPricingController.btnNovo.tooltiptext')}" /> tooltiptext="${c:l('editarPricingController.btnApagarPricing.tooltiptext')}" />
<separator orient="vertical" /> <button id="btnNovo" image="/gui/img/add.png" width="35px"
<button id="btnCerrar" onClick="winBusquedaPricing.detach()" image="/gui/img/exit.png" width="35px" tooltiptext="${c:l('busquedaPricingController.btnNovo.tooltiptext')}" />
tooltiptext="${c:l('busquedaPricingController.btnCerrar.tooltiptext')}"/> <separator orient="vertical" />
</toolbar> <button id="btnCerrar" onClick="winBusquedaPricing.detach()"
image="/gui/img/exit.png" width="35px"
tooltiptext="${c:l('busquedaPricingController.btnCerrar.tooltiptext')}" />
</toolbar>
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
<column width="20%" /> <column width="20%" />
<column width="80%" /> <column width="30%" />
</columns> <column width="20%" />
<rows> <column width="30%" />
<row> </columns>
<label value="${c:l('busquedaPricingController.lhEmpresa.label')}"/> <rows>
<combobox id="cmbEmpresa" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" <row spans="1,3">
mold="rounded" buttonVisible="true" width="90%" <label
model="@{winBusquedaPricing$composer.lsEmpresa}"> value="${c:l('busquedaPricingController.lhNome.label')}" />
</combobox> <textbox id="txtNome" width="90%"
</row> use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
<row> </row>
<label value="${c:l('busquedaPricingController.lhNome.label')}"/> <row spans="1,2,1">
<textbox id="txtNome" width="90%" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/> <label
</row> value="${c:l('busquedaPricingController.lhEmpresa.label')}" />
<row> <combobox id="cmbEmpresa"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
mold="rounded" buttonVisible="true" width="90%"
model="@{winBusquedaPricing$composer.lsEmpresa}">
</combobox>
<label value="${c:l('editarPricingController.vigHoraInicioViaje.value')}"/> <checkbox id="chkBuscarInativos" checked="false"
<hbox> label="${c:l('busquedaPricingController.lhBuscarInativos.label')}" />
<datebox width="150px" id="fechaInicio" mold="rounded" lenient="false"/> </row>
<label value="${c:l('editarPricingController.vigHoraFinViaje.value')}"/> <row>
<datebox width="150px" id="fechaFin" mold="rounded" lenient="false"/> <label
</hbox> value="${c:l('editarPricingController.vigHoraInicioViaje.value')}" />
</row> <datebox width="90%" id="fechaInicio" mold="rounded"
</rows> lenient="false" />
</grid>
<toolbar> <label
<button id="btnPesquisa" image="/gui/img/find.png" value="${c:l('editarPricingController.vigHoraFinViaje.value')}" />
label="${c:l('busquedaPricingController.btnPesquisa.label')}"/> <datebox width="90%" id="fechaFin" mold="rounded"
</toolbar> lenient="false" />
<paging id="pagingPricing" pageSize="15"/> </row>
<listbox id="pricingList" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox" </rows>
multiple="false" height="60%" vflex="false"> </grid>
<listhead sizable="true">
<listheader image="/gui/img/create_doc.gif" <toolbar>
label="${c:l('lb.id')}" width="70px" <button id="btnPesquisa" image="/gui/img/find.png"
sort="auto(pricingId)"/> label="${c:l('busquedaPricingController.btnPesquisa.label')}" />
<listheader image="/gui/img/create_doc.gif" </toolbar>
label="${c:l('busquedaPricingController.lhNome.label')}"
sort="auto(nombPricing)"/> <paging id="pagingPricing" pageSize="15" />
<listheader image="/gui/img/create_doc.gif" <listbox id="pricingList"
label="${c:l('busquedaPricingController.lhEmpresa.label')}" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
sort="auto(empresa.nombempresa)"/> multiple="false" height="60%" vflex="false">
<listheader image="/gui/img/create_doc.gif" width="230px" <listhead sizable="true">
label="${c:l('busquedaPricingController.lhDataInicioFimViagem.label')}" <listheader image="/gui/img/create_doc.gif"
/> label="${c:l('lb.id')}" width="70px" sort="auto(pricingId)" />
</listhead> <listheader image="/gui/img/create_doc.gif"
</listbox> label="${c:l('busquedaPricingController.lhNome.label')}"
</window> sort="auto(nombPricing)" />
<listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaPricingController.lhEmpresa.label')}"
sort="auto(empresa.nombempresa)" />
<listheader image="/gui/img/create_doc.gif"
width="230px"
label="${c:l('busquedaPricingController.lhDataInicioFimViagem.label')}" />
</listhead>
</listbox>
</window>
</zk> </zk>

View File

@ -17,6 +17,20 @@
<button id="btnSalvar" height="20" <button id="btnSalvar" height="20"
image="/gui/img/save.png" width="35px" image="/gui/img/save.png" width="35px"
tooltiptext="${c:l('editarPricingController.btnSalvar.tooltiptext')}" /> tooltiptext="${c:l('editarPricingController.btnSalvar.tooltiptext')}" />
<separator orient="vertical" />
<separator orient="vertical" />
<button id="btnInativar" height="20"
image="/gui/img/close_icon_inactive.png" width="35px"
tooltiptext="${c:l('editarPricingController.btnInativar.tooltiptext')}" />
<button id="btnAtivar" height="20"
image="/gui/img/icon-active.gif" width="35px"
tooltiptext="${c:l('editarPricingController.btnAtivar.tooltiptext')}" />
<separator orient="vertical" />
<separator orient="vertical" />
<button id="btnFechar" height="20" <button id="btnFechar" height="20"
image="/gui/img/exit.png" width="35px" image="/gui/img/exit.png" width="35px"
tooltiptext="${c:l('editarPricingController.btnFechar.tooltiptext')}" /> tooltiptext="${c:l('editarPricingController.btnFechar.tooltiptext')}" />
@ -200,7 +214,7 @@
</toolbar> </toolbar>
<listbox id="pricingVigenciaList" <listbox id="pricingVigenciaList"
use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox" use="com.rjconsultores.ventaboletos.web.utilerias.MyListbox"
height="170px" multiple="true" checkmark="true" > height="170px" multiple="true" checkmark="true">
<listhead sizable="true"> <listhead sizable="true">
<listheader width="25%" <listheader width="25%"
image="/gui/img/create_doc.gif" sort="auto(fecinicioviaje)" image="/gui/img/create_doc.gif" sort="auto(fecinicioviaje)"