From 069789593fc6d4542872f7009edcc2dfdf38c7f9 Mon Sep 17 00:00:00 2001
From: Ronan Tavares Camargo <ronan.camargo@centralit.com.br>
Date: Fri, 15 Apr 2016 14:57:43 -0300
Subject: [PATCH] Ajuste relatórios

---
 cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml         | 14 +++++++-------
 cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml |  4 ++--
 cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml   | 12 ++++++------
 cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml           | 12 ++++++------
 cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml          | 10 +++++-----
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml
index 6790281..f5b01f4 100644
--- a/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml
@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioEventoEmpenho" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isFloatColumnFooter="true" whenResourceMissingType="Empty" uuid="d74b4c6b-2cfa-4211-acc4-a49eb0fe52fc">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="citgrpdb"/>
-	<property name="ireport.zoom" value="1.4641000000000006"/>
+	<property name="ireport.zoom" value="2.357947691000002"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Table_TH" mode="Opaque" backcolor="#F0F8FF">
@@ -116,7 +116,7 @@ limit 1]]>
 			<frame>
 				<reportElement x="5" y="10" width="544" height="25" uuid="49228958-c953-4f27-bf6e-874a60b4f019"/>
 				<staticText>
-					<reportElement x="0" y="0" width="135" height="25" uuid="9ede57f9-e6f1-474e-b69b-f7962867927d">
+					<reportElement x="0" y="0" width="54" height="25" uuid="9ede57f9-e6f1-474e-b69b-f7962867927d">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box leftPadding="5" rightPadding="3"/>
@@ -126,7 +126,7 @@ limit 1]]>
 					<text><![CDATA[Período:]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="135" y="0" width="409" height="25" uuid="0fe71459-79b7-429e-bd18-4309f83c70b3">
+					<reportElement x="54" y="0" width="490" height="25" uuid="0fe71459-79b7-429e-bd18-4309f83c70b3">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box leftPadding="5" rightPadding="3"/>
@@ -140,7 +140,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
 			<frame>
 				<reportElement x="5" y="35" width="544" height="25" uuid="23c0fa75-b74a-45b3-9f39-01ec2e451ddb"/>
 				<staticText>
-					<reportElement x="0" y="0" width="135" height="25" uuid="29d0c9a4-2635-4ef8-b257-3e8d5d2006ec">
+					<reportElement x="0" y="0" width="141" height="25" uuid="29d0c9a4-2635-4ef8-b257-3e8d5d2006ec">
 						<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
@@ -151,7 +151,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
 					<text><![CDATA[Número / Ano do contrato:]]></text>
 				</staticText>
 				<textField isBlankWhenNull="true">
-					<reportElement x="135" y="0" width="409" height="25" uuid="6492b8bb-061a-4c97-9f17-84773a127db4">
+					<reportElement x="141" y="0" width="403" height="25" uuid="6492b8bb-061a-4c97-9f17-84773a127db4">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box padding="0" leftPadding="5" rightPadding="3"/>
@@ -164,7 +164,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
 			<frame>
 				<reportElement x="5" y="60" width="544" height="25" uuid="6818cb3e-16e3-4a02-93c0-e3e93e8b6642"/>
 				<staticText>
-					<reportElement x="0" y="0" width="135" height="25" uuid="baf877b5-16f3-4e94-9bcb-623905f58c29">
+					<reportElement x="0" y="0" width="124" height="25" uuid="baf877b5-16f3-4e94-9bcb-623905f58c29">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box padding="0" leftPadding="5" rightPadding="3"/>
@@ -174,7 +174,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d
 					<text><![CDATA[Valor total do contrato:]]></text>
 				</staticText>
 				<textField pattern="¤#,##0.00;¤-#,##0.00" isBlankWhenNull="true">
-					<reportElement x="135" y="0" width="409" height="25" uuid="61434fec-2f9f-4b7c-b53a-8c3c37744334">
+					<reportElement x="124" y="0" width="420" height="25" uuid="61434fec-2f9f-4b7c-b53a-8c3c37744334">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box padding="0" leftPadding="5" rightPadding="3"/>
diff --git a/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
index 0027d4e..7c311aa 100644
--- a/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
@@ -99,7 +99,7 @@ limit 1]]>
 			<frame>
 				<reportElement x="5" y="10" width="544" height="25" uuid="ca1de359-745c-40f6-9b5f-c57c1957f4ae"/>
 				<staticText>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="135" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11">
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="53" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11">
 						<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 						<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
@@ -112,7 +112,7 @@ limit 1]]>
 					<text><![CDATA[Período:]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531">
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="53" y="0" width="491" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531">
 						<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 					</reportElement>
 					<box leftPadding="5" rightPadding="3"/>
diff --git a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
index 526b3f1..d24d58e 100644
--- a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioLiberacaoPagamento" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.zoom" value="2.1961500000000007"/>
+	<property name="ireport.x" value="25"/>
 	<property name="ireport.y" value="0"/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="citgrpdb"/>
 	<style name="table">
@@ -106,7 +106,7 @@ limit 1]]>
 			<frame>
 				<reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/>
 				<staticText>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="52" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -120,7 +120,7 @@ limit 1]]>
 					<text><![CDATA[Período:]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="52" y="0" width="492" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -166,7 +166,7 @@ limit 1]]>
 			<frame>
 				<reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/>
 				<textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="119" y="0" width="425" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -178,7 +178,7 @@ limit 1]]>
 					<textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="119" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
diff --git a/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
index d0a3d6d..95ed736 100644
--- a/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioPenalidades" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="3.8906136901500026"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="7"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -79,7 +79,7 @@ where c.id = $P{CONTRATO_ID}]]>
 			<frame>
 				<reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/>
 				<staticText>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="52" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -93,7 +93,7 @@ where c.id = $P{CONTRATO_ID}]]>
 					<text><![CDATA[Período:]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="52" y="0" width="492" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -141,7 +141,7 @@ where c.id = $P{CONTRATO_ID}]]>
 			<frame>
 				<reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="68" y="0" width="476" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -153,7 +153,7 @@ where c.id = $P{CONTRATO_ID}]]>
 					<textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="68" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
diff --git a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
index 97734f8..adc6b0e 100644
--- a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
+++ b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioRepactuacoes" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="2.9230756500000017"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
@@ -74,7 +74,7 @@ where c.id = $P{CONTRATO_ID}]]>
 			<frame>
 				<reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/>
 				<staticText>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="51" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -88,7 +88,7 @@ where c.id = $P{CONTRATO_ID}]]>
 					<text><![CDATA[Período:]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="51" y="0" width="493" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -134,7 +134,7 @@ where c.id = $P{CONTRATO_ID}]]>
 			<frame>
 				<reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="67" y="0" width="477" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
@@ -146,7 +146,7 @@ where c.id = $P{CONTRATO_ID}]]>
 					<textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
+					<reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="67" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
 					<box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0"/>
--
libgit2 0.21.2