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

fixes bug #7451 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55816 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-05-10 19:41:22 +00:00
parent 2dcdd36615
commit c92a1b11ed
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
View File

@ -114,6 +114,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
private DivisionService divisionService; private DivisionService divisionService;
private List<Division> lsDivision; private List<Division> lsDivision;
private List<Empresa> lsEmpresa; private List<Empresa> lsEmpresa;
private List<Empresa> lsEmpresaIngresso;
private List<Marca> lsMarca; private List<Marca> lsMarca;
private List<ClaseServicio> lsClase; private List<ClaseServicio> lsClase;
private List<Ruta> lsRuta; private List<Ruta> lsRuta;
@ -204,7 +205,12 @@ public class EditarCorridaController extends MyGenericForwardComposer {
lsParadaEsquema = new ArrayList<ParadaEsquema>(); lsParadaEsquema = new ArrayList<ParadaEsquema>();
lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); lsEmpresa = new ArrayList<Empresa>();
lsEmpresa.addAll(UsuarioLogado.getUsuarioLogado().getEmpresa());
lsEmpresaIngresso = new ArrayList<Empresa>();
lsEmpresaIngresso.addAll(UsuarioLogado.getUsuarioLogado().getEmpresa());
lsClase = claseService.buscarTodosExceto(-1); lsClase = claseService.buscarTodosExceto(-1);
lsRolOperativo = rolOperativoService.obtenerTodos(); lsRolOperativo = rolOperativoService.obtenerTodos();
@ -1867,4 +1873,12 @@ public class EditarCorridaController extends MyGenericForwardComposer {
diaSimDiaNao.setDisabled(Boolean.FALSE); diaSimDiaNao.setDisabled(Boolean.FALSE);
} }
} }
public List<Empresa> getLsEmpresaIngresso() {
return lsEmpresaIngresso;
}
public void setLsEmpresaIngresso(List<Empresa> lsEmpresaIngresso) {
this.lsEmpresaIngresso = lsEmpresaIngresso;
}
} }

2
web/gui/esquema_operacional/editarCorrida.zul
View File

@ -145,7 +145,7 @@
<combobox id="cmbEmpresaIngresso" <combobox id="cmbEmpresaIngresso"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
constraint="no empty" mold="rounded" width="70%" constraint="no empty" mold="rounded" width="70%"
model="@{winEditarCorrida$composer.lsEmpresa}" model="@{winEditarCorrida$composer.lsEmpresaIngresso}"
selectedItem="@{winEditarCorrida$composer.esquemaCorrida.empresa1}" /> selectedItem="@{winEditarCorrida$composer.esquemaCorrida.empresa1}" />
</row> </row>
<row> <row>