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

fixes bug#20911 

dev:alberto
qua:wallysson

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104699 d1611594-4594-4d17-8e1d-87c2c4800839
master
changelogweb 2020-12-13 23:47:05 +00:00
parent d960a1e48f
commit d51d9b5861
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCorridasController.java
View File

@ -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<Empresa> 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<Empresa> getLsEmpresa() {
return lsEmpresa;
}
public void setLsEmpresa(List<Empresa> lsEmpresa) {
this.lsEmpresa = lsEmpresa;
}
@Override
public void doAfterCompose(Component comp) throws Exception {
lsEmpresa = empresaService.obtenerTodos();
super.doAfterCompose(comp);
cmbParadaOrigemCve.setItemRenderer(new ComboitemRenderer() {

30
src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandarEmpresaUsuario.java 100644
View File

@ -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);
}
}
}

7
web/gui/relatorios/filtroRelatorioCorridas.zul
View File

@ -58,10 +58,9 @@
<row spans="1,3">
<label
value="${c:l('relatorioOrigemDestinoController.lblEmpresa.value')}" />
<combobox id="cmbEmpresa" constraint="no empty"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
mold="rounded" buttonVisible="true" width="40%"
model="@{winFiltroRelatorioCorridas$composer.lsEmpresa}" />
<combobox id="cmbEmpresa"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandarEmpresaUsuario"
mold="rounded" buttonVisible="true" width="40%"/>
</row>
<row>