Download as
Browse Code »

Commit 31d1098a5ed63ed0878f73a4a21f58bef6700f68

Authored by geovane.filho
2 parents 0ffa7aed 421668d3
Exists in master

Merge branch 'ctr-pj-0001-sprint9' of http://ferramentasgo.centralit.com.br:8080… 

…/scm/git/cit-grp-contratos into ctr-pj-0001-sprint9
Showing 11 changed files with 81 additions and 74 deletions   Show diff stats
cit-contratos-api/src/main/java/br/com/centralit/api/model/EventoLiberacaoPagamento.java
  Diff comments   View file @31d1098
... ... @@ -57,7 +57,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
57 57 */
58 58 @Entity
59 59 @Table(name = "cnt_ev_liberacao_pagamento")
60   -@JsonIgnoreProperties({ "valorLiberadoPagamento", "valorExecutado", "percentualEmpenho", "liberarPagamentoValorContrata", "valorTotalOS" })
  60 +@JsonIgnoreProperties({ "valorLiberadoPagamento", "valorExecutado", "percentualEmpenho", "liberarPagamentoValorContrata", "valorTotalOS", "valorGlosa" })
61 61 public class EventoLiberacaoPagamento extends ContratoEvento {
62 62  
63 63 /** Atributo serialVersionUID. */
... ...
cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoPenalidadeServiceImpl.java
  Diff comments   View file @31d1098
1 1 package br.com.centralit.api.service.impl;
2 2  
  3 +import java.text.SimpleDateFormat;
3 4 import java.util.Collection;
  5 +import java.util.Date;
4 6  
5 7 import org.apache.commons.collections.CollectionUtils;
  8 +import org.apache.commons.lang3.StringUtils;
6 9 import org.apache.log4j.Logger;
7 10 import org.springframework.beans.factory.annotation.Autowired;
8 11 import org.springframework.beans.factory.annotation.Qualifier;
... ... @@ -93,9 +96,13 @@ public class EventoPenalidadeServiceImpl extends GenericServiceImpl<EventoPenali
93 96 penalidadeRegistroOcorrencia.setEventoPenalidade(eventoPenalidade);
94 97 }
95 98  
96   - String descricao = internacionalizacaoService.getTranslate("CONTRATOS.MSG.DESCRICAO_EVENTO_APLICAR_PENALIDADE", this.getIdioma());
97   - descricao = descricao.concat(eventoPenalidade.getTermoReferenciaPenalidade().getOcorrencia());
98   - eventoPenalidade.setDescricao(descricao);
  99 + String descricao = this.internacionalizacaoService.getTranslate("CONTRATOS.MSG.DESCRICAO_EVENTO_APLICAR_PENALIDADE_DATA", this.getIdioma());
  100 + if(StringUtils.isNotEmpty(descricao)){
  101 + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
  102 + String date = sdf.format(new Date());
  103 + eventoPenalidade.setDescricao(String.format(descricao, date));
  104 + }
  105 +
99 106 eventoPenalidade.setDataEvento(eventoPenalidade.getDataPenalizacao());
100 107 eventoPenalidade.setTipoEvento(this.dominioService.findByChaveAndCodigo(DominioContrato.TIPO_EVENTO_CONTRATO, DominioContrato.TIPO_EVENTO_PENALIDADE));
101 108  
... ...
cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java
  Diff comments   View file @31d1098
... ... @@ -518,7 +518,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
518 518 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.PAPEIS_OBRIGATORIOS_CONTRATO_FALTANDO", "Estão faltando um ou mais papéis obrigatórios dos envolvidos no contrato. Verifique quais dentre os seguintes papéis não forma informados ", dominio, modulo));
519 519 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.FINALIDADE_EMPENHO_FALTANDO", "Não é permitido informar as finalidades 'Anulação' e 'Reforço' antes de informar a finalidade 'Despesa contrato'.", dominio, modulo));
520 520 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.VALOR_GARANTIA_ACIMA_LIMITE_MAXIMO", "O valor da garantia do contrato está acima do valor máximo. Valor máximo da garantia ", dominio, modulo));
521   - internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.ALTERACAO_ENVOLVIDOS_EXIGE_JUSTIFICATIVA", "É obrigatório informar uma justificativa para alterar os envolvidos do contrato", dominio, modulo));
  521 + internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.ALTERACAO_ENVOLVIDOS_EXIGE_JUSTIFICATIVA", "É obrigatório informar uma justificativa para alterar os envolvidos do contrato", dominio, modulo));
522 522 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.VALOR_LIBERADO_MAIOR_VALOR_CONTRATO", "Valor liberado não pode ser maior que o valor do contrato", dominio, modulo));
523 523 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.VALOR_LIBERADO_MAIOR_VALOR_OFBS", "O valor liberado para pagamento não pode ser maior que o valor liberado referente às ordem de fornecimento de bens e serviços", dominio, modulo));
524 524 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.VALOR_TOTAL_CONTRATO_JA_LIBERADO", "Já liberado o pagamento no valor do contrato.", dominio, modulo));
... ... @@ -587,7 +587,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
587 587 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DESCRICAO_EVENTO_ATUALIZACAO_STATUS", "Atualização da Situação do Contrato realizado no dia %s. (Situação anterior: %s - Nova situação: %s)", dominio, modulo));
588 588 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DESCRICAO_EVENTO_NAO_CONFORMIDADE", "Registro não conformidade %s, realizado no dia %s.", dominio, modulo));
589 589 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.SANCAO_VINCULADA_NAO_CONFORMIDADE", "Não é permitido remover essa sanção, pois há um evento de não conformidade vinculada a ela.", dominio, modulo));
590   - internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.VALOR_TOTAL_EMPENHADO_SUPERIOR_VALOR_RESIDUAL", "O valor empenh não pode ser maior que o valor residual", dominio, modulo));
  590 + internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.VALIDACAO.VALOR_TOTAL_EMPENHADO_SUPERIOR_VALOR_RESIDUAL", "O valor empenhdo não pode ser maior que o valor residual", dominio, modulo));
