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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@28885 d1611594-4594-4d17-8e1d-87c2c4800839

master
rodrigo 2013-07-10 14:26:21 +00:00
parent b0ab6441af
commit 369102e551
24 changed files with 3535 additions and 3363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -87,7 +87,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/CustomAdmVenta"/>
<classpathentry combineaccessrules="false" kind="src" path="/modelWeb"/>
<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/poi-3.8-20120326.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/poi-ooxml-3.8-20120326.jar"/>

341
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java
View File

@ -19,6 +19,7 @@ import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Datebox;
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.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.PricingService;
import com.rjconsultores.ventaboletos.service.UsuarioEmpresaService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
@ -44,14 +44,13 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricing;
@Scope("prototype")
public class BusquedaPricingController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private transient PagedListWrapper<Pricing> plwPricingPunto;
@Autowired
private PricingService pricingService;
@Autowired
private EmpresaService empresaService;
@Autowired
private UsuarioEmpresaService usuarioEmpresaService;
private MyListbox pricingList;
private Paging pagingPricing;
private List<Pricing> lsPricing;
@ -60,178 +59,9 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
private Textbox txtNome;
private Datebox fechaInicio;
private Datebox fechaFin;
private Checkbox chkBuscarInativos;
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() {
return lsPricing;
}
@ -248,14 +78,6 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
this.pagingPricing = pagingPricing;
}
public PagedListWrapper<Pricing> getPlwPricingPunto() {
return plwPricingPunto;
}
public void setPlwPricingPunto(PagedListWrapper<Pricing> plwPricingPunto) {
this.plwPricingPunto = plwPricingPunto;
}
public MyListbox getPricingList() {
return pricingList;
}
@ -312,5 +134,162 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
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);
}
}
}

7
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingAnticipacionController.java
View File

