Download as
Browse Code »

Commit 8bdeda97f4986231f307373584fdc54ad5040d84

Authored by luis.camargo
2 parents e8c038ab 1a141a9f
Exists in master

Merge branch 'tarefa-4430' into cnt-1.0.0-alfa12

Showing 10 changed files with 90 additions and 56 deletions   Show diff stats
cit-contratos-api/src/main/java/br/com/centralit/api/model/Programa.java
  Diff comments   View file @8bdeda9
@@ -34,7 +34,7 @@ public class Programa extends PersistentObjectAuditOrganizacao { @@ -34,7 +34,7 @@ public class Programa extends PersistentObjectAuditOrganizacao {
34 @JsonView({ Views.GenericView.class }) 34 @JsonView({ Views.GenericView.class })
35 private Long id; 35 private Long id;
36 36
37 - @Column(length = 4, nullable=false) 37 + @Column(length = 4, nullable=true)
38 @JsonView({ ViewsContrato.ProgramaEditView.class, ViewsContrato.ProgramaAutoCompleteView.class }) 38 @JsonView({ ViewsContrato.ProgramaEditView.class, ViewsContrato.ProgramaAutoCompleteView.class })
39 private Integer anoExercicio; 39 private Integer anoExercicio;
40 40
cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java
  Diff comments   View file @8bdeda9
@@ -397,25 +397,22 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento @@ -397,25 +397,22 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento
397 397
398 private JasperPrint selecionaRelatorio(Long idContrato, Date dataInicial, Date dataFinal, Connection conn, JasperPrint jasperPrint, Usuario usuarioLogado, Dominio dominioTipoRelatorio) 398 private JasperPrint selecionaRelatorio(Long idContrato, Date dataInicial, Date dataFinal, Connection conn, JasperPrint jasperPrint, Usuario usuarioLogado, Dominio dominioTipoRelatorio)
399 throws JRException { 399 throws JRException {
  400 +
  401 + String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.CONSULTA_RELATORIOS", this.getIdioma());
400 402
401 if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_EMPENHO) { 403 if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_EMPENHO) {
402 - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REGISTRO_EMPENHO", this.getIdioma());  
403 jasperPrint = this.contratoEmpenhoService.getJasperPrintRelatorioEmpenho(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); 404 jasperPrint = this.contratoEmpenhoService.getJasperPrintRelatorioEmpenho(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo);
404 405
405 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_LIBERA_PAGAMENTO) { 406 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_LIBERA_PAGAMENTO) {
406 - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_LIBERACAO_PAGAMENTO", this.getIdioma());  
407 jasperPrint = this.eventoLiberacaoPagamentoService.getJasperPrintRelatorioLiberacaoPagamento(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); 407 jasperPrint = this.eventoLiberacaoPagamentoService.getJasperPrintRelatorioLiberacaoPagamento(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo);
408 408
409 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_REPACTUACAO) { 409 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_REPACTUACAO) {
410 - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REPACTUACAO", this.getIdioma());  
411 jasperPrint = this.repactuacaoService.getJasperPrintRelatorioRepactuacao(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); 410 jasperPrint = this.repactuacaoService.getJasperPrintRelatorioRepactuacao(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo);
412 411
413 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_NAO_CONFORMIDADE) { 412 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_NAO_CONFORMIDADE) {
414 - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_NAO_CONFORMIDADE", this.getIdioma());  
415 jasperPrint = this.eventoRegistroNaoConformidadeService.getJasperPrintRelatorioRegistroNaoConformidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); 413 jasperPrint = this.eventoRegistroNaoConformidadeService.getJasperPrintRelatorioRegistroNaoConformidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo);
416 414
417 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_PENALIDADE) { 415 } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_PENALIDADE) {
418 - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_PENALIDADE_APLICADA", this.getIdioma());  
419 jasperPrint = this.eventoPenalidadeService.getJasperPrintRelatorioPenalidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); 416 jasperPrint = this.eventoPenalidadeService.getJasperPrintRelatorioPenalidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo);
420 } 417 }
421 418
cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/InicializarContratosServiceImpl.java
  Diff comments   View file @8bdeda9