591 591  
592 592 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.EVENTO_NAO_CONFORMIDADE_CRIAR_ADVERTENCIA", "Para gerar essa não conformodidade, é necessário gerar uma não conformidade de advertência primeiramente.", dominio, modulo));
593 593 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.EVENTO_NAO_CONFORMIDADE_CRIAR_MULTA", "Para gerar essa não conformodidade, é necessário gerar uma não conformidade de multa primeiramente.", dominio, modulo));
... ... @@ -953,6 +953,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
953 953 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.OCORRENCIA_PENALIDADE", "Ocorrência da penalidade", dominio, modulo));
954 954 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.RESPOSTA_CONTRATADA", "Resposta da contratada", dominio, modulo));
955 955 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DESCRICAO_EVENTO_APLICAR_PENALIDADE", "Aplicação de penalidade para a ocorrência da penalidade: ", dominio, modulo));
  956 + internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.MSG.DESCRICAO_EVENTO_APLICAR_PENALIDADE_DATA", "Penalidade gerada em ", dominio, modulo));
956 957  
957 958 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.NOTA_EMPENHO", "Nota de empenho", dominio, modulo));
958 959 internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.JUSTIFICATIVA_EMPENHO", "Justificativa do empenho", dominio, modulo));
... ... @@ -1115,6 +1116,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
1115 1116 internacionalizacaoList.add(new Internacionalizacao("LABEL.VALOR_TOTAL_CONTRATO", "Valor total do contrato", dominio, modulo));
1116 1117 internacionalizacaoList.add(new Internacionalizacao("LABEL.POSSIVEL_RESPOSTA", "Possível resposta", dominio, modulo));
1117 1118 internacionalizacaoList.add(new Internacionalizacao("LABEL.VIGENCIA", "Vigência", dominio, modulo));
  1119 + internacionalizacaoList.add(new Internacionalizacao("LABEL.ANEXOS", "Anexos", dominio, modulo));
1118 1120 internacionalizacaoList.add(new Internacionalizacao("LABEL.ANEXOS_OBSERVACOES", "Anexos e observações", dominio, modulo));
1119 1121 internacionalizacaoList.add(new Internacionalizacao("LABEL.ATUALIZAR_STATUS", "Atualizar Status", dominio, modulo));
1120 1122 internacionalizacaoList.add(new Internacionalizacao("LABEL.BENEFICIOS_ESPERADOS", "Benefícios Esperados", dominio, modulo));
... ... @@ -2124,6 +2126,7 @@ public class StartupListenerContratos extends UtilStartup implements Application
2124 2126 internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DATA_DEVOLUCAO_DATA_FINALIZACAO", "Data de devolução não pode ser inferior a data de finalização da requisição!", dominio, modulo));
2125 2127 internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DATA_EMISSAO_DATA_ATUAL", "Data de emissão não pode ser maior que a data atual!", dominio, modulo));
2126 2128 internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DATA_ENCERRAMENTO_DATA_INICIO", "Data de encerramento não pode ser inferior a data início!", dominio, modulo));
  2129 + internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DATA_ENCERRAMENTO_DATA_FINAL", "Data de encerramento não pode ser inferior a data de vitgência final!", dominio, modulo));
2127 2130 internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DATA_ESTORNO_FORA_REFERENCIA_VIGENTE", "Data de estorno tem que estar dentro da referência vigente", dominio, modulo));
2128 2131 internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DATA_ESTORNO_MENOR_DATA_ALMOXARIFADO", "A data do estorno não pode ser menor que a data da baixa!", dominio, modulo));
2129 2132 internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DATA_FIM_GARANTIA_MENOR_DATA_INICIO", "Data final da garantia deve ser maior que a data inicial!", dominio, modulo));
... ...
cit-contratos-web/src/main/resources/reports/ordemFornecimento.jrxml
  Diff comments   View file @31d1098
... ... @@ -2,7 +2,7 @@
2 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="ordemFornecimento" 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 3 <property name="ireport.zoom" value="1.5"/>
4 4 <property name="ireport.x" value="0"/>
5   - <property name="ireport.y" value="283"/>
  5 + <property name="ireport.y" value="33"/>
6 6 <style name="table">
7 7 <box>
8 8 <pen lineWidth="1.0" lineColor="#000000"/>
... ... @@ -432,9 +432,9 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
432 432 <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
433 433 </datasetRun>
434 434 <jr:column width="213" uuid="fdfe3465-3b51-423a-af25-4045485d5a1e">
435   - <jr:columnHeader height="25" rowSpan="1">
  435 + <jr:columnHeader height="35" rowSpan="1">
436 436 <staticText>
437   - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="213" height="25" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/>
  437 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="213" height="35" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/>
438 438 <box leftPadding="5" rightPadding="3">
439 439 <pen lineWidth="1.0"/>
440 440 <topPen lineWidth="1.0"/>
... ... @@ -442,23 +442,23 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
442 442 <bottomPen lineWidth="1.0"/>
443 443 <rightPen lineWidth="1.0"/>
444 444 </box>
445   - <textElement textAlignment="Left" verticalAlignment="Middle">
  445 + <textElement textAlignment="Center" verticalAlignment="Middle">
446 446 <font isBold="true"/>
447 447 </textElement>
448 448 <text><![CDATA[Descrição do item]]></text>
449 449 </staticText>
450 450 </jr:columnHeader>
451   - <jr:detailCell height="25" rowSpan="1">
  451 + <jr:detailCell height="27" rowSpan="1">
452 452 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
453 453 <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="213" height="25" uuid="27fc566c-19fd-4f74-b01c-e2c58ae5b107"/>
454   - <box leftPadding="5" rightPadding="3">
  454 + <box>
