Merge pull request 'Se agrega campo DISPONIBLE EN TOTALBUS a tabla PARADAS. #AL-4882' (!696) from AL-4882 into master

Reviewed-on: adm/VentaBoletosAdm#696
Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>

pom.xml

@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.133.0</version>
+	<version>1.133.1</version>
 	<packaging>war</packaging> 
     
 	<properties>
-		<modelWeb.version>1.103.0</modelWeb.version>
+		<modelWeb.version>1.103.1</modelWeb.version>
-		<flyway.version>1.90.0</flyway.version>
+		<flyway.version>1.90.1</flyway.version>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java

@@ -80,7 +80,8 @@ public class EditarCatalogoDeParadaController extends MyGenericForwardComposer {
 	private Checkbox chkVendeTotem;
 	private Checkbox chkVendeInternet;
 	private Checkbox chkIntegracaoW2i;
-	private Combobox cmbAgruparParada;;
+	private Checkbox chkDisponibleTotalbus;
+	private Combobox cmbAgruparParada;
 
 	private List<TipoParada> lsTipoParadas;
 	private List<OrgaoConcedente> lsOrgaosConcedentes;
@@ -112,6 +113,7 @@ public class EditarCatalogoDeParadaController extends MyGenericForwardComposer {
 		chkVendeInternet.setChecked(parada.getIndVisibleInternet() == null ? false : parada.getIndVisibleInternet());
 
 		chkIntegracaoW2i.setChecked(parada.getIndIntegracaoW2i());
+		chkDisponibleTotalbus.setChecked(parada.getIndDisponibleTotalBus() == null ? true : parada.getIndDisponibleTotalBus());
 		
 		lsNodo = nodoService.obtenerTodos();
 
@@ -154,6 +156,7 @@ public class EditarCatalogoDeParadaController extends MyGenericForwardComposer {
 			parada.setIndVendeTotem(chkVendeTotem.isChecked());
 			parada.setIndVisibleInternet(chkVendeInternet.isChecked());
 			parada.setIndIntegracaoW2i(chkIntegracaoW2i.isChecked());
+			parada.setIndDisponibleTotalBus(chkDisponibleTotalbus.isChecked());
 			
 			if("".equals(cmbAgruparParada.getValue())){
 				parada.setAgrupamentoParada(null);

web/WEB-INF/i3-label_en.label

@@ -2973,6 +2973,7 @@ editarCatalogoDeParadaController.btnApagar.tooltiptext                   = Delet
 editarCatalogoDeParadaController.btnFechar.tooltiptext                   = Close
 editarCatalogoDeParadaController.btnRemoverCodOrgaoConcedente.tooltiptext = Remove Granting Body Code
 editarCatalogoDeParadaController.btnSalvar.tooltiptext                   = Save
+editarCatalogoDeParadaController.chkDisponibleTotalbus.value             = Availability on Totalbus
 editarCatalogoDeParadaController.chkIntegracaoW2i.value                  = Has W2i integration
 editarCatalogoDeParadaController.chkVendeInternet.value                  = Sells Internet
 editarCatalogoDeParadaController.chkVendeTotem.value                     = Sell Totem

web/WEB-INF/i3-label_es_MX.label

@@ -2969,6 +2969,7 @@ editarCatalogoDeParadaController.btnApagar.tooltiptext                   = Elimi
 editarCatalogoDeParadaController.btnFechar.tooltiptext                   = Cerrar
 editarCatalogoDeParadaController.btnRemoverCodOrgaoConcedente.tooltiptext = Remover Código Orgão Concedente
 editarCatalogoDeParadaController.btnSalvar.tooltiptext                   = Guardar
+editarCatalogoDeParadaController.chkDisponibleTotalbus.value             = Disponible en Totalbus
 editarCatalogoDeParadaController.chkIntegracaoW2i.value                  = Tiene integración W2i
 editarCatalogoDeParadaController.chkVendeInternet.value                  = Vende Internet
 editarCatalogoDeParadaController.chkVendeTotem.value                     = Vende Totem

web/WEB-INF/i3-label_fr_FR.label

@@ -2970,6 +2970,7 @@ editarCatalogoDeParadaController.btnApagar.tooltiptext                   = Suppr
 editarCatalogoDeParadaController.btnFechar.tooltiptext                   = Fermer
 editarCatalogoDeParadaController.btnRemoverCodOrgaoConcedente.tooltiptext = Supprimer le code de l'organisme concédant
 editarCatalogoDeParadaController.btnSalvar.tooltiptext                   = Enregistrer
+editarCatalogoDeParadaController.chkDisponibleTotalbus.value             = Disponible sur Totalbus
 editarCatalogoDeParadaController.chkIntegracaoW2i.value                  = A une intégration W2i
 editarCatalogoDeParadaController.chkVendeInternet.value                  = Vend Internet
 editarCatalogoDeParadaController.chkVendeTotem.value                     = Vendre un totem

web/WEB-INF/i3-label_pt_BR.label

@@ -2966,6 +2966,7 @@ editarCatalogoDeParadaController.btnApagar.tooltiptext                   = Elimi
 editarCatalogoDeParadaController.btnFechar.tooltiptext                   = Fechar
 editarCatalogoDeParadaController.btnRemoverCodOrgaoConcedente.tooltiptext = Remover Código Orgão Concedente
 editarCatalogoDeParadaController.btnSalvar.tooltiptext                   = Salvar
+editarCatalogoDeParadaController.chkDisponibleTotalbus.value             = Disponível no Totalbus
 editarCatalogoDeParadaController.chkIntegracaoW2i.value                  = Possui integração W2i
 editarCatalogoDeParadaController.chkVendeInternet.value                  = Vende Internet
 editarCatalogoDeParadaController.chkVendeTotem.value                     = Vende Totem

web/gui/esquema_operacional/editarParada.zul

@@ -128,6 +128,12 @@
 					<checkbox id="chkIntegracaoW2i"
 						value="@{winEditarEmpresa$composer.empresa.indIntegracaoW2i}" />
 				</row>
+				<row>
+					<label
+						value="${c:l('editarCatalogoDeParadaController.chkDisponibleTotalbus.value')}" />
+					<checkbox id="chkDisponibleTotalbus"
+						value="@{winEditarEmpresa$composer.empresa.indDisponibleTotalbus}" />
+				</row>
 
 			</rows>
 		</grid>