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

fixes bug#al-1334 

qua:
dev:Wallace

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@114108 d1611594-4594-4d17-8e1d-87c2c4800839
master
aristides 2022-09-09 16:33:24 +00:00
parent 32722bc377
commit 8c1dc6fad3
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/CalcularPeajeController.java
View File

@ -106,8 +106,7 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
public void onClick$btnCalcularPeaje(Event ev) throws InterruptedException { public void onClick$btnCalcularPeaje(Event ev) throws InterruptedException {
OrgaoConcedente orgao = null; OrgaoConcedente orgao = null;
boolean orgaoListaRutasHasIndices = true; boolean orgaoListaRutasHasIndices = true;
List<Ruta> lsRutaAuxiliar = new ArrayList<Ruta>(); if(!validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio()) {
if(!validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio(lsRutaAuxiliar)) {
return; return;
}; };
if (!listSelectedRutas.isEmpty()) { if (!listSelectedRutas.isEmpty()) {
@ -122,13 +121,27 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
orgao = ((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue()); orgao = ((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue());
} }
if ((orgao != null && orgao.getIndicePeaje() != null) || (!listSelectedRutas.isEmpty() && orgaoListaRutasHasIndices) || !listSelectedCasetaPeaje.isEmpty() ) { if ((orgao != null && orgao.getIndicePeaje() != null) || (!listSelectedRutas.isEmpty() && orgaoListaRutasHasIndices) || (!listSelectedCasetaPeaje.isEmpty() && orgaoListaRutasHasIndices)) {
List<Ruta> lsRuta; List<Ruta> lsRuta;
if (!listSelectedRutas.isEmpty()) { if (!listSelectedRutas.isEmpty()) {
lsRuta = listSelectedRutas; lsRuta = listSelectedRutas;
} else if (!listSelectedCasetaPeaje.isEmpty()){ } else if (!listSelectedCasetaPeaje.isEmpty()){
lsRuta=rutaService.buscarPorOrgaoEcasetaPeaje(orgao,converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(listSelectedCasetaPeaje)); lsRuta=rutaService.buscarPorOrgaoEcasetaPeaje(orgao,converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(listSelectedCasetaPeaje));
orgao = null;
List<Ruta> lsRutaAux = new ArrayList<Ruta>();
lsRutaAux.addAll(lsRuta);
for (Ruta r : lsRutaAux) {
if (r.getOrgaoConcedente().getIndicePeaje() == null) {
lsRuta.remove(r);
}
}
if(!lsRutaAux.isEmpty() && lsRuta.isEmpty() ) {
lsIdsOrgSemIndice.add(lsRutaAux.get(0).getOrgaoConcedente().getOrgaoConcedenteId());
retornoDoErro(orgao);
return;
}
} }
else { else {
lsRuta = rutaService.buscaRutasFromOrgao(orgao); lsRuta = rutaService.buscaRutasFromOrgao(orgao);
@ -187,21 +200,26 @@ public class CalcularPeajeController extends MyGenericForwardComposer {
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR); Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
} }
} else { } else {
if (orgao != null) { retornoDoErro(orgao);
Messagebox.show(
Labels.getLabel("calcularPeajeController.MSG.orgaoSemIndice", new Object[] { orgao.getOrgaoConcedenteId() }),
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
} else {
Messagebox.show(
Labels.getLabel("calcularPeajeController.MSG.orgaoSemIndice", new Object[] { retornaIdsOrgaoSemIndice(lsIdsOrgSemIndice) }),
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
}
} }
} }
private Boolean validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio(List<Ruta> lsRutaAuxiliar) throws InterruptedException { private void retornoDoErro(OrgaoConcedente orgao) throws InterruptedException {
if (orgao != null) {
Messagebox.show(
Labels.getLabel("calcularPeajeController.MSG.orgaoSemIndice", new Object[] { orgao.getOrgaoConcedenteId() }),
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
} else {
Messagebox.show(
Labels.getLabel("calcularPeajeController.MSG.orgaoSemIndice", new Object[] { retornaIdsOrgaoSemIndice(lsIdsOrgSemIndice) }),
Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.NO, Messagebox.ERROR);
}
}
private Boolean validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio() throws InterruptedException {
if (!listSelectedCasetaPeaje.isEmpty() && !listSelectedRutas.isEmpty()) { if (!listSelectedCasetaPeaje.isEmpty() && !listSelectedRutas.isEmpty()) {
List<Ruta> lsRutaAuxiliar = new ArrayList<Ruta>();
retornarApenasRutaQuePossuiSecuenciasComAsPracas(lsRutaAuxiliar); retornarApenasRutaQuePossuiSecuenciasComAsPracas(lsRutaAuxiliar);
for (Ruta ruta : listSelectedRutas) { for (Ruta ruta : listSelectedRutas) {
if (!lsRutaAuxiliar.contains(ruta)) { if (!lsRutaAuxiliar.contains(ruta)) {