From 19c1ae715a2cdfb47e1fb62ed2ae843349ca36c3 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 10 Oct 2013 13:25:09 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@31432
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 .../catalogos/EditarEstadoController.java     | 31 ++++++++++++-------
 web/gui/catalogos/editarEstado.zul            |  4 +--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java
index 8debd9550..d90d63cf3 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java
@@ -61,18 +61,18 @@ public class EditarEstadoController extends MyGenericForwardComposer {
 
 	private Radio sim;
 	private Radio nao;
-	private Grid hv1;
-	private Grid hv2;
+	private Grid hvFechor;
+	private Grid hvTiempo;
 
 	public void onCheck$sv1(Event ev) throws InterruptedException {
 
 		if (sim.isChecked()) {
-			hv1.setVisible(Boolean.TRUE);
-			hv2.setVisible(Boolean.TRUE);
+			hvFechor.setVisible(Boolean.TRUE);
+			hvTiempo.setVisible(Boolean.TRUE);
 		}
 		if (nao.isChecked()) {
-			hv1.setVisible(Boolean.FALSE);
-			hv2.setVisible(Boolean.FALSE);
+			hvFechor.setVisible(Boolean.FALSE);
+			hvTiempo.setVisible(Boolean.FALSE);
 		}
 	}
 
@@ -105,8 +105,8 @@ public class EditarEstadoController extends MyGenericForwardComposer {
 			btnApagar.setVisible(Boolean.FALSE);
 
 			nao.setChecked(Boolean.TRUE);
-			hv1.setVisible(Boolean.FALSE);
-			hv2.setVisible(Boolean.FALSE);
+			hvFechor.setVisible(Boolean.FALSE);
+			hvTiempo.setVisible(Boolean.FALSE);
 
 		} else {
 			try {
@@ -116,12 +116,12 @@ public class EditarEstadoController extends MyGenericForwardComposer {
 
 			if (estado.getFecInicioHorVerano() == null) {
 				nao.setChecked(Boolean.TRUE);
-				hv1.setVisible(Boolean.FALSE);
-				hv2.setVisible(Boolean.FALSE);
+				hvFechor.setVisible(Boolean.FALSE);
+				hvTiempo.setVisible(Boolean.FALSE);
 			} else {
 				sim.setChecked(Boolean.TRUE);
-				hv1.setVisible(Boolean.TRUE);
-				hv2.setVisible(Boolean.TRUE);
+				hvFechor.setVisible(Boolean.TRUE);
+				hvTiempo.setVisible(Boolean.TRUE);
 			}
 		}
 
@@ -142,6 +142,13 @@ public class EditarEstadoController extends MyGenericForwardComposer {
 			} else {
 				estado.setTiempoHorHuso(tiempoHorHuso.getValue());
 			}
+
+			if (nao.isChecked()) {
+				estado.setTiempoHorVerano(NumberUtils.INTEGER_ZERO);
+				estado.setFecInicioHorVerano(null);
+				estado.setFecFinoHorVerano(null);
+			}
+
 			estado.setActivo(Boolean.TRUE);
 			estado.setFecmodif(Calendar.getInstance().getTime());
 			estado.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
diff --git a/web/gui/catalogos/editarEstado.zul b/web/gui/catalogos/editarEstado.zul
index 722d9bc5c..515d30468 100644
--- a/web/gui/catalogos/editarEstado.zul
+++ b/web/gui/catalogos/editarEstado.zul
@@ -84,7 +84,7 @@
 			</rows>
 		</grid>
 
-		<grid id="hv1" fixedLayout="true">
+		<grid id="hvFechor" fixedLayout="true">
 
 			<columns>
 				<column width="28%" />
@@ -108,7 +108,7 @@
 			</rows>
 		</grid>
 
-		<grid id="hv2" fixedLayout="true">
+		<grid id="hvTiempo" fixedLayout="true">
 			<columns>
 				<column width="50%" />
 				<column width="50%" />