From 515372d997d5a5bd7738503caeb9a275800435b6 Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 1 Feb 2022 19:24:28 +0000
Subject: [PATCH] =?UTF-8?q?0024050:=20Espec=20Complementar=20-=20Automatiz?=
 =?UTF-8?q?a=C3=A7=C3=A3o=20de=20hor=C3=A1rio=20extra=20bug#24050=20dev:va?=
 =?UTF-8?q?ldevir=20qua:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@110682 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarCorridaController.java              | 29 ++++++++++++-------
 web/WEB-INF/i3-label_es_MX.label              |  1 +
 web/WEB-INF/i3-label_pt_BR.label              |  1 +
 web/gui/esquema_operacional/editarCorrida.zul |  3 ++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
index 0e201d1bf..75c7dbaaa 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
@@ -750,6 +750,8 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 								esquemaCorrida.setMinutosAutomacaoHEAte(txtMinutosAutomacaoATE.getValue() == null ? 0 : txtMinutosAutomacaoATE.getValue());
 								esquemaCorrida.setTaxaOcupacao(txtOcupacaoHorarioExtra.getValue() == null ? 0 : txtOcupacaoHorarioExtra.getValue() );
 								esquemaCorrida.setNumCorridaServicoExtra(txtNumCorridaExtraAuto.getValue());
+								
+								esquemaCorrida.setHorasalidaExtra(buscarHora(esquemaCorrida.getHorasalidaExtra()));
 							} 
 
 							if (porBloq.isChecked()) {
@@ -790,16 +792,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 							}
 
 							// nao gravar segundos:
-							GregorianCalendar gHoraSalida = new GregorianCalendar();
-							if (esquemaCorrida.getHorasalida() != null) {
-								gHoraSalida.setTime(esquemaCorrida.getHorasalida());
-								gHoraSalida.set(Calendar.SECOND, 0);
-								gHoraSalida.set(Calendar.MILLISECOND, 0);
-								gHoraSalida.set(Calendar.MONTH, 01);
-								gHoraSalida.set(Calendar.DAY_OF_MONTH, 01);
-								gHoraSalida.set(Calendar.YEAR, 1970);
-								esquemaCorrida.setHorasalida(gHoraSalida.getTime());
-							}
+							esquemaCorrida.setHorasalida(buscarHora(esquemaCorrida.getHorasalida()));
 
 							List<EsquemaCorrida> lsEC = Collections.EMPTY_LIST;
 
@@ -980,6 +973,22 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 		}
 	}
 
+	private Date buscarHora(Date horasalidaExtra) {
+		if (horasalidaExtra != null) {
+			GregorianCalendar gHoraSalida = new GregorianCalendar();
+			gHoraSalida.setTime(horasalidaExtra);
+			gHoraSalida.set(Calendar.SECOND, 0);
+			gHoraSalida.set(Calendar.MILLISECOND, 0);
+			gHoraSalida.set(Calendar.MONTH, 01);
+			gHoraSalida.set(Calendar.DAY_OF_MONTH, 01);
+			gHoraSalida.set(Calendar.YEAR, 1970);
+			
+			return  gHoraSalida.getTime();
+		}
+		
+		return null;
+	}
+
 	public void onClick$btnApagar(Event ev) {
 		try {
 			int resp = Messagebox.show(Labels.getLabel("editarConfiguracionCorridaController.MSG.borrarPergunta"),
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index c13df2665..bbdb6941c 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -2955,6 +2955,7 @@ editarConfiguracionCorridaController.lbCada.value = Cada
 editarConfiguracionCorridaController.lbMinutos.value = Minutos
 editarConfiguracionCorridaController.lbHrs.value = Hrs.
 editarConfiguracionCorridaController.lbNumCorrida.value = Numero de servicio
+editarConfiguracionCorridaController.lbHoraCorrida.value = Hora
 editarConfiguracionCorridaController.cmbClase.value = Tipo clase
 editarConfiguracionCorridaController.cmbClase2.value = Tipo clase doble piso
 editarConfiguracionCorridaController.doblePiso.value = Doble piso
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index a156c84e5..c9da1067f 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -3246,6 +3246,7 @@ editarConfiguracionCorridaController.lbCada.value = Cada
 editarConfiguracionCorridaController.lbMinutos.value = Minutos
 editarConfiguracionCorridaController.lbHrs.value = Hrs.
 editarConfiguracionCorridaController.lbNumCorrida.value = Número de Serviço
+editarConfiguracionCorridaController.lbHoraCorrida.value = Hora
 editarConfiguracionCorridaController.cmbClase.value = Tipo classe
 editarConfiguracionCorridaController.cmbClase2.value = Tipo classe Doble Piso
 editarConfiguracionCorridaController.doblePiso.value = Doble Piso
diff --git a/web/gui/esquema_operacional/editarCorrida.zul b/web/gui/esquema_operacional/editarCorrida.zul
index 67a93206f..168c0d865 100644
--- a/web/gui/esquema_operacional/editarCorrida.zul
+++ b/web/gui/esquema_operacional/editarCorrida.zul
@@ -637,6 +637,9 @@
 								<hbox>
 									<intbox id="txtNumCorridaExtraAuto" maxlength="7" width="120px" value="@{winEditarCorrida$composer.esquemaCorrida.numCorridaServicoExtra}" />
 									<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('editarConfiguracionCorridaController.ajudaNumeroCorridaExtra')}" style="cursor: help" />
+									
+									<label value="${c:l('editarConfiguracionCorridaController.lbHoraCorrida.value')}" />
+									<timebox id="horasalida2" mold="rounded" width="200px" value="@{winEditarCorrida$composer.esquemaCorrida.horasalidaExtra}" />
 								</hbox>
 							</row>