Commit 8a893c5ad2d8a5c4b39bdfac978406fceeaaf789
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
| ... | ... | @@ -116,21 +116,21 @@ limit 1]]> |
| 116 | 116 | <frame> |
| 117 | 117 | <reportElement x="5" y="10" width="544" height="25" uuid="49228958-c953-4f27-bf6e-874a60b4f019"/> |
| 118 | 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 | 120 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 121 | 121 | </reportElement> |
| 122 | 122 | <box leftPadding="5" rightPadding="3"/> |
| 123 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 123 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 124 | 124 | <font isBold="true"/> |
| 125 | 125 | </textElement> |
| 126 | 126 | <text><![CDATA[Período:]]></text> |
| 127 | 127 | </staticText> |
| 128 | 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 | 130 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 131 | 131 | </reportElement> |
| 132 | 132 | <box leftPadding="5" rightPadding="3"/> |
| 133 | - <textElement verticalAlignment="Middle"/> | |
| 133 | + <textElement verticalAlignment="Top"/> | |
| 134 | 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 | 135 | $P{dataInicial} != null ? "Apartir de " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) : |
| 136 | 136 | $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal}) : |
| ... | ... | @@ -140,22 +140,22 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 140 | 140 | <frame> |
| 141 | 141 | <reportElement x="5" y="35" width="544" height="25" uuid="23c0fa75-b74a-45b3-9f39-01ec2e451ddb"/> |
| 142 | 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 | 144 | <property name="com.jaspersoft.studio.unit.x" value="pixel"/> |
| 145 | 145 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 146 | 146 | </reportElement> |
| 147 | 147 | <box padding="0" leftPadding="5" rightPadding="3"/> |
| 148 | - <textElement verticalAlignment="Middle"> | |
| 148 | + <textElement verticalAlignment="Top"> | |
| 149 | 149 | <font isBold="true"/> |
| 150 | 150 | </textElement> |
| 151 | - <text><![CDATA[Número / ano do contrato:]]></text> | |
| 151 | + <text><![CDATA[Número / Ano do contrato:]]></text> | |
| 152 | 152 | </staticText> |
| 153 | 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 | 155 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 156 | 156 | </reportElement> |
| 157 | 157 | <box padding="0" leftPadding="5" rightPadding="3"/> |
| 158 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 158 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 159 | 159 | <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0, $F{numeroanocontrato}.length() - 4) |
| 160 | 160 | .concat("/") |
| 161 | 161 | .concat($F{numeroanocontrato}.substring($F{numeroanocontrato}.length() - 4))]]></textFieldExpression> |
| ... | ... | @@ -164,21 +164,21 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 164 | 164 | <frame> |
| 165 | 165 | <reportElement x="5" y="60" width="544" height="25" uuid="6818cb3e-16e3-4a02-93c0-e3e93e8b6642"/> |
| 166 | 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 | 168 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 169 | 169 | </reportElement> |
| 170 | 170 | <box padding="0" leftPadding="5" rightPadding="3"/> |
| 171 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 171 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 172 | 172 | <font isBold="true"/> |
| 173 | 173 | </textElement> |
| 174 | 174 | <text><![CDATA[Valor total do contrato:]]></text> |
| 175 | 175 | </staticText> |
| 176 | 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 | 178 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 179 | 179 | </reportElement> |
| 180 | 180 | <box padding="0" leftPadding="5" rightPadding="3"/> |
| 181 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 181 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 182 | 182 | <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression> |
| 183 | 183 | </textField> |
| 184 | 184 | </frame> | ... | ... |
cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
| ... | ... | @@ -99,24 +99,24 @@ limit 1]]> |
| 99 | 99 | <frame> |
| 100 | 100 | <reportElement x="5" y="10" width="544" height="25" uuid="ca1de359-745c-40f6-9b5f-c57c1957f4ae"/> |
| 101 | 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 | 103 | <property name="com.jaspersoft.studio.unit.width" value="pixel"/> |
| 104 | 104 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 105 | 105 | <property name="com.jaspersoft.studio.unit.x" value="pixel"/> |
| 106 | 106 | <property name="com.jaspersoft.studio.unit.y" value="pixel"/> |
| 107 | 107 | </reportElement> |
| 108 | 108 | <box leftPadding="5" rightPadding="3"/> |
| 109 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 109 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 110 | 110 | <font isBold="true"/> |
| 111 | 111 | </textElement> |
| 112 | 112 | <text><![CDATA[Período:]]></text> |
| 113 | 113 | </staticText> |
| 114 | 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 | 116 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 117 | 117 | </reportElement> |
| 118 | 118 | <box leftPadding="5" rightPadding="3"/> |
| 119 | - <textElement verticalAlignment="Middle"/> | |
| 119 | + <textElement verticalAlignment="Top"/> | |
| 120 | 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 | 121 | $P{dataInicial} != null ? "Apartir de " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataInicial}) : |
| 122 | 122 | $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{dataFinal}) : |
| ... | ... | @@ -126,22 +126,22 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 126 | 126 | <frame> |
| 127 | 127 | <reportElement x="5" y="35" width="544" height="25" uuid="bcd4711f-c2a2-4ef5-bb90-a150b346a0cf"/> |
| 128 | 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 | 130 | <property name="com.jaspersoft.studio.unit.x" value="pixel"/> |
| 131 | 131 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 132 | 132 | </reportElement> |
| 133 | 133 | <box padding="0" leftPadding="5" rightPadding="3"/> |
| 134 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 134 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 135 | 135 | <font isBold="true"/> |
| 136 | 136 | </textElement> |
| 137 | - <text><![CDATA[Número / ano do contrato:]]></text> | |
| 137 | + <text><![CDATA[Número / Ano do contrato:]]></text> | |
| 138 | 138 | </staticText> |
| 139 | 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 | 141 | <property name="com.jaspersoft.studio.unit.height" value="pixel"/> |
| 142 | 142 | </reportElement> |
| 143 | 143 | <box padding="0" leftPadding="5" rightPadding="3"/> |
| 144 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 144 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 145 | 145 | <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0, $F{numeroanocontrato}.length() - 4) |
| 146 | 146 | .concat("/") |
| 147 | 147 | .concat($F{numeroanocontrato}.substring($F{numeroanocontrato}.length() - 4))]]></textFieldExpression> |
| ... | ... | @@ -250,13 +250,13 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 250 | 250 | </textField> |
| 251 | 251 | </jr:detailCell> |
| 252 | 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 | 254 | <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/> |
| 255 | 255 | <property name="com.jaspersoft.studio.unit.width" value="pixel"/> |
| 256 | 256 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
| 257 | 257 | <property name="com.jaspersoft.studio.unit.width" value="px"/> |
| 258 | 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 | 260 | <box padding="0" leftPadding="3" rightPadding="3"> |
| 261 | 261 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 262 | 262 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| ... | ... | @@ -278,7 +278,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 278 | 278 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 279 | 279 | </box> |
| 280 | 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 | 282 | <box padding="3"> |
| 283 | 283 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 284 | 284 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| ... | ... | @@ -290,13 +290,13 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 290 | 290 | </textField> |
| 291 | 291 | </jr:detailCell> |
| 292 | 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 | 294 | <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column3"/> |
| 295 | 295 | <property name="com.jaspersoft.studio.unit.width" value="pixel"/> |
| 296 | 296 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
| 297 | 297 | <property name="com.jaspersoft.studio.unit.width" value="px"/> |
| 298 | 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 | 300 | <box padding="0" leftPadding="3" rightPadding="3"> |
| 301 | 301 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 302 | 302 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| ... | ... | @@ -318,7 +318,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 318 | 318 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 319 | 319 | </box> |
| 320 | 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 | 322 | <box padding="3"> |
| 323 | 323 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 324 | 324 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| ... | ... | @@ -330,13 +330,13 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 330 | 330 | </textField> |
| 331 | 331 | </jr:detailCell> |
| 332 | 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 | 334 | <property name="com.jaspersoft.studio.components.table.model.column.name" value="Column4"/> |
| 335 | 335 | <property name="com.jaspersoft.studio.unit.width" value="pixel"/> |
| 336 | 336 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
| 337 | 337 | <property name="com.jaspersoft.studio.unit.width" value="px"/> |
| 338 | 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 | 340 | <box padding="0" leftPadding="3" rightPadding="3"> |
| 341 | 341 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 342 | 342 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| ... | ... | @@ -358,7 +358,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
| 358 | 358 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 359 | 359 | </box> |
| 360 | 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 | 362 | <box padding="3"> |
| 363 | 363 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
| 364 | 364 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> | ... | ... |
cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
| ... | ... | @@ -106,7 +106,7 @@ limit 1]]> |
| 106 | 106 | <frame> |
| 107 | 107 | <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> |
| 108 | 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 | 110 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 111 | 111 | <pen lineWidth="0.0"/> |
| 112 | 112 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -114,13 +114,13 @@ limit 1]]> |
| 114 | 114 | <bottomPen lineWidth="0.0"/> |
| 115 | 115 | <rightPen lineWidth="0.0"/> |
| 116 | 116 | </box> |
| 117 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 117 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 118 | 118 | <font isBold="true"/> |
| 119 | 119 | </textElement> |
| 120 | 120 | <text><![CDATA[Período:]]></text> |
| 121 | 121 | </staticText> |
| 122 | 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 | 124 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 125 | 125 | <pen lineWidth="0.0"/> |
| 126 | 126 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -128,7 +128,7 @@ limit 1]]> |
| 128 | 128 | <bottomPen lineWidth="0.0"/> |
| 129 | 129 | <rightPen lineWidth="0.0"/> |
| 130 | 130 | </box> |
| 131 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 131 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 132 | 132 | <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : |
| 133 | 133 | ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + |
| 134 | 134 | ($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> |
| ... | ... | @@ -137,7 +137,7 @@ limit 1]]> |
| 137 | 137 | <frame> |
| 138 | 138 | <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> |
| 139 | 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 | 141 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 142 | 142 | <pen lineWidth="0.0"/> |
| 143 | 143 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -145,13 +145,13 @@ limit 1]]> |
| 145 | 145 | <bottomPen lineWidth="0.0"/> |
| 146 | 146 | <rightPen lineWidth="0.0"/> |
| 147 | 147 | </box> |
| 148 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 148 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 149 | 149 | <font isBold="true"/> |
| 150 | 150 | </textElement> |
| 151 | 151 | <text><![CDATA[Número / Ano do contrato:]]></text> |
| 152 | 152 | </staticText> |
| 153 | 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 | 155 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 156 | 156 | <pen lineWidth="0.0"/> |
| 157 | 157 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -159,14 +159,14 @@ limit 1]]> |
| 159 | 159 | <bottomPen lineWidth="0.0"/> |
| 160 | 160 | <rightPen lineWidth="0.0"/> |
| 161 | 161 | </box> |
| 162 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 162 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 163 | 163 | <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0,9) + "/" + $F{numeroanocontrato}.substring(9,13)]]></textFieldExpression> |
| 164 | 164 | </textField> |
| 165 | 165 | </frame> |
| 166 | 166 | <frame> |
| 167 | 167 | <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> |
| 168 | 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 | 170 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 171 | 171 | <pen lineWidth="0.0"/> |
| 172 | 172 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -174,11 +174,11 @@ limit 1]]> |
| 174 | 174 | <bottomPen lineWidth="0.0"/> |
| 175 | 175 | <rightPen lineWidth="0.0"/> |
| 176 | 176 | </box> |
| 177 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 177 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 178 | 178 | <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression> |
| 179 | 179 | </textField> |
| 180 | 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 | 182 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 183 | 183 | <pen lineWidth="0.0"/> |
| 184 | 184 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -186,7 +186,7 @@ limit 1]]> |
| 186 | 186 | <bottomPen lineWidth="0.0"/> |
| 187 | 187 | <rightPen lineWidth="0.0"/> |
| 188 | 188 | </box> |
| 189 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 189 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 190 | 190 | <font isBold="true"/> |
| 191 | 191 | </textElement> |
| 192 | 192 | <text><![CDATA[Valor total do contrato:]]></text> | ... | ... |
cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
| ... | ... | @@ -79,7 +79,7 @@ where c.id = $P{CONTRATO_ID}]]> |
| 79 | 79 | <frame> |
| 80 | 80 | <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> |
| 81 | 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 | 83 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 84 | 84 | <pen lineWidth="0.0"/> |
| 85 | 85 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -87,13 +87,13 @@ where c.id = $P{CONTRATO_ID}]]> |
| 87 | 87 | <bottomPen lineWidth="0.0"/> |
| 88 | 88 | <rightPen lineWidth="0.0"/> |
| 89 | 89 | </box> |
| 90 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 90 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 91 | 91 | <font isBold="true"/> |
| 92 | 92 | </textElement> |
| 93 | 93 | <text><![CDATA[Período:]]></text> |
| 94 | 94 | </staticText> |
| 95 | 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 | 97 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 98 | 98 | <pen lineWidth="0.0"/> |
| 99 | 99 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -101,7 +101,9 @@ where c.id = $P{CONTRATO_ID}]]> |
| 101 | 101 | <bottomPen lineWidth="0.0"/> |
| 102 | 102 | <rightPen lineWidth="0.0"/> |
| 103 | 103 | </box> |
| 104 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 104 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 105 | + <font isBold="false"/> | |
| 106 | + </textElement> | |
| 105 | 107 | <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : |
| 106 | 108 | ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + |
| 107 | 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}]]> |
| 110 | 112 | <frame> |
| 111 | 113 | <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> |
| 112 | 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 | 116 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 115 | 117 | <pen lineWidth="0.0"/> |
| 116 | 118 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -118,13 +120,13 @@ where c.id = $P{CONTRATO_ID}]]> |
| 118 | 120 | <bottomPen lineWidth="0.0"/> |
| 119 | 121 | <rightPen lineWidth="0.0"/> |
| 120 | 122 | </box> |
| 121 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 123 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 122 | 124 | <font isBold="true"/> |
| 123 | 125 | </textElement> |
| 124 | 126 | <text><![CDATA[Número / Ano do contrato:]]></text> |
| 125 | 127 | </staticText> |
| 126 | 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 | 130 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 129 | 131 | <pen lineWidth="0.0"/> |
| 130 | 132 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -132,14 +134,14 @@ where c.id = $P{CONTRATO_ID}]]> |
| 132 | 134 | <bottomPen lineWidth="0.0"/> |
| 133 | 135 | <rightPen lineWidth="0.0"/> |
| 134 | 136 | </box> |
| 135 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 137 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 136 | 138 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> |
| 137 | 139 | </textField> |
| 138 | 140 | </frame> |
| 139 | 141 | <frame> |
| 140 | 142 | <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> |
| 141 | 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 | 145 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 144 | 146 | <pen lineWidth="0.0"/> |
| 145 | 147 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -147,11 +149,11 @@ where c.id = $P{CONTRATO_ID}]]> |
| 147 | 149 | <bottomPen lineWidth="0.0"/> |
| 148 | 150 | <rightPen lineWidth="0.0"/> |
| 149 | 151 | </box> |
| 150 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 152 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 151 | 153 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> |
| 152 | 154 | </textField> |
| 153 | 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 | 157 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 156 | 158 | <pen lineWidth="0.0"/> |
| 157 | 159 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -159,7 +161,7 @@ where c.id = $P{CONTRATO_ID}]]> |
| 159 | 161 | <bottomPen lineWidth="0.0"/> |
| 160 | 162 | <rightPen lineWidth="0.0"/> |
| 161 | 163 | </box> |
| 162 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 164 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 163 | 165 | <font isBold="true"/> |
| 164 | 166 | </textElement> |
| 165 | 167 | <text><![CDATA[Contratada:]]></text> |
| ... | ... | @@ -247,10 +249,10 @@ where c.id = $P{CONTRATO_ID}]]> |
| 247 | 249 | </textField> |
| 248 | 250 | </jr:detailCell> |
| 249 | 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 | 253 | <jr:columnHeader height="30" rowSpan="1"> |
| 252 | 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 | 256 | <box leftPadding="3" rightPadding="3"> |
| 255 | 257 | <pen lineWidth="1.0"/> |
| 256 | 258 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -266,7 +268,7 @@ where c.id = $P{CONTRATO_ID}]]> |
| 266 | 268 | </jr:columnHeader> |
| 267 | 269 | <jr:detailCell height="25" rowSpan="1"> |
| 268 | 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 | 272 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 271 | 273 | <pen lineWidth="1.0"/> |
| 272 | 274 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -279,10 +281,10 @@ where c.id = $P{CONTRATO_ID}]]> |
| 279 | 281 | </textField> |
| 280 | 282 | </jr:detailCell> |
| 281 | 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 | 285 | <jr:columnHeader height="30" rowSpan="1"> |
| 284 | 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 | 288 | <box leftPadding="3" rightPadding="3"> |
| 287 | 289 | <pen lineWidth="1.0"/> |
| 288 | 290 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -293,12 +295,12 @@ where c.id = $P{CONTRATO_ID}]]> |
| 293 | 295 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
| 294 | 296 | <font isBold="true"/> |
| 295 | 297 | </textElement> |
| 296 | - <text><![CDATA[Nº ocorrência vinculada]]></text> | |
| 298 | + <text><![CDATA[Nº da Ocorrência vinculada]]></text> | |
| 297 | 299 | </staticText> |
| 298 | 300 | </jr:columnHeader> |
| 299 | 301 | <jr:detailCell height="25" rowSpan="1"> |
| 300 | 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 | 304 | <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> |
| 303 | 305 | <pen lineWidth="1.0"/> |
| 304 | 306 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -311,10 +313,10 @@ where c.id = $P{CONTRATO_ID}]]> |
| 311 | 313 | </textField> |
| 312 | 314 | </jr:detailCell> |
| 313 | 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 | 317 | <jr:columnHeader height="30" rowSpan="1"> |
| 316 | 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 | 320 | <box leftPadding="3" rightPadding="3"> |
| 319 | 321 | <pen lineWidth="1.0"/> |
| 320 | 322 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -331,7 +333,7 @@ penalidade]]></text> |
| 331 | 333 | </jr:columnHeader> |
| 332 | 334 | <jr:detailCell height="25" rowSpan="1"> |
| 333 | 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 | 337 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 336 | 338 | <pen lineWidth="1.0"/> |
| 337 | 339 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -344,10 +346,10 @@ penalidade]]></text> |
| 344 | 346 | </textField> |
| 345 | 347 | </jr:detailCell> |
| 346 | 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 | 350 | <jr:columnHeader height="30" rowSpan="1"> |
| 349 | 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 | 353 | <box leftPadding="3" rightPadding="3"> |
| 352 | 354 | <pen lineWidth="1.0"/> |
| 353 | 355 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -363,7 +365,7 @@ penalidade]]></text> |
| 363 | 365 | </jr:columnHeader> |
| 364 | 366 | <jr:detailCell height="25" rowSpan="1"> |
| 365 | 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 | 369 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 368 | 370 | <pen lineWidth="1.0"/> |
| 369 | 371 | <topPen lineWidth="1.0"/> | ... | ... |
cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
| ... | ... | @@ -74,7 +74,7 @@ where c.id = $P{CONTRATO_ID}]]> |
| 74 | 74 | <frame> |
| 75 | 75 | <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> |
| 76 | 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 | 78 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 79 | 79 | <pen lineWidth="0.0"/> |
| 80 | 80 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -82,13 +82,13 @@ where c.id = $P{CONTRATO_ID}]]> |
| 82 | 82 | <bottomPen lineWidth="0.0"/> |
| 83 | 83 | <rightPen lineWidth="0.0"/> |
| 84 | 84 | </box> |
| 85 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 85 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 86 | 86 | <font isBold="true"/> |
| 87 | 87 | </textElement> |
| 88 | - <text><![CDATA[Período]]></text> | |
| 88 | + <text><![CDATA[Período:]]></text> | |
| 89 | 89 | </staticText> |
| 90 | 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 | 92 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 93 | 93 | <pen lineWidth="0.0"/> |
| 94 | 94 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -96,7 +96,7 @@ where c.id = $P{CONTRATO_ID}]]> |
| 96 | 96 | <bottomPen lineWidth="0.0"/> |
| 97 | 97 | <rightPen lineWidth="0.0"/> |
| 98 | 98 | </box> |
| 99 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 99 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 100 | 100 | <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : |
| 101 | 101 | ($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + |
| 102 | 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}]]> |
| 105 | 105 | <frame> |
| 106 | 106 | <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> |
| 107 | 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 | 109 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 110 | 110 | <pen lineWidth="0.0"/> |
| 111 | 111 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -113,13 +113,13 @@ where c.id = $P{CONTRATO_ID}]]> |
| 113 | 113 | <bottomPen lineWidth="0.0"/> |
| 114 | 114 | <rightPen lineWidth="0.0"/> |
| 115 | 115 | </box> |
| 116 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 116 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 117 | 117 | <font isBold="true"/> |
| 118 | 118 | </textElement> |
| 119 | - <text><![CDATA[Número / Ano do contrato]]></text> | |
| 119 | + <text><![CDATA[Número / Ano do contrato:]]></text> | |
| 120 | 120 | </staticText> |
| 121 | 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 | 123 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 124 | 124 | <pen lineWidth="0.0"/> |
| 125 | 125 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -127,14 +127,14 @@ where c.id = $P{CONTRATO_ID}]]> |
| 127 | 127 | <bottomPen lineWidth="0.0"/> |
| 128 | 128 | <rightPen lineWidth="0.0"/> |
| 129 | 129 | </box> |
| 130 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 130 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 131 | 131 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> |
| 132 | 132 | </textField> |
| 133 | 133 | </frame> |
| 134 | 134 | <frame> |
| 135 | 135 | <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> |
| 136 | 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 | 138 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 139 | 139 | <pen lineWidth="0.0"/> |
| 140 | 140 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -142,11 +142,11 @@ where c.id = $P{CONTRATO_ID}]]> |
| 142 | 142 | <bottomPen lineWidth="0.0"/> |
| 143 | 143 | <rightPen lineWidth="0.0"/> |
| 144 | 144 | </box> |
| 145 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | |
| 145 | + <textElement textAlignment="Left" verticalAlignment="Top"/> | |
| 146 | 146 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> |
| 147 | 147 | </textField> |
| 148 | 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 | 150 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 151 | 151 | <pen lineWidth="0.0"/> |
| 152 | 152 | <topPen lineWidth="0.0"/> |
| ... | ... | @@ -154,10 +154,10 @@ where c.id = $P{CONTRATO_ID}]]> |
| 154 | 154 | <bottomPen lineWidth="0.0"/> |
| 155 | 155 | <rightPen lineWidth="0.0"/> |
| 156 | 156 | </box> |
| 157 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | |
| 157 | + <textElement textAlignment="Left" verticalAlignment="Top"> | |
| 158 | 158 | <font isBold="true"/> |
| 159 | 159 | </textElement> |
| 160 | - <text><![CDATA[Contratada]]></text> | |
| 160 | + <text><![CDATA[Contratada:]]></text> | |
| 161 | 161 | </staticText> |
| 162 | 162 | </frame> |
| 163 | 163 | <line> |
| ... | ... | @@ -200,10 +200,10 @@ where c.id = $P{CONTRATO_ID}]]> |
| 200 | 200 | <text><![CDATA[Não existem dados para este relatório.]]></text> |
| 201 | 201 | </staticText> |
| 202 | 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 | 204 | <jr:columnHeader height="25" rowSpan="1"> |
| 205 | 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 | 207 | <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> |
| 208 | 208 | <pen lineWidth="1.0"/> |
| 209 | 209 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -219,7 +219,7 @@ where c.id = $P{CONTRATO_ID}]]> |
| 219 | 219 | </jr:columnHeader> |
| 220 | 220 | <jr:detailCell height="25" rowSpan="1"> |
| 221 | 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 | 223 | <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> |
| 224 | 224 | <pen lineWidth="1.0"/> |
| 225 | 225 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -266,10 +266,10 @@ where c.id = $P{CONTRATO_ID}]]> |
| 266 | 266 | </textField> |
| 267 | 267 | </jr:detailCell> |
| 268 | 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 | 270 | <jr:columnHeader height="25" rowSpan="1"> |
| 271 | 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 | 273 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 274 | 274 | <pen lineWidth="1.0"/> |
| 275 | 275 | <topPen lineWidth="1.0"/> |
| ... | ... | @@ -285,7 +285,7 @@ where c.id = $P{CONTRATO_ID}]]> |
| 285 | 285 | </jr:columnHeader> |
| 286 | 286 | <jr:detailCell height="25" rowSpan="1"> |
| 287 | 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 | 289 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 290 | 290 | <pen lineWidth="1.0"/> |
| 291 | 291 | <topPen lineWidth="1.0"/> | ... | ... |