From d6ec6e96c3576088ebaf98fb15b64055b8e2398a Mon Sep 17 00:00:00 2001
From: leonardo <leonardo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 18 Dec 2014 11:47:26 +0000
Subject: [PATCH] fixed bug #5928

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@40508 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../catalogos/EditarOrgaoConcedenteController.java  |  3 +++
 .../utilerias/render/RenderOrgaoCancelacion.java    |  6 ++++++
 web/WEB-INF/i3-label_es_MX.label                    |  1 +
 web/WEB-INF/i3-label_pt_BR.label                    |  1 +
 web/gui/catalogos/editarOrgaoConcedente.zul         | 13 +++++++++----
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
index d790e13b0..ee5404018 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOrgaoConcedenteController.java
@@ -41,6 +41,7 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 	private MyTextbox txtNome;
 	private MyTextboxDecimal txtPorcMulta;
 	private MyTextboxDecimal txtPorcCambio;
+	private MyTextbox txtTiempoLimite;
 	private MyComboboxEmpresa cmbEmpresa;
 
 	private List<OrgaoCancelacion> lsOrgaoCancelacion;
@@ -102,6 +103,7 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 		oc.setPorcmulta(new BigDecimal(txtPorcMulta.getValue()));
 		oc.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
 		oc.setFecmodif(Calendar.getInstance().getTime());
+		oc.setTiempolimite(new Integer(txtTiempoLimite.getValue()));
 		oc.setActivo(Boolean.TRUE);
 		
 		oc = orgaoCancelacionService.suscribirActualizacion(oc);
@@ -115,4 +117,5 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 		lsOrgaoCancelacion.remove(oc);
 		orgaoCancelacionList.setData(lsOrgaoCancelacion);
 	}
+	
 }
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
index e348b4844..1356d7e04 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderOrgaoCancelacion.java
@@ -21,10 +21,16 @@ public class RenderOrgaoCancelacion implements ListitemRenderer {
 
         lc = new Listcell(df.format(orgaoCancelacion.getPorccambio()));
         lc.setParent(lstm);
+        lc.setStyle("text-align:right");
         
         lc = new Listcell(df.format(orgaoCancelacion.getPorccambio()));
         lc.setParent(lstm);
+        lc.setStyle("text-align:right");
 
+        lc = new Listcell(orgaoCancelacion.getTiempolimite().toString());
+        lc.setParent(lstm);
+        lc.setStyle("text-align:right");
+        
         lstm.setAttribute("data", orgaoCancelacion);
     }
 }
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index f4d5e4123..b478e0c37 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -4162,6 +4162,7 @@ editarOrgaoConcedenteController.tabParametrosCancelacion.value=Parámetros Cance
 editarOrgaoConcedenteController.empresa.label=Empresa
 editarOrgaoConcedenteController.porcMulta.label=Porc Multa
 editarOrgaoConcedenteController.porcCambio.label=Porc Cambio
+editarOrgaoConcedenteController.tiempoLimite.label=Tiempo Limite
 
 
 # Busqueda Indice Tarifa
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 398349dfd..2503d62d0 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -4211,6 +4211,7 @@ editarOrgaoConcedenteController.tabParametrosCancelacion.value=Parâmetros Cance
 editarOrgaoConcedenteController.empresa.label=Empresa
 editarOrgaoConcedenteController.porcMulta.label=Porc Multa
 editarOrgaoConcedenteController.porcCambio.label=Porc Cambio
+editarOrgaoConcedenteController.tiempoLimite.label=Tempo Limite
 
 # Busqueda Coeficiente Tarifa
 busquedaCoeficienteTarifaController.window.title = Coeficiente Tarifario
diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul
index ecd71623c..8b8052cb3 100644
--- a/web/gui/catalogos/editarOrgaoConcedente.zul
+++ b/web/gui/catalogos/editarOrgaoConcedente.zul
@@ -79,14 +79,17 @@
 							<row>
                                 <label value="${c:l('editarOrgaoConcedenteController.porcMulta.label')}"/>
                                 <textbox id="txtPorcMulta" constraint="no empty" width="60%" maxlength="60"
-                                    use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-                                    value="@{winEditarConfiguracionReservacion$composer.reservacionCtrl.descConfig}"/>
+                                    use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"/>
                             </row>
 							<row>
                                 <label value="${c:l('editarOrgaoConcedenteController.porcCambio.label')}"/>
                                 <textbox id="txtPorcCambio" constraint="no empty" width="60%" maxlength="60"
-                                    use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-                                    value="@{winEditarConfiguracionReservacion$composer.reservacionCtrl.descConfig}"/>
+                                    use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"/>
+                            </row>
+                            <row>
+                                <label value="${c:l('editarOrgaoConcedenteController.tiempoLimite.label')}"/>
+                                <textbox id="txtTiempoLimite" constraint="no empty" width="60%" maxlength="60"
+                                    use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
                             </row>
 						</rows>
 					</grid>
@@ -109,6 +112,8 @@
                                 label="${c:l('editarOrgaoConcedenteController.porcMulta.label')}"/>
                             <listheader image="/gui/img/create_doc.gif"
                                 label="${c:l('editarOrgaoConcedenteController.porcCambio.label')}"/>
+                            <listheader image="/gui/img/create_doc.gif"
+                                label="${c:l('editarOrgaoConcedenteController.tiempoLimite.label')}"/>
                         </listhead>
                     </listbox>
 				</tabpanel>