455 455 <pen lineWidth="1.0"/>
456 456 <topPen lineWidth="1.0"/>
457 457 <leftPen lineWidth="1.0"/>
458 458 <bottomPen lineWidth="1.0"/>
459 459 <rightPen lineWidth="1.0"/>
460 460 </box>
461   - <textElement textAlignment="Left" verticalAlignment="Middle">
  461 + <textElement verticalAlignment="Middle">
462 462 <font isBold="false"/>
463 463 </textElement>
464 464 <textFieldExpression><![CDATA[$F{descricaobemservicosolucao}]]></textFieldExpression>
... ... @@ -466,9 +466,9 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
466 466 </jr:detailCell>
467 467 </jr:column>
468 468 <jr:column width="67" uuid="f46445fc-007b-46e6-ade9-eef37e5d0b29">
469   - <jr:columnHeader height="25" rowSpan="1">
  469 + <jr:columnHeader height="35" rowSpan="1">
470 470 <staticText>
471   - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="67" height="25" backcolor="#CCCCCC" uuid="90f3ef28-e481-484a-b04b-c5cf8ca77b35"/>
  471 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="67" height="35" backcolor="#CCCCCC" uuid="90f3ef28-e481-484a-b04b-c5cf8ca77b35"/>
472 472 <box leftPadding="0" rightPadding="0">
473 473 <pen lineWidth="1.0"/>
474 474 <topPen lineWidth="1.0"/>
... ... @@ -482,10 +482,10 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
482 482 <text><![CDATA[Inicio previsto]]></text>
483 483 </staticText>
484 484 </jr:columnHeader>
485   - <jr:detailCell height="25" rowSpan="1">
  485 + <jr:detailCell height="27" rowSpan="1">
486 486 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
487 487 <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="67" height="25" uuid="091e5094-5a8e-4d7f-9b94-e1e94b518cf5"/>
488   - <box leftPadding="0" rightPadding="0">
  488 + <box>
489 489 <pen lineWidth="1.0"/>
490 490 <topPen lineWidth="1.0"/>
491 491 <leftPen lineWidth="1.0"/>
... ... @@ -498,9 +498,9 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
498 498 </jr:detailCell>
499 499 </jr:column>
500 500 <jr:column width="67" uuid="c297508b-d28b-41d0-b617-8d905832ba11">
501   - <jr:columnHeader height="25" rowSpan="1">
  501 + <jr:columnHeader height="35" rowSpan="1">
502 502 <staticText>
503   - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="67" height="25" backcolor="#CCCCCC" uuid="625201c3-c39d-4610-bd3c-8448d651d8cb"/>
  503 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="67" height="35" backcolor="#CCCCCC" uuid="625201c3-c39d-4610-bd3c-8448d651d8cb"/>
504 504 <box leftPadding="0" rightPadding="0">
505 505 <pen lineWidth="1.0"/>
506 506 <topPen lineWidth="1.0"/>
... ... @@ -514,10 +514,10 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
514 514 <text><![CDATA[Término previsto]]></text>
515 515 </staticText>
516 516 </jr:columnHeader>
517   - <jr:detailCell height="25" rowSpan="1">
  517 + <jr:detailCell height="27" rowSpan="1">
518 518 <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
519 519 <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="67" height="25" uuid="2cce3e85-ab55-477f-a4b3-0d811f6d405c"/>
520   - <box leftPadding="0" rightPadding="0">
  520 + <box>
521 521 <pen lineWidth="1.0"/>
522 522 <topPen lineWidth="1.0"/>
523 523 <leftPen lineWidth="1.0"/>
... ... @@ -530,9 +530,9 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
530 530 </jr:detailCell>
531 531 </jr:column>
532 532 <jr:column width="50" uuid="0a1e8915-6f85-4d7a-a08e-73b217283674">
533   - <jr:columnHeader height="25" rowSpan="1">
  533 + <jr:columnHeader height="35" rowSpan="1">
534 534 <staticText>
535   - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="50" height="25" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/>
  535 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="50" height="35" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/>
536 536 <box leftPadding="3" rightPadding="5">
537 537 <pen lineWidth="1.0"/>
538 538 <topPen lineWidth="1.0"/>
... ... @@ -540,16 +540,16 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
540 540 <bottomPen lineWidth="1.0"/>
541 541 <rightPen lineWidth="1.0"/>
542 542 </box>
543   - <textElement textAlignment="Right" verticalAlignment="Middle">
  543 + <textElement textAlignment="Center" verticalAlignment="Middle">
544 544 <font isBold="true"/>
545 545 </textElement>
546 546 <text><![CDATA[Qtde.]]></text>
547 547 </staticText>
548 548 </jr:columnHeader>
549   - <jr:detailCell height="25" rowSpan="1">
  549 + <jr:detailCell height="27" rowSpan="1">
550 550 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
551 551 <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="25" uuid="1a4d3c83-faee-4ef1-9f14-8459e5436112"/>
552   - <box leftPadding="3" rightPadding="5">
  552 + <box>
553 553 <pen lineWidth="1.0"/>
554 554 <topPen lineWidth="1.0"/>
555 555 <leftPen lineWidth="1.0"/>
... ... @@ -562,9 +562,9 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
562 562 </jr:detailCell>
563 563 </jr:column>
564 564 <jr:column width="67" uuid="7b617d92-2ae8-4bba-ab9f-a9cf7a621879">
565   - <jr:columnHeader height="25" rowSpan="1">
  565 + <jr:columnHeader height="35" rowSpan="1">
566 566 <staticText>
567   - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="67" height="25" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/>
  567 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="67" height="35" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/>