@@ -256,9 +256,9 @@ public class InicializarContratosServiceImpl extends UtilStartup { @@ -256,9 +256,9 @@ public class InicializarContratosServiceImpl extends UtilStartup {
256 256
257 private void criarOpcaoTermoReferenciaProjetoBasico(Modulo modulo, Menu menuPlanejamentoContrat) { 257 private void criarOpcaoTermoReferenciaProjetoBasico(Modulo modulo, Menu menuPlanejamentoContrat) {
258 258
259 - Pagina paginaTermo = new Pagina("Termo Referência/Projeto Básico", "/cit-contratos-web/html/termoReferencia/termoReferencia.html"); 259 + Pagina paginaTermo = new Pagina("Termo de referência/Projeto básico", "/cit-contratos-web/html/termoReferencia/termoReferencia.html");
260 paginaTermo = this.paginaService.saveIfNotExist(paginaTermo); 260 paginaTermo = this.paginaService.saveIfNotExist(paginaTermo);
261 - Menu menuTermo = new Menu("Termo Referência/Projeto Básico", paginaTermo, menuPlanejamentoContrat, null, 4, null, null, null, null, modulo, "TERMO_REFERENCIA"); 261 + Menu menuTermo = new Menu("Termo de referência/Projeto básico", paginaTermo, menuPlanejamentoContrat, null, 4, null, null, null, null, modulo, "TERMO_REFERENCIA");
262 262
263 List<MenuFile> filesMenuFileTermo = new ArrayList<MenuFile>(); 263 List<MenuFile> filesMenuFileTermo = new ArrayList<MenuFile>();
264 filesMenuFileTermo.add(new MenuFile(CIT_CONTRATOS_WEB_ANGULAR_CUSTOM + "controller/TermoReferenciaListController.js", this.dominioJS, menuTermo)); 264 filesMenuFileTermo.add(new MenuFile(CIT_CONTRATOS_WEB_ANGULAR_CUSTOM + "controller/TermoReferenciaListController.js", this.dominioJS, menuTermo));
@@ -536,9 +536,9 @@ public class InicializarContratosServiceImpl extends UtilStartup { @@ -536,9 +536,9 @@ public class InicializarContratosServiceImpl extends UtilStartup {
536 536
537 private void criarConsultaTermo(Modulo modulo, Menu menuTermosRelatorios) { 537 private void criarConsultaTermo(Modulo modulo, Menu menuTermosRelatorios) {
538 538
539 - Pagina pgRelatorioRecisao = new Pagina("Termos", "/cit-contratos-web/html/consultaTermo/consultaTermo.html"); 539 + Pagina pgRelatorioRecisao = new Pagina("Consulta de termos", "/cit-contratos-web/html/consultaTermo/consultaTermo.html");
540 pgRelatorioRecisao = this.paginaService.saveIfNotExist(pgRelatorioRecisao); 540 pgRelatorioRecisao = this.paginaService.saveIfNotExist(pgRelatorioRecisao);
541 - Menu menuRelatorioRecisao = new Menu("Consulta de Termos", pgRelatorioRecisao, menuTermosRelatorios, null, 1, null, null, null, null, modulo, "CONSULTA_TERMOS"); 541 + Menu menuRelatorioRecisao = new Menu("Consulta de termos", pgRelatorioRecisao, menuTermosRelatorios, null, 1, null, null, null, null, modulo, "CONSULTA_TERMOS");
542 542
543 this.menuService.mergeIfNotExist(menuRelatorioRecisao); 543 this.menuService.mergeIfNotExist(menuRelatorioRecisao);
544 } 544 }
@@ -547,7 +547,7 @@ public class InicializarContratosServiceImpl extends UtilStartup { @@ -547,7 +547,7 @@ public class InicializarContratosServiceImpl extends UtilStartup {
547 547
548 Pagina pgConsultaRelatorios = new Pagina("Consulta de relatórios", "/cit-contratos-web/html/consultaRelatorios/consultaRelatorios.html"); 548 Pagina pgConsultaRelatorios = new Pagina("Consulta de relatórios", "/cit-contratos-web/html/consultaRelatorios/consultaRelatorios.html");
549 pgConsultaRelatorios = this.paginaService.saveIfNotExist(pgConsultaRelatorios); 549 pgConsultaRelatorios = this.paginaService.saveIfNotExist(pgConsultaRelatorios);
550 - Menu menuConsultaRelatorios = new Menu("Consulta de relatório", pgConsultaRelatorios, menuTermosRelatorios, null, 11, null, null, null, null, modulo, "CONSULTA_RELATORIO"); 550 + Menu menuConsultaRelatorios = new Menu("Consulta de relatórios", pgConsultaRelatorios, menuTermosRelatorios, null, 11, null, null, null, null, modulo, "CONSULTA_RELATORIO");
551 551
552 List<MenuFile> filesMenuConsultaRelatorios = new ArrayList<MenuFile>(); 552 List<MenuFile> filesMenuConsultaRelatorios = new ArrayList<MenuFile>();
553 filesMenuConsultaRelatorios.add(new MenuFile(CIT_CONTRATOS_WEB_ANGULAR_CUSTOM + "controller/ConsultaRelatoriosController.js", this.dominioJS, menuConsultaRelatorios)); 553 filesMenuConsultaRelatorios.add(new MenuFile(CIT_CONTRATOS_WEB_ANGULAR_CUSTOM + "controller/ConsultaRelatoriosController.js", this.dominioJS, menuConsultaRelatorios));
cit-contratos-api/src/main/resources/script-bd/v1.0.0-alpha12/01-cit-contratos-1.0.0-ALFA-12-postgres.sql
  Diff comments   View file @8bdeda9
1 -- LUÍS CÉSAR INÍCIO 11/04/2016 1 -- LUÍS CÉSAR INÍCIO 11/04/2016
2 TRUNCATE INTERNACIONALIZACAO CASCADE; 2 TRUNCATE INTERNACIONALIZACAO CASCADE;
3 --- LUÍS CÉSAR FIM 11/04/2016  
4 \ No newline at end of file 3 \ No newline at end of file
  4 +-- LUÍS CÉSAR FIM 11/04/2016
  5 +
  6 +-- LUÍS CÉSAR INÍCIO 12/04/2016
  7 +update menu set nome = 'Consulta de relatórios' where chave = 'CONSULTA_RELATORIO';
  8 +update menu set nome = 'Consulta de termos' where chave = 'CONSULTA_TERMOS';
  9 +update menu set nome = 'Termo de referência/Projeto básico' where chave = 'TERMO_REFERENCIA';
  10 +update pagina set nome = 'Termo de refência/Projeto básico' where pagina = '/cit-contratos-web/html/termoReferencia/termoReferencia.html';
  11 +update pagina set nome = 'Consulta de termos' where pagina = '/cit-contratos-web/html/consultaTermo/consultaTermo.html';
  12 +alter table cnt_programa alter anoexercicio drop not null;
  13 +-- LUÍS CÉSAR FIM 12/04/2016
5 \ No newline at end of file 14 \ No newline at end of file
cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java
  Diff comments   View file @8bdeda9
@@ -990,6 +990,9 @@ public class StartupListenerContratos extends UtilStartup implements Application @@ -990,6 +990,9 @@ public class StartupListenerContratos extends UtilStartup implements Application
990 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.EXCLUSAO_ADITIVO_NEGADA", "Exclusão não permitida, o aditivo de prazo já está vigente ou há aditivos de prazo subsequentes a este.", dominio, modulo)); 990 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.EXCLUSAO_ADITIVO_NEGADA", "Exclusão não permitida, o aditivo de prazo já está vigente ou há aditivos de prazo subsequentes a este.", dominio, modulo));
991 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_12_MESES_POSTERIOR", "Data de emissão não permitida, pois infere intervalo de 12 meses em relação ao aditivo subsequente.", dominio, modulo)); 991 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DATA_EMISSAO_12_MESES_POSTERIOR", "Data de emissão não permitida, pois infere intervalo de 12 meses em relação ao aditivo subsequente.", dominio, modulo));
992 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.ADITIVO_DATA_EMISSAO_MAIOR_DATA_INICIO", "Data de emissão deve ser menor que a data de início do aditivo.", dominio, modulo)); 992 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.ADITIVO_DATA_EMISSAO_MAIOR_DATA_INICIO", "Data de emissão deve ser menor que a data de início do aditivo.", dominio, modulo));
  993 +
  994 + internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.CONSULTA_RELATORIOS", "Consulta de relatórios", dominio, modulo));
  995 + internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.CONSULTA_TERMOS", "Consulta de termos", dominio, modulo));
993 } 996 }
994 997
995 private void gerarMensagem(Dominio dominio, Modulo modulo, List<Internacionalizacao> internacionalizacaoList) { 998 private void gerarMensagem(Dominio dominio, Modulo modulo, List<Internacionalizacao> internacionalizacaoList) {
cit-contratos-web/src/main/resources/reports/relatorioEventoEmpenho.jrxml
  Diff comments   View file @8bdeda9
@@ -204,7 +204,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -204,7 +204,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
204 <textElement textAlignment="Left" verticalAlignment="Middle"> 204 <textElement textAlignment="Left" verticalAlignment="Middle">
205 <font size="13" isBold="true"/> 205 <font size="13" isBold="true"/>
206 </textElement> 206 </textElement>
207 - <text><![CDATA[1. Relatórios]]></text> 207 + <text><![CDATA[1. Relatório de Registro de Empenho]]></text>
208 </staticText> 208 </staticText>
209 <componentElement> 209 <componentElement>
210 <reportElement x="15" y="40" width="534" height="30" uuid="daece71a-c857-4368-833f-95e7841c2392"> 210 <reportElement x="15" y="40" width="534" height="30" uuid="daece71a-c857-4368-833f-95e7841c2392">
@@ -255,7 +255,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -255,7 +255,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
255 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 255 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
256 <staticText> 256 <staticText>
257 <reportElement x="0" y="0" width="105" height="30" uuid="e6106735-9cb7-4e8e-a3c2-9cdbd675331a"/> 257 <reportElement x="0" y="0" width="105" height="30" uuid="e6106735-9cb7-4e8e-a3c2-9cdbd675331a"/>
258 - <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> 258 + <box padding="5" topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3">
259 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 259 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
260 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 260 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
261 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 261 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -286,7 +286,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -286,7 +286,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
286 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 286 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
287 <staticText> 287 <staticText>
288 <reportElement x="0" y="0" width="105" height="30" uuid="239910ff-efc4-4da7-bbea-198cfc6487a9"/> 288 <reportElement x="0" y="0" width="105" height="30" uuid="239910ff-efc4-4da7-bbea-198cfc6487a9"/>
289 - <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> 289 + <box padding="5" topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3">
290 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 290 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
291 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 291 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
292 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 292 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -317,7 +317,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -317,7 +317,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
317 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 317 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
318 <staticText> 318 <staticText>
319 <reportElement x="0" y="0" width="110" height="30" uuid="ffd14591-401f-4be0-ba1e-8903b27dae76"/> 319 <reportElement x="0" y="0" width="110" height="30" uuid="ffd14591-401f-4be0-ba1e-8903b27dae76"/>
320 - <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> 320 + <box padding="5" topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3">
321 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 321 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
322 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 322 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
323 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 323 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -348,7 +348,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -348,7 +348,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
348 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 348 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
349 <staticText> 349 <staticText>
350 <reportElement x="0" y="0" width="110" height="30" uuid="1f54f03e-37a0-437b-916b-78717c24673c"/> 350 <reportElement x="0" y="0" width="110" height="30" uuid="1f54f03e-37a0-437b-916b-78717c24673c"/>
351 - <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> 351 + <box padding="5" topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3">
352 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 352 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
353 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 353 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
354 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 354 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -357,7 +357,8 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -357,7 +357,8 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
357 <textElement textAlignment="Center" verticalAlignment="Middle"> 357 <textElement textAlignment="Center" verticalAlignment="Middle">
358 <font size="10" isBold="true"/> 358 <font size="10" isBold="true"/>
359 </textElement> 359 </textElement>
360 - <text><![CDATA[Categoria econômica]]></text> 360 + <text><![CDATA[Categoria
  361 +econômica]]></text>
361 </staticText> 362 </staticText>
362 </jr:columnHeader> 363 </jr:columnHeader>
363 <jr:detailCell height="30" rowSpan="1"> 364 <jr:detailCell height="30" rowSpan="1">
@@ -379,7 +380,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -379,7 +380,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
379 <jr:columnHeader style="Table_CH" height="30" rowSpan="1"> 380 <jr:columnHeader style="Table_CH" height="30" rowSpan="1">
380 <staticText> 381 <staticText>
381 <reportElement x="0" y="0" width="105" height="30" uuid="ab8d621e-50a7-484e-99bd-3c28b015a77e"/> 382 <reportElement x="0" y="0" width="105" height="30" uuid="ab8d621e-50a7-484e-99bd-3c28b015a77e"/>
382 - <box padding="5" topPadding="3" leftPadding="5" bottomPadding="3" rightPadding="5"> 383 + <box padding="5" topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3">
383 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 384 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
384 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 385 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
385 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 386 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -394,13 +395,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -394,13 +395,13 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
394 <jr:detailCell height="30" rowSpan="1"> 395 <jr:detailCell height="30" rowSpan="1">
395 <textField pattern="¤#,##0.00;¤-#,##0.00" isBlankWhenNull="true"> 396 <textField pattern="¤#,##0.00;¤-#,##0.00" isBlankWhenNull="true">
396 <reportElement x="0" y="0" width="105" height="30" uuid="b1153c35-ce40-4f61-bdc9-584f2b5def50"/> 397 <reportElement x="0" y="0" width="105" height="30" uuid="b1153c35-ce40-4f61-bdc9-584f2b5def50"/>
397 - <box padding="5"> 398 + <box padding="5" topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
398 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 399 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
399 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 400 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
400 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 401 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
401 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 402 <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
402 </box> 403 </box>
403 - <textElement textAlignment="Center" verticalAlignment="Middle"/> 404 + <textElement textAlignment="Right" verticalAlignment="Middle"/>
404 <textFieldExpression><![CDATA[$F{valorempenhado}]]></textFieldExpression> 405 <textFieldExpression><![CDATA[$F{valorempenhado}]]></textFieldExpression>
405 </textField> 406 </textField>
406 </jr:detailCell> 407 </jr:detailCell>
cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
  Diff comments   View file @8bdeda9
@@ -166,7 +166,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -166,7 +166,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
166 <textElement textAlignment="Left" verticalAlignment="Middle"> 166 <textElement textAlignment="Left" verticalAlignment="Middle">
167 <font size="13" isBold="true"/> 167 <font size="13" isBold="true"/>
168 </textElement> 168 </textElement>
169 - <text><![CDATA[1. Relatórios]]></text> 169 + <text><![CDATA[1. Relatório de Não Conformidade]]></text>
170 </staticText> 170 </staticText>
171 <componentElement> 171 <componentElement>
172 <reportElement x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="687f8495-5035-426f-8cde-dfbd8bfae41d"> 172 <reportElement x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="687f8495-5035-426f-8cde-dfbd8bfae41d">
@@ -218,7 +218,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -218,7 +218,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
218 <property name="com.jaspersoft.studio.unit.width" value="px"/> 218 <property name="com.jaspersoft.studio.unit.width" value="px"/>
219 <staticText> 219 <staticText>
220 <reportElement x="0" y="0" width="90" height="30" uuid="1f98eb0c-6f4a-4af7-9425-586f89befa01"/> 220 <reportElement x="0" y="0" width="90" height="30" uuid="1f98eb0c-6f4a-4af7-9425-586f89befa01"/>
221 - <box padding="0"> 221 + <box padding="0" leftPadding="3" rightPadding="3">
222 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 222 <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
223 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 223 <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
224 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 224 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -257,7 +257,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -257,7 +257,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
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="100" height="30" uuid="974e758a-8bf7-4952-999f-ce9618f47caa"/>
260 - <box padding="0"> 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"/>
263 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 263 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -266,7 +266,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -266,7 +266,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
266 <textElement textAlignment="Center" verticalAlignment="Middle"> 266 <textElement textAlignment="Center" verticalAlignment="Middle">
267 <font isBold="true"/> 267 <font isBold="true"/>
268 </textElement> 268 </textElement>
269 - <text><![CDATA[Não conformidade]]></text> 269 + <text><![CDATA[Não conformidade aplicável]]></text>
270 </staticText> 270 </staticText>
271 </jr:columnHeader> 271 </jr:columnHeader>
272 <jr:detailCell style="Table_TD" height="30" rowSpan="1"> 272 <jr:detailCell style="Table_TD" height="30" rowSpan="1">
@@ -297,7 +297,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -297,7 +297,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
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="172" height="30" uuid="861458cb-d5e8-4899-a0e7-2bfb6a35cfd2"/>
300 - <box padding="0"> 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"/>
303 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 303 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -337,7 +337,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -337,7 +337,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
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="172" height="30" uuid="88c4c49d-2a32-4a3b-afd4-99977d3a707b"/>
340 - <box padding="0"> 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"/>
343 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/> 343 <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
  Diff comments   View file @8bdeda9
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioPenalidades" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f"> 2 +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioLiberacaoPagamento" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3 <property name="ireport.zoom" value="1.5"/> 3 <property name="ireport.zoom" value="1.5"/>
4 <property name="ireport.x" value="0"/> 4 <property name="ireport.x" value="0"/>
5 <property name="ireport.y" value="0"/> 5 <property name="ireport.y" value="0"/>
@@ -67,14 +67,37 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN};]]&gt; @@ -67,14 +67,37 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN};]]&gt;
67 <defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and lp.emissao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression> 67 <defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and lp.emissao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression>
68 </parameter> 68 </parameter>
69 <queryString> 69 <queryString>
70 - <![CDATA[select c.numeroanocontrato as numanocontrato, pess.nome as contratada  
71 -from cnt_contrato c  
72 - inner join parceiro parc ON parc.id = c.fornecedor_id  
73 - inner join pessoa pess ON pess.id = parc.pessoa_id  
74 -where c.id = $P{CONTRATO_ID}]]> 70 + <![CDATA[select
  71 +contrato.numeroanocontrato as numeroanocontrato,
  72 +(contrato.valorcontrato +
  73 +(CASE WHEN
  74 +(SELECT count(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = evEmpenho.contrato_id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0
  75 +THEN
  76 +(SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = evEmpenho.contrato_id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1))
  77 +ELSE 0
  78 +END)
  79 +-
  80 +(CASE WHEN
  81 +(SELECT count(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = evEmpenho.contrato_id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0
  82 +THEN
  83 +(SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = evEmpenho.contrato_id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2))
  84 +ELSE 0
  85 +END)) as valorContrato
  86 +
  87 +from cnt_cn_evento as evEmpenho
  88 +
  89 +left join cnt_cn_empenho as cntEmpenho on cntEmpenho.id = evEmpenho.id
  90 +left join cnt_contrato as contrato on contrato.id = evEmpenho.contrato_id
  91 +left join dominio as tipoEvento on tipoEvento.id = evEmpenho.tipoevento_id
  92 +
  93 +where evEmpenho.contrato_id = $P{CONTRATO_ID} and
  94 +tipoEvento.chave = 'tipoEventoContrato' and
  95 +tipoEvento.codigo = '6'
  96 +
  97 +limit 1]]>
75 </queryString> 98 </queryString>
76 - <field name="numanocontrato" class="java.lang.String"/>  
77 - <field name="contratada" class="java.lang.String"/> 99 + <field name="numeroanocontrato" class="java.lang.String"/>
  100 + <field name="valorcontrato" class="java.math.BigDecimal"/>
78 <background> 101 <background>
79 <band splitType="Stretch"/> 102 <band splitType="Stretch"/>
80 </background> 103 </background>
@@ -94,7 +117,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -94,7 +117,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
94 <textElement textAlignment="Left" verticalAlignment="Middle"> 117 <textElement textAlignment="Left" verticalAlignment="Middle">
95 <font isBold="true"/> 118 <font isBold="true"/>
96 </textElement> 119 </textElement>
97 - <text><![CDATA[Período]]></text> 120 + <text><![CDATA[Período:]]></text>
98 </staticText> 121 </staticText>
99 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> 122 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false">
100 <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="150" y="0" width="394" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
@@ -125,7 +148,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -125,7 +148,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
125 <textElement textAlignment="Left" verticalAlignment="Middle"> 148 <textElement textAlignment="Left" verticalAlignment="Middle">
126 <font isBold="true"/> 149 <font isBold="true"/>
127 </textElement> 150 </textElement>
128 - <text><![CDATA[Número / Ano do contrato]]></text> 151 + <text><![CDATA[Número / Ano do contrato:]]></text>
129 </staticText> 152 </staticText>
130 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 153 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
131 <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="150" y="0" width="394" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/>
@@ -137,12 +160,12 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -137,12 +160,12 @@ where c.id = $P{CONTRATO_ID}]]&gt;
137 <rightPen lineWidth="0.0"/> 160 <rightPen lineWidth="0.0"/>
138 </box> 161 </box>
139 <textElement textAlignment="Left" verticalAlignment="Middle"/> 162 <textElement textAlignment="Left" verticalAlignment="Middle"/>
140 - <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> 163 + <textFieldExpression><![CDATA[$F{numeroanocontrato}.substring(0,9) + "/" + $F{numeroanocontrato}.substring(9,13)]]></textFieldExpression>
141 </textField> 164 </textField>
142 </frame> 165 </frame>
143 <frame> 166 <frame>
144 <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"/>
145 - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 168 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
146 <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="150" y="0" width="394" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/>
147 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 170 <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3">
148 <pen lineWidth="0.0"/> 171 <pen lineWidth="0.0"/>
@@ -152,7 +175,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -152,7 +175,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
152 <rightPen lineWidth="0.0"/> 175 <rightPen lineWidth="0.0"/>
153 </box> 176 </box>
154 <textElement textAlignment="Left" verticalAlignment="Middle"/> 177 <textElement textAlignment="Left" verticalAlignment="Middle"/>
155 - <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> 178 + <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression>
156 </textField> 179 </textField>
157 <staticText> 180 <staticText>
158 <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="150" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/>
@@ -166,7 +189,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -166,7 +189,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
166 <textElement textAlignment="Left" verticalAlignment="Middle"> 189 <textElement textAlignment="Left" verticalAlignment="Middle">
167 <font isBold="true"/> 190 <font isBold="true"/>
168 </textElement> 191 </textElement>
169 - <text><![CDATA[Contratada]]></text> 192 + <text><![CDATA[Valor total do contrato:]]></text>
170 </staticText> 193 </staticText>
171 </frame> 194 </frame>
172 <line> 195 <line>
@@ -180,7 +203,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -180,7 +203,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
180 <textElement verticalAlignment="Middle"> 203 <textElement verticalAlignment="Middle">
181 <font size="13" isBold="true"/> 204 <font size="13" isBold="true"/>
182 </textElement> 205 </textElement>
183 - <text><![CDATA[1. Relatórios]]></text> 206 + <text><![CDATA[1. Relatório de Liberação de Pagamento]]></text>
184 </staticText> 207 </staticText>
185 <componentElement> 208 <componentElement>
186 <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/> 209 <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/>
@@ -231,7 +254,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -231,7 +254,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
231 <textElement textAlignment="Center" verticalAlignment="Middle"> 254 <textElement textAlignment="Center" verticalAlignment="Middle">
232 <font isBold="true"/> 255 <font isBold="true"/>
233 </textElement> 256 </textElement>
234 - <text><![CDATA[Nr. da liberação]]></text> 257 + <text><![CDATA[Nº da liberação]]></text>
235 </staticText> 258 </staticText>
236 </jr:columnHeader> 259 </jr:columnHeader>
237 <jr:detailCell height="25" rowSpan="1"> 260 <jr:detailCell height="25" rowSpan="1">
@@ -361,7 +384,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -361,7 +384,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
361 <textElement textAlignment="Center" verticalAlignment="Middle"> 384 <textElement textAlignment="Center" verticalAlignment="Middle">
362 <font isBold="true"/> 385 <font isBold="true"/>
363 </textElement> 386 </textElement>
364 - <text><![CDATA[Nr. do empenho]]></text> 387 + <text><![CDATA[Nº do empenho]]></text>
365 </staticText> 388 </staticText>
366 </jr:columnHeader> 389 </jr:columnHeader>
367 <jr:detailCell height="25" rowSpan="1"> 390 <jr:detailCell height="25" rowSpan="1">
cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
  Diff comments   View file @8bdeda9
