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@70863 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2017-06-29 18:24:23 +00:00
parent 16e096d86a
commit 48ab534299
3 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java
View File

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

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

@ -117,6 +117,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer {
private MyListbox tarifaMinimaCategoriaList;
private Combobox cmbVigencia;
private Combobox cmbRegionMetropolitana;
private Combobox cmbCoeficienteTarifa;
private List<VigenciaTarifa> lsVigenciaTarifa;
private List<Ruta> lsRuta;
private List<CoeficienteTarifa> 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) {

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

@ -92,22 +92,6 @@
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.ruta}" />
</row>
<row>
<label value="${c:l('busquedaTarifasMinimasController.lhOrigem.label')}"/>
<combobox id="cmbOrigem" constraint="no empty"
mold="rounded" buttonVisible="true" width="90%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
initialValue="@{winEditarTarifaMinima$composer.tarifaMinima.origem}"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.origem}"/>
</row>
<row>
<label value="${c:l('busquedaTarifasMinimasController.lhDestino.label')}"/>
<combobox id="cmbDestino" constraint="no empty"
mold="rounded" buttonVisible="true" width="90%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
initialValue="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"/>
</row>
<row>
<label value="${c:l('busquedaTarifaController.lhFeciniciovigencia.label')}"/>
@ -139,6 +123,24 @@
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.coeficienteTarifa}"/>
</row>
<row>
<label value="${c:l('busquedaTarifasMinimasController.lhOrigem.label')}"/>
<combobox id="cmbOrigem" constraint="no empty"
mold="rounded" buttonVisible="true" width="90%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
initialValue="@{winEditarTarifaMinima$composer.tarifaMinima.origem}"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.origem}"/>
</row>
<row>
<label value="${c:l('busquedaTarifasMinimasController.lhDestino.label')}"/>
<combobox id="cmbDestino" constraint="no empty"
mold="rounded" buttonVisible="true" width="90%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada"
initialValue="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"
selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"/>
</row>
<row visible="@{winEditarTarifaMinima$composer.tarifaMinimaSalva}">
<label id="lblCategorias"