568 568 <box leftPadding="3" rightPadding="5">
569 569 <pen lineWidth="1.0"/>
570 570 <topPen lineWidth="1.0"/>
... ... @@ -572,16 +572,16 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
572 572 <bottomPen lineWidth="1.0"/>
573 573 <rightPen lineWidth="1.0"/>
574 574 </box>
575   - <textElement textAlignment="Right" verticalAlignment="Middle">
  575 + <textElement textAlignment="Center" verticalAlignment="Middle">
576 576 <font isBold="true"/>
577 577 </textElement>
578 578 <text><![CDATA[Valor unitário]]></text>
579 579 </staticText>
580 580 </jr:columnHeader>
581   - <jr:detailCell height="25" rowSpan="1">
  581 + <jr:detailCell height="27" rowSpan="1">
582 582 <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
583 583 <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="67" height="25" uuid="7461c57c-7e7c-43de-bacd-9e25c72fce48"/>
584   - <box leftPadding="3" rightPadding="5">
  584 + <box>
585 585 <pen lineWidth="1.0"/>
586 586 <topPen lineWidth="1.0"/>
587 587 <leftPen lineWidth="1.0"/>
... ... @@ -594,9 +594,9 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
594 594 </jr:detailCell>
595 595 </jr:column>
596 596 <jr:column width="70" uuid="4297871e-dcc0-47e3-826c-cbf523cd2e17">
597   - <jr:columnHeader height="25" rowSpan="1">
  597 + <jr:columnHeader height="35" rowSpan="1">
598 598 <staticText>
599   - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="70" height="25" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/>
  599 + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="70" height="35" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/>
600 600 <box leftPadding="3" rightPadding="5">
601 601 <pen lineWidth="1.0"/>
602 602 <topPen lineWidth="1.0"/>
... ... @@ -604,16 +604,16 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
604 604 <bottomPen lineWidth="1.0"/>
605 605 <rightPen lineWidth="1.0"/>
606 606 </box>
607   - <textElement textAlignment="Right" verticalAlignment="Middle">
  607 + <textElement textAlignment="Center" verticalAlignment="Middle">
608 608 <font isBold="true"/>
609 609 </textElement>
610 610 <text><![CDATA[Valor total]]></text>
611 611 </staticText>
612 612 </jr:columnHeader>
613   - <jr:detailCell height="25" rowSpan="1">
  613 + <jr:detailCell height="27" rowSpan="1">
614 614 <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
615 615 <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="70" height="25" uuid="c4c4f934-ddee-489a-b261-9438a2c87051"/>
616   - <box leftPadding="3" rightPadding="5">
  616 + <box>
617 617 <pen lineWidth="1.0"/>
618 618 <topPen lineWidth="1.0"/>
619 619 <leftPen lineWidth="1.0"/>
... ... @@ -630,11 +630,12 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
630 630 </band>
631 631 <band height="190" splitType="Prevent">
632 632 <textField pattern="dd/MM/yyyy">
633   - <reportElement x="489" y="10" width="60" height="25" uuid="23a0f99a-8e9f-4f3c-96bc-4c62fb5f446e"/>
634   - <textElement textAlignment="Right" verticalAlignment="Bottom">
  633 + <reportElement x="15" y="12" width="534" height="25" uuid="23a0f99a-8e9f-4f3c-96bc-4c62fb5f446e"/>
  634 + <box rightPadding="5"/>
  635 + <textElement textAlignment="Right" verticalAlignment="Middle">
635 636 <font isBold="false"/>
636 637 </textElement>
637   - <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
  638 + <textFieldExpression><![CDATA["___________________, " + new SimpleDateFormat("dd/MM/yyyy").format(new Date())]]></textFieldExpression>
638 639 </textField>
639 640 <frame>
640 641 <reportElement positionType="Float" x="15" y="135" width="534" height="50" uuid="8ecb3030-42b0-4fd4-b9c8-51304e048761"/>
... ... @@ -723,11 +724,6 @@ $F{cnpjcontratado}.substring(12,14)]]&gt;&lt;/textFieldExpression&gt;
723 724 <textFieldExpression><![CDATA[$F{prepostomatricula}]]></textFieldExpression>
724 725 </textField>
725 726 </frame>
726   - <staticText>
727   - <reportElement x="371" y="10" width="118" height="25" uuid="bd202387-9a37-4b8f-84bd-f52dbbcced99"/>
728   - <textElement textAlignment="Right" verticalAlignment="Bottom"/>
729   - <text><![CDATA[___________________,]]></text>
730   - </staticText>
731 727 </band>
732 728 </detail>
733 729 </jasperReport>
... ...
cit-contratos-web/src/main/resources/reports/registroOcorrencia.jrxml
  Diff comments   View file @31d1098
... ... @@ -2,7 +2,7 @@
2 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="registroOcorrencia" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="e3539b84-00a7-49ab-94ac-e56c384a5198">
3 3 <property name="ireport.zoom" value="1.4641000000000013"/>
4 4 <property name="ireport.x" value="0"/>
5   - <property name="ireport.y" value="332"/>
  5 + <property name="ireport.y" value="306"/>
