Download as
Browse Code »

Commit 8a893c5ad2d8a5c4b39bdfac978406fceeaaf789

Authored by Ronan Tavares Camargo
1 parent 8412a6ed
Exists in master

Ajustes nos relatórios.

Showing 5 changed files with 91 additions and 89 deletions   Show diff stats
cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml
  Diff comments   View file @8a893c5
@@ -116,21 +116,21 @@ limit 1]]> @@ -116,21 +116,21 @@ limit 1]]>
116 <frame> 116 <frame>
117 <reportElement x="5" y="10" width="544" height="25" uuid="49228958-c953-4f27-bf6e-874a60b4f019"/> 117 <reportElement x="5" y="10" width="544" height="25" uuid="49228958-c953-4f27-bf6e-874a60b4f019"/>
118 <staticText> 118 <staticText>
119 - <reportElement x="0" y="0" width="150" height="25" uuid="9ede57f9-e6f1-474e-b69b-f7962867927d"> 119 + <reportElement x="0" y="0" width="135" height="25" uuid="9ede57f9-e6f1-474e-b69b-f7962867927d">
120 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 120 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
121 </reportElement> 121 </reportElement>
122 <box leftPadding="5" rightPadding="3"/> 122 <box leftPadding="5" rightPadding="3"/>
123 - <textElement textAlignment="Left" verticalAlignment="Middle"> 123 + <textElement textAlignment="Left" verticalAlignment="Top">
124 <font isBold="true"/> 124 <font isBold="true"/>
125 </textElement> 125 </textElement>
126 <text><![CDATA[Período:]]></text> 126 <text><![CDATA[Período:]]></text>
127 </staticText> 127 </staticText>
128 <textField> 128 <textField>
129 - <reportElement x="150" y="0" width="394" height="25" uuid="0fe71459-79b7-429e-bd18-4309f83c70b3"> 129 + <reportElement x="135" y="0" width="409" height="25" uuid="0fe71459-79b7-429e-bd18-4309f83c70b3">
130 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 130 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
131 </reportElement> 131 </reportElement>
132 <box leftPadding="5" rightPadding="3"/> 132 <box leftPadding="5" rightPadding="3"/>
133 - <textElement verticalAlignment="Middle"/> 133 + <textElement verticalAlignment="Top"/>
134 <textFieldExpression><![CDATA[($P{dataInicial} != null && $P{dataFinal} != null) ? (new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) + " a " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal})) : 134 <textFieldExpression><![CDATA[($P{dataInicial} != null && $P{dataFinal} != null) ? (new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) + " a " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal})) :
135 $P{dataInicial} != null ? "Apartir de " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) : 135 $P{dataInicial} != null ? "Apartir de " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) :
136 $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal}) : 136 $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal}) :
@@ -140,22 +140,22 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -140,22 +140,22 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
140 <frame> 140 <frame>
141 <reportElement x="5" y="35" width="544" height="25" uuid="23c0fa75-b74a-45b3-9f39-01ec2e451ddb"/> 141 <reportElement x="5" y="35" width="544" height="25" uuid="23c0fa75-b74a-45b3-9f39-01ec2e451ddb"/>
142 <staticText> 142 <staticText>
143 - <reportElement x="0" y="0" width="150" height="25" uuid="29d0c9a4-2635-4ef8-b257-3e8d5d2006ec"> 143 + <reportElement x="0" y="0" width="135" height="25" uuid="29d0c9a4-2635-4ef8-b257-3e8d5d2006ec">
144 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 144 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
145 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 145 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
146 </reportElement> 146 </reportElement>
147 <box padding="0" leftPadding="5" rightPadding="3"/> 147 <box padding="0" leftPadding="5" rightPadding="3"/>
148 - <textElement verticalAlignment="Middle"> 148 + <textElement verticalAlignment="Top">
149 <font isBold="true"/> 149 <font isBold="true"/>
150 </textElement> 150 </textElement>
151 - <text><![CDATA[Número / ano do contrato:]]></text> 151 + <text><![CDATA[Número / Ano do contrato:]]></text>
152 </staticText> 152 </staticText>
153 <textField isBlankWhenNull="true"> 153 <textField isBlankWhenNull="true">
154 - <reportElement x="150" y="0" width="394" height="25" uuid="6492b8bb-061a-4c97-9f17-84773a127db4"> 154 + <reportElement x="135" y="0" width="409" height="25" uuid="6492b8bb-061a-4c97-9f17-84773a127db4">
155 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 155 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
156 </reportElement> 156 </reportElement>
157 <box padding="0" leftPadding="5" rightPadding="3"/> 157 <box padding="0" leftPadding="5" rightPadding="3"/>
158 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 158 + <textElement textAlignment="Left" verticalAlignment="Top"/>
159 <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0, $F{numeroanocontrato}.length() - 4) 159 <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0, $F{numeroanocontrato}.length() - 4)
160 .concat("/") 160 .concat("/")
161 .concat($F{numeroanocontrato}.substring($F{numeroanocontrato}.length() - 4))]]></textFieldExpression> 161 .concat($F{numeroanocontrato}.substring($F{numeroanocontrato}.length() - 4))]]></textFieldExpression>
@@ -164,21 +164,21 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -164,21 +164,21 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
164 <frame> 164 <frame>
165 <reportElement x="5" y="60" width="544" height="25" uuid="6818cb3e-16e3-4a02-93c0-e3e93e8b6642"/> 165 <reportElement x="5" y="60" width="544" height="25" uuid="6818cb3e-16e3-4a02-93c0-e3e93e8b6642"/>
166 <staticText> 166 <staticText>
167 - <reportElement x="0" y="0" width="150" height="25" uuid="baf877b5-16f3-4e94-9bcb-623905f58c29"> 167 + <reportElement x="0" y="0" width="135" height="25" uuid="baf877b5-16f3-4e94-9bcb-623905f58c29">
168 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 168 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
169 </reportElement> 169 </reportElement>
170 <box padding="0" leftPadding="5" rightPadding="3"/> 170 <box padding="0" leftPadding="5" rightPadding="3"/>
171 - <textElement textAlignment="Left" verticalAlignment="Middle"> 171 + <textElement textAlignment="Left" verticalAlignment="Top">
172 <font isBold="true"/> 172 <font isBold="true"/>
173 </textElement> 173 </textElement>
174 <text><![CDATA[Valor total do contrato:]]></text> 174 <text><![CDATA[Valor total do contrato:]]></text>
175 </staticText> 175 </staticText>
176 <textField pattern="¤#,##0.00;¤-#,##0.00" isBlankWhenNull="true"> 176 <textField pattern="¤#,##0.00;¤-#,##0.00" isBlankWhenNull="true">
177 - <reportElement x="150" y="0" width="394" height="25" uuid="61434fec-2f9f-4b7c-b53a-8c3c37744334"> 177 + <reportElement x="135" y="0" width="409" height="25" uuid="61434fec-2f9f-4b7c-b53a-8c3c37744334">
178 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 178 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
179 </reportElement> 179 </reportElement>
180 <box padding="0" leftPadding="5" rightPadding="3"/> 180 <box padding="0" leftPadding="5" rightPadding="3"/>
181 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 181 + <textElement textAlignment="Left" verticalAlignment="Top"/>
182 <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression> 182 <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression>
183 </textField> 183 </textField>
184 </frame> 184 </frame>
cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
  Diff comments   View file @8a893c5
