diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueKmController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueKmController.java index 1eeab1469..889f4396c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueKmController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueKmController.java @@ -98,22 +98,16 @@ public class BusquedaTaxaEmbarqueKmController extends MyGenericForwardComposer { private void refreshLista() { - HibernateSearchObject taxaEmbarqueKmBusqueda = - new HibernateSearchObject(OrgaoConcedente.class, - pagingTaxaEmbarqueKm.getPageSize()); - - + HibernateSearchObject taxaEmbarqueKmBusqueda =new HibernateSearchObject(OrgaoConcedente.class,pagingTaxaEmbarqueKm.getPageSize()); taxaEmbarqueKmBusqueda.addFilterEqual("activo", Boolean.TRUE); if (!txtOrgao.getValue().equals("")) { - taxaEmbarqueKmBusqueda.addFilterLike("descOrgao", - "%" + txtOrgao.getText().trim().concat("%")); + taxaEmbarqueKmBusqueda.addFilterLike("descOrgao","%" + txtOrgao.getText().trim().concat("%")); } taxaEmbarqueKmBusqueda.addSortAsc("descOrgao"); - plwOrgao.init(taxaEmbarqueKmBusqueda, taxaEmbarqueKmList, pagingTaxaEmbarqueKm); if (taxaEmbarqueKmList.getData().length == 0) { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueParadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueParadaController.java index bd5313300..7ec62547f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueParadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbarqueParadaController.java @@ -88,11 +88,8 @@ public class BusquedaTaxaEmbarqueParadaController extends MyGenericForwardCompos Map args = new HashMap(); args.put("parada", s); - //args.put("taxaEmbarqueParadaList", taxaEmbarqueParadaList); - openWindow("/gui/tarifas/editarTaxaEmbarqueParada.zul", - Labels.getLabel("busquedaTaxaEmbarqueParadaController.window.title"), - args, MODAL); + openWindow("/gui/tarifas/editarTaxaEmbarqueParada.zul",Labels.getLabel("busquedaTaxaEmbarqueParadaController.window.title"),args, MODAL); } private void refreshLista() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java index e1e8dfefb..9e99a1a6b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java @@ -126,8 +126,7 @@ public class EditarTaxaEmbarqueKmController extends MyGenericForwardComposer { taxaEmbarqueKmList.setItemRenderer(new RenderTaxaEmbarqueKm()); lsTaxaEmbarqueKm = new ArrayList(); - if (orgao != null - && orgao.getOrgaoConcedenteId() != null) { + if (orgao != null && orgao.getOrgaoConcedenteId() != null) { lsTaxaEmbarqueKm = taxaEmbarqueKmService.buscarPorOrgao(orgao); taxaEmbarqueKmList.setData(lsTaxaEmbarqueKm); cmbOrgao.setDisabled(Boolean.TRUE); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java index e7e72a22f..0b365ed7b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java @@ -120,7 +120,6 @@ public class EditarTaxaEmbarqueParadaController extends MyGenericForwardComposer super.doAfterCompose(comp); parada = (Parada) Executions.getCurrent().getArg().get("parada"); - //taxaEmbarqueParada = (TaxaEmbarqueParada) Executions.getCurrent().getArg().get("taxaEmbarqueParada"); taxaEmbarqueParadaList.setItemRenderer(new RenderTaxaEmbarqueParada()); lsTaxaEmbarqueParada = new ArrayList(); @@ -171,34 +170,6 @@ public class EditarTaxaEmbarqueParadaController extends MyGenericForwardComposer } } -// public void onClick$btnApagar(Event ev) throws InterruptedException { -// try { -// int resp = Messagebox.show( -// Labels.getLabel("editarTaxaEmbarqueParadaController.MSG.borrarPergunta"), -// Labels.getLabel("editarTaxaEmbarqueParadaController.window.title"), -// Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); -// -// if (resp == Messagebox.YES) { -// -// taxaEmbarqueParadaService.borrar(taxaEmbarqueParada); -// -// Messagebox.show( -// Labels.getLabel("editarTaxaEmbarqueParadaController.MSG.borrarOK"), -// Labels.getLabel("editarTaxaEmbarqueParadaController.window.title"), -// Messagebox.OK, Messagebox.INFORMATION); -// -// taxaEmbarqueParadaList.removeItem(taxaEmbarqueParada); -// -// closeWindow(); -// } -// } catch (Exception ex) { -// log.error(ex); -// Messagebox.show( -// Labels.getLabel("MSG.Error"), -// Labels.getLabel("editarTaxaEmbarqueParadaController.window.title"), -// Messagebox.OK, Messagebox.ERROR); -// } -// } public void onClick$rdNo(Event ev) { txtKm.setConstraint(""); txtKm.setText(""); diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index d213c2aa8..ea2e2bd96 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7,7 +7,7 @@ # . . = XXX #Versao do VentaBoleto: -versao = ADM_20120829_1RC59 +versao = ADM_20120831_1RC60 # MSG Defaut: MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100 diff --git a/web/gui/tarifas/busquedaSeguroKm.zul b/web/gui/tarifas/busquedaSeguroKm.zul index 314ce196c..0cf93d697 100644 --- a/web/gui/tarifas/busquedaSeguroKm.zul +++ b/web/gui/tarifas/busquedaSeguroKm.zul @@ -7,7 +7,7 @@ + height="450px" width="500px" border="normal" >