6 6 <property name="com.jaspersoft.studio.data.sql.tables" value="cGFyY2Vpcm9fY29sYWJvcmFkb3IgLDE1LDExODMsZTFiNzExOWItN2ZhZi00NDA4LTk2MzgtOTI5&#xA;ZTJmMjIzMjVmO3BhcmNlaXJvIEFTICwyMjcsMTUsOWViMzc4NzgtMTY4Yy00ODg4LWI2YzktZDBm&#xA;OTJmYmZlMjVlO2N0cnRfZW52b2x2aWRvICw1ODcsMTYxMywxM2NlMDk4Yi1jNmVmLTQ0M2YtOGIy&#xA;Yi0yMmRhNWZmZjMzNWE7Y3RydF9jb250cmF0byBBUyAsODM1LDU2MyxjNjM1NzE0YS0yMDhiLTQ1&#xA;NDUtOGYzMC04YWY4ZGRkYzg4Njk7Zm9ybmVjZWRvciBBUyAsMTI0MCw0NTcsNDNkM2RlMTQtMjdm&#xA;MS00ODMwLWI2ZTQtZmIxZjYxZTlhNmY3O3Blc3NvYSAsMjI3LDEyODksZWEyZGMzNzEtZDI4Yi00&#xA;YWJlLWIwMGYtMjc1MjRjNmQyMzM5O3JvX3JlZ2lzdHJvb2NvcnJlbmNpYSBBUyAsNTg3LDEyMSwx&#xA;YWMxZjE4NS05ZjU4LTQ2NzItODQxMC04ZmMyMDQyMTVjZDQ7cGVzc29hanVyaWRpY2EgQVMgLDM5&#xA;NCwxMjEsMzE2NzVmY2QtOGY1Yi00YjI0LWE4MzAtOWY0Y2U3ZTAyZDM5O3BhcmNlaXJvICwzOTQs&#xA;ODAyLGQxYzQ0MWQ1LWQ4OTItNDAyMS1iMWE4LWU1NGE3NWQzNWVlNTtwYXJjZWlyb19jb2xhYm9y&#xA;YWRvciAsMTUsNjk2LGIwNTZkMjkxLTE5NzktNGZhYi04OGZlLTI2NzM5NTEwODRmYTtvZl9vcmRl&#xA;bWZvcm5lY2ltZW50byBBUyAsODM1LDEyMSwzYjFkZjkzOS1jYWQ2LTQyOTktOTM0OS1mZDVhYzlk&#xA;Yzg2OWI7Y3RydF9lbnZvbHZpZG8gLDU4Nyw2ODMsNjUxOTBkOGEtMWQ2Yi00YmQ2LTk3ZWQtZjU1&#xA;OGMxNDM0MWQ5O3BhcmNlaXJvICwzOTQsMTI4OSxjNDBlNWNiNS02MzA2LTQ5MGMtYjVkZC00OGJj&#xA;YmE2NjFiMzE7cGFyY2Vpcm9fY29sYWJvcmFkb3IgLDE1LDIxMzYsM2UyZGMxN2ItM2MyZC00MWJl&#xA;LWI1YTctNmEyZmEyNGRlNWZjO3Blc3NvYSAsMjI3LDgwMiwxOGU4YWQwZi01YTMxLTQxNjItOTFl&#xA;OC1kMDA5YThmNDI3NDA7cGVzc29hICwyMjcsMTc1NSxjMGQ0YWZkOS05MWQ5LTRiNjEtOTNhOC1k&#xA;MWViZDk3ZTIzZDg7ZG9taW5pbyBBUyAsMTA5MywzMjEsYjdlZjlmOGQtMzMyNy00MmRkLTg2OWUt&#xA;ZjI4MmU3NDI2YTA5O2N0cnRfZW52b2x2aWRvICw1ODcsMTA4MCxhZDU1NDNmZi0xYWRiLTQ5Yjkt&#xA;OGY2OC0wMDQxZDZkYTgzNDM7cGFyY2Vpcm8gLDM5NCwxNzI4LDZmODgwNjI0LTc5MWItNDgzNi05&#xA;NmUzLTkyNWM0YzdjMTc3NDs="/>
7 7 <property name="com.jaspersoft.studio.data.defaultdataadapter" value="citgrpdb"/>
8 8 <parameter name="registroOcorrenciaId" class="java.lang.Long">
... ... @@ -192,7 +192,7 @@ WHERE
192 192 <text><![CDATA[Término da vigência]]></text>
193 193 </staticText>
194 194 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
195   - <reportElement x="175" y="160" width="375" height="25" uuid="12ab56e1-ded2-4151-ae15-f7011f37db72">
  195 + <reportElement x="175" y="160" width="375" height="25" isRemoveLineWhenBlank="true" uuid="12ab56e1-ded2-4151-ae15-f7011f37db72">
196 196 <printWhenExpression><![CDATA[$F{numordemfornecimento} != null]]></printWhenExpression>
197 197 </reportElement>
198 198 <box leftPadding="5" rightPadding="3">
... ... @@ -206,7 +206,7 @@ WHERE
206 206 <textFieldExpression><![CDATA[$F{numordemfornecimento}]]></textFieldExpression>
207 207 </textField>
208 208 <staticText>
209   - <reportElement mode="Opaque" x="15" y="160" width="160" height="25" backcolor="#CCCCCC" uuid="4e56ee20-3278-47bb-a437-ad5fc743449a">
  209 + <reportElement mode="Opaque" x="15" y="160" width="160" height="25" isRemoveLineWhenBlank="true" backcolor="#CCCCCC" uuid="4e56ee20-3278-47bb-a437-ad5fc743449a">
210 210 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
211 211 <printWhenExpression><![CDATA[$F{numordemfornecimento} != null]]></printWhenExpression>
212 212 </reportElement>
... ... @@ -545,7 +545,7 @@ WHERE
545 545 </textField>
546 546 </frame>
547 547 </band>
548   - <band height="215">
  548 + <band height="164" splitType="Prevent">
549 549 <textField pattern="dd/MM/yyyy">
550 550 <reportElement x="480" y="10" width="70" height="25" uuid="14ec1c5e-d522-4c1c-ab23-d9469ed04530"/>
551 551 <textElement textAlignment="Right" verticalAlignment="Bottom"/>
... ... @@ -557,7 +557,7 @@ WHERE
557 557 <text><![CDATA[____________________, ]]></text>
558 558 </staticText>
559 559 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
560   - <reportElement stretchType="RelativeToTallestObject" x="15" y="160" width="178" height="25" uuid="2b042a8e-b1b5-4249-97d6-1e54390b60d9">
  560 + <reportElement stretchType="RelativeToTallestObject" x="15" y="106" width="178" height="25" uuid="2b042a8e-b1b5-4249-97d6-1e54390b60d9">
