From 6f95a3c5196d9eee7224986ee17aa7ece4a6f618 Mon Sep 17 00:00:00 2001
From: edgar <edgar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 13 Sep 2016 20:04:54 +0000
Subject: [PATCH] fixes bug #7867

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@60259 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarOrgaoConcedenteController.java      | 34 +++++++++++--------
 .../render/RenderClasseIndicePeaj.java        |  8 +++--
 .../V20160913_1649__classeindicepeaje.sql     |  4 +++
 web/gui/catalogos/editarOrgaoConcedente.zul   |  3 +-
 4 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 src/java/db/migration/V20160913_1649__classeindicepeaje.sql

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 a681c05c0..661ee09ad 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
@@ -175,24 +175,28 @@ public class EditarOrgaoConcedenteController extends MyGenericForwardComposer {
 
 	public void onClick$btnAdicionarClassePeaje(Event ev) throws InterruptedException {
 		cmbClasseServicio.setConstraint("no empty");
-		txtIndicePeajClasse.setConstraint("no empty,no negative, /[0-9]+(\\,[0-9][0-9]?)?|/ ");
 
-		if (!classeExistente((ClaseServicio) cmbClasseServicio.getSelectedItem().getValue())
-				&& txtIndicePeajClasse.getValueDecimal() != null) {
+		if (!classeExistente((ClaseServicio) cmbClasseServicio.getSelectedItem().getValue())) {
+			if (txtIndicePeajClasse.getValueDecimal() != null
+					&& !txtIndicePeajClasse.getValueDecimal().equals(BigDecimal.ZERO)) {
+				ClasseIndicePeaje classeIndicePeaje = new ClasseIndicePeaje();
+				classeIndicePeaje.setActivo(true);
+				classeIndicePeaje.setClasseServicio((ClaseServicio) cmbClasseServicio.getSelectedItem().getValue());
+				classeIndicePeaje.setOrgaoConcedente(orgaoConcedente);
+				classeIndicePeaje.setIndicePeaje(txtIndicePeajClasse.getValueDecimal());
 
-			ClasseIndicePeaje classeIndicePeaje = new ClasseIndicePeaje();
-			classeIndicePeaje.setActivo(true);
-			classeIndicePeaje.setClasseServicio((ClaseServicio) cmbClasseServicio.getSelectedItem().getValue());
-			classeIndicePeaje.setOrgaoConcedente(orgaoConcedente);
-			classeIndicePeaje.setIndicePeaje(txtIndicePeajClasse.getValueDecimal());
+				cmbClasseServicio.setConstraint("");
+				txtIndicePeajClasse.setConstraint("");
 
-			cmbClasseServicio.setConstraint("");
-			txtIndicePeajClasse.setConstraint("");
-
-			lsClasseIndicePeajes.add(classeIndicePeaje);
-			listBoxIndicePeaj.addItemNovo(classeIndicePeaje);
-			cmbClasseServicio.setSelectedItem(null);
-			txtIndicePeajClasse.setText("");
+				lsClasseIndicePeajes.add(classeIndicePeaje);
+				listBoxIndicePeaj.addItemNovo(classeIndicePeaje);
+				cmbClasseServicio.setSelectedItem(null);
+			} else {
+				Messagebox.show(
+						Labels.getLabel("editarOrgaoConcedenteController.MSG.indicePeajeZeroInvalido"),
+						Labels.getLabel("editarOrgaoConcedenteController.window.title"),
+						Messagebox.OK, Messagebox.INFORMATION);
+			}
 		}
 	}
 
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java
index dcbce19f8..e3f8d9a50 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderClasseIndicePeaj.java
@@ -1,21 +1,25 @@
 package com.rjconsultores.ventaboletos.web.utilerias.render;
 
+import java.text.DecimalFormat;
+
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.ListitemRenderer;
 
 import com.rjconsultores.ventaboletos.entidad.ClasseIndicePeaje;
 
-public class RenderClasseIndicePeaj implements ListitemRenderer { 
+public class RenderClasseIndicePeaj implements ListitemRenderer {
 
 	@Override
 	public void render(Listitem arg0, Object arg1) throws Exception {
 		ClasseIndicePeaje classeIndicePeaje = (ClasseIndicePeaje) arg1;
 
+		DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+
 		Listcell lc = new Listcell(classeIndicePeaje.getClasseServicio().getDescclase());
 		lc.setParent(arg0);
 
-		lc = new Listcell(classeIndicePeaje.getIndicePeaje().toString());
+		lc = new Listcell(decimalFormat.format(classeIndicePeaje.getIndicePeaje()));
 		lc.setParent(arg0);
 
 		arg0.setAttribute("data", classeIndicePeaje);
diff --git a/src/java/db/migration/V20160913_1649__classeindicepeaje.sql b/src/java/db/migration/V20160913_1649__classeindicepeaje.sql
new file mode 100644
index 000000000..1a269bb55
--- /dev/null
+++ b/src/java/db/migration/V20160913_1649__classeindicepeaje.sql
@@ -0,0 +1,4 @@
+DELETE FROM CLASSE_INDICE_PEAJE;
+
+ALTER TABLE CLASSE_INDICE_PEAJE
+MODIFY (INDICE_PEAJE NUMERIC(7,2));
diff --git a/web/gui/catalogos/editarOrgaoConcedente.zul b/web/gui/catalogos/editarOrgaoConcedente.zul
index 2e2797d29..aa202ee2f 100644
--- a/web/gui/catalogos/editarOrgaoConcedente.zul
+++ b/web/gui/catalogos/editarOrgaoConcedente.zul
@@ -84,7 +84,8 @@
 							<label style="margin-left:5px;"
 								value="${c:l('busquedaOrgaoConcedenteController.indicePeaje.label')}" />
 							<textbox id="txtIndicePeajClasse"
-								maxlength="8" mold="rounded"  
+								maxlength="8" mold="rounded"
+								constraint=" no negative, /[0-9]+(\,[0-9][0-9]?)?|/ "
 								use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal" />
 
 							<button id="btnAdicionarClassePeaje"