From 8a893c5ad2d8a5c4b39bdfac978406fceeaaf789 Mon Sep 17 00:00:00 2001 From: Ronan Tavares Camargo Date: Thu, 14 Apr 2016 17:05:36 -0300 Subject: [PATCH] Ajustes nos relatórios. --- cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml | 26 +++++++++++++------------- cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml | 36 ++++++++++++++++++------------------ cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml | 24 ++++++++++++------------ cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml | 52 +++++++++++++++++++++++++++------------------------- cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml | 42 +++++++++++++++++++++--------------------- 5 files changed, 91 insertions(+), 89 deletions(-) diff --git a/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml index cd1ab81..6790281 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml @@ -116,21 +116,21 @@ limit 1]]> - + - + - + - + - + - + - + - + - + @@ -164,21 +164,21 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + - + - + - + diff --git a/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml index 0cedef6..0027d4e 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml @@ -99,24 +99,24 @@ limit 1]]> - + - + - + - + - + - + - + - + - + @@ -250,13 +250,13 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + - + @@ -278,7 +278,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + @@ -290,13 +290,13 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + - + @@ -318,7 +318,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + @@ -330,13 +330,13 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + - + @@ -358,7 +358,7 @@ $P{dataFinal} != null ? "Até " + new SimpleDateFormat("dd/MM/yyyy").format($P{d - + diff --git a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml index 905af84..526b3f1 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml @@ -106,7 +106,7 @@ limit 1]]> - + @@ -114,13 +114,13 @@ limit 1]]> - + - + @@ -128,7 +128,7 @@ limit 1]]> - + @@ -137,7 +137,7 @@ limit 1]]> - + @@ -145,13 +145,13 @@ limit 1]]> - + - + @@ -159,14 +159,14 @@ limit 1]]> - + - + @@ -174,11 +174,11 @@ limit 1]]> - + - + @@ -186,7 +186,7 @@ limit 1]]> - + diff --git a/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml index 3d6f93c..d0a3d6d 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml @@ -79,7 +79,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -87,13 +87,13 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -101,7 +101,9 @@ where c.id = $P{CONTRATO_ID}]]> - + + + @@ -110,7 +112,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -118,13 +120,13 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -132,14 +134,14 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -147,11 +149,11 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -159,7 +161,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -247,10 +249,10 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -266,7 +268,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -279,10 +281,10 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -293,12 +295,12 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -311,10 +313,10 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -331,7 +333,7 @@ penalidade]]> - + @@ -344,10 +346,10 @@ penalidade]]> - + - + @@ -363,7 +365,7 @@ penalidade]]> - + diff --git a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml index 57087bf..97734f8 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml @@ -74,7 +74,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -82,13 +82,13 @@ where c.id = $P{CONTRATO_ID}]]> - + - + - + @@ -96,7 +96,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -105,7 +105,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -113,13 +113,13 @@ where c.id = $P{CONTRATO_ID}]]> - + - + - + @@ -127,14 +127,14 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -142,11 +142,11 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -154,10 +154,10 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -200,10 +200,10 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -219,7 +219,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -266,10 +266,10 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -285,7 +285,7 @@ where c.id = $P{CONTRATO_ID}]]> - + -- libgit2 0.21.2