@@ -90,7 +90,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -90,7 +90,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
90 <textElement textAlignment="Left" verticalAlignment="Middle"> 90 <textElement textAlignment="Left" verticalAlignment="Middle">
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="150" y="0" width="394" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/>
@@ -121,7 +121,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -121,7 +121,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
121 <textElement textAlignment="Left" verticalAlignment="Middle"> 121 <textElement textAlignment="Left" verticalAlignment="Middle">
122 <font isBold="true"/> 122 <font isBold="true"/>
123 </textElement> 123 </textElement>
124 - <text><![CDATA[Número / Ano do contrato]]></text> 124 + <text><![CDATA[Número / Ano do contrato:]]></text>
125 </staticText> 125 </staticText>
126 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 126 <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"/> 127 <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/>
@@ -162,7 +162,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -162,7 +162,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
162 <textElement textAlignment="Left" verticalAlignment="Middle"> 162 <textElement textAlignment="Left" verticalAlignment="Middle">
163 <font isBold="true"/> 163 <font isBold="true"/>
164 </textElement> 164 </textElement>
165 - <text><![CDATA[Contratada]]></text> 165 + <text><![CDATA[Contratada:]]></text>
166 </staticText> 166 </staticText>
167 </frame> 167 </frame>
168 <line> 168 <line>
@@ -176,7 +176,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -176,7 +176,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
176 <textElement verticalAlignment="Middle"> 176 <textElement verticalAlignment="Middle">
177 <font size="13" isBold="true"/> 177 <font size="13" isBold="true"/>
178 </textElement> 178 </textElement>
179 - <text><![CDATA[1. Relatórios]]></text> 179 + <text><![CDATA[1. Relatório de Penalidades Aplicadas]]></text>
180 </staticText> 180 </staticText>
181 <componentElement> 181 <componentElement>
182 <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/> 182 <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/>
@@ -217,7 +217,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -217,7 +217,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
217 <jr:columnHeader height="30" rowSpan="1"> 217 <jr:columnHeader height="30" rowSpan="1">
218 <staticText> 218 <staticText>
219 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="65" height="30" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/> 219 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="65" height="30" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/>
220 - <box topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3"> 220 + <box leftPadding="3" rightPadding="3">
221 <pen lineWidth="1.0"/> 221 <pen lineWidth="1.0"/>
222 <topPen lineWidth="1.0"/> 222 <topPen lineWidth="1.0"/>
223 <leftPen lineWidth="1.0"/> 223 <leftPen lineWidth="1.0"/>
@@ -251,7 +251,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -251,7 +251,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
251 <jr:columnHeader height="30" rowSpan="1"> 251 <jr:columnHeader height="30" rowSpan="1">
252 <staticText> 252 <staticText>
253 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/> 253 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/>
254 - <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> 254 + <box leftPadding="3" rightPadding="3">
255 <pen lineWidth="1.0"/> 255 <pen lineWidth="1.0"/>
256 <topPen lineWidth="1.0"/> 256 <topPen lineWidth="1.0"/>
257 <leftPen lineWidth="1.0"/> 257 <leftPen lineWidth="1.0"/>
@@ -283,7 +283,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -283,7 +283,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
283 <jr:columnHeader height="30" rowSpan="1"> 283 <jr:columnHeader height="30" rowSpan="1">
284 <staticText> 284 <staticText>
285 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="79" height="30" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/> 285 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="79" height="30" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/>
286 - <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> 286 + <box leftPadding="3" rightPadding="3">
287 <pen lineWidth="1.0"/> 287 <pen lineWidth="1.0"/>
288 <topPen lineWidth="1.0"/> 288 <topPen lineWidth="1.0"/>
289 <leftPen lineWidth="1.0"/> 289 <leftPen lineWidth="1.0"/>
@@ -315,7 +315,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -315,7 +315,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
315 <jr:columnHeader height="30" rowSpan="1"> 315 <jr:columnHeader height="30" rowSpan="1">
316 <staticText> 316 <staticText>
317 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/> 317 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/>
318 - <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> 318 + <box leftPadding="3" rightPadding="3">
319 <pen lineWidth="1.0"/> 319 <pen lineWidth="1.0"/>
320 <topPen lineWidth="1.0"/> 320 <topPen lineWidth="1.0"/>
321 <leftPen lineWidth="1.0"/> 321 <leftPen lineWidth="1.0"/>
@@ -325,7 +325,8 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -325,7 +325,8 @@ where c.id = $P{CONTRATO_ID}]]&gt;
325 <textElement textAlignment="Center" verticalAlignment="Middle"> 325 <textElement textAlignment="Center" verticalAlignment="Middle">
326 <font isBold="true"/> 326 <font isBold="true"/>
327 </textElement> 327 </textElement>
328 - <text><![CDATA[Ocorrência da penalidade]]></text> 328 + <text><![CDATA[Ocorrência da
  329 +penalidade]]></text>