561 561 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
562 562 </reportElement>
563 563 <box>
... ... @@ -571,7 +571,7 @@ WHERE
571 571 <textFieldExpression><![CDATA[$F{gestor}]]></textFieldExpression>
572 572 </textField>
573 573 <staticText>
574   - <reportElement mode="Opaque" x="15" y="135" width="178" height="25" backcolor="#C0C0C0" uuid="6d9d85fa-6a2d-4b77-8e77-a7ee6641f958">
  574 + <reportElement mode="Opaque" x="15" y="81" width="178" height="25" backcolor="#C0C0C0" uuid="6d9d85fa-6a2d-4b77-8e77-a7ee6641f958">
575 575 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
576 576 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
577 577 </reportElement>
... ... @@ -588,7 +588,7 @@ WHERE
588 588 <text><![CDATA[Gestor do Contrato]]></text>
589 589 </staticText>
590 590 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
591   - <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="15" y="185" width="178" height="25" uuid="95a94b85-25d9-4154-b415-cf46f5dcb112">
  591 + <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="15" y="131" width="178" height="25" uuid="95a94b85-25d9-4154-b415-cf46f5dcb112">
592 592 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
593 593 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
594 594 </reportElement>
... ... @@ -603,7 +603,7 @@ WHERE
603 603 <textFieldExpression><![CDATA[$F{gestormatricula}]]></textFieldExpression>
604 604 </textField>
605 605 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
606   - <reportElement stretchType="RelativeToTallestObject" x="193" y="160" width="178" height="25" uuid="11320692-2ec4-4f0c-a14c-b21b1a549d4b">
  606 + <reportElement stretchType="RelativeToTallestObject" x="193" y="106" width="178" height="25" uuid="11320692-2ec4-4f0c-a14c-b21b1a549d4b">
607 607 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
608 608 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
609 609 </reportElement>
... ... @@ -618,7 +618,7 @@ WHERE
618 618 <textFieldExpression><![CDATA[$F{fiscaltecnico}]]></textFieldExpression>
619 619 </textField>
620 620 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
621   - <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="193" y="185" width="178" height="25" uuid="4c90573f-fd0b-4da6-9367-d5a4a89a25f1">
  621 + <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="193" y="131" width="178" height="25" uuid="4c90573f-fd0b-4da6-9367-d5a4a89a25f1">
622 622 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
623 623 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
624 624 </reportElement>
... ... @@ -633,7 +633,7 @@ WHERE
633 633 <textFieldExpression><![CDATA[$F{fiscaltecnicomatricula}]]></textFieldExpression>
634 634 </textField>
635 635 <staticText>
636   - <reportElement mode="Opaque" x="193" y="135" width="178" height="25" backcolor="#C0C0C0" uuid="f5f4def3-c40a-4549-a26f-967fa8def378">
  636 + <reportElement mode="Opaque" x="193" y="81" width="178" height="25" backcolor="#C0C0C0" uuid="f5f4def3-c40a-4549-a26f-967fa8def378">
637 637 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
638 638 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
639 639 </reportElement>
... ... @@ -650,7 +650,7 @@ WHERE
650 650 <text><![CDATA[Fiscal do Contrato]]></text>
651 651 </staticText>
652 652 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
653   - <reportElement stretchType="RelativeToTallestObject" x="371" y="160" width="179" height="25" uuid="0ff9ad2c-7858-45fe-a014-7526365df018">
  653 + <reportElement stretchType="RelativeToTallestObject" x="371" y="106" width="179" height="25" uuid="0ff9ad2c-7858-45fe-a014-7526365df018">
654 654 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
655 655 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
656 656 </reportElement>
... ... @@ -665,7 +665,7 @@ WHERE
665 665 <textFieldExpression><![CDATA[$F{preposto}]]></textFieldExpression>
666 666 </textField>
667 667 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
668   - <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="371" y="185" width="179" height="25" uuid="b5a91278-5d56-4396-8385-5654f09838d2">
  668 + <reportElement positionType="Float" stretchType="RelativeToTallestObject" x="371" y="131" width="179" height="25" uuid="b5a91278-5d56-4396-8385-5654f09838d2">
669 669 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
670 670 </reportElement>
671 671 <box>
... ... @@ -679,7 +679,7 @@ WHERE
679 679 <textFieldExpression><![CDATA[$F{prepostomatricula}]]></textFieldExpression>
680 680 </textField>
681 681 <staticText>
682   - <reportElement mode="Opaque" x="371" y="135" width="179" height="25" backcolor="#C0C0C0" uuid="d9b8b663-80a0-4a7a-b334-096f97320f29">
  682 + <reportElement mode="Opaque" x="371" y="81" width="179" height="25" backcolor="#C0C0C0" uuid="d9b8b663-80a0-4a7a-b334-096f97320f29">
683 683 <property name="com.jaspersoft.studio.unit.width" value="pixel"/>
684 684 <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
685 685 </reportElement>
... ...
cit-contratos-web/src/main/resources/reports/termoReferencia.jrxml
  Diff comments   View file @31d1098
... ... @@ -2,7 +2,7 @@
2 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="termoReferencia" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="530de830-724f-4747-89e4-0ad3f25625f6">
3 3 <property name="ireport.zoom" value="1.5931540885517859"/>
4 4 <property name="ireport.x" value="0"/>
5   - <property name="ireport.y" value="3155"/>
  5 + <property name="ireport.y" value="1824"/>
6 6 <style name="table">
7 7 <box>
8 8 <pen lineWidth="1.0" lineColor="#000000"/>
... ... @@ -685,7 +685,7 @@ ORDER BY tr.id, et.id, dominio.id]]&gt;
685 685 </staticText>
686 686 </jr:columnHeader>
687 687 <jr:detailCell style="table 1_TD" height="25" rowSpan="1">
688   - <textField isStretchWithOverflow="true">
  688 + <textField isStretchWithOverflow="true" isBlankWhenNull="true">
