From b338606dd9c77a4c71719d6884b5e94bcf07237c Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 17 Sep 2013 21:24:00 +0000
Subject: [PATCH] =?UTF-8?q?Pricing=20-=20Customizar=20Aba=20de=20Servi?=
 =?UTF-8?q?=C3=A7o?=
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@31009 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../pricing/EditarPricingDiaController.java   |  5 ++++-
 web/WEB-INF/i3-label_pt_BR.label              |  3 +++
 web/gui/pricing/editarPricing.zul             | 20 ++++++++++---------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java
index 5804d6552..1f3f0746c 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java
@@ -188,13 +188,16 @@ public class EditarPricingDiaController extends MyGenericForwardComposer {
 
 		if (horarioinicio.getValue().after(horariofin.getValue())) {
 			Messagebox.show(Labels.getLabel("editarPricingController.MSG.datas"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.OK, Messagebox.EXCLAMATION);
+			return;
+		}
 
+		if (!ckFecViaje.isChecked() && !ckFecVenta.isChecked()) {
+			Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioData"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION);
 			return;
 		}
 
 		if (!rdLun.isChecked() && !rdMar.isChecked() && !rdMie.isChecked() && !rdJue.isChecked() && !rdVie.isChecked() && !rdSab.isChecked() && !rdDom.isChecked()) {
 			Clients.alert(Labels.getLabel("EditarPricingDiaController.MSG.obligatorioDia"), Labels.getLabel("editarPricingController.windowDia.title"), Messagebox.EXCLAMATION);
-
 			return;
 		}
 		try {
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 55596a18d..25dc0e917 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -2140,6 +2140,8 @@ editarPricingController.lbVieM.value = Sex
 editarPricingController.lbSabM.value = Sáb
 editarPricingController.lbDomM.value = Dom
 editarPricingController.lbDatas.value = Datas
+editarPricingController.lbFecViaje.value = Data Viagem
+editarPricingController.lbFecVenta.value = Data Venda
 editarPricingController.ckFecViagem.value = Data da Viagem
 editarPricingController.ckFecCompra.value = Data da Compra
 editarPricingController.hIni.value = Horário Inicial
@@ -3507,6 +3509,7 @@ editarConfiguracionCategoriaDatosCategoriaController.title=Editar dados Tipo de
 
 #Editar pricing dia
 EditarPricingDiaController.MSG.obligatorioDia=Deve de seleccionar um dia da semana
+EditarPricingDiaController.MSG.obligatorioData=Deve de seleccionar um dos filtros de datas, data de venda ou data de viagem 
 
 # INFORME PASAJERO POR SERVICIO
 informePasajeroServicioController.window.title = Passageiro por Serviço
diff --git a/web/gui/pricing/editarPricing.zul b/web/gui/pricing/editarPricing.zul
index 4010ed8a3..7c365f51f 100644
--- a/web/gui/pricing/editarPricing.zul
+++ b/web/gui/pricing/editarPricing.zul
@@ -552,38 +552,40 @@
 												image="/gui/img/create_doc.gif" sort="auto(horariofin)"
 												label="${c:l('editarPricingController.hFim.value')}" />
 											<listheader
-												image="/gui/img/create_doc.gif" width="8%"
+												image="/gui/img/create_doc.gif" width="7%"
 												label="${c:l('editarPricingController.lbLunM.value')}"
 												sort="auto(indlunes)" />
 											<listheader
-												image="/gui/img/create_doc.gif" width="8%"
+												image="/gui/img/create_doc.gif" width="7%"
 												label="${c:l('editarPricingController.lbMarM.value')}"
 												sort="auto(indmartes)" />
 											<listheader
-												image="/gui/img/create_doc.gif" width="8%"
+												image="/gui/img/create_doc.gif" width="7%"
 												label="${c:l('editarPricingController.lbMieM.value')}"
 												sort="auto(indmiercoles)" />
 											<listheader
-												image="/gui/img/create_doc.gif" width="8%"
+												image="/gui/img/create_doc.gif" width="7%"
 												label="${c:l('editarPricingController.lbJueM.value')}"
 												sort="auto(indjueves)" />
 											<listheader
-												image="/gui/img/create_doc.gif" width="8%"
+												image="/gui/img/create_doc.gif" width="7%"
 												label="${c:l('editarPricingController.lbVieM.value')}"
 												sort="auto(indviernes)" />
 											<listheader
-												image="/gui/img/create_doc.gif" width="8%"
+												image="/gui/img/create_doc.gif" width="7%"
 												label="${c:l('editarPricingController.lbSabM.value')}"
 												sort="auto(indsabado)" />
 											<listheader
-												image="/gui/img/create_doc.gif" width="8%"
+												image="/gui/img/create_doc.gif" width="7%"
 												label="${c:l('editarPricingController.lbDomM.value')}"
 												sort="auto(inddomingo)" />
 											<listheader
-												image="/gui/img/create_doc.gif" label="Data Viagem"
+												image="/gui/img/create_doc.gif"
+												label="${c:l('editarPricingController.lbFecViaje.value')}"
 												sort="auto(indfecviaje)" />
 											<listheader
-												image="/gui/img/create_doc.gif" label="Data Venda"
+												image="/gui/img/create_doc.gif" width="12%"
+												label="${c:l('editarPricingController.lbFecVenta.value')}"
 												sort="auto(indfecventa)" />
 										</listhead>
 									</listbox>