diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaAlteracaoPrecoPedagioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaAlteracaoPrecoPedagioController.java index f1d655517..418dc1df1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaAlteracaoPrecoPedagioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaAlteracaoPrecoPedagioController.java @@ -7,14 +7,11 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -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.Combobox; import org.zkoss.zul.Comboitem; -import org.zkoss.zul.ListModelArray; import org.zkoss.zul.Paging; import com.rjconsultores.ventaboletos.constantes.Constantes; @@ -34,7 +31,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPedagio; -import com.trg.search.Filter; @Controller("busquedaAlteracaoPrecoPedagioController") @Scope("prototype") @@ -57,6 +53,7 @@ public class BusquedaAlteracaoPrecoPedagioController extends MyGenericForwardCo private MyListbox pedagioList; private List lsPracaPedagio; private List lsEmpresa; + private List lsRuta; @Autowired private OrgaoConcedenteService orgaoConcedenteService; @@ -68,12 +65,16 @@ public class BusquedaAlteracaoPrecoPedagioController extends MyGenericForwardCo private CasetaPeajeService casetaPeajeService; @Autowired private EmpresaService empresaService; + @Autowired + private RutaService rutaService; @Override public void doAfterCompose(Component comp) throws Exception { lsEmpresa = empresaService.obtenerTodos(); lsPracaPedagio = casetaPeajeService.obtenerTodos(); + lsRuta = rutaService.obtenerTodos(); + Collections.sort(lsPracaPedagio); lsOrgaoConcedente = new ArrayList(); for (Integer orgaoConcedenteId : Constantes.ORGAOS_CONCEDENTES_CALCULO_ANTT) { @@ -145,17 +146,20 @@ public class BusquedaAlteracaoPrecoPedagioController extends MyGenericForwardCo private void refreshLista() throws InterruptedException { - OrgaoConcedente orgao = (OrgaoConcedente)(cmbOrgaoConcedente.getSelectedItem() != null ? cmbOrgaoConcedente.getSelectedItem().getValue() : null ); - Ruta ruta = (Ruta)(cmbRuta.getSelectedItem() != null ? cmbRuta.getSelectedItem().getValue() : null ); - + OrgaoConcedente orgao = (OrgaoConcedente)(cmbOrgaoConcedente.getSelectedItem() != null ? cmbOrgaoConcedente.getSelectedItem().getValue() : null ); HibernateSearchObject peajeBusqueda =new HibernateSearchObject(Peaje.class, pagingPeaje.getPageSize()); Integer i= null; - if(null != orgao){i = orgao.getOrgaoConcedenteId();} + if(null != orgao) { + i = orgao.getOrgaoConcedenteId(); + } peajeBusqueda.addFilterEqual("activo", Boolean.TRUE); peajeBusqueda.addFilterEqual("orgaoConcedente.orgaoConcedenteId", i); - if(ruta != null){ + + Comboitem comboRuta = cmbRuta.getSelectedItem(); + if(comboRuta != null){ + Ruta ruta = (Ruta) comboRuta.getValue(); peajeBusqueda.addFilterEqual("ruta.rutaId", ruta.getRutaId()); } @@ -186,18 +190,6 @@ public class BusquedaAlteracaoPrecoPedagioController extends MyGenericForwardCo peajeBusqueda.addSortAsc("casetaPeaje.desccaseta"); plwPeaje.init(peajeBusqueda, pedagioList, pagingPeaje); - if (pedagioList.getData().length == 0) { - Messagebox.show(Labels.getLabel("MSG.ningunRegistro"),Labels.getLabel("busquedaAlteracaoPrecoPedagioController.window.title"),Messagebox.OK, Messagebox.INFORMATION); - cmbRuta.setModel(new ListModelArray(new ArrayList())); - cmbRuta.setSelectedItem(null); - }else{ - List lp = pedagioList.getListData(); - Integer[] ids = new Integer[lp.size()]; - for(int x = 0 ; x < lp.size() ; x++){ - ids[x]=lp.get(x).getRuta().getRutaId(); - } - cmbRuta.setModel(new ListModelArray(calcularPeajeService.buscarRutaWithCasetaPeajeFromOrgao(orgao))); - } } public List getLsPracaPedagio() { @@ -222,5 +214,13 @@ public class BusquedaAlteracaoPrecoPedagioController extends MyGenericForwardCo public void setLsEmpresa(List lsEmpresa) { this.lsEmpresa = lsEmpresa; - } + } + + public List getLsRuta() { + return lsRuta; + } + + public void setLsRuta(List lsRuta) { + this.lsRuta = lsRuta; + } } \ No newline at end of file diff --git a/web/gui/tarifas/busquedaAlteracaoPrecoPedagio.zul b/web/gui/tarifas/busquedaAlteracaoPrecoPedagio.zul index e06638db0..f6d333473 100644 --- a/web/gui/tarifas/busquedaAlteracaoPrecoPedagio.zul +++ b/web/gui/tarifas/busquedaAlteracaoPrecoPedagio.zul @@ -34,6 +34,7 @@ use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" />