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

fixes bug #7432 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@55773 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2016-05-09 21:28:08 +00:00
parent acd18c6f92
commit 800dbf11e1
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1179,6 +1179,16 @@ public class EditarCorridaController extends MyGenericForwardComposer {
lsRuta = rutaService.buscarPorClaseServicioEmpresa(esquemaCorrida.getClaseServicio(), esquemaCorrida.getMarca().getEmpresa()); lsRuta = rutaService.buscarPorClaseServicioEmpresa(esquemaCorrida.getClaseServicio(), esquemaCorrida.getMarca().getEmpresa());
BindingListModelList l = new BindingListModelList(lsRuta, true); BindingListModelList l = new BindingListModelList(lsRuta, true);
cmbRuta.setModel(l); cmbRuta.setModel(l);
lsEmpresa.clear();
for(Empresa e : UsuarioLogado.getUsuarioLogado().getEmpresa()){
if (e.getEmpresaId() == ((Marca)cmbMarca.getSelectedItem().getValue()).getEmpresa().getEmpresaId()){
lsEmpresa.add(e);
BindingListModelList lb = new BindingListModelList(lsEmpresa, true);
cmbEmpresaCorrida.setModel(lb);
break;
}
}
} }
public void onClick$porBloq(Event ev) { public void onClick$porBloq(Event ev) {

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

@ -130,6 +130,24 @@
width="70%" model="@{winEditarCorrida$composer.lsMarca}" width="70%" model="@{winEditarCorrida$composer.lsMarca}"
selectedItem="@{winEditarCorrida$composer.esquemaCorrida.marca}" /> selectedItem="@{winEditarCorrida$composer.esquemaCorrida.marca}" />
</row> </row>
<row>
<label
value="${c:l('editarConfiguracionCorridaController.cmbEmpresaCorrida.value')}" />
<combobox id="cmbEmpresaCorrida"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
constraint="no empty" mold="rounded" width="70%"
model="@{winEditarCorrida$composer.lsEmpresa}"
selectedItem="@{winEditarCorrida$composer.esquemaCorrida.empresa}" />
</row>
<row>
<label
value="${c:l('editarConfiguracionCorridaController.cmbEmpresaIngresso.value')}" />
<combobox id="cmbEmpresaIngresso"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
constraint="no empty" mold="rounded" width="70%"
model="@{winEditarCorrida$composer.lsEmpresa}"
selectedItem="@{winEditarCorrida$composer.esquemaCorrida.empresa1}" />
</row>
<row> <row>
<label <label
value="${c:l('editarConfiguracionCorridaController.cmbRuta.value')}" /> value="${c:l('editarConfiguracionCorridaController.cmbRuta.value')}" />
@ -264,25 +282,7 @@
<combobox id="cmbIndGeneraFeriado" <combobox id="cmbIndGeneraFeriado"
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%" />
</row> </row>
<row>
<label
value="${c:l('editarConfiguracionCorridaController.cmbEmpresaCorrida.value')}" />
<combobox id="cmbEmpresaCorrida"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
constraint="no empty" mold="rounded" width="70%"
model="@{winEditarCorrida$composer.lsEmpresa}"
selectedItem="@{winEditarCorrida$composer.esquemaCorrida.empresa}" />
</row>
<row>
<label
value="${c:l('editarConfiguracionCorridaController.cmbEmpresaIngresso.value')}" />
<combobox id="cmbEmpresaIngresso"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
constraint="no empty" mold="rounded" width="70%"
model="@{winEditarCorrida$composer.lsEmpresa}"
selectedItem="@{winEditarCorrida$composer.esquemaCorrida.empresa1}" />
</row>
<row> <row>
<label <label
value="${c:l('editarConfiguracionCorridaController.cmbEmpresaRolOperativo.value')}" /> value="${c:l('editarConfiguracionCorridaController.cmbEmpresaRolOperativo.value')}" />