diff --git a/pom.xml b/pom.xml index d7cad4ee3..f472eb3f7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.131.8 + 1.131.9 war - 1.102.1 - 1.89.0 + 1.103.1 + 1.90.1 UTF-8 diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java index b9faeae4d..bc60f1ed8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java +++ b/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 lsTipoParadas; private List 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); diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index e83c176df..f95f9a203 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/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 diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 67b10b515..966c721b4 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/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 diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label index 619a04d0c..0284da229 100644 --- a/web/WEB-INF/i3-label_fr_FR.label +++ b/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 diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 81b364a4f..e340240b9 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/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 diff --git a/web/gui/esquema_operacional/editarParada.zul b/web/gui/esquema_operacional/editarParada.zul index 84573473d..2dd7dd05e 100644 --- a/web/gui/esquema_operacional/editarParada.zul +++ b/web/gui/esquema_operacional/editarParada.zul @@ -128,6 +128,12 @@ + +