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

fixes bug 6971 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53262 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.penido 2016-02-25 13:44:50 +00:00
parent 138bc77a8d
commit dcf5745283
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaAlteracaoPrecoPedagioController.java
View File

@ -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<CasetaPeaje> lsPracaPedagio;
private List<Empresa> lsEmpresa;
private List<Ruta> 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<OrgaoConcedente>();
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<Peaje> peajeBusqueda =new HibernateSearchObject<Peaje>(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<Ruta>()));
cmbRuta.setSelectedItem(null);
}else{
List<Peaje> 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<CasetaPeaje> getLsPracaPedagio() {
@ -222,5 +214,13 @@ public class BusquedaAlteracaoPrecoPedagioController extends MyGenericForwardCo
public void setLsEmpresa(List<Empresa> lsEmpresa) {
this.lsEmpresa = lsEmpresa;
}
}
public List<Ruta> getLsRuta() {
return lsRuta;
}
public void setLsRuta(List<Ruta> lsRuta) {
this.lsRuta = lsRuta;
}
}

1
web/gui/tarifas/busquedaAlteracaoPrecoPedagio.zul
View File

@ -34,6 +34,7 @@
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" />
<label value="${c:l('busquedaAlteracaoPrecoPedagioController.lhRuta.label')}"/>
<combobox id="cmbRuta" mold="rounded" buttonVisible="true"
model="@{winBusquedaAlteracaoPrecoPedagio$composer.lsRuta}"
width="99%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" />
</row>