Commit ef94c45631c4c5a02496db4a53c6822c165dca98
1 parent
69595447
Exists in
master
redmine #4428 Modificações nos títulos dos relatórios;
Showing
3 changed files
with
16 additions
and
13 deletions
Show diff stats
cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha12/01-cit-contratos-1.0.0-ALFA-12-postgres.sql
0 → 100644
cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml
... | ... | @@ -255,14 +255,14 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
255 | 255 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
256 | 256 | <staticText> |
257 | 257 | <reportElement x="0" y="0" width="105" height="30" uuid="e6106735-9cb7-4e8e-a3c2-9cdbd675331a"/> |
258 | - <box padding="5"> | |
258 | + <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> | |
259 | 259 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
260 | 260 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
261 | 261 | <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
262 | 262 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
263 | 263 | </box> |
264 | 264 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
265 | - <font size="12" isBold="true"/> | |
265 | + <font size="10" isBold="true"/> | |
266 | 266 | </textElement> |
267 | 267 | <text><![CDATA[Nº do empenho]]></text> |
268 | 268 | </staticText> |
... | ... | @@ -286,16 +286,16 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
286 | 286 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
287 | 287 | <staticText> |
288 | 288 | <reportElement x="0" y="0" width="105" height="30" uuid="239910ff-efc4-4da7-bbea-198cfc6487a9"/> |
289 | - <box padding="5"> | |
289 | + <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> | |
290 | 290 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
291 | 291 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
292 | 292 | <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
293 | 293 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
294 | 294 | </box> |
295 | 295 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
296 | - <font size="12" isBold="true"/> | |
296 | + <font size="10" isBold="true"/> | |
297 | 297 | </textElement> |
298 | - <text><![CDATA[Dt do empenho]]></text> | |
298 | + <text><![CDATA[Data do empenho]]></text> | |
299 | 299 | </staticText> |
300 | 300 | </jr:columnHeader> |
301 | 301 | <jr:detailCell height="30" rowSpan="1"> |
... | ... | @@ -317,14 +317,14 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
317 | 317 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
318 | 318 | <staticText> |
319 | 319 | <reportElement x="0" y="0" width="110" height="30" uuid="ffd14591-401f-4be0-ba1e-8903b27dae76"/> |
320 | - <box padding="5"> | |
320 | + <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> | |
321 | 321 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
322 | 322 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
323 | 323 | <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
324 | 324 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
325 | 325 | </box> |
326 | 326 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
327 | - <font size="12" isBold="true"/> | |
327 | + <font size="10" isBold="true"/> | |
328 | 328 | </textElement> |
329 | 329 | <text><![CDATA[Finalidade]]></text> |
330 | 330 | </staticText> |
... | ... | @@ -348,14 +348,14 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
348 | 348 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
349 | 349 | <staticText> |
350 | 350 | <reportElement x="0" y="0" width="110" height="30" uuid="1f54f03e-37a0-437b-916b-78717c24673c"/> |
351 | - <box padding="5"> | |
351 | + <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> | |
352 | 352 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
353 | 353 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
354 | 354 | <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
355 | 355 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
356 | 356 | </box> |
357 | 357 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
358 | - <font size="12" isBold="true"/> | |
358 | + <font size="10" isBold="true"/> | |
359 | 359 | </textElement> |
360 | 360 | <text><![CDATA[Categoria econômica]]></text> |
361 | 361 | </staticText> |
... | ... | @@ -379,16 +379,16 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d |
379 | 379 | <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> |
380 | 380 | <staticText> |
381 | 381 | <reportElement x="0" y="0" width="105" height="30" uuid="ab8d621e-50a7-484e-99bd-3c28b015a77e"/> |
382 | - <box padding="5"> | |
382 | + <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> | |
383 | 383 | <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
384 | 384 | <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
385 | 385 | <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
386 | 386 | <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> |
387 | 387 | </box> |
388 | 388 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
389 | - <font size="12" isBold="true"/> | |
389 | + <font size="10" isBold="true"/> | |
390 | 390 | </textElement> |
391 | - <text><![CDATA[Vlr empenhado]]></text> | |
391 | + <text><![CDATA[Valor empenhado]]></text> | |
392 | 392 | </staticText> |
393 | 393 | </jr:columnHeader> |
394 | 394 | <jr:detailCell height="30" rowSpan="1"> | ... | ... |
cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
... | ... | @@ -293,7 +293,7 @@ where c.id = $P{CONTRATO_ID}]]> |
293 | 293 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
294 | 294 | <font isBold="true"/> |
295 | 295 | </textElement> |
296 | - <text><![CDATA[Nr. da ocorr. vinculada]]></text> | |
296 | + <text><![CDATA[Nº ocorrência vinculada]]></text> | |
297 | 297 | </staticText> |
298 | 298 | </jr:columnHeader> |
299 | 299 | <jr:detailCell height="25" rowSpan="1"> | ... | ... |