329 </staticText> 330 </staticText>
330 </jr:columnHeader> 331 </jr:columnHeader>
331 <jr:detailCell height="25" rowSpan="1"> 332 <jr:detailCell height="25" rowSpan="1">
@@ -347,7 +348,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -347,7 +348,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
347 <jr:columnHeader height="30" rowSpan="1"> 348 <jr:columnHeader height="30" rowSpan="1">
348 <staticText> 349 <staticText>
349 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="6df9dcd8-69d0-4d0b-9870-e3e7c89a468b"/> 350 <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="6df9dcd8-69d0-4d0b-9870-e3e7c89a468b"/>
350 - <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> 351 + <box leftPadding="3" rightPadding="3">
351 <pen lineWidth="1.0"/> 352 <pen lineWidth="1.0"/>
352 <topPen lineWidth="1.0"/> 353 <topPen lineWidth="1.0"/>
353 <leftPen lineWidth="1.0"/> 354 <leftPen lineWidth="1.0"/>
cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
  Diff comments   View file @8bdeda9
@@ -214,7 +214,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -214,7 +214,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
214 <textElement textAlignment="Center" verticalAlignment="Middle"> 214 <textElement textAlignment="Center" verticalAlignment="Middle">
215 <font isBold="true"/> 215 <font isBold="true"/>
216 </textElement> 216 </textElement>
217 - <text><![CDATA[Nr. da repactuação]]></text> 217 + <text><![CDATA[Nº da repactuação]]></text>
218 </staticText> 218 </staticText>
219 </jr:columnHeader> 219 </jr:columnHeader>
220 <jr:detailCell height="25" rowSpan="1"> 220 <jr:detailCell height="25" rowSpan="1">
@@ -307,7 +307,7 @@ where c.id = $P{CONTRATO_ID}]]&gt; @@ -307,7 +307,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
307 <textElement verticalAlignment="Middle"> 307 <textElement verticalAlignment="Middle">
308 <font size="13" isBold="true"/> 308 <font size="13" isBold="true"/>
309 </textElement> 309 </textElement>
310 - <text><![CDATA[1. Relatórios]]></text> 310 + <text><![CDATA[1. Relatório de Repactuação]]></text>
311 </staticText> 311 </staticText>
312 </band> 312 </band>
313 </detail> 313 </detail>