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

Merge remote-tracking branch 'remotes/origin/master' into fixBug_AL-3854 

# Conflicts:
#	pom.xml
#	web/WEB-INF/i3-label_pt_BR.label
master
valdevir 2024-05-09 16:53:16 -03:00
parent 96c31f8c06 138668e7fe
commit 45fd6c7d3d
3 changed files with 10639 additions and 9715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.69.1</version> <version>1.72.1</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.52.0</modelWeb.version> <modelWeb.version>1.55.0</modelWeb.version>
<flyway.version>1.42.0</flyway.version> <flyway.version>1.42.0</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

20
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
View File

@ -1017,9 +1017,9 @@ public class EditarCorridaController extends MyGenericForwardComposer {
Date dataIter = Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date dataIter = Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant());
try { try {
Corrida corrida = corridaService.buscarCorridaAtivaPorId(new Corrida.Id(esquemaCorrida.getNumCorrida(),dataIter ));
List<ParadaEsquema> lsParadaEsquemaRemovidas = new ArrayList<ParadaEsquema>(); List<ParadaEsquema> lsParadaEsquemaRemovidas = new ArrayList<ParadaEsquema>();
List<ParadaEsquema> lsParadaEsquemaEditadas =new ArrayList<ParadaEsquema>(); List<ParadaEsquema> lsParadaEsquemaEditadas =new ArrayList<ParadaEsquema>();
Corrida corrida = corridaService.buscarCorridaAtivaPorId(new Corrida.Id(esquemaCorrida.getNumCorrida(),dataIter ));
preencheParadaEsquemaRemovidaEEditada(lsParadaEsquemaRemovidas, lsParadaEsquemaEditadas); preencheParadaEsquemaRemovidaEEditada(lsParadaEsquemaRemovidas, lsParadaEsquemaEditadas);
List<ParadaEsquema> lsParadaEsquemaAdicionadasRemovidasOuEditadas = new ArrayList<ParadaEsquema>() ; List<ParadaEsquema> lsParadaEsquemaAdicionadasRemovidasOuEditadas = new ArrayList<ParadaEsquema>() ;
@ -1335,7 +1335,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private boolean realizaValidacoes() throws InterruptedException { private boolean realizaValidacoes() throws InterruptedException {
if(lsParadaEsquema!=null && !lsParadaEsquema.isEmpty()) { if( isMostraOpcaoAlteracaoCorridaJaGerada()) {
int resp = Messagebox.show(Labels.getLabel("editarConfiguracionCorridaController.MSG.desajaAlterarCorridaJaGeradas"), int resp = Messagebox.show(Labels.getLabel("editarConfiguracionCorridaController.MSG.desajaAlterarCorridaJaGeradas"),
Labels.getLabel("editarConfiguracionCorridaController.window.title"), Labels.getLabel("editarConfiguracionCorridaController.window.title"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
@ -1439,6 +1439,22 @@ public class EditarCorridaController extends MyGenericForwardComposer {
return true; return true;
} }
/**
* Valida se foi editada ou removida alguma localidade para mostrar opção de alterar corrida já gerada.
* @return
*/
private boolean isMostraOpcaoAlteracaoCorridaJaGerada() {
if( esquemaCorrida.getEsquemacorridaId()!=null && lsParadaEsquema!=null && !lsParadaEsquema.isEmpty()) {
List<ParadaEsquema> lsParadaEsquemaRemovidas = null;
List<ParadaEsquema> lsParadaEsquemaEditadas =null;
preencheParadaEsquemaRemovidaEEditada(lsParadaEsquemaRemovidas, lsParadaEsquemaEditadas);
if(lsParadaEsquemaRemovidas !=null || lsParadaEsquemaEditadas !=null ) {
return true;
}
}
return false;
}
private Date buscarHora(Date horasalidaExtra) { private Date buscarHora(Date horasalidaExtra) {
if (horasalidaExtra != null) { if (horasalidaExtra != null) {
GregorianCalendar gHoraSalida = new GregorianCalendar(); GregorianCalendar gHoraSalida = new GregorianCalendar();

20330
web/WEB-INF/i3-label_pt_BR.label
View File

File diff suppressed because it is too large Load Diff