@@ -99,24 +99,24 @@ limit 1]]&gt; @@ -99,24 +99,24 @@ limit 1]]&gt;
99 <frame> 99 <frame>
100 <reportElement x="5" y="10" width="544" height="25" uuid="ca1de359-745c-40f6-9b5f-c57c1957f4ae"/> 100 <reportElement x="5" y="10" width="544" height="25" uuid="ca1de359-745c-40f6-9b5f-c57c1957f4ae"/>
101 <staticText> 101 <staticText>
102 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11"> 102 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="135" height="25" uuid="967d8fd8-d42e-4294-ae3f-8e9e9cc75a11">
103 <property name="com.jaspersoft.studio.unit.width" value="pixel"/> 103 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
104 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 104 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
105 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 105 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
106 <property name="com.jaspersoft.studio.unit.y" value="pixel"/> 106 <property name="com.jaspersoft.studio.unit.y" value="pixel"/>
107 </reportElement> 107 </reportElement>
108 <box leftPadding="5" rightPadding="3"/> 108 <box leftPadding="5" rightPadding="3"/>
109 - <textElement textAlignment="Left" verticalAlignment="Middle"> 109 + <textElement textAlignment="Left" verticalAlignment="Top">
110 <font isBold="true"/> 110 <font isBold="true"/>
111 </textElement> 111 </textElement>
112 <text><![CDATA[Período:]]></text> 112 <text><![CDATA[Período:]]></text>
113 </staticText> 113 </staticText>
114 <textField> 114 <textField>
115 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531"> 115 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="1fb03a9d-ef90-4c2f-8da0-c9d02834b531">
116 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 116 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
117 </reportElement> 117 </reportElement>
118 <box leftPadding="5" rightPadding="3"/> 118 <box leftPadding="5" rightPadding="3"/>
119 - <textElement verticalAlignment="Middle"/> 119 + <textElement verticalAlignment="Top"/>
120 <textFieldExpression><![CDATA[($P{dataInicial} != null && $P{dataFinal} != null) ? (new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) + " a " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal})) : 120 <textFieldExpression><![CDATA[($P{dataInicial} != null && $P{dataFinal} != null) ? (new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) + " a " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal})) :
121 $P{dataInicial} != null ? "Apartir de " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) : 121 $P{dataInicial} != null ? "Apartir de " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) :
122 $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal}) : 122 $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal}) :
@@ -126,22 +126,22 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -126,22 +126,22 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
126 <frame> 126 <frame>
127 <reportElement x="5" y="35" width="544" height="25" uuid="bcd4711f-c2a2-4ef5-bb90-a150b346a0cf"/> 127 <reportElement x="5" y="35" width="544" height="25" uuid="bcd4711f-c2a2-4ef5-bb90-a150b346a0cf"/>
128 <staticText> 128 <staticText>
129 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="150" height="25" uuid="a6eead87-8e02-41a7-9499-59b318edef85"> 129 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="135" height="25" uuid="a6eead87-8e02-41a7-9499-59b318edef85">
130 <property name="com.jaspersoft.studio.unit.x" value="pixel"/> 130 <property name="com.jaspersoft.studio.unit.x" value="pixel"/>
131 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 131 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
132 </reportElement> 132 </reportElement>
133 <box padding="0" leftPadding="5" rightPadding="3"/> 133 <box padding="0" leftPadding="5" rightPadding="3"/>
134 - <textElement textAlignment="Left" verticalAlignment="Middle"> 134 + <textElement textAlignment="Left" verticalAlignment="Top">
135 <font isBold="true"/> 135 <font isBold="true"/>
136 </textElement> 136 </textElement>
137 - <text><![CDATA[Número / ano do contrato:]]></text> 137 + <text><![CDATA[Número / Ano do contrato:]]></text>
138 </staticText> 138 </staticText>
139 <textField isBlankWhenNull="true"> 139 <textField isBlankWhenNull="true">
140 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="a0057589-19f8-437d-b135-9da3b94a8f28"> 140 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="a0057589-19f8-437d-b135-9da3b94a8f28">
141 <property name="com.jaspersoft.studio.unit.height" value="pixel"/> 141 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
142 </reportElement> 142 </reportElement>
143 <box padding="0" leftPadding="5" rightPadding="3"/> 143 <box padding="0" leftPadding="5" rightPadding="3"/>
144 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 144 + <textElement textAlignment="Left" verticalAlignment="Top"/>
145 <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0, $F{numeroanocontrato}.length() - 4) 145 <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0, $F{numeroanocontrato}.length() - 4)
146 .concat("/") 146 .concat("/")
147 .concat($F{numeroanocontrato}.substring($F{numeroanocontrato}.length() - 4))]]></textFieldExpression> 147 .concat($F{numeroanocontrato}.substring($F{numeroanocontrato}.length() - 4))]]></textFieldExpression>
@@ -250,13 +250,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -250,13 +250,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
250 </textField> 250 </textField>
251 </jr:detailCell> 251 </jr:detailCell>
252 </jr:column> 252 </jr:column>
253 - <jr:column width="100" uuid="0283b8c0-e839-4788-b019-aaece0882599"> 253 + <jr:column width="115" uuid="0283b8c0-e839-4788-b019-aaece0882599">
254 <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/> 254 <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/>
255 <property name="com.jaspersoft.studio.unit.width" value="pixel"/> 255 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
256 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 256 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
257 <property name="com.jaspersoft.studio.unit.width" value="px"/> 257 <property name="com.jaspersoft.studio.unit.width" value="px"/>
258 <staticText> 258 <staticText>
259 - <reportElement x="0" y="0" width="100" height="30" uuid="974e758a-8bf7-4952-999f-ce9618f47caa"/> 259 + <reportElement x="0" y="0" width="115" height="30" uuid="974e758a-8bf7-4952-999f-ce9618f47caa"/>
260 <box padding="0" leftPadding="3" rightPadding="3"> 260 <box padding="0" leftPadding="3" rightPadding="3">
261 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 261 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
262 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 262 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -278,7 +278,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -278,7 +278,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
278 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 278 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
279 </box> 279 </box>
280 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 280 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
281 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="30" uuid="210d7971-8daf-455b-a85c-321bda7fb0b5"/> 281 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="115" height="30" uuid="210d7971-8daf-455b-a85c-321bda7fb0b5"/>
282 <box padding="3"> 282 <box padding="3">
283 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 283 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
284 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 284 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -290,13 +290,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -290,13 +290,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
290 </textField> 290 </textField>
291 </jr:detailCell> 291 </jr:detailCell>
292 </jr:column> 292 </jr:column>
293 - <jr:column width="172" uuid="c1974531-3543-43df-aa80-bb50a6da10fe"> 293 + <jr:column width="164" uuid="c1974531-3543-43df-aa80-bb50a6da10fe">
294 <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column3"/> 294 <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column3"/>
295 <property name="com.jaspersoft.studio.unit.width" value="pixel"/> 295 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
296 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 296 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
297 <property name="com.jaspersoft.studio.unit.width" value="px"/> 297 <property name="com.jaspersoft.studio.unit.width" value="px"/>
298 <staticText> 298 <staticText>
299 - <reportElement x="0" y="0" width="172" height="30" uuid="861458cb-d5e8-4899-a0e7-2bfb6a35cfd2"/> 299 + <reportElement x="0" y="0" width="164" height="30" uuid="861458cb-d5e8-4899-a0e7-2bfb6a35cfd2"/>
300 <box padding="0" leftPadding="3" rightPadding="3"> 300 <box padding="0" leftPadding="3" rightPadding="3">
301 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 301 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
302 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 302 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -318,7 +318,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -318,7 +318,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
318 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 318 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
319 </box> 319 </box>
320 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 320 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
321 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="172" height="30" uuid="9fb27778-d8ca-4ca3-8050-afbf4ef71f2e"/> 321 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="164" height="30" uuid="9fb27778-d8ca-4ca3-8050-afbf4ef71f2e"/>
322 <box padding="3"> 322 <box padding="3">
323 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 323 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
324 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 324 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -330,13 +330,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -330,13 +330,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
330 </textField> 330 </textField>
331 </jr:detailCell> 331 </jr:detailCell>
332 </jr:column> 332 </jr:column>
333 - <jr:column width="172" uuid="1a9d9d9a-960c-4941-9117-8661ba8362bf"> 333 + <jr:column width="165" uuid="1a9d9d9a-960c-4941-9117-8661ba8362bf">
334 <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column4"/> 334 <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column4"/>
335 <property name="com.jaspersoft.studio.unit.width" value="pixel"/> 335 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
336 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 336 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
337 <property name="com.jaspersoft.studio.unit.width" value="px"/> 337 <property name="com.jaspersoft.studio.unit.width" value="px"/>
338 <staticText> 338 <staticText>
339 - <reportElement x="0" y="0" width="172" height="30" uuid="88c4c49d-2a32-4a3b-afd4-99977d3a707b"/> 339 + <reportElement x="0" y="0" width="165" height="30" uuid="88c4c49d-2a32-4a3b-afd4-99977d3a707b"/>
340 <box padding="0" leftPadding="3" rightPadding="3"> 340 <box padding="0" leftPadding="3" rightPadding="3">
341 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 341 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
342 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 342 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -358,7 +358,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -358,7 +358,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
358 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 358 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
359 </box> 359 </box>
360 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 360 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
361 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="172" height="30" uuid="8578f83b-3f28-4045-bbb5-9981bf617ee4"/> 361 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="165" height="30" uuid="8578f83b-3f28-4045-bbb5-9981bf617ee4"/>
362 <box padding="3"> 362 <box padding="3">
363 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 363 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
364 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 364 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
  Diff comments   View file @8a893c5
