From 9735e92c0dfac564f93b8beb03fddf68e4371baa Mon Sep 17 00:00:00 2001
From: valdir <valdir@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 14 Sep 2020 20:19:18 +0000
Subject: [PATCH] =?UTF-8?q?0019878:=20Espec=20-=20Altera=C3=A7=C3=A3o=20re?=
 =?UTF-8?q?gra=20de=20Pricing=20por=20Trecho=20bug#19878=20dev:=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@103300 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../pricing/EditarPricingController.java      | 51 +++++++++++--------
 web/WEB-INF/i3-label_es_MX.label              |  1 +
 web/WEB-INF/i3-label_pt_BR.label              |  1 +
 web/gui/pricing/editarPricing.zul             | 17 ++++++-
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
index 11b9abf13..507d13481 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java
@@ -243,6 +243,9 @@ public class EditarPricingController extends PricingController {
 	private Combobox cmbIndGeneraFeriadoFechaVenta;
 	private Combobox cmbIndGeneraFeriadoFechaViaje;
 	private Integer buscarPricingInativosAtivos;
+	
+	private Radio rdOcupacaoTrechoSim;
+	private Radio rdOcupacaoTrechoNao;
 
 	
 	private void clearCombobox(Combobox combobox) {
@@ -563,6 +566,10 @@ public class EditarPricingController extends PricingController {
 			if (pricing.getDescuentoporcentaje() != null) {
 				radioPor.setChecked(true);
 			}
+			
+			rdOcupacaoTrechoSim.setChecked(pricing.getIndOcupacaoPorTrecho());
+			rdOcupacaoTrechoNao.setChecked(!pricing.getIndOcupacaoPorTrecho());
+			
 			if (lsPricingImporte.size() > 0) {
 				radioImp.setChecked(true);
 				onClick$radioImp(null);
@@ -980,26 +987,15 @@ public class EditarPricingController extends PricingController {
 
 			pricing.setEmpresa((Empresa) cmbEmpresa.getSelectedItem().getValue());
 
-			if (rdTransSi.isChecked()) {
-				pricing.setIndtransferible(Boolean.TRUE);
-			} else {
-				pricing.setIndtransferible(Boolean.FALSE);
-			}
-			if (rdCanceSi.isChecked()) {
-				pricing.setIndcancelable(Boolean.TRUE);
-			} else {
-				pricing.setIndcancelable(Boolean.FALSE);
-			}
-			if (rdReserSi.isChecked()) {
-				pricing.setIndreservable(Boolean.TRUE);
-			} else {
-				pricing.setIndreservable(Boolean.FALSE);
-			}
-			if (rdExibirVendaSi.isChecked()) {
-				pricing.setExibeVenda(Boolean.TRUE);
-			} else {
-				pricing.setExibeVenda(Boolean.FALSE);
-			}
+			pricing.setIndtransferible(rdTransSi.isChecked());
+			
+			pricing.setIndcancelable(rdCanceSi.isChecked());
+			
+			pricing.setIndreservable(rdReserSi.isChecked());
+			
+			pricing.setExibeVenda(rdExibirVendaSi.isChecked());
+			
+			pricing.setIndOcupacaoPorTrecho(rdOcupacaoTrechoSim.isChecked());
 			
 			if (gravarNovo) {
 				List<Pricing> lsPricing =
@@ -2537,4 +2533,19 @@ public class EditarPricingController extends PricingController {
 		return ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.IS_FORMAPAGO_PRICING_INATIVO.getDescricao(), "1");
 	}
 
+	public Radio getRdOcupacaoTrechoSim() {
+		return rdOcupacaoTrechoSim;
+	}
+
+	public void setRdOcupacaoTrechoSim(Radio rdOcupacaoTrechoSim) {
+		this.rdOcupacaoTrechoSim = rdOcupacaoTrechoSim;
+	}
+
+	public Radio getRdOcupacaoTrechoNao() {
+		return rdOcupacaoTrechoNao;
+	}
+
+	public void setRdOcupacaoTrechoNao(Radio rdOcupacaoTrechoNao) {
+		this.rdOcupacaoTrechoNao = rdOcupacaoTrechoNao;
+	}
 }
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 2af0c3fdc..3894426b9 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -3435,6 +3435,7 @@ editarPricingController.lhCantDias.label = Días de anticipación
 editarPricingController.nombrePricing.label = Nombre pricing
 editarPricingController.nombrePricingEsp.label = Nombre pricing específico
 editarPricingController.trans.label = Puede transferir?
+editarPricingController.ocupacaoPorTrecho.label = Ocupación por Tramo
 editarPricingController.origem.label = Origen
 editarPricingController.destino.label = Destino
 editarPricingController.cance.label = Puede cancelar?
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 77b82d2c6..2c943f140 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -3645,6 +3645,7 @@ editarPricingController.lhCantDias.label = Dias de Antecipação
 editarPricingController.nombrePricing.label = Nome Pricing
 editarPricingController.nombrePricingEsp.label = Nome Pricing Específico
 editarPricingController.trans.label = Pode Transferir?
+editarPricingController.ocupacaoPorTrecho.label = Ocupação por Trecho
 editarPricingController.origem.label = Origem
 editarPricingController.destino.label = Destino
 editarPricingController.cance.label = Pode Cancelar?
diff --git a/web/gui/pricing/editarPricing.zul b/web/gui/pricing/editarPricing.zul
index e0817823b..6d35d70b5 100644
--- a/web/gui/pricing/editarPricing.zul
+++ b/web/gui/pricing/editarPricing.zul
@@ -69,15 +69,28 @@
 							<column width="30%" />
 						</columns>
 						<rows>
-							<row spans="1,3">
+							<row >
 								<label
 									value="${c:l('editarPricingController.nombrePricing.label')}" />
 								<textbox id="nombrePricing"
 									constraint="no empty" maxlength="60"
 									value="@{winEditarPricing$composer.pricing.nombPricing}"
-									width="50%"
+									width="95%"
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
+									
+								<label
+									value="${c:l('editarPricingController.ocupacaoPorTrecho.label')}" />
+								<radiogroup Id="radioOcupacaoTrecho">
+									<hbox align="center">
+										<radio Id="rdOcupacaoTrechoSim"
+											label="${c:l('editarPricingController.si.label')}"
+											 />
+										<radio Id="rdOcupacaoTrechoNao"
+											label="${c:l('editarPricingController.no.label')}" checked="true" />
+									</hbox>
+								</radiogroup>
 							</row>
+														
 							<row>
 								<label
 									value="${c:l('editarPricingController.cmbIndGeneraFeriadoFechaViaje.value')}" />