@ -36,6 +36,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
@Scope("prototype")
public class EditarPricingAnticipacionController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingAnticipacionService pricingAnticipacionService;
private PricingAnticipacion pricingAnticipacion;
@ -90,7 +91,7 @@ public class EditarPricingAnticipacionController extends MyGenericForwardCompose
lsPricingAnticipacion.remove(pricingAnticipacion);
}
for (PricingAnticipacion po : lsPricingAnticipacion) {
if (po.getActivo()) {
if (po.getActivo().equals(Pricing.ATIVO)) {
boolean traslapa = TraslaparUtil.intersectNum(
po.getCantdiasmin().longValue(), po.getCantdiasmax().longValue(),
min.longValue(), max.longValue());
@ -106,7 +107,7 @@ public class EditarPricingAnticipacionController extends MyGenericForwardCompose
pricingAnticipacionList.updateItem(pricingAnticipacion);
} else {
pricingAnticipacionService.suscribir(pricingAnticipacion);
pricingAnticipacionList.addItem(pricingAnticipacion);
pricingAnticipacionList.addItemNovo(pricingAnticipacion);
}
closeWindow();
} else {
@ -130,7 +131,7 @@ public class EditarPricingAnticipacionController extends MyGenericForwardCompose
if (resp == Messagebox.YES) {
pricingAnticipacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingAnticipacion.setFecmodif(Calendar.getInstance().getTime());
pricingAnticipacion.setActivo(Boolean.FALSE);
pricingAnticipacion.setActivo(Pricing.EXCLUIDO);
pricingAnticipacionList.removeItem(pricingAnticipacion);
pricingAnticipacionService.borrar(pricingAnticipacion);

11
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingAsientoController.java
View File

@ -16,9 +16,9 @@ import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Decimalbox;
import org.zkoss.zul.Intbox;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingAsiento;
import com.rjconsultores.ventaboletos.service.PricingAsientoService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@ -35,6 +35,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
@Scope("prototype")
public class EditarPricingAsientoController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingAsientoService pricingAsientoService;
private PricingAsiento pricingAsiento;
@ -79,7 +80,7 @@ public class EditarPricingAsientoController extends MyGenericForwardComposer {
pricingAsientoList.updateItem(pricingAsiento);
} else {
pricingAsientoService.suscribir(pricingAsiento);
pricingAsientoList.addItem(pricingAsiento);
pricingAsientoList.addItemNovo(pricingAsiento);
}
closeWindow();
} else {
@ -93,7 +94,6 @@ public class EditarPricingAsientoController extends MyGenericForwardComposer {
}
}
public void onClick$btnRemoverAsiento(Event ev) {
try {
PricingAsiento pAsiento = (PricingAsiento) pricingAsientoList.getSelected();
@ -106,7 +106,7 @@ public class EditarPricingAsientoController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) {
pricingAsiento.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingAsiento.setFecmodif(Calendar.getInstance().getTime());
pricingAsiento.setActivo(Boolean.FALSE);
pricingAsiento.setActivo(Pricing.INATIVO);
pricingAsientoList.removeItem(pricingAsiento);
pricingAsientoService.borrar(pricingAsiento);
@ -156,7 +156,8 @@ public class EditarPricingAsientoController extends MyGenericForwardComposer {
}
/**
* @param ct the ct to set
* @param ct
* the ct to set
*/
public void setCt(ConstraintPorcentagem ct) {
this.ct = ct;

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCategoriaController.java
View File

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

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingClaseController.java
View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.ClaseServicio;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingClase;
import com.rjconsultores.ventaboletos.service.ClaseServicioService;
import com.rjconsultores.ventaboletos.service.PricingClaseService;
@ -52,7 +53,6 @@ public class EditarPricingClaseController extends MyGenericForwardComposer {
super.doAfterCompose(comp);
cmbClase.focus();
}
@ -102,7 +102,7 @@ public class EditarPricingClaseController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) {
pricingClase.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingClase.setFecmodif(Calendar.getInstance().getTime());
pricingClase.setActivo(Boolean.FALSE);
pricingClase.setActivo(Pricing.INATIVO);
pricingClaseList.removeItem(pricingClase);
pricingClaseService.borrar(pricingClase);

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

File diff suppressed because it is too large Load Diff

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

@ -35,7 +35,6 @@ import com.rjconsultores.ventaboletos.service.PricingCorridaService;
import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEditarPricingCorrida;
/**
@ -46,8 +45,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEditarPricingCo
@Scope("prototype")
public class EditarPricingCorridaController extends MyGenericForwardComposer {
@Autowired
private transient PagedListWrapper<Corrida> plwCorrida;
private static final long serialVersionUID = 1L;
@Autowired
private PricingCorridaService pricingCorridaService;
@Autowired
@ -129,7 +127,7 @@ public class EditarPricingCorridaController extends MyGenericForwardComposer {
public void onClick$btnAdicionarCorrida(Event ev) throws Exception {
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();
if (!ls.isEmpty()) {
for (Object o : ls) {
@ -149,7 +147,7 @@ public class EditarPricingCorridaController extends MyGenericForwardComposer {
if (!achou) {
PricingCorrida p = new PricingCorrida();
p.setActivo(Boolean.TRUE);
p.setActivo(Pricing.ATIVO);
p.setCorridaCtrl(corrida.getCorridaCtrl());

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java
View File

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

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingImporteController.java
View File

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

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMarcaController.java
View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Marca;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingMarca;
import com.rjconsultores.ventaboletos.service.MarcaService;
import com.rjconsultores.ventaboletos.service.PricingMarcaService;
@ -32,6 +33,7 @@ import org.zkoss.zul.Combobox;
@Scope("prototype")
public class EditarPricingMarcaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingMarcaService pricingMarcaService;
@Autowired
@ -77,7 +79,7 @@ public class EditarPricingMarcaController extends MyGenericForwardComposer {
pricingMarcaList.updateItem(pricingMarca);
} else {
pricingMarcaService.suscribir(pricingMarca);
pricingMarcaList.addItem(pricingMarca);
pricingMarcaList.addItemNovo(pricingMarca);
}
closeWindow();
}
@ -98,7 +100,7 @@ public class EditarPricingMarcaController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) {
pricingMarca.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingMarca.setFecmodif(Calendar.getInstance().getTime());
pricingMarca.setActivo(Boolean.FALSE);
pricingMarca.setActivo(Pricing.INATIVO);
pricingMarcaList.removeItem(pricingMarca);
pricingMarcaService.borrar(pricingMarca);

10
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java
View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.Pricing;
import com.rjconsultores.ventaboletos.entidad.PricingMercado;
import com.rjconsultores.ventaboletos.service.ParadaService;
import com.rjconsultores.ventaboletos.service.PricingMercadoService;
@ -32,6 +33,7 @@ import org.zkoss.zul.Combobox;
@Scope("prototype")
public class EditarPricingMercadoController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingMercadoService pricingMercadoService;
@Autowired
@ -86,7 +88,7 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer {
} else {
destino = (Parada) cmbDestino.getSelectedItem().getValue();
}
//Parada destino = (Parada) cmbDestino.getSelectedItem().getValue();
// Parada destino = (Parada) cmbDestino.getSelectedItem().getValue();
try {
if (origen == null) {
Messagebox.show(
@ -120,7 +122,7 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer {
pricingMercadoList.updateItem(pricingMercado);
} else {
pricingMercadoService.suscribir(pricingMercado);
pricingMercadoList.addItem(pricingMercado);
pricingMercadoList.addItemNovo(pricingMercado);
}
closeWindow();
@ -143,7 +145,7 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer {
pricingMercadoList.updateItem(pricingMercado);
} else {
pricingMercadoService.suscribir(pricingMercado);
pricingMercadoList.addItem(pricingMercado);
pricingMercadoList.addItemNovo(pricingMercado);
}
closeWindow();
@ -179,7 +181,7 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) {
pricingMercado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingMercado.setFecmodif(Calendar.getInstance().getTime());
pricingMercado.setActivo(Boolean.FALSE);
pricingMercado.setActivo(Pricing.INATIVO);
pricingMercadoList.removeItem(pricingMercado);
pricingMercadoService.borrar(pricingMercado);

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupacionController.java
View File

@ -37,6 +37,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
@Scope("prototype")
public class EditarPricingOcupacionController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingOcupacionService pricingOcupacionService;
private PricingOcupacion pricingOcupacion;
@ -90,8 +91,9 @@ public class EditarPricingOcupacionController extends MyGenericForwardComposer {
if (pricingOcupacion != null) {
lsPricingOcupacion.remove(pricingOcupacion);
}
for (PricingOcupacion po : lsPricingOcupacion) {
if (po.getActivo()) {
if (po.getActivo().equals(Pricing.ATIVO)) {
boolean traslapa = TraslaparUtil.intersectNum(
po.getOcupacioninicial(), po.getOcupacionfinal(),
min, max);
@ -107,7 +109,7 @@ public class EditarPricingOcupacionController extends MyGenericForwardComposer {
pricingOcupacionList.updateItem(pricingOcupacion);
} else {
pricingOcupacionService.suscribir(pricingOcupacion);
pricingOcupacionList.addItem(pricingOcupacion);
pricingOcupacionList.addItemNovo(pricingOcupacion);
}
closeWindow();
} else {
@ -131,7 +133,7 @@ public class EditarPricingOcupacionController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) {
pricingOcupacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingOcupacion.setFecmodif(Calendar.getInstance().getTime());
pricingOcupacion.setActivo(Boolean.FALSE);
pricingOcupacion.setActivo(Pricing.INATIVO);
pricingOcupacionList.removeItem(pricingOcupacion);
pricingOcupacionService.borrar(pricingOcupacion);

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingPuntoVentaController.java
View File

@ -4,6 +4,7 @@
*/
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.PuntoVenta;
import com.rjconsultores.ventaboletos.service.PricingPuntoVentaService;
@ -31,6 +32,7 @@ import org.zkoss.zul.Combobox;
@Scope("prototype")
public class EditarPricingPuntoVentaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingPuntoVentaService pricingPuntoVentaService;
@Autowired
@ -73,7 +75,7 @@ public class EditarPricingPuntoVentaController extends MyGenericForwardComposer
pricingPuntoVentaList.updateItem(pricingPuntoVenta);
} else {
pricingPuntoVentaService.suscribir(pricingPuntoVenta);
pricingPuntoVentaList.addItem(pricingPuntoVenta);
pricingPuntoVentaList.addItemNovo(pricingPuntoVenta);
}
closeWindow();
}
@ -105,7 +107,7 @@ public class EditarPricingPuntoVentaController extends MyGenericForwardComposer
if (resp == Messagebox.YES) {
pricingPuntoVenta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingPuntoVenta.setFecmodif(Calendar.getInstance().getTime());
pricingPuntoVenta.setActivo(Boolean.FALSE);
pricingPuntoVenta.setActivo(Pricing.INATIVO);
pricingPuntoVentaList.removeItem(pricingPuntoVenta);
pricingPuntoVentaService.borrar(pricingPuntoVenta);

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingRutaController.java
View File

@ -4,6 +4,7 @@
*/
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.PricingRuta;
import com.rjconsultores.ventaboletos.service.RutaService;
@ -32,6 +33,7 @@ import org.zkoss.zul.Combobox;
@Scope("prototype")
public class EditarPricingRutaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingRutaService pricingRutaService;
@Autowired
@ -81,7 +83,7 @@ public class EditarPricingRutaController extends MyGenericForwardComposer {
pricingRutaList.updateItem(pricingRuta);
} else {
pricingRutaService.suscribir(pricingRuta);
pricingRutaList.addItem(pricingRuta);
pricingRutaList.addItemNovo(pricingRuta);
}
closeWindow();
}
@ -103,7 +105,7 @@ public class EditarPricingRutaController extends MyGenericForwardComposer {
if (resp == Messagebox.YES) {
pricingRuta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingRuta.setFecmodif(Calendar.getInstance().getTime());
pricingRuta.setActivo(Boolean.FALSE);
pricingRuta.setActivo(Pricing.INATIVO);
pricingRutaList.removeItem(pricingRuta);
pricingRutaService.borrar(pricingRuta);

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoPtoVtaController.java
View File

@ -4,6 +4,7 @@
*/
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.TipoPuntoVenta;
import com.rjconsultores.ventaboletos.service.PricingTipoPtoVtaService;
@ -32,6 +33,7 @@ import org.zkoss.zul.Combobox;
@Scope("prototype")
public class EditarPricingTipoPtoVtaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L;
@Autowired
private PricingTipoPtoVtaService pricingTipoPtoVtaService;
@Autowired
@ -79,7 +81,7 @@ public class EditarPricingTipoPtoVtaController extends MyGenericForwardComposer
pricingTipoPtoVtaList.updateItem(pricingTipoPtoVta);
} else {
pricingTipoPtoVtaService.suscribir(pricingTipoPtoVta);
pricingTipoPtoVtaList.addItem(pricingTipoPtoVta);
pricingTipoPtoVtaList.addItemNovo(pricingTipoPtoVta);
}
closeWindow();
}
@ -101,7 +103,7 @@ public class EditarPricingTipoPtoVtaController extends MyGenericForwardComposer
if (resp == Messagebox.YES) {
pricingTipoPtoVta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingTipoPtoVta.setFecmodif(Calendar.getInstance().getTime());
pricingTipoPtoVta.setActivo(Boolean.FALSE);
pricingTipoPtoVta.setActivo(Pricing.INATIVO);
pricingTipoPtoVtaList.removeItem(pricingTipoPtoVta);
pricingTipoPtoVtaService.borrar(pricingTipoPtoVta);

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoServicioController.java
View File

@ -4,6 +4,7 @@
*/
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.PricingTipoServicio;
import com.rjconsultores.ventaboletos.service.TipoServicioService;
@ -102,7 +103,7 @@ public class EditarPricingTipoServicioController extends MyGenericForwardCompose
if (resp == Messagebox.YES) {
pricingTipoServicio.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
pricingTipoServicio.setFecmodif(Calendar.getInstance().getTime());
pricingTipoServicio.setActivo(Boolean.FALSE);
pricingTipoServicio.setActivo(Pricing.EXCLUIDO);
pricingTipoServicioList.removeItem(pricingTipoServicio);
pricingTipoServicioService.borrar(pricingTipoServicio);

15
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingVigenciaController.java
View File

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

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

@ -41,7 +41,6 @@ public class RenderPricing implements ListitemRenderer {
}
lc.setParent(lstm);
if (p.getEmpresa() != null) {
lc = new Listcell(p.getEmpresa().getNombempresa());
} else {
@ -49,13 +48,14 @@ public class RenderPricing implements ListitemRenderer {
}
lc.setParent(lstm);
Integer pricingInativoAtivo = p.getActivo();
SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm");
if (!p.getPricingVigenciaList().isEmpty()) {
if (!p.getPricingVigenciaList(pricingInativoAtivo).isEmpty()) {
String data = "";
for(PricingVigencia pv : p.getPricingVigenciaList()){
data = data + dt.format( pv.getFecinicioviaje()) +" a "+ dt.format(pv.getFecfinviaje()) + " ou ";
for (PricingVigencia pv : p.getPricingVigenciaList(pricingInativoAtivo)) {
data = data + dt.format(pv.getFecinicioviaje()) + " a " + dt.format(pv.getFecfinviaje()) + " ou ";
}
data = data.substring(0,data.length()-3);
data = data.substring(0, data.length() - 3);
lc = new Listcell(data);
} else {
lc = new Listcell("-");

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

@ -1804,6 +1804,7 @@ editarPricingCorridaController.lblFin.value = Hora Saida Fim
busquedaPricingController.window.title = Pricing
busquedaPricingEspecificoController.window.title = Pricing Específico
busquedaPricingController.lhEmpresa.label = Empresa
busquedaPricingController.lhBuscarInativos.label = Buscar Inativos
busquedaPricingController.lhNome.label = Nome Pricing
busquedaPricingController.lhDataInicioFimViagem.label = Período de Vigência
busquedaPricingController.btnPesquisa.label = Pesquisa
@ -1813,6 +1814,8 @@ busquedaPricingController.btnCerrar.tooltiptext = Fechar
#Pricing - busquedaPricingController
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.MSG.inativarPergunta = Deseja realmente inativar esse pricing?
editarPricingController.MSG.inativarOK = Pricing desativado com sucesso.
editarPricingController.window.title = Pricing
editarPricingController.windowEspecifico.title = Pricing Específico
editarPricingController.windowVigencia.title = Filtros
@ -1836,6 +1839,10 @@ editarPricingController.windowAsiento.title = Poltrona
editarPricingController.windowAnticipacion.title = Antecipação
editarPricingController.windowTipoServicio.title = Tipo classe
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.btnFechar.tooltiptext = Fechar
editarPricingController.tarifia.label = Tarifa

BIN
web/gui/img/close_icon_inactive.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
web/gui/img/icon-active.gif 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

79
web/gui/pricing/busquedaPricing.zul
View File

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

16
web/gui/pricing/editarPricing.zul
View File

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