@@ -106,7 +106,7 @@ limit 1]]&gt; @@ -106,7 +106,7 @@ limit 1]]&gt;
106 <frame> 106 <frame>
107 <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> 107 <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/>
108 <staticText> 108 <staticText>
109 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> 109 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
110 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 110 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
111 <pen lineWidth="0.0"/> 111 <pen lineWidth="0.0"/>
112 <topPen lineWidth="0.0"/> 112 <topPen lineWidth="0.0"/>
@@ -114,13 +114,13 @@ limit 1]]&gt; @@ -114,13 +114,13 @@ limit 1]]&gt;
114 <bottomPen lineWidth="0.0"/> 114 <bottomPen lineWidth="0.0"/>
115 <rightPen lineWidth="0.0"/> 115 <rightPen lineWidth="0.0"/>
116 </box> 116 </box>
117 - <textElement textAlignment="Left" verticalAlignment="Middle"> 117 + <textElement textAlignment="Left" verticalAlignment="Top">
118 <font isBold="true"/> 118 <font isBold="true"/>
119 </textElement> 119 </textElement>
120 <text><![CDATA[Período:]]></text> 120 <text><![CDATA[Período:]]></text>
121 </staticText> 121 </staticText>
122 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> 122 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
123 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> 123 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
124 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 124 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
125 <pen lineWidth="0.0"/> 125 <pen lineWidth="0.0"/>
126 <topPen lineWidth="0.0"/> 126 <topPen lineWidth="0.0"/>
@@ -128,7 +128,7 @@ limit 1]]&gt; @@ -128,7 +128,7 @@ limit 1]]&gt;
128 <bottomPen lineWidth="0.0"/> 128 <bottomPen lineWidth="0.0"/>
129 <rightPen lineWidth="0.0"/> 129 <rightPen lineWidth="0.0"/>
130 </box> 130 </box>
131 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 131 + <textElement textAlignment="Left" verticalAlignment="Top"/>
132 <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : 132 <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" :
133 ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + 133 ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " +
134 ($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> 134 ($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression>
@@ -137,7 +137,7 @@ limit 1]]&gt; @@ -137,7 +137,7 @@ limit 1]]&gt;
137 <frame> 137 <frame>
138 <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> 138 <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/>
139 <staticText> 139 <staticText>
140 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> 140 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/>
141 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 141 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
142 <pen lineWidth="0.0"/> 142 <pen lineWidth="0.0"/>
143 <topPen lineWidth="0.0"/> 143 <topPen lineWidth="0.0"/>
@@ -145,13 +145,13 @@ limit 1]]&gt; @@ -145,13 +145,13 @@ limit 1]]&gt;
145 <bottomPen lineWidth="0.0"/> 145 <bottomPen lineWidth="0.0"/>
146 <rightPen lineWidth="0.0"/> 146 <rightPen lineWidth="0.0"/>
147 </box> 147 </box>
148 - <textElement textAlignment="Left" verticalAlignment="Middle"> 148 + <textElement textAlignment="Left" verticalAlignment="Top">
149 <font isBold="true"/> 149 <font isBold="true"/>
150 </textElement> 150 </textElement>
151 <text><![CDATA[Número / Ano do contrato:]]></text> 151 <text><![CDATA[Número / Ano do contrato:]]></text>
152 </staticText> 152 </staticText>
153 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 153 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
154 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/> 154 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/>
155 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 155 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
156 <pen lineWidth="0.0"/> 156 <pen lineWidth="0.0"/>
157 <topPen lineWidth="0.0"/> 157 <topPen lineWidth="0.0"/>
@@ -159,14 +159,14 @@ limit 1]]&gt; @@ -159,14 +159,14 @@ limit 1]]&gt;
159 <bottomPen lineWidth="0.0"/> 159 <bottomPen lineWidth="0.0"/>
160 <rightPen lineWidth="0.0"/> 160 <rightPen lineWidth="0.0"/>
161 </box> 161 </box>
162 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 162 + <textElement textAlignment="Left" verticalAlignment="Top"/>
163 <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0,9) + "/" + $F{numeroanocontrato}.substring(9,13)]]></textFieldExpression> 163 <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0,9) + "/" + $F{numeroanocontrato}.substring(9,13)]]></textFieldExpression>
164 </textField> 164 </textField>
165 </frame> 165 </frame>
166 <frame> 166 <frame>
167 <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> 167 <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/>
168 <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true"> 168 <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
169 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> 169 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
170 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 170 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
171 <pen lineWidth="0.0"/> 171 <pen lineWidth="0.0"/>
172 <topPen lineWidth="0.0"/> 172 <topPen lineWidth="0.0"/>
@@ -174,11 +174,11 @@ limit 1]]&gt; @@ -174,11 +174,11 @@ limit 1]]&gt;
174 <bottomPen lineWidth="0.0"/> 174 <bottomPen lineWidth="0.0"/>
175 <rightPen lineWidth="0.0"/> 175 <rightPen lineWidth="0.0"/>
176 </box> 176 </box>
177 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 177 + <textElement textAlignment="Left" verticalAlignment="Top"/>
178 <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression> 178 <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression>
179 </textField> 179 </textField>
180 <staticText> 180 <staticText>
181 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> 181 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
182 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 182 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
183 <pen lineWidth="0.0"/> 183 <pen lineWidth="0.0"/>
184 <topPen lineWidth="0.0"/> 184 <topPen lineWidth="0.0"/>
@@ -186,7 +186,7 @@ limit 1]]&gt; @@ -186,7 +186,7 @@ limit 1]]&gt;
186 <bottomPen lineWidth="0.0"/> 186 <bottomPen lineWidth="0.0"/>
187 <rightPen lineWidth="0.0"/> 187 <rightPen lineWidth="0.0"/>
188 </box> 188 </box>
189 - <textElement textAlignment="Left" verticalAlignment="Middle"> 189 + <textElement textAlignment="Left" verticalAlignment="Top">
190 <font isBold="true"/> 190 <font isBold="true"/>
191 </textElement> 191 </textElement>
192 <text><![CDATA[Valor total do contrato:]]></text> 192 <text><![CDATA[Valor total do contrato:]]></text>
cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
  Diff comments   View file @8a893c5