689 689 <reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="355" height="25" uuid="3143f8af-78f3-43e9-b86c-d86980aa7d1e"/>
690 690 <box topPadding="3" leftPadding="5" bottomPadding="0" rightPadding="3">
691 691 <pen lineWidth="1.0"/>
... ... @@ -1193,14 +1193,14 @@ ORDER BY tr.id, et.id, dominio.id]]&gt;
1193 1193 <jr:detailCell style="table 4_TD" height="25" rowSpan="1">
1194 1194 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
1195 1195 <reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="167" height="25" uuid="f8f4c3fd-6337-473c-8fbb-074276246429"/>
1196   - <box topPadding="3" leftPadding="5" bottomPadding="0" rightPadding="3">
  1196 + <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
1197 1197 <pen lineWidth="1.0"/>
1198 1198 <topPen lineWidth="1.0"/>
1199 1199 <leftPen lineWidth="1.0"/>
1200 1200 <bottomPen lineWidth="1.0"/>
1201 1201 <rightPen lineWidth="1.0"/>
1202 1202 </box>
1203   - <textElement textAlignment="Left" verticalAlignment="Middle"/>
  1203 + <textElement verticalAlignment="Top"/>
1204 1204 <textFieldExpression><![CDATA[$F{nomebemservicosolucao}]]></textFieldExpression>
1205 1205 </textField>
1206 1206 </jr:detailCell>
... ... @@ -1225,14 +1225,14 @@ ORDER BY tr.id, et.id, dominio.id]]&gt;
1225 1225 <jr:detailCell style="table 4_TD" height="25" rowSpan="1">
1226 1226 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
1227 1227 <reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="75" height="25" uuid="7910b29c-0396-4718-a8bd-171cc3f93c57"/>
1228   - <box topPadding="3" leftPadding="5" bottomPadding="0" rightPadding="3">
  1228 + <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
1229 1229 <pen lineWidth="1.0"/>
1230 1230 <topPen lineWidth="1.0"/>
1231 1231 <leftPen lineWidth="1.0"/>
1232 1232 <bottomPen lineWidth="1.0"/>
1233 1233 <rightPen lineWidth="1.0"/>
1234 1234 </box>
1235   - <textElement textAlignment="Left" verticalAlignment="Middle"/>
  1235 + <textElement verticalAlignment="Top"/>
1236 1236 <textFieldExpression><![CDATA[$F{metrica}]]></textFieldExpression>
1237 1237 </textField>
1238 1238 </jr:detailCell>
... ... @@ -1257,14 +1257,14 @@ ORDER BY tr.id, et.id, dominio.id]]&gt;
1257 1257 <jr:detailCell style="table 4_TD" height="25" rowSpan="1">
1258 1258 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
1259 1259 <reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="84" height="25" uuid="e7678eef-3eba-4e0a-a170-bd27796bc210"/>
1260   - <box topPadding="3" leftPadding="5" bottomPadding="0" rightPadding="3">
  1260 + <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
1261 1261 <pen lineWidth="1.0"/>
1262 1262 <topPen lineWidth="1.0"/>
1263 1263 <leftPen lineWidth="1.0"/>
1264 1264 <bottomPen lineWidth="1.0"/>
1265 1265 <rightPen lineWidth="1.0"/>
1266 1266 </box>
1267   - <textElement textAlignment="Center" verticalAlignment="Middle"/>
  1267 + <textElement verticalAlignment="Middle"/>
1268 1268 <textFieldExpression><![CDATA[$F{indicador} == null ? "Não se aplica" : $F{indicador}]]></textFieldExpression>
1269 1269 </textField>
1270 1270 </jr:detailCell>
... ... @@ -1289,14 +1289,14 @@ ORDER BY tr.id, et.id, dominio.id]]&gt;
1289 1289 <jr:detailCell style="table 4_TD" height="25" rowSpan="1">
1290 1290 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
1291 1291 <reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="104" height="25" uuid="1b62db36-e629-43e7-9a71-c3001e54db96"/>
1292   - <box topPadding="3" leftPadding="5" bottomPadding="0" rightPadding="3">
  1292 + <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
1293 1293 <pen lineWidth="1.0"/>
1294 1294 <topPen lineWidth="1.0"/>
1295 1295 <leftPen lineWidth="1.0"/>
1296 1296 <bottomPen lineWidth="1.0"/>
1297 1297 <rightPen lineWidth="1.0"/>
1298 1298 </box>
1299   - <textElement textAlignment="Center" verticalAlignment="Middle"/>
  1299 + <textElement verticalAlignment="Middle"/>
1300 1300 <textFieldExpression><![CDATA[$F{nivelservico}]]></textFieldExpression>
1301 1301 </textField>
1302 1302 </jr:detailCell>
... ... @@ -1321,14 +1321,14 @@ ORDER BY tr.id, et.id, dominio.id]]&gt;
1321 1321 <jr:detailCell style="table 4_TD" height="25" rowSpan="1">
1322 1322 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
1323 1323 <reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="108" height="25" uuid="d898fd7e-0f74-408f-a919-85a3163c3720"/>
1324   - <box topPadding="3" leftPadding="5" bottomPadding="0" rightPadding="3">
  1324 + <box topPadding="5" leftPadding="5" bottomPadding="5" rightPadding="5">
1325 1325 <pen lineWidth="1.0"/>
1326 1326 <topPen lineWidth="1.0"/>
1327 1327 <leftPen lineWidth="1.0"/>
1328 1328 <bottomPen lineWidth="1.0"/>
1329 1329 <rightPen lineWidth="1.0"/>
1330 1330 </box>
1331   - <textElement textAlignment="Left" verticalAlignment="Middle"/>
  1331 + <textElement verticalAlignment="Middle"/>
