diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java index 1de46bc51..a915e4704 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java @@ -142,8 +142,9 @@ public class EditarRegionMetropolitanaController extends MyGenericForwardCompose public void onClick$btnNovaParada(Event ev) throws InterruptedException { - if (regionMetropolitana.getRegionMetropolitanaId() == null) - salvarRegionMetropolitana(); +// if (regionMetropolitana.getRegionMetropolitanaId() == null){ +// salvarRegionMetropolitana(); +// } Parada parada = (Parada) cmbParada.getSelectedItem().getValue(); parada.setRegionMetropolitana(regionMetropolitana); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java index 83790f346..97e816611 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java @@ -117,6 +117,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { private MyListbox tarifaMinimaCategoriaList; private Combobox cmbVigencia; private Combobox cmbRegionMetropolitana; + private Combobox cmbCoeficienteTarifa; private List lsVigenciaTarifa; private List lsRuta; private List lsCoeficienteTarifa; @@ -168,6 +169,24 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { llenarRutasPorClase(); llenarMarcaPorClaseServicio(); } + + public void onChange$cmbRegionMetropolitana(InputEvent ev) { + + if (ev.isChangingBySelectBack()) { + return; + } + + cmbCoeficienteTarifa.setSelectedItem(null); + } + + public void onChange$cmbCoeficienteTarifa(InputEvent ev) { + + if (ev.isChangingBySelectBack()) { + return; + } + + cmbRegionMetropolitana.setSelectedItem(null); + } public void onClick$btnSalvar(Event ev) throws InterruptedException { @@ -204,6 +223,13 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { regionMetropolitana = (RegionMetropolitana) cbiRegionMetropolitana.getValue(); } tarifaMinima.setRegionMetropolitana(regionMetropolitana); + + Comboitem cbiCoeficienteTarifa = cmbCoeficienteTarifa.getSelectedItem(); + CoeficienteTarifa coeficienteTarifa = null; + if (cbiCoeficienteTarifa != null) { + coeficienteTarifa = (CoeficienteTarifa) cbiCoeficienteTarifa.getValue(); + } + tarifaMinima.setCoeficienteTarifa(coeficienteTarifa); try { if (tarifaMinima.getOrgaoConcedente() == null) { diff --git a/web/gui/tarifas/editarTarifasMinimas.zul b/web/gui/tarifas/editarTarifasMinimas.zul index 651e38011..359da1d24 100644 --- a/web/gui/tarifas/editarTarifasMinimas.zul +++ b/web/gui/tarifas/editarTarifasMinimas.zul @@ -92,22 +92,6 @@ selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.ruta}" /> - - - - + + + + + +