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

fixed bug #7577 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@58676 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-08-03 18:08:43 +00:00
parent 4c3c0bd10e
commit da26842e1f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java
View File

@ -139,6 +139,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
} }
public void onClick$btnGenerarVigencia(Event ev) throws InterruptedException { public void onClick$btnGenerarVigencia(Event ev) throws InterruptedException {
Boolean limparRutas = false;
cmbOrgaoConcedente.getValue(); cmbOrgaoConcedente.getValue();
cmbEmpresa.getValue(); cmbEmpresa.getValue();
@ -151,6 +152,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
lsEmpresaSelected = Arrays.asList((Empresa) cmbEmpresa.getSelectedItem().getValue()); lsEmpresaSelected = Arrays.asList((Empresa) cmbEmpresa.getSelectedItem().getValue());
if (listSelectedRutas == null || listSelectedRutas.isEmpty()) { if (listSelectedRutas == null || listSelectedRutas.isEmpty()) {
limparRutas = true;
listSelectedRutas = lsRuta; listSelectedRutas = lsRuta;
} }
@ -214,7 +216,9 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
} }
} }
if (limparRutas) {
listSelectedRutas.clear();
}
} }
public List<Ruta> getListSelectedRutas() { public List<Ruta> getListSelectedRutas() {
@ -226,7 +230,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
} }
public void onClick$btnAddRuta(Event ev) throws InterruptedException { public void onClick$btnAddRuta(Event ev) throws InterruptedException {
if(esperar){ if (esperar) {
cmbRuta.setSelectedItem(null); cmbRuta.setSelectedItem(null);
return; return;
} }
@ -250,7 +254,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
public void onSelect$cmbEmpresa(Event ev) throws InterruptedException { public void onSelect$cmbEmpresa(Event ev) throws InterruptedException {
onSelectEmpresaOrgaoConcedente(); onSelectEmpresaOrgaoConcedente();
} }
public void onSelectEmpresaOrgaoConcedente() { public void onSelectEmpresaOrgaoConcedente() {
Constraint constraint = cmbEmpresa.getConstraint(); Constraint constraint = cmbEmpresa.getConstraint();
cmbEmpresa.setConstraint(""); cmbEmpresa.setConstraint("");
@ -259,7 +263,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer {
OrgaoConcedente orgaoSelected = cmbOrgaoConcedente.getSelectedItem() == null ? null : (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); OrgaoConcedente orgaoSelected = cmbOrgaoConcedente.getSelectedItem() == null ? null : (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue();
esperar = true; esperar = true;
lsRuta = rutaService.buscarRutasPorEmpresaOrgaoConcedente(empresaSelected, orgaoSelected); lsRuta = rutaService.buscarRutasPorEmpresaOrgaoConcedente(empresaSelected, orgaoSelected);
int indexToRemove = 0; int indexToRemove = 0;

4
src/java/db/migration/V20160801_1732__dropTarifaUnica.sql
View File

@ -20,9 +20,9 @@ DECLARE
BEGIN BEGIN
SELECT COUNT(*) INTO COUNT_INDEXES SELECT COUNT(*) INTO COUNT_INDEXES
FROM USER_INDEXES FROM USER_INDEXES
WHERE INDEX_NAME = '"VTABOL"."TARIFA_UNICA"'; WHERE INDEX_NAME = 'TARIFA_UNICA';
IF COUNT_INDEXES > 0 THEN IF COUNT_INDEXES > 0 THEN
EXECUTE IMMEDIATE 'DROP INDEX "VTABOL"."TARIFA_UNICA"'; EXECUTE IMMEDIATE 'DROP INDEX TARIFA_UNICA';
END IF; END IF;
END; END;