1332 1332 <textFieldExpression><![CDATA[$F{glosa}]]></textFieldExpression>
1333 1333 </textField>
1334 1334 </jr:detailCell>
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js
  Diff comments   View file @31d1098
... ... @@ -106,6 +106,7 @@ citApp.controller(&#39;VisaoContratoController&#39;, [&#39;$scope&#39;,
106 106 });
107 107 break;
108 108 case 'EMPENHO':
  109 + $scope.valorResidual = $scope.valorTotalContratoAditivado - $scope.contratoEventos[0].contrato.totalEmpenhado;
109 110 $scope.$openModalController('cnt_ev_empenho.html', 'lg', 'EventoEmpenhoController');
110 111 break;
111 112 case 'NAO_CONFORMIDADE':
... ...
cit-contratos-web/src/main/webapp/html/contrato/contratoPg5.html
  Diff comments   View file @31d1098
... ... @@ -69,7 +69,7 @@
69 69 <fieldset ng-if="(contrato.id && hasAlteracaoEnvolvido) || (contrato.id && contrato.justificativas.length > 0)">
70 70 <legend>
71 71 <label ng-class="{'has-error' : informacoesEnvolvidosContratoForm.$submitted && hasAlteracaoEnvolvido && (!contrato.justificativas || contrato.justificativas.length < 1)}">
72   - <translate>CONTRATOS.LABEL.JUSTIFICATIVAS</translate>
  72 + <translate>LABEL.JUSTIFICATIVAS</translate>
73 73 <span class='red' ng-show="true">*</span>
74 74 <i ng-show="informacoesEnvolvidosContratoForm.$submitted && hasAlteracaoEnvolvido && (!contrato.justificativas || contrato.justificativas.length < 1)" class='fa fa-warning red'
75 75 tooltip="{{$translate.instant('CONTRATOS.VALIDACAO.ALTERACAO_ENVOLVIDOS_EXIGE_JUSTIFICATIVA')}}" tooltip-placement='top'/>
... ...
cit-contratos-web/src/main/webapp/html/eventos/cnt_ev_apostilamentoModal.html
  Diff comments   View file @31d1098
... ... @@ -58,7 +58,7 @@
58 58 <div class="row">
59 59 <div class="col-sm-4">
60 60 <label-input ng-type="text" ng-id="eventoApostilamento.registroSequencial.sequencialAno" ng-label="CONTRATOS.LABEL.NUMERO_APOSTILAMENTO" ng-disabled="true"
61   - ng-custom-maxlength="30" ng-model="eventoApostilamento.registroSequencial.sequencialAno" ng-mask="9999/9999" form="cnt_ev_apostilamentoForm" ng-hide="eventoApostilamento.id"/>
  61 + ng-custom-maxlength="30" ng-model="eventoApostilamento.registroSequencial.sequencialAno" ng-mask="9999/9999" form="cnt_ev_apostilamentoForm" ng-hide="!eventoApostilamento.id"/>
62 62 </div><!-- .col -->
63 63 <div class="col-sm-4">
64 64 <label-input-data ng-id="eventoApostilamento.dataEmissao" ng-label="CONTRATOS.LABEL.DATA_EMISSAO_APOSTILAMENTO" ng-disabled="!edit || eventoApostilamento.id"
... ...
cit-contratos-web/src/main/webapp/html/notificacao/notificacaoContratoEdit.html
  Diff comments   View file @31d1098
... ... @@ -155,7 +155,7 @@
155 155 <div class="row">
156 156 <div class="col-sm-4">
157 157 <label-select ng-id="notificacao.dominioTipoSancao" ng-label="NOTIFICACAO_CONTRATO.TIPO_SANCAO" ng-list="dominioTiposSancaoList"
158   - ng-model="notificacao.dominioTipoSancao" form="notificacaoContratoForm" ng-disabled="!edit" ng-obrigatorio="false"
  158 + ng-model="notificacao.dominioTipoSancao" form="notificacaoContratoForm" ng-disabled="!edit" ng-obrigatorio="true"
159 159 ng-custom-options="dominioTipoSancao.originalElement as dominioTipoSancao.descricao for dominioTipoSancao"
160 160 track-by="track by dominioTipoSancao.id"/>
161 161 </div>
... ...
cit-contratos-web/src/main/webapp/html/ordemFornecimento/ordemFornecimentoEdit.html
  Diff comments   View file @31d1098
... ... @@ -105,14 +105,14 @@
105 105 ng-model="ordemFornecimento.contrato.fornecedor.pessoa.nome" form="ordemFornecimentoForm" ng-disabled="true"/>
106 106 </div><!-- .col-sm-4 -->
107 107  
108   - <div class="col-sm-3">
  108 + <div class="col-sm-2">
109 109 <label-input ng-id="ordemFornecimento.contrato.fornecedor.pessoa.pessoaJuridica.cnpj" ng-label="LABEL.CNPJ_FORNECEDOR" ng-mask="99.999.999/9999-99"
110 110 ng-model="ordemFornecimento.contrato.fornecedor.pessoa.pessoaJuridica.cnpj" form="ordemFornecimentoForm" ng-disabled="true"/>
111 111 </div><!-- .col-sm-4 -->
112 112 </div>
113 113  
114 114 <div class="row">
115   - <div class="col-sm-12">
  115 + <div class="col-sm-7">
116 116 <label-input ng-type="text" ng-id="ordemFornecimento.localPrestacaoServico" ng-label="LABEL.LOCAL_PRESTACAO_SERVICO" ng-obrigatorio="false" ng-disabled="!edit"
117 117 form="ordemFornecimentoForm" ng-model="ordemFornecimento.localPrestacaoServico" ng-custom-maxlength="150" />
118 118 </div>
... ...