@@ -79,7 +79,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -79,7 +79,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
79 <frame> 79 <frame>
80 <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> 80 <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/>
81 <staticText> 81 <staticText>
82 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> 82 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
83 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 83 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
84 <pen lineWidth="0.0"/> 84 <pen lineWidth="0.0"/>
85 <topPen lineWidth="0.0"/> 85 <topPen lineWidth="0.0"/>
@@ -87,13 +87,13 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -87,13 +87,13 @@ where c.id = $P{CONTRATO_ID}]]&gt;
87 <bottomPen lineWidth="0.0"/> 87 <bottomPen lineWidth="0.0"/>
88 <rightPen lineWidth="0.0"/> 88 <rightPen lineWidth="0.0"/>
89 </box> 89 </box>
90 - <textElement textAlignment="Left" verticalAlignment="Middle"> 90 + <textElement textAlignment="Left" verticalAlignment="Top">
91 <font isBold="true"/> 91 <font isBold="true"/>
92 </textElement> 92 </textElement>
93 <text><![CDATA[Período:]]></text> 93 <text><![CDATA[Período:]]></text>
94 </staticText> 94 </staticText>
95 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> 95 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
96 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> 96 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
97 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 97 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
98 <pen lineWidth="0.0"/> 98 <pen lineWidth="0.0"/>
99 <topPen lineWidth="0.0"/> 99 <topPen lineWidth="0.0"/>
@@ -101,7 +101,9 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -101,7 +101,9 @@ where c.id = $P{CONTRATO_ID}]]&gt;
101 <bottomPen lineWidth="0.0"/> 101 <bottomPen lineWidth="0.0"/>
102 <rightPen lineWidth="0.0"/> 102 <rightPen lineWidth="0.0"/>
103 </box> 103 </box>
104 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 104 + <textElement textAlignment="Left" verticalAlignment="Top">
  105 + <font isBold="false"/>
  106 + </textElement>
105 <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : 107 <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" :
106 ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + 108 ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " +
107 ($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> 109 ($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression>
@@ -110,7 +112,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -110,7 +112,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
110 <frame> 112 <frame>
111 <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> 113 <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/>
112 <staticText> 114 <staticText>
113 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> 115 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/>
114 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 116 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
115 <pen lineWidth="0.0"/> 117 <pen lineWidth="0.0"/>
116 <topPen lineWidth="0.0"/> 118 <topPen lineWidth="0.0"/>
@@ -118,13 +120,13 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -118,13 +120,13 @@ where c.id = $P{CONTRATO_ID}]]&gt;
118 <bottomPen lineWidth="0.0"/> 120 <bottomPen lineWidth="0.0"/>
119 <rightPen lineWidth="0.0"/> 121 <rightPen lineWidth="0.0"/>
120 </box> 122 </box>
121 - <textElement textAlignment="Left" verticalAlignment="Middle"> 123 + <textElement textAlignment="Left" verticalAlignment="Top">
122 <font isBold="true"/> 124 <font isBold="true"/>
123 </textElement> 125 </textElement>
124 <text><![CDATA[Número / Ano do contrato:]]></text> 126 <text><![CDATA[Número / Ano do contrato:]]></text>
125 </staticText> 127 </staticText>
126 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 128 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
127 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/> 129 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/>
128 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 130 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
129 <pen lineWidth="0.0"/> 131 <pen lineWidth="0.0"/>
130 <topPen lineWidth="0.0"/> 132 <topPen lineWidth="0.0"/>
@@ -132,14 +134,14 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -132,14 +134,14 @@ where c.id = $P{CONTRATO_ID}]]&gt;
132 <bottomPen lineWidth="0.0"/> 134 <bottomPen lineWidth="0.0"/>
133 <rightPen lineWidth="0.0"/> 135 <rightPen lineWidth="0.0"/>
134 </box> 136 </box>
135 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 137 + <textElement textAlignment="Left" verticalAlignment="Top"/>
136 <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> 138 <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression>
137 </textField> 139 </textField>
138 </frame> 140 </frame>
139 <frame> 141 <frame>
140 <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> 142 <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/>
141 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 143 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
142 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> 144 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
143 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 145 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
144 <pen lineWidth="0.0"/> 146 <pen lineWidth="0.0"/>
145 <topPen lineWidth="0.0"/> 147 <topPen lineWidth="0.0"/>
@@ -147,11 +149,11 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -147,11 +149,11 @@ where c.id = $P{CONTRATO_ID}]]&gt;
147 <bottomPen lineWidth="0.0"/> 149 <bottomPen lineWidth="0.0"/>
148 <rightPen lineWidth="0.0"/> 150 <rightPen lineWidth="0.0"/>
149 </box> 151 </box>
150 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 152 + <textElement textAlignment="Left" verticalAlignment="Top"/>
151 <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> 153 <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression>
152 </textField> 154 </textField>
153 <staticText> 155 <staticText>
154 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> 156 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
155 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 157 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
156 <pen lineWidth="0.0"/> 158 <pen lineWidth="0.0"/>
157 <topPen lineWidth="0.0"/> 159 <topPen lineWidth="0.0"/>
@@ -159,7 +161,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -159,7 +161,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
159 <bottomPen lineWidth="0.0"/> 161 <bottomPen lineWidth="0.0"/>
160 <rightPen lineWidth="0.0"/> 162 <rightPen lineWidth="0.0"/>
161 </box> 163 </box>
162 - <textElement textAlignment="Left" verticalAlignment="Middle"> 164 + <textElement textAlignment="Left" verticalAlignment="Top">
163 <font isBold="true"/> 165 <font isBold="true"/>
164 </textElement> 166 </textElement>
165 <text><![CDATA[Contratada:]]></text> 167 <text><![CDATA[Contratada:]]></text>
@@ -247,10 +249,10 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -247,10 +249,10 @@ where c.id = $P{CONTRATO_ID}]]&gt;
247 </textField> 249 </textField>
248 </jr:detailCell> 250 </jr:detailCell>
249 </jr:column> 251 </jr:column>
250 - <jr:column width="130" uuid="0a1e8915-6f85-4d7a-a08e-73b217283674"> 252 + <jr:column width="106" uuid="0a1e8915-6f85-4d7a-a08e-73b217283674">
251 <jr:columnHeader height="30" rowSpan="1"> 253 <jr:columnHeader height="30" rowSpan="1">
252 <staticText> 254 <staticText>
253 - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/> 255 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="106" height="30" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/>
254 <box leftPadding="3" rightPadding="3"> 256 <box leftPadding="3" rightPadding="3">
255 <pen lineWidth="1.0"/> 257 <pen lineWidth="1.0"/>
256 <topPen lineWidth="1.0"/> 258 <topPen lineWidth="1.0"/>
@@ -266,7 +268,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -266,7 +268,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
266 </jr:columnHeader> 268 </jr:columnHeader>
267 <jr:detailCell height="25" rowSpan="1"> 269 <jr:detailCell height="25" rowSpan="1">
268 <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> 270 <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
269 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="130" height="25" uuid="c4c4f934-ddee-489a-b261-9438a2c87051"/> 271 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="106" height="25" uuid="c4c4f934-ddee-489a-b261-9438a2c87051"/>
270 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> 272 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3">
271 <pen lineWidth="1.0"/> 273 <pen lineWidth="1.0"/>
272 <topPen lineWidth="1.0"/> 274 <topPen lineWidth="1.0"/>
@@ -279,10 +281,10 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -279,10 +281,10 @@ where c.id = $P{CONTRATO_ID}]]&gt;
279 </textField> 281 </textField>
280 </jr:detailCell> 282 </jr:detailCell>
281 </jr:column> 283 </jr:column>
282 - <jr:column width="79" uuid="f46445fc-007b-46e6-ade9-eef37e5d0b29"> 284 + <jr:column width="108" uuid="f46445fc-007b-46e6-ade9-eef37e5d0b29">
283 <jr:columnHeader height="30" rowSpan="1"> 285 <jr:columnHeader height="30" rowSpan="1">
284 <staticText> 286 <staticText>
285 - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="79" height="30" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/> 287 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="108" height="30" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/>
286 <box leftPadding="3" rightPadding="3"> 288 <box leftPadding="3" rightPadding="3">
287 <pen lineWidth="1.0"/> 289 <pen lineWidth="1.0"/>
288 <topPen lineWidth="1.0"/> 290 <topPen lineWidth="1.0"/>
@@ -293,12 +295,12 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -293,12 +295,12 @@ where c.id = $P{CONTRATO_ID}]]&gt;
293 <textElement textAlignment="Center" verticalAlignment="Middle"> 295 <textElement textAlignment="Center" verticalAlignment="Middle">
294 <font isBold="true"/> 296 <font isBold="true"/>
295 </textElement> 297 </textElement>
296 - <text><![CDATA[Nº ocorrência vinculada]]></text> 298 + <text><![CDATA[Nº da Ocorrência vinculada]]></text>
297 </staticText> 299 </staticText>
298 </jr:columnHeader> 300 </jr:columnHeader>
299 <jr:detailCell height="25" rowSpan="1"> 301 <jr:detailCell height="25" rowSpan="1">
300 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 302 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
301 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="79" height="25" uuid="1a4d3c83-faee-4ef1-9f14-8459e5436112"/> 303 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="108" height="25" uuid="1a4d3c83-faee-4ef1-9f14-8459e5436112"/>
302 <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> 304 <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2">
303 <pen lineWidth="1.0"/> 305 <pen lineWidth="1.0"/>
304 <topPen lineWidth="1.0"/> 306 <topPen lineWidth="1.0"/>
@@ -311,10 +313,10 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -311,10 +313,10 @@ where c.id = $P{CONTRATO_ID}]]&gt;
311 </textField> 313 </textField>
312 </jr:detailCell> 314 </jr:detailCell>
313 </jr:column> 315 </jr:column>
314 - <jr:column width="130" uuid="c297508b-d28b-41d0-b617-8d905832ba11"> 316 + <jr:column width="110" uuid="c297508b-d28b-41d0-b617-8d905832ba11">
315 <jr:columnHeader height="30" rowSpan="1"> 317 <jr:columnHeader height="30" rowSpan="1">
316 <staticText> 318 <staticText>
317 - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/> 319 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="110" height="30" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/>
318 <box leftPadding="3" rightPadding="3"> 320 <box leftPadding="3" rightPadding="3">
319 <pen lineWidth="1.0"/> 321 <pen lineWidth="1.0"/>
320 <topPen lineWidth="1.0"/> 322 <topPen lineWidth="1.0"/>
@@ -331,7 +333,7 @@ penalidade]]&gt;&lt;/text&gt; @@ -331,7 +333,7 @@ penalidade]]&gt;&lt;/text&gt;
331 </jr:columnHeader> 333 </jr:columnHeader>
332 <jr:detailCell height="25" rowSpan="1"> 334 <jr:detailCell height="25" rowSpan="1">
333 <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> 335 <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
334 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="130" height="25" uuid="7461c57c-7e7c-43de-bacd-9e25c72fce48"/> 336 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="110" height="25" uuid="7461c57c-7e7c-43de-bacd-9e25c72fce48"/>
335 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> 337 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3">
336 <pen lineWidth="1.0"/> 338 <pen lineWidth="1.0"/>
337 <topPen lineWidth="1.0"/> 339 <topPen lineWidth="1.0"/>
@@ -344,10 +346,10 @@ penalidade]]&gt;&lt;/text&gt; @@ -344,10 +346,10 @@ penalidade]]&gt;&lt;/text&gt;
344 </textField> 346 </textField>
345 </jr:detailCell> 347 </jr:detailCell>
346 </jr:column> 348 </jr:column>
347 - <jr:column width="130" uuid="c2128a98-752d-409e-89cc-eb883a56b4e6"> 349 + <jr:column width="145" uuid="c2128a98-752d-409e-89cc-eb883a56b4e6">
348 <jr:columnHeader height="30" rowSpan="1"> 350 <jr:columnHeader height="30" rowSpan="1">
349 <staticText> 351 <staticText>
350 - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="6df9dcd8-69d0-4d0b-9870-e3e7c89a468b"/> 352 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="145" height="30" backcolor="#CCCCCC" uuid="6df9dcd8-69d0-4d0b-9870-e3e7c89a468b"/>
351 <box leftPadding="3" rightPadding="3"> 353 <box leftPadding="3" rightPadding="3">
352 <pen lineWidth="1.0"/> 354 <pen lineWidth="1.0"/>
353 <topPen lineWidth="1.0"/> 355 <topPen lineWidth="1.0"/>
@@ -363,7 +365,7 @@ penalidade]]&gt;&lt;/text&gt; @@ -363,7 +365,7 @@ penalidade]]&gt;&lt;/text&gt;
363 </jr:columnHeader> 365 </jr:columnHeader>
364 <jr:detailCell height="25" rowSpan="1"> 366 <jr:detailCell height="25" rowSpan="1">
365 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 367 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
366 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="130" height="25" uuid="89c24ae1-9089-4a3a-859d-c0b737b24509"/> 368 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="145" height="25" uuid="89c24ae1-9089-4a3a-859d-c0b737b24509"/>
367 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> 369 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3">
368 <pen lineWidth="1.0"/> 370 <pen lineWidth="1.0"/>
369 <topPen lineWidth="1.0"/> 371 <topPen lineWidth="1.0"/>
cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
  Diff comments   View file @8a893c5
@@ -74,7 +74,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -74,7 +74,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
74 <frame> 74 <frame>
75 <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> 75 <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/>
76 <staticText> 76 <staticText>
77 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> 77 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/>
78 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 78 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
79 <pen lineWidth="0.0"/> 79 <pen lineWidth="0.0"/>
80 <topPen lineWidth="0.0"/> 80 <topPen lineWidth="0.0"/>
@@ -82,13 +82,13 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -82,13 +82,13 @@ where c.id = $P{CONTRATO_ID}]]&gt;
82 <bottomPen lineWidth="0.0"/> 82 <bottomPen lineWidth="0.0"/>
83 <rightPen lineWidth="0.0"/> 83 <rightPen lineWidth="0.0"/>
84 </box> 84 </box>
85 - <textElement textAlignment="Left" verticalAlignment="Middle"> 85 + <textElement textAlignment="Left" verticalAlignment="Top">
86 <font isBold="true"/> 86 <font isBold="true"/>
87 </textElement> 87 </textElement>
88 - <text><![CDATA[Período]]></text> 88 + <text><![CDATA[Período:]]></text>
89 </staticText> 89 </staticText>
90 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> 90 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
91 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> 91 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
92 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 92 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
93 <pen lineWidth="0.0"/> 93 <pen lineWidth="0.0"/>
94 <topPen lineWidth="0.0"/> 94 <topPen lineWidth="0.0"/>
@@ -96,7 +96,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -96,7 +96,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
96 <bottomPen lineWidth="0.0"/> 96 <bottomPen lineWidth="0.0"/>
97 <rightPen lineWidth="0.0"/> 97 <rightPen lineWidth="0.0"/>
98 </box> 98 </box>
99 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 99 + <textElement textAlignment="Left" verticalAlignment="Top"/>
100 <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : 100 <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" :
101 ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + 101 ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " +
102 ($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> 102 ($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression>
@@ -105,7 +105,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -105,7 +105,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
105 <frame> 105 <frame>
106 <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> 106 <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/>
107 <staticText> 107 <staticText>
108 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> 108 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/>
109 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 109 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
110 <pen lineWidth="0.0"/> 110 <pen lineWidth="0.0"/>
111 <topPen lineWidth="0.0"/> 111 <topPen lineWidth="0.0"/>
@@ -113,13 +113,13 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -113,13 +113,13 @@ where c.id = $P{CONTRATO_ID}]]&gt;
113 <bottomPen lineWidth="0.0"/> 113 <bottomPen lineWidth="0.0"/>
114 <rightPen lineWidth="0.0"/> 114 <rightPen lineWidth="0.0"/>
115 </box> 115 </box>
116 - <textElement textAlignment="Left" verticalAlignment="Middle"> 116 + <textElement textAlignment="Left" verticalAlignment="Top">
117 <font isBold="true"/> 117 <font isBold="true"/>
118 </textElement> 118 </textElement>
119 - <text><![CDATA[Número / Ano do contrato]]></text> 119 + <text><![CDATA[Número / Ano do contrato:]]></text>
120 </staticText> 120 </staticText>
121 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 121 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
122 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/> 122 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/>
123 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 123 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
124 <pen lineWidth="0.0"/> 124 <pen lineWidth="0.0"/>
125 <topPen lineWidth="0.0"/> 125 <topPen lineWidth="0.0"/>
@@ -127,14 +127,14 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -127,14 +127,14 @@ where c.id = $P{CONTRATO_ID}]]&gt;
127 <bottomPen lineWidth="0.0"/> 127 <bottomPen lineWidth="0.0"/>
128 <rightPen lineWidth="0.0"/> 128 <rightPen lineWidth="0.0"/>
129 </box> 129 </box>
130 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 130 + <textElement textAlignment="Left" verticalAlignment="Top"/>
131 <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> 131 <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression>
132 </textField> 132 </textField>
133 </frame> 133 </frame>
134 <frame> 134 <frame>
135 <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> 135 <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/>
136 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 136 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
137 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> 137 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="135" y="0" width="409" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
138 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 138 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
139 <pen lineWidth="0.0"/> 139 <pen lineWidth="0.0"/>
140 <topPen lineWidth="0.0"/> 140 <topPen lineWidth="0.0"/>
@@ -142,11 +142,11 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -142,11 +142,11 @@ where c.id = $P{CONTRATO_ID}]]&gt;
142 <bottomPen lineWidth="0.0"/> 142 <bottomPen lineWidth="0.0"/>
143 <rightPen lineWidth="0.0"/> 143 <rightPen lineWidth="0.0"/>
144 </box> 144 </box>
145 - <textElement textAlignment="Left" verticalAlignment="Middle"/> 145 + <textElement textAlignment="Left" verticalAlignment="Top"/>
146 <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> 146 <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression>
147 </textField> 147 </textField>
148 <staticText> 148 <staticText>
149 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> 149 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="135" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
150 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 150 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
151 <pen lineWidth="0.0"/> 151 <pen lineWidth="0.0"/>
152 <topPen lineWidth="0.0"/> 152 <topPen lineWidth="0.0"/>
@@ -154,10 +154,10 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -154,10 +154,10 @@ where c.id = $P{CONTRATO_ID}]]&gt;
154 <bottomPen lineWidth="0.0"/> 154 <bottomPen lineWidth="0.0"/>
155 <rightPen lineWidth="0.0"/> 155 <rightPen lineWidth="0.0"/>
156 </box> 156 </box>
157 - <textElement textAlignment="Left" verticalAlignment="Middle"> 157 + <textElement textAlignment="Left" verticalAlignment="Top">
158 <font isBold="true"/> 158 <font isBold="true"/>
159 </textElement> 159 </textElement>
160 - <text><![CDATA[Contratada]]></text> 160 + <text><![CDATA[Contratada:]]></text>
161 </staticText> 161 </staticText>
162 </frame> 162 </frame>
163 <line> 163 <line>
@@ -200,10 +200,10 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -200,10 +200,10 @@ where c.id = $P{CONTRATO_ID}]]&gt;
200 <text><![CDATA[Não existem dados para este relatório.]]></text> 200 <text><![CDATA[Não existem dados para este relatório.]]></text>
201 </staticText> 201 </staticText>
202 </jr:tableFooter> 202 </jr:tableFooter>
203 - <jr:column width="100" uuid="fdfe3465-3b51-423a-af25-4045485d5a1e"> 203 + <jr:column width="110" uuid="fdfe3465-3b51-423a-af25-4045485d5a1e">
204 <jr:columnHeader height="25" rowSpan="1"> 204 <jr:columnHeader height="25" rowSpan="1">
205 <staticText> 205 <staticText>
206 - <reportElement positionType="Float" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="100" height="25" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/> 206 + <reportElement positionType="Float" stretchType="RelativeToTallestObject" mode="Opaque" x="0" y="0" width="110" height="25" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/>
207 <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> 207 <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2">
208 <pen lineWidth="1.0"/> 208 <pen lineWidth="1.0"/>
209 <topPen lineWidth="1.0"/> 209 <topPen lineWidth="1.0"/>
@@ -219,7 +219,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -219,7 +219,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
219 </jr:columnHeader> 219 </jr:columnHeader>
220 <jr:detailCell height="25" rowSpan="1"> 220 <jr:detailCell height="25" rowSpan="1">
221 <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> 221 <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
222 - <reportElement positionType="Float" x="0" y="0" width="100" height="25" uuid="27fc566c-19fd-4f74-b01c-e2c58ae5b107"/> 222 + <reportElement positionType="Float" x="0" y="0" width="110" height="25" uuid="27fc566c-19fd-4f74-b01c-e2c58ae5b107"/>
223 <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> 223 <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2">
224 <pen lineWidth="1.0"/> 224 <pen lineWidth="1.0"/>
225 <topPen lineWidth="1.0"/> 225 <topPen lineWidth="1.0"/>
@@ -266,10 +266,10 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -266,10 +266,10 @@ where c.id = $P{CONTRATO_ID}]]&gt;
266 </textField> 266 </textField>
267 </jr:detailCell> 267 </jr:detailCell>
268 </jr:column> 268 </jr:column>
269 - <jr:column width="350" uuid="f46445fc-007b-46e6-ade9-eef37e5d0b29"> 269 + <jr:column width="340" uuid="f46445fc-007b-46e6-ade9-eef37e5d0b29">
270 <jr:columnHeader height="25" rowSpan="1"> 270 <jr:columnHeader height="25" rowSpan="1">
271 <staticText> 271 <staticText>
272 - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="350" height="25" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/> 272 + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="340" height="25" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/>
273 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> 273 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3">
274 <pen lineWidth="1.0"/> 274 <pen lineWidth="1.0"/>
275 <topPen lineWidth="1.0"/> 275 <topPen lineWidth="1.0"/>
@@ -285,7 +285,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -285,7 +285,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
285 </jr:columnHeader> 285 </jr:columnHeader>
286 <jr:detailCell height="25" rowSpan="1"> 286 <jr:detailCell height="25" rowSpan="1">
287 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 287 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
288 - <reportElement positionType="Float" x="0" y="0" width="350" height="25" uuid="1a4d3c83-faee-4ef1-9f14-8459e5436112"/> 288 + <reportElement positionType="Float" x="0" y="0" width="340" height="25" uuid="1a4d3c83-faee-4ef1-9f14-8459e5436112"/>
289 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> 289 <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3">
290 <pen lineWidth="1.0"/> 290 <pen lineWidth="1.0"/>
291 <topPen lineWidth="1.0"/> 291 <topPen lineWidth="1.0"/>