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

fixes bug #9035 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@70758 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2017-06-28 18:06:14 +00:00
parent 4f2f7cf6a5
commit 2d73d160bb
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java
View File

@ -184,6 +184,13 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
tarifaMinima.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); tarifaMinima.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
tarifaMinima.setActivo(Boolean.TRUE); tarifaMinima.setActivo(Boolean.TRUE);
Comboitem cbiRuta = cmbRuta.getSelectedItem();
Ruta ruta = null;
if (cbiRuta != null) {
ruta = (Ruta) cbiRuta.getValue();
}
tarifaMinima.setRuta(ruta);
Comboitem cbiVigenciaTarifa = cmbVigencia.getSelectedItem(); Comboitem cbiVigenciaTarifa = cmbVigencia.getSelectedItem();
VigenciaTarifa vigenciaTarifa = null; VigenciaTarifa vigenciaTarifa = null;
if (cbiVigenciaTarifa != null) { if (cbiVigenciaTarifa != null) {
@ -243,9 +250,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
} else { } else {
if (tarifaMinima.getTarifaminimaId() == null) { if (tarifaMinima.getTarifaminimaId() == null) {
List<TarifaMinima> lsTM = tarifaMinimaService.pesquisar( List<TarifaMinima> lsTM = tarifaMinimaService.pesquisar(tarifaMinima );
tarifaMinima.getMoneda(), tarifaMinima.getPlaza(), tarifaMinima.getMarca(),
tarifaMinima.getOrigem(), tarifaMinima.getDestino(), tarifaMinima.getClaseServicio(),tarifaMinima.getOrgaoConcedente() );
if (lsTM.isEmpty()) { if (lsTM.isEmpty()) {
tarifaMinimaService.suscribir(tarifaMinima); tarifaMinimaService.suscribir(tarifaMinima);

22
web/gui/tarifas/editarTarifasMinimas.zul
View File

@ -61,6 +61,17 @@
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.marca}"/> selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.marca}"/>
</row> </row>
<row>
<label value="${c:l('busquedaTarifasMinimasController.lhClaseServicio.label')}"/>
<combobox id="cmbClaseServicio" constraint="no empty"
mold="rounded" buttonVisible="true" width="90%"
model="@{winEditarTarifaMinima$composer.lsClaseServico}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.claseServicio}"/>
</row>
<row> <row>
<label <label
value="${c:l('modificacionMasivaTarifasController.orgaoConcedente.label')}" /> value="${c:l('modificacionMasivaTarifasController.orgaoConcedente.label')}" />
@ -96,21 +107,12 @@
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
initialValue="@{winEditarTarifaMinima$composer.tarifaMinima.destino}" initialValue="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"/> selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"/>
</row>
<row>
<label value="${c:l('busquedaTarifasMinimasController.lhClaseServicio.label')}"/>
<combobox id="cmbClaseServicio" constraint="no empty"
mold="rounded" buttonVisible="true" width="90%"
model="@{winEditarTarifaMinima$composer.lsClaseServico}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.claseServicio}"/>
</row> </row>
<row> <row>
<label value="${c:l('busquedaTarifaController.lhFeciniciovigencia.label')}"/> <label value="${c:l('busquedaTarifaController.lhFeciniciovigencia.label')}"/>
<combobox id="cmbVigencia" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" <combobox id="cmbVigencia" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
disabled="false" disabled="false" constraint="no empty"
mold="rounded" buttonVisible="true" width="90%" mold="rounded" buttonVisible="true" width="90%"
model="@{winEditarTarifaMinima$composer.lsVigenciaTarifa}" model="@{winEditarTarifaMinima$composer.lsVigenciaTarifa}"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.vigenciaTarifa}"/> selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.vigenciaTarifa}"/>