diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCorridasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCorridasController.java index 94a774907..337ec6586 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCorridasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCorridasController.java @@ -34,10 +34,8 @@ public class RelatorioCorridasController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; @Autowired private DataSource dataSourceRead; - @Autowired - private EmpresaService empresaService; + - private List lsEmpresa; private Datebox datInicial; private Datebox datFinal; private Intbox txtCorridaId; @@ -47,17 +45,10 @@ public class RelatorioCorridasController extends MyGenericForwardComposer { private MyComboboxParada cmbParadaDestino; private MyComboboxParadaCve cmbParadaDestinoCve; - public List getLsEmpresa() { - return lsEmpresa; - } - - public void setLsEmpresa(List lsEmpresa) { - this.lsEmpresa = lsEmpresa; - } @Override public void doAfterCompose(Component comp) throws Exception { - lsEmpresa = empresaService.obtenerTodos(); + super.doAfterCompose(comp); cmbParadaOrigemCve.setItemRenderer(new ComboitemRenderer() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandarEmpresaUsuario.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandarEmpresaUsuario.java new file mode 100644 index 000000000..3364e4796 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandarEmpresaUsuario.java @@ -0,0 +1,30 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.utilerias; + +import org.zkoss.zkplus.databind.BindingListModel; +import org.zkoss.zkplus.databind.BindingListModelList; + +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; + +/** + * + * @author gleimar + */ +public class MyComboboxEstandarEmpresaUsuario extends MyComboboxEstandar { + + private static final long serialVersionUID = 1L; + + public MyComboboxEstandarEmpresaUsuario() { + super(); + + Usuario usuario = UsuarioLogado.getUsuarioLogado(); + if (usuario!=null){ + BindingListModel listModelEmpresa = new BindingListModelList(usuario.getEmpresa(), true); + MyComboboxEstandarEmpresaUsuario.this.setModel(listModelEmpresa); + } + } +} diff --git a/web/gui/relatorios/filtroRelatorioCorridas.zul b/web/gui/relatorios/filtroRelatorioCorridas.zul index c334b8411..bf731830e 100644 --- a/web/gui/relatorios/filtroRelatorioCorridas.zul +++ b/web/gui/relatorios/filtroRelatorioCorridas.zul @@ -58,10 +58,9 @@