From cf4bcc1c09cdc3d1ce23885f571a7ea8f0014d39 Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 3 Jul 2015 16:39:49 +0000
Subject: [PATCH] pequenos ajusetes da demanda de calculo da artesp 6401

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45663 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../tarifas/EditarTarifaKmController.java            | 12 ++++++------
 web/gui/tarifas/editarTarifaKm.zul                   |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java
index 8511f4ce2..309a3ca76 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java
@@ -65,7 +65,7 @@ public class EditarTarifaKmController extends MyGenericForwardComposer {
 	private Button btnRemoverTarifaKm;
 	private OrgaoConcedente orgao;
 	private MyTextboxDecimal txtValor;
-	private Intbox txtKm;
+	private MyTextboxDecimal txtKm;
 	private static Logger log = Logger.getLogger(EditarTarifaKmController.class);
 	
 	
@@ -246,8 +246,8 @@ public class EditarTarifaKmController extends MyGenericForwardComposer {
         txtValor.setConstraint("");
         txtKm.setText("");
         txtValor.setText("");
-        txtKm.setConstraint("no empty, no zero, no negative");
-        txtValor.setConstraint("no empty, no zero, no negative");
+        txtKm.setConstraint("no empty, no zero, no negative, /[0-9]+(\\,[0-9][0-9]?)?/");
+        txtValor.setConstraint("no empty, no zero, no negative, /[0-9]+(\\,[0-9][0-9]?)?/");
     }
 	
 	public void onClick$btnAdicionarTarifaKm(Event ev) throws InterruptedException {
@@ -284,7 +284,7 @@ public class EditarTarifaKmController extends MyGenericForwardComposer {
 
         TarifaKm km = new TarifaKm();
         km.setOrgaoconcedenteId((orgao) );
-        km.setKmate(txtKm.getValue());
+        km.setKmate(txtKm.getValueDecimal());
         km.setValortaxa(txtValor.getValueDecimal());
         km.setActivo(true);
         km.setFecmodif(Calendar.getInstance().getTime());
@@ -387,11 +387,11 @@ public class EditarTarifaKmController extends MyGenericForwardComposer {
 		this.orgao = orgao;
 	}
 	
-	public Intbox getTxtKm() {
+	public MyTextboxDecimal getTxtKm() {
 		return txtKm;
 	}
 
-	public void setTxtKm(Intbox txtKm) {
+	public void setTxtKm(MyTextboxDecimal txtKm) {
 		this.txtKm = txtKm;
 	}
 
diff --git a/web/gui/tarifas/editarTarifaKm.zul b/web/gui/tarifas/editarTarifaKm.zul
index 5f2a93e51..5de6b0460 100644
--- a/web/gui/tarifas/editarTarifaKm.zul
+++ b/web/gui/tarifas/editarTarifaKm.zul
@@ -44,13 +44,14 @@
                
                 <row>
                     <label value="${c:l('editarTarifaKmController.km')}"/>
-                     <intbox id="txtKm" maxlength="5"
-                        constraint="no empty, no zero, no negative"/>
+                     <textbox id="txtKm"
+                        constraint="no empty, no zero, no negative, /[0-9]+(\,[0-9][0-9]?)?/ "
+                        use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" precision="6" scale="2"/>
                 </row>
                 <row>
                     <label value="${c:l('editarTarifaKmController.valor')}"/>
                       <textbox id="txtValor"
-                        constraint="no empty, no zero, no negative"
+                        constraint="no empty, no zero, no negative, /[0-9]+(\,[0-9][0-9]?)?/ "
                         use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" precision="6" scale="2"/>
                 </row>
                 <row>