Commit 9b32cbd194d839414257c448e0e19564b06e4443
1 parent
c8b72244
Exists in
master
redmine #4115 Alterações (numero do contrato passa não ser obrigatório) solicitadas pela analista;
Showing
11 changed files
with
317 additions
and
253 deletions
Show diff stats
cit-contratos-api/src/main/java/br/com/centralit/api/dao/ContratoEventoDao.java
| @@ -50,4 +50,6 @@ public interface ContratoEventoDao extends CitGenericDAO { | @@ -50,4 +50,6 @@ public interface ContratoEventoDao extends CitGenericDAO { | ||
| 50 | Collection<ContratoEvento> findAllByContratoIntervalDataEmissao(Long contratoId, Date dataInicial, Date dateFinal); | 50 | Collection<ContratoEvento> findAllByContratoIntervalDataEmissao(Long contratoId, Date dataInicial, Date dateFinal); |
| 51 | 51 | ||
| 52 | Collection<ContratoEvento> findAllByContratoTipoTermoDataEmissao(List<Long> codigosTermo, Date dataInicial, Date dateFinal); | 52 | Collection<ContratoEvento> findAllByContratoTipoTermoDataEmissao(List<Long> codigosTermo, Date dataInicial, Date dateFinal); |
| 53 | + | ||
| 54 | + Collection<ContratoEvento> findAllByTipoEvento(List<Long> tiposEvento); | ||
| 53 | } | 55 | } |
| 54 | \ No newline at end of file | 56 | \ No newline at end of file |
cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoDaoHibernate.java
| @@ -100,5 +100,5 @@ public class ContratoDaoHibernate extends CitGenericDAOImpl implements ContratoD | @@ -100,5 +100,5 @@ public class ContratoDaoHibernate extends CitGenericDAOImpl implements ContratoD | ||
| 100 | 100 | ||
| 101 | return this.search(searchSeven, this.persistentClass); | 101 | return this.search(searchSeven, this.persistentClass); |
| 102 | } | 102 | } |
| 103 | - | 103 | + |
| 104 | } | 104 | } |
cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoEventoDaoHibernate.java
| 1 | package br.com.centralit.api.dao.impl; | 1 | package br.com.centralit.api.dao.impl; |
| 2 | 2 | ||
| 3 | -import java.text.SimpleDateFormat; | ||
| 4 | import java.util.Collection; | 3 | import java.util.Collection; |
| 5 | import java.util.Date; | 4 | import java.util.Date; |
| 6 | import java.util.List; | 5 | import java.util.List; |
| @@ -119,4 +118,18 @@ public class ContratoEventoDaoHibernate extends CitGenericDAOImpl implements Con | @@ -119,4 +118,18 @@ public class ContratoEventoDaoHibernate extends CitGenericDAOImpl implements Con | ||
| 119 | 118 | ||
| 120 | return this.search(search); | 119 | return this.search(search); |
| 121 | } | 120 | } |
| 121 | + | ||
| 122 | + @Override | ||
| 123 | + public Collection<ContratoEvento> findAllByTipoEvento(List<Long> tiposEvento) { | ||
| 124 | + SearchSeven search = new SearchSeven(); | ||
| 125 | + | ||
| 126 | + search.addFilterIn("tipoEvento.id", tiposEvento); | ||
| 127 | + | ||
| 128 | + search.addSort("dataEvento", false); | ||
| 129 | + | ||
| 130 | + search.addSort("id", false); | ||
| 131 | + | ||
| 132 | + return this.search(search); | ||
| 133 | + } | ||
| 134 | + | ||
| 122 | } | 135 | } |
cit-contratos-api/src/main/java/br/com/centralit/api/service/ContratoService.java
| @@ -72,4 +72,6 @@ public interface ContratoService extends GenericService<Contrato, Long> { | @@ -72,4 +72,6 @@ public interface ContratoService extends GenericService<Contrato, Long> { | ||
| 72 | 72 | ||
| 73 | Collection<Contrato> findAutoCompleteContratoPorNumeroAndOrganizacao(String numeroAnoContrato, Long idOrganizacao); | 73 | Collection<Contrato> findAutoCompleteContratoPorNumeroAndOrganizacao(String numeroAnoContrato, Long idOrganizacao); |
| 74 | 74 | ||
| 75 | + Collection<Contrato> findAllByEvento(Long[] idsTipoEvento); | ||
| 76 | + | ||
| 75 | } | 77 | } |
cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java
| @@ -279,7 +279,7 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento | @@ -279,7 +279,7 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento | ||
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | @Override | 281 | @Override |
| 282 | - public void gerarRelatorios(Long[] idsTiposRelatorios, Long idContrato, Date dataInicial, Date dataFinal, boolean download, HttpServletResponse response) { | 282 | + public void gerarRelatorios(Long[] idsTipoEvento, Long idContrato, Date dataInicial, Date dataFinal, boolean download, HttpServletResponse response) { |
| 283 | 283 | ||
| 284 | Connection conn = null; | 284 | Connection conn = null; |
| 285 | ByteArrayOutputStream baos = null; | 285 | ByteArrayOutputStream baos = null; |
| @@ -294,37 +294,46 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento | @@ -294,37 +294,46 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento | ||
| 294 | List<JasperPrint> jasperPrints = new ArrayList<JasperPrint>(); | 294 | List<JasperPrint> jasperPrints = new ArrayList<JasperPrint>(); |
| 295 | JasperPrint jasperPrincipal = new JasperPrint(); | 295 | JasperPrint jasperPrincipal = new JasperPrint(); |
| 296 | 296 | ||
| 297 | - if (UtilObjeto.isReferencia(idsTiposRelatorios)) { | 297 | + if (UtilObjeto.isReferencia(idsTipoEvento)) { |
| 298 | Integer index = 1; | 298 | Integer index = 1; |
| 299 | - for (Long idTipoRelatorio : idsTiposRelatorios) { | ||
| 300 | - Dominio dominioTipoRelatorio = dominioService.find(idTipoRelatorio); | ||
| 301 | 299 | ||
| 302 | - if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_EMPENHO) { | ||
| 303 | - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REGISTRO_EMPENHO", this.getIdioma()); | ||
| 304 | - jasperPrint = this.contratoEmpenhoService.getJasperPrintRelatorioEmpenho(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | 300 | + if (idContrato == null) { |
| 305 | 301 | ||
| 306 | - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_LIBERA_PAGAMENTO) { | ||
| 307 | - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_LIBERACAO_PAGAMENTO", this.getIdioma()); | ||
| 308 | - jasperPrint = this.eventoLiberacaoPagamentoService.getJasperPrintRelatorioLiberacaoPagamento(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | ||
| 309 | - | ||
| 310 | - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_REPACTUACAO) { | ||
| 311 | - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REPACTUACAO", this.getIdioma()); | ||
| 312 | - jasperPrint = this.repactuacaoService.getJasperPrintRelatorioRepactuacao(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | 302 | + Collection<ContratoEvento> contratoEventos = contratoEventoDao.findAllByTipoEvento(Arrays.asList(idsTipoEvento)); |
| 303 | + List<Long> idsContratos = new ArrayList<Long>(); | ||
| 304 | + for (ContratoEvento contratoEvento : contratoEventos) { | ||
| 305 | + if (!idsContratos.contains(contratoEvento.getContrato().getId())) { | ||
| 306 | + idsContratos.add(contratoEvento.getContrato().getId()); | ||
| 307 | + } | ||
| 308 | + } | ||
| 309 | + | ||
| 310 | + for (Long contrato : idsContratos) { | ||
| 311 | + | ||
| 312 | + for (Long idTipoEvento : idsTipoEvento) { | ||
| 313 | + Dominio dominioTipoRelatorio = dominioService.find(idTipoEvento); | ||
| 314 | + | ||
| 315 | + jasperPrint = selecionaRelatorio(contrato, dataInicial, dataFinal, conn, jasperPrint, usuarioLogado, dominioTipoRelatorio); | ||
| 316 | + | ||
| 317 | + jasperPrincipal = addJasperPrint(jasperPrint, jasperPrints, jasperPrincipal, index); | ||
| 318 | + index++; | ||
| 319 | + continue; | ||
| 320 | + } | ||
| 321 | + } | ||
| 322 | + | ||
| 313 | 323 | ||
| 314 | - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_NAO_CONFORMIDADE) { | ||
| 315 | - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_NAO_CONFORMIDADE", this.getIdioma()); | ||
| 316 | - jasperPrint = this.eventoRegistroNaoConformidadeService.getJasperPrintRelatorioRegistroNaoConformidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | 324 | + } else { |
| 317 | 325 | ||
| 318 | - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_PENALIDADE) { | ||
| 319 | - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_PENALIDADE_APLICADA", this.getIdioma()); | ||
| 320 | - jasperPrint = this.eventoPenalidadeService.getJasperPrintRelatorioPenalidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | ||
| 321 | - } | 326 | + for (Long idTipoEvento : idsTipoEvento) { |
| 327 | + Dominio dominioTipoRelatorio = dominioService.find(idTipoEvento); | ||
| 322 | 328 | ||
| 323 | - jasperPrincipal = addJasperPrint(jasperPrint, jasperPrints, jasperPrincipal, index); | ||
| 324 | - index++; | ||
| 325 | - continue; | 329 | + jasperPrint = selecionaRelatorio(idContrato, dataInicial, dataFinal, conn, jasperPrint, usuarioLogado, dominioTipoRelatorio); |
| 326 | 330 | ||
| 331 | + jasperPrincipal = addJasperPrint(jasperPrint, jasperPrints, jasperPrincipal, index); | ||
| 332 | + index++; | ||
| 333 | + continue; | ||
| 334 | + } | ||
| 327 | } | 335 | } |
| 336 | + | ||
| 328 | if (!UtilColecao.isVazio(jasperPrints)) { | 337 | if (!UtilColecao.isVazio(jasperPrints)) { |
| 329 | for (JasperPrint jasper : jasperPrints) { | 338 | for (JasperPrint jasper : jasperPrints) { |
| 330 | for (int j = 0; j < jasper.getPages().size(); j++) { | 339 | for (int j = 0; j < jasper.getPages().size(); j++) { |
| @@ -342,4 +351,31 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento | @@ -342,4 +351,31 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento | ||
| 342 | UtilDataBase.closeResources(conn, inputCabecalho, baos); | 351 | UtilDataBase.closeResources(conn, inputCabecalho, baos); |
| 343 | } | 352 | } |
| 344 | } | 353 | } |
| 354 | + | ||
| 355 | + private JasperPrint selecionaRelatorio(Long idContrato, Date dataInicial, Date dataFinal, Connection conn, JasperPrint jasperPrint, Usuario usuarioLogado, Dominio dominioTipoRelatorio) | ||
| 356 | + throws JRException { | ||
| 357 | + | ||
| 358 | + if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_EMPENHO) { | ||
| 359 | + String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REGISTRO_EMPENHO", this.getIdioma()); | ||
| 360 | + jasperPrint = this.contratoEmpenhoService.getJasperPrintRelatorioEmpenho(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | ||
| 361 | + | ||
| 362 | + } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_LIBERA_PAGAMENTO) { | ||
| 363 | + String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_LIBERACAO_PAGAMENTO", this.getIdioma()); | ||
| 364 | + jasperPrint = this.eventoLiberacaoPagamentoService.getJasperPrintRelatorioLiberacaoPagamento(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | ||
| 365 | + | ||
| 366 | + } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_REPACTUACAO) { | ||
| 367 | + String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REPACTUACAO", this.getIdioma()); | ||
| 368 | + jasperPrint = this.repactuacaoService.getJasperPrintRelatorioRepactuacao(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | ||
| 369 | + | ||
| 370 | + } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_NAO_CONFORMIDADE) { | ||
| 371 | + String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_NAO_CONFORMIDADE", this.getIdioma()); | ||
| 372 | + jasperPrint = this.eventoRegistroNaoConformidadeService.getJasperPrintRelatorioRegistroNaoConformidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | ||
| 373 | + | ||
| 374 | + } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_PENALIDADE) { | ||
| 375 | + String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_PENALIDADE_APLICADA", this.getIdioma()); | ||
| 376 | + jasperPrint = this.eventoPenalidadeService.getJasperPrintRelatorioPenalidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); | ||
| 377 | + } | ||
| 378 | + | ||
| 379 | + return jasperPrint; | ||
| 380 | + } | ||
| 345 | } | 381 | } |
cit-contratos-web/src/main/java/br/com/centralit/controller/ContratoEventoController.java
| @@ -225,17 +225,18 @@ public class ContratoEventoController extends GenericController<ContratoEvento> | @@ -225,17 +225,18 @@ public class ContratoEventoController extends GenericController<ContratoEvento> | ||
| 225 | @RequestMapping(method = RequestMethod.GET, value = "/pdfGerarRelatorios") | 225 | @RequestMapping(method = RequestMethod.GET, value = "/pdfGerarRelatorios") |
| 226 | public void gerarRelatorios( | 226 | public void gerarRelatorios( |
| 227 | @RequestParam(value = "idsTiposRelatorio") String idsRelatoriosSelecionados, | 227 | @RequestParam(value = "idsTiposRelatorio") String idsRelatoriosSelecionados, |
| 228 | - @RequestParam(value = "idContrato") Long idContrato, | 228 | + @RequestParam(value = "idContrato", required = false) String idContrato, |
| 229 | @RequestParam(value = "dataInicial", required = false) String dataInicial, | 229 | @RequestParam(value = "dataInicial", required = false) String dataInicial, |
| 230 | @RequestParam(value = "dataFinal", required = false) String dataFinal, | 230 | @RequestParam(value = "dataFinal", required = false) String dataFinal, |
| 231 | @RequestParam(value = "download") boolean download, HttpServletResponse response) throws SQLException, JRException, IOException { | 231 | @RequestParam(value = "download") boolean download, HttpServletResponse response) throws SQLException, JRException, IOException { |
| 232 | 232 | ||
| 233 | Long[] arrayLong = getArrayLong(idsRelatoriosSelecionados); | 233 | Long[] arrayLong = getArrayLong(idsRelatoriosSelecionados); |
| 234 | 234 | ||
| 235 | + Long contratoId = StringUtils.isNumeric(idContrato) ? Long.parseLong(idContrato) : null; | ||
| 235 | Date dataInicio = StringUtils.isEmpty(dataInicial) || dataInicial.equalsIgnoreCase("null") ? null : UtilDate.jsonToDate(UtilDate.dataInicioFormatada(dataInicial)); | 236 | Date dataInicio = StringUtils.isEmpty(dataInicial) || dataInicial.equalsIgnoreCase("null") ? null : UtilDate.jsonToDate(UtilDate.dataInicioFormatada(dataInicial)); |
| 236 | Date dataFim = StringUtils.isEmpty(dataFinal) || dataFinal.equalsIgnoreCase("null") ? null : UtilDate.jsonToDate(UtilDate.dataInicioFormatada(dataFinal)); | 237 | Date dataFim = StringUtils.isEmpty(dataFinal) || dataFinal.equalsIgnoreCase("null") ? null : UtilDate.jsonToDate(UtilDate.dataInicioFormatada(dataFinal)); |
| 237 | 238 | ||
| 238 | - this.contratoEventoService.gerarRelatorios(arrayLong, idContrato, dataInicio, dataFim, download, response); | 239 | + this.contratoEventoService.gerarRelatorios(arrayLong, contratoId, dataInicio, dataFim, download, response); |
| 239 | } | 240 | } |
| 240 | 241 | ||
| 241 | } | 242 | } |
cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
| @@ -78,25 +78,48 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -78,25 +78,48 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 78 | <band splitType="Stretch"/> | 78 | <band splitType="Stretch"/> |
| 79 | </background> | 79 | </background> |
| 80 | <detail> | 80 | <detail> |
| 81 | - <band height="115" splitType="Prevent"> | ||
| 82 | - <staticText> | ||
| 83 | - <reportElement x="0" y="0" width="549" height="25" uuid="b507a610-f7ee-4c3b-9d62-3ac4f2da7706"/> | ||
| 84 | - <box topPadding="0" leftPadding="5"/> | ||
| 85 | - <textElement verticalAlignment="Middle"> | ||
| 86 | - <font size="13" isBold="true"/> | ||
| 87 | - </textElement> | ||
| 88 | - <text><![CDATA[1. Informações gerais]]></text> | ||
| 89 | - </staticText> | 81 | + <band height="90" splitType="Prevent"> |
| 82 | + <frame> | ||
| 83 | + <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> | ||
| 84 | + <staticText> | ||
| 85 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> | ||
| 86 | + <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 87 | + <pen lineWidth="0.0"/> | ||
| 88 | + <topPen lineWidth="0.0"/> | ||
| 89 | + <leftPen lineWidth="0.0"/> | ||
| 90 | + <bottomPen lineWidth="0.0"/> | ||
| 91 | + <rightPen lineWidth="0.0"/> | ||
| 92 | + </box> | ||
| 93 | + <textElement textAlignment="Left" verticalAlignment="Middle"> | ||
| 94 | + <font isBold="true"/> | ||
| 95 | + </textElement> | ||
| 96 | + <text><![CDATA[Período]]></text> | ||
| 97 | + </staticText> | ||
| 98 | + <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> | ||
| 99 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> | ||
| 100 | + <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 101 | + <pen lineWidth="0.0"/> | ||
| 102 | + <topPen lineWidth="0.0"/> | ||
| 103 | + <leftPen lineWidth="0.0"/> | ||
| 104 | + <bottomPen lineWidth="0.0"/> | ||
| 105 | + <rightPen lineWidth="0.0"/> | ||
| 106 | + </box> | ||
| 107 | + <textElement textAlignment="Left" verticalAlignment="Middle"/> | ||
| 108 | + <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : | ||
| 109 | +($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + | ||
| 110 | +($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> | ||
| 111 | + </textField> | ||
| 112 | + </frame> | ||
| 90 | <frame> | 113 | <frame> |
| 91 | - <reportElement positionType="Float" x="15" y="35" width="534" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> | 114 | + <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> |
| 92 | <staticText> | 115 | <staticText> |
| 93 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> | 116 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> |
| 94 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 117 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 95 | - <pen lineWidth="1.0"/> | ||
| 96 | - <topPen lineWidth="1.0"/> | ||
| 97 | - <leftPen lineWidth="1.0"/> | ||
| 98 | - <bottomPen lineWidth="1.0"/> | ||
| 99 | - <rightPen lineWidth="1.0"/> | 118 | + <pen lineWidth="0.0"/> |
| 119 | + <topPen lineWidth="0.0"/> | ||
| 120 | + <leftPen lineWidth="0.0"/> | ||
| 121 | + <bottomPen lineWidth="0.0"/> | ||
| 122 | + <rightPen lineWidth="0.0"/> | ||
| 100 | </box> | 123 | </box> |
| 101 | <textElement textAlignment="Left" verticalAlignment="Middle"> | 124 | <textElement textAlignment="Left" verticalAlignment="Middle"> |
| 102 | <font isBold="true"/> | 125 | <font isBold="true"/> |
| @@ -104,40 +127,40 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -104,40 +127,40 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 104 | <text><![CDATA[Número / Ano do contrato]]></text> | 127 | <text><![CDATA[Número / Ano do contrato]]></text> |
| 105 | </staticText> | 128 | </staticText> |
| 106 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 129 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 107 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/> | 130 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/> |
| 108 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 131 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 109 | - <pen lineWidth="1.0"/> | ||
| 110 | - <topPen lineWidth="1.0"/> | ||
| 111 | - <leftPen lineWidth="1.0"/> | ||
| 112 | - <bottomPen lineWidth="1.0"/> | ||
| 113 | - <rightPen lineWidth="1.0"/> | 132 | + <pen lineWidth="0.0"/> |
| 133 | + <topPen lineWidth="0.0"/> | ||
| 134 | + <leftPen lineWidth="0.0"/> | ||
| 135 | + <bottomPen lineWidth="0.0"/> | ||
| 136 | + <rightPen lineWidth="0.0"/> | ||
| 114 | </box> | 137 | </box> |
| 115 | <textElement textAlignment="Left" verticalAlignment="Middle"/> | 138 | <textElement textAlignment="Left" verticalAlignment="Middle"/> |
| 116 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> | 139 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> |
| 117 | </textField> | 140 | </textField> |
| 118 | </frame> | 141 | </frame> |
| 119 | <frame> | 142 | <frame> |
| 120 | - <reportElement positionType="Float" x="15" y="60" width="534" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> | 143 | + <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> |
| 121 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 144 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 122 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> | 145 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> |
| 123 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 146 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 124 | - <pen lineWidth="1.0"/> | ||
| 125 | - <topPen lineWidth="1.0"/> | ||
| 126 | - <leftPen lineWidth="1.0"/> | ||
| 127 | - <bottomPen lineWidth="1.0"/> | ||
| 128 | - <rightPen lineWidth="1.0"/> | 147 | + <pen lineWidth="0.0"/> |
| 148 | + <topPen lineWidth="0.0"/> | ||
| 149 | + <leftPen lineWidth="0.0"/> | ||
| 150 | + <bottomPen lineWidth="0.0"/> | ||
| 151 | + <rightPen lineWidth="0.0"/> | ||
| 129 | </box> | 152 | </box> |
| 130 | <textElement textAlignment="Left" verticalAlignment="Middle"/> | 153 | <textElement textAlignment="Left" verticalAlignment="Middle"/> |
| 131 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> | 154 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> |
| 132 | </textField> | 155 | </textField> |
| 133 | <staticText> | 156 | <staticText> |
| 134 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> | 157 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> |
| 135 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 158 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 136 | - <pen lineWidth="1.0"/> | ||
| 137 | - <topPen lineWidth="1.0"/> | ||
| 138 | - <leftPen lineWidth="1.0"/> | ||
| 139 | - <bottomPen lineWidth="1.0"/> | ||
| 140 | - <rightPen lineWidth="1.0"/> | 159 | + <pen lineWidth="0.0"/> |
| 160 | + <topPen lineWidth="0.0"/> | ||
| 161 | + <leftPen lineWidth="0.0"/> | ||
| 162 | + <bottomPen lineWidth="0.0"/> | ||
| 163 | + <rightPen lineWidth="0.0"/> | ||
| 141 | </box> | 164 | </box> |
| 142 | <textElement textAlignment="Left" verticalAlignment="Middle"> | 165 | <textElement textAlignment="Left" verticalAlignment="Middle"> |
| 143 | <font isBold="true"/> | 166 | <font isBold="true"/> |
| @@ -145,41 +168,21 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -145,41 +168,21 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 145 | <text><![CDATA[Contratada]]></text> | 168 | <text><![CDATA[Contratada]]></text> |
| 146 | </staticText> | 169 | </staticText> |
| 147 | </frame> | 170 | </frame> |
| 148 | - <frame> | ||
| 149 | - <reportElement positionType="Float" x="15" y="85" width="534" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> | ||
| 150 | - <staticText> | ||
| 151 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> | ||
| 152 | - <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 153 | - <pen lineWidth="1.0"/> | ||
| 154 | - <topPen lineWidth="1.0"/> | ||
| 155 | - <leftPen lineWidth="1.0"/> | ||
| 156 | - <bottomPen lineWidth="1.0"/> | ||
| 157 | - <rightPen lineWidth="1.0"/> | ||
| 158 | - </box> | ||
| 159 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | ||
| 160 | - <font isBold="true"/> | ||
| 161 | - </textElement> | ||
| 162 | - <text><![CDATA[Período]]></text> | ||
| 163 | - </staticText> | ||
| 164 | - <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> | ||
| 165 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> | ||
| 166 | - <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 167 | - <pen lineWidth="1.0"/> | ||
| 168 | - <topPen lineWidth="1.0"/> | ||
| 169 | - <leftPen lineWidth="1.0"/> | ||
| 170 | - <bottomPen lineWidth="1.0"/> | ||
| 171 | - <rightPen lineWidth="1.0"/> | ||
| 172 | - </box> | ||
| 173 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | ||
| 174 | - <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : | ||
| 175 | -($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + | ||
| 176 | -($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> | ||
| 177 | - </textField> | ||
| 178 | - </frame> | 171 | + <line> |
| 172 | + <reportElement x="5" y="85" width="544" height="1" uuid="0a116f87-49ef-40ba-8e38-021384df19ac"/> | ||
| 173 | + </line> | ||
| 179 | </band> | 174 | </band> |
| 180 | - <band height="70" splitType="Stretch"> | 175 | + <band height="75" splitType="Stretch"> |
| 176 | + <staticText> | ||
| 177 | + <reportElement x="5" y="10" width="549" height="25" uuid="b507a610-f7ee-4c3b-9d62-3ac4f2da7706"/> | ||
| 178 | + <box topPadding="0" leftPadding="5"/> | ||
| 179 | + <textElement verticalAlignment="Middle"> | ||
| 180 | + <font size="13" isBold="true"/> | ||
| 181 | + </textElement> | ||
| 182 | + <text><![CDATA[1. Relatórios]]></text> | ||
| 183 | + </staticText> | ||
| 181 | <componentElement> | 184 | <componentElement> |
| 182 | - <reportElement key="table 1" positionType="Float" x="15" y="10" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/> | 185 | + <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/> |
| 183 | <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd"> | 186 | <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd"> |
| 184 | <datasetRun subDataset="liberacoesPagamento" uuid="164d2db9-5e45-482b-b184-e729be724bfd"> | 187 | <datasetRun subDataset="liberacoesPagamento" uuid="164d2db9-5e45-482b-b184-e729be724bfd"> |
| 185 | <datasetParameter name="REPORT_CONNECTION"> | 188 | <datasetParameter name="REPORT_CONNECTION"> |
cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml
| @@ -75,25 +75,48 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -75,25 +75,48 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 75 | <band splitType="Stretch"/> | 75 | <band splitType="Stretch"/> |
| 76 | </background> | 76 | </background> |
| 77 | <detail> | 77 | <detail> |
| 78 | - <band height="115" splitType="Prevent"> | ||
| 79 | - <staticText> | ||
| 80 | - <reportElement x="0" y="0" width="549" height="25" uuid="b507a610-f7ee-4c3b-9d62-3ac4f2da7706"/> | ||
| 81 | - <box topPadding="0" leftPadding="5"/> | ||
| 82 | - <textElement verticalAlignment="Middle"> | ||
| 83 | - <font size="13" isBold="true"/> | ||
| 84 | - </textElement> | ||
| 85 | - <text><![CDATA[1. Informações gerais]]></text> | ||
| 86 | - </staticText> | 78 | + <band height="90" splitType="Prevent"> |
| 79 | + <frame> | ||
| 80 | + <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> | ||
| 81 | + <staticText> | ||
| 82 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> | ||
| 83 | + <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 84 | + <pen lineWidth="0.0"/> | ||
| 85 | + <topPen lineWidth="0.0"/> | ||
| 86 | + <leftPen lineWidth="0.0"/> | ||
| 87 | + <bottomPen lineWidth="0.0"/> | ||
| 88 | + <rightPen lineWidth="0.0"/> | ||
| 89 | + </box> | ||
| 90 | + <textElement textAlignment="Left" verticalAlignment="Middle"> | ||
| 91 | + <font isBold="true"/> | ||
| 92 | + </textElement> | ||
| 93 | + <text><![CDATA[Período]]></text> | ||
| 94 | + </staticText> | ||
| 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"/> | ||
| 97 | + <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 98 | + <pen lineWidth="0.0"/> | ||
| 99 | + <topPen lineWidth="0.0"/> | ||
| 100 | + <leftPen lineWidth="0.0"/> | ||
| 101 | + <bottomPen lineWidth="0.0"/> | ||
| 102 | + <rightPen lineWidth="0.0"/> | ||
| 103 | + </box> | ||
| 104 | + <textElement textAlignment="Left" verticalAlignment="Middle"/> | ||
| 105 | + <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : | ||
| 106 | +($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + | ||
| 107 | +($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> | ||
| 108 | + </textField> | ||
| 109 | + </frame> | ||
| 87 | <frame> | 110 | <frame> |
| 88 | - <reportElement positionType="Float" x="15" y="35" width="534" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> | 111 | + <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> |
| 89 | <staticText> | 112 | <staticText> |
| 90 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> | 113 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> |
| 91 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 114 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 92 | - <pen lineWidth="1.0"/> | ||
| 93 | - <topPen lineWidth="1.0"/> | ||
| 94 | - <leftPen lineWidth="1.0"/> | ||
| 95 | - <bottomPen lineWidth="1.0"/> | ||
| 96 | - <rightPen lineWidth="1.0"/> | 115 | + <pen lineWidth="0.0"/> |
| 116 | + <topPen lineWidth="0.0"/> | ||
| 117 | + <leftPen lineWidth="0.0"/> | ||
| 118 | + <bottomPen lineWidth="0.0"/> | ||
| 119 | + <rightPen lineWidth="0.0"/> | ||
| 97 | </box> | 120 | </box> |
| 98 | <textElement textAlignment="Left" verticalAlignment="Middle"> | 121 | <textElement textAlignment="Left" verticalAlignment="Middle"> |
| 99 | <font isBold="true"/> | 122 | <font isBold="true"/> |
| @@ -101,40 +124,40 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -101,40 +124,40 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 101 | <text><![CDATA[Número / Ano do contrato]]></text> | 124 | <text><![CDATA[Número / Ano do contrato]]></text> |
| 102 | </staticText> | 125 | </staticText> |
| 103 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 126 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 104 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" 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"/> |
| 105 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 128 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 106 | - <pen lineWidth="1.0"/> | ||
| 107 | - <topPen lineWidth="1.0"/> | ||
| 108 | - <leftPen lineWidth="1.0"/> | ||
| 109 | - <bottomPen lineWidth="1.0"/> | ||
| 110 | - <rightPen lineWidth="1.0"/> | 129 | + <pen lineWidth="0.0"/> |
| 130 | + <topPen lineWidth="0.0"/> | ||
| 131 | + <leftPen lineWidth="0.0"/> | ||
| 132 | + <bottomPen lineWidth="0.0"/> | ||
| 133 | + <rightPen lineWidth="0.0"/> | ||
| 111 | </box> | 134 | </box> |
| 112 | <textElement textAlignment="Left" verticalAlignment="Middle"/> | 135 | <textElement textAlignment="Left" verticalAlignment="Middle"/> |
| 113 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> | 136 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> |
| 114 | </textField> | 137 | </textField> |
| 115 | </frame> | 138 | </frame> |
| 116 | <frame> | 139 | <frame> |
| 117 | - <reportElement positionType="Float" x="15" y="60" width="534" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> | 140 | + <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> |
| 118 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 141 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 119 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> | 142 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> |
| 120 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 143 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 121 | - <pen lineWidth="1.0"/> | ||
| 122 | - <topPen lineWidth="1.0"/> | ||
| 123 | - <leftPen lineWidth="1.0"/> | ||
| 124 | - <bottomPen lineWidth="1.0"/> | ||
| 125 | - <rightPen lineWidth="1.0"/> | 144 | + <pen lineWidth="0.0"/> |
| 145 | + <topPen lineWidth="0.0"/> | ||
| 146 | + <leftPen lineWidth="0.0"/> | ||
| 147 | + <bottomPen lineWidth="0.0"/> | ||
| 148 | + <rightPen lineWidth="0.0"/> | ||
| 126 | </box> | 149 | </box> |
| 127 | <textElement textAlignment="Left" verticalAlignment="Middle"/> | 150 | <textElement textAlignment="Left" verticalAlignment="Middle"/> |
| 128 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> | 151 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> |
| 129 | </textField> | 152 | </textField> |
| 130 | <staticText> | 153 | <staticText> |
| 131 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> | 154 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> |
| 132 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 155 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 133 | - <pen lineWidth="1.0"/> | ||
| 134 | - <topPen lineWidth="1.0"/> | ||
| 135 | - <leftPen lineWidth="1.0"/> | ||
| 136 | - <bottomPen lineWidth="1.0"/> | ||
| 137 | - <rightPen lineWidth="1.0"/> | 156 | + <pen lineWidth="0.0"/> |
| 157 | + <topPen lineWidth="0.0"/> | ||
| 158 | + <leftPen lineWidth="0.0"/> | ||
| 159 | + <bottomPen 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 | <font isBold="true"/> | 163 | <font isBold="true"/> |
| @@ -142,41 +165,21 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -142,41 +165,21 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 142 | <text><![CDATA[Contratada]]></text> | 165 | <text><![CDATA[Contratada]]></text> |
| 143 | </staticText> | 166 | </staticText> |
| 144 | </frame> | 167 | </frame> |
| 145 | - <frame> | ||
| 146 | - <reportElement positionType="Float" x="15" y="85" width="534" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> | ||
| 147 | - <staticText> | ||
| 148 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> | ||
| 149 | - <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 150 | - <pen lineWidth="1.0"/> | ||
| 151 | - <topPen lineWidth="1.0"/> | ||
| 152 | - <leftPen lineWidth="1.0"/> | ||
| 153 | - <bottomPen lineWidth="1.0"/> | ||
| 154 | - <rightPen lineWidth="1.0"/> | ||
| 155 | - </box> | ||
| 156 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | ||
| 157 | - <font isBold="true"/> | ||
| 158 | - </textElement> | ||
| 159 | - <text><![CDATA[Período]]></text> | ||
| 160 | - </staticText> | ||
| 161 | - <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> | ||
| 162 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> | ||
| 163 | - <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 164 | - <pen lineWidth="1.0"/> | ||
| 165 | - <topPen lineWidth="1.0"/> | ||
| 166 | - <leftPen lineWidth="1.0"/> | ||
| 167 | - <bottomPen lineWidth="1.0"/> | ||
| 168 | - <rightPen lineWidth="1.0"/> | ||
| 169 | - </box> | ||
| 170 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | ||
| 171 | - <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : | ||
| 172 | -($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + | ||
| 173 | -($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> | ||
| 174 | - </textField> | ||
| 175 | - </frame> | 168 | + <line> |
| 169 | + <reportElement x="5" y="85" width="544" height="1" uuid="c86827d4-91f0-4452-bc2d-6d68c7d7804c"/> | ||
| 170 | + </line> | ||
| 176 | </band> | 171 | </band> |
| 177 | - <band height="70" splitType="Stretch"> | 172 | + <band height="75" splitType="Stretch"> |
| 173 | + <staticText> | ||
| 174 | + <reportElement x="5" y="10" width="544" height="25" uuid="b507a610-f7ee-4c3b-9d62-3ac4f2da7706"/> | ||
| 175 | + <box topPadding="0" leftPadding="5"/> | ||
| 176 | + <textElement verticalAlignment="Middle"> | ||
| 177 | + <font size="13" isBold="true"/> | ||
| 178 | + </textElement> | ||
| 179 | + <text><![CDATA[1. Relatórios]]></text> | ||
| 180 | + </staticText> | ||
| 178 | <componentElement> | 181 | <componentElement> |
| 179 | - <reportElement key="table 1" positionType="Float" x="15" y="10" 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"/> |
| 180 | <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd"> | 183 | <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd"> |
| 181 | <datasetRun subDataset="penalidades" uuid="164d2db9-5e45-482b-b184-e729be724bfd"> | 184 | <datasetRun subDataset="penalidades" uuid="164d2db9-5e45-482b-b184-e729be724bfd"> |
| 182 | <datasetParameter name="REPORT_CONNECTION"> | 185 | <datasetParameter name="REPORT_CONNECTION"> |
| @@ -194,9 +197,9 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -194,9 +197,9 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 194 | <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> | 197 | <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> |
| 195 | </datasetRun> | 198 | </datasetRun> |
| 196 | <jr:column width="65" uuid="fdfe3465-3b51-423a-af25-4045485d5a1e"> | 199 | <jr:column width="65" uuid="fdfe3465-3b51-423a-af25-4045485d5a1e"> |
| 197 | - <jr:columnHeader height="25" rowSpan="1"> | 200 | + <jr:columnHeader height="30" rowSpan="1"> |
| 198 | <staticText> | 201 | <staticText> |
| 199 | - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="65" height="25" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/> | 202 | + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="65" height="30" backcolor="#CCCCCC" uuid="bf8f850b-5145-49fd-8c41-52c7ac05faee"/> |
| 200 | <box topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3"> | 203 | <box topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3"> |
| 201 | <pen lineWidth="1.0"/> | 204 | <pen lineWidth="1.0"/> |
| 202 | <topPen lineWidth="1.0"/> | 205 | <topPen lineWidth="1.0"/> |
| @@ -227,10 +230,10 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -227,10 +230,10 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 227 | </textField> | 230 | </textField> |
| 228 | </jr:detailCell> | 231 | </jr:detailCell> |
| 229 | </jr:column> | 232 | </jr:column> |
| 230 | - <jr:column width="140" uuid="0a1e8915-6f85-4d7a-a08e-73b217283674"> | ||
| 231 | - <jr:columnHeader height="25" rowSpan="1"> | 233 | + <jr:column width="130" uuid="0a1e8915-6f85-4d7a-a08e-73b217283674"> |
| 234 | + <jr:columnHeader height="30" rowSpan="1"> | ||
| 232 | <staticText> | 235 | <staticText> |
| 233 | - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="140" height="25" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/> | 236 | + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="5aadd943-07a6-4a31-a246-3111079e1b23"/> |
| 234 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 237 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 235 | <pen lineWidth="1.0"/> | 238 | <pen lineWidth="1.0"/> |
| 236 | <topPen lineWidth="1.0"/> | 239 | <topPen lineWidth="1.0"/> |
| @@ -246,7 +249,7 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -246,7 +249,7 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 246 | </jr:columnHeader> | 249 | </jr:columnHeader> |
| 247 | <jr:detailCell height="25" rowSpan="1"> | 250 | <jr:detailCell height="25" rowSpan="1"> |
| 248 | <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> | 251 | <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> |
| 249 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="140" height="25" uuid="c4c4f934-ddee-489a-b261-9438a2c87051"/> | 252 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="130" height="25" uuid="c4c4f934-ddee-489a-b261-9438a2c87051"/> |
| 250 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> | 253 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 251 | <pen lineWidth="1.0"/> | 254 | <pen lineWidth="1.0"/> |
| 252 | <topPen lineWidth="1.0"/> | 255 | <topPen lineWidth="1.0"/> |
| @@ -259,10 +262,10 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -259,10 +262,10 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 259 | </textField> | 262 | </textField> |
| 260 | </jr:detailCell> | 263 | </jr:detailCell> |
| 261 | </jr:column> | 264 | </jr:column> |
| 262 | - <jr:column width="49" uuid="f46445fc-007b-46e6-ade9-eef37e5d0b29"> | ||
| 263 | - <jr:columnHeader height="25" rowSpan="1"> | 265 | + <jr:column width="79" uuid="f46445fc-007b-46e6-ade9-eef37e5d0b29"> |
| 266 | + <jr:columnHeader height="30" rowSpan="1"> | ||
| 264 | <staticText> | 267 | <staticText> |
| 265 | - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="49" height="25" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/> | 268 | + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="79" height="30" backcolor="#CCCCCC" uuid="2cea64aa-39b7-4fe4-acaa-c11e1981148a"/> |
| 266 | <box topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3"> | 269 | <box topPadding="0" leftPadding="3" bottomPadding="0" rightPadding="3"> |
| 267 | <pen lineWidth="1.0"/> | 270 | <pen lineWidth="1.0"/> |
| 268 | <topPen lineWidth="1.0"/> | 271 | <topPen lineWidth="1.0"/> |
| @@ -273,12 +276,12 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -273,12 +276,12 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 273 | <textElement textAlignment="Center" verticalAlignment="Middle"> | 276 | <textElement textAlignment="Center" verticalAlignment="Middle"> |
| 274 | <font isBold="true"/> | 277 | <font isBold="true"/> |
| 275 | </textElement> | 278 | </textElement> |
| 276 | - <text><![CDATA[Nr. da ocorrência vinculada]]></text> | 279 | + <text><![CDATA[Nr. da ocorr. vinculada]]></text> |
| 277 | </staticText> | 280 | </staticText> |
| 278 | </jr:columnHeader> | 281 | </jr:columnHeader> |
| 279 | <jr:detailCell height="25" rowSpan="1"> | 282 | <jr:detailCell height="25" rowSpan="1"> |
| 280 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 283 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 281 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="49" height="25" uuid="1a4d3c83-faee-4ef1-9f14-8459e5436112"/> | 284 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="79" height="25" uuid="1a4d3c83-faee-4ef1-9f14-8459e5436112"/> |
| 282 | <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> | 285 | <box topPadding="2" leftPadding="2" bottomPadding="2" rightPadding="2"> |
| 283 | <pen lineWidth="1.0"/> | 286 | <pen lineWidth="1.0"/> |
| 284 | <topPen lineWidth="1.0"/> | 287 | <topPen lineWidth="1.0"/> |
| @@ -291,10 +294,10 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -291,10 +294,10 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 291 | </textField> | 294 | </textField> |
| 292 | </jr:detailCell> | 295 | </jr:detailCell> |
| 293 | </jr:column> | 296 | </jr:column> |
| 294 | - <jr:column width="140" uuid="c297508b-d28b-41d0-b617-8d905832ba11"> | ||
| 295 | - <jr:columnHeader height="25" rowSpan="1"> | 297 | + <jr:column width="130" uuid="c297508b-d28b-41d0-b617-8d905832ba11"> |
| 298 | + <jr:columnHeader height="30" rowSpan="1"> | ||
| 296 | <staticText> | 299 | <staticText> |
| 297 | - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="140" height="25" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/> | 300 | + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="eda2a9c7-8e71-424c-964b-0adcfdbd626d"/> |
| 298 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 301 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 299 | <pen lineWidth="1.0"/> | 302 | <pen lineWidth="1.0"/> |
| 300 | <topPen lineWidth="1.0"/> | 303 | <topPen lineWidth="1.0"/> |
| @@ -310,7 +313,7 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -310,7 +313,7 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 310 | </jr:columnHeader> | 313 | </jr:columnHeader> |
| 311 | <jr:detailCell height="25" rowSpan="1"> | 314 | <jr:detailCell height="25" rowSpan="1"> |
| 312 | <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> | 315 | <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> |
| 313 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="140" height="25" uuid="7461c57c-7e7c-43de-bacd-9e25c72fce48"/> | 316 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="130" height="25" uuid="7461c57c-7e7c-43de-bacd-9e25c72fce48"/> |
| 314 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> | 317 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 315 | <pen lineWidth="1.0"/> | 318 | <pen lineWidth="1.0"/> |
| 316 | <topPen lineWidth="1.0"/> | 319 | <topPen lineWidth="1.0"/> |
| @@ -323,10 +326,10 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -323,10 +326,10 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 323 | </textField> | 326 | </textField> |
| 324 | </jr:detailCell> | 327 | </jr:detailCell> |
| 325 | </jr:column> | 328 | </jr:column> |
| 326 | - <jr:column width="140" uuid="c2128a98-752d-409e-89cc-eb883a56b4e6"> | ||
| 327 | - <jr:columnHeader height="25" rowSpan="1"> | 329 | + <jr:column width="130" uuid="c2128a98-752d-409e-89cc-eb883a56b4e6"> |
| 330 | + <jr:columnHeader height="30" rowSpan="1"> | ||
| 328 | <staticText> | 331 | <staticText> |
| 329 | - <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="140" height="25" backcolor="#CCCCCC" uuid="6df9dcd8-69d0-4d0b-9870-e3e7c89a468b"/> | 332 | + <reportElement positionType="Float" mode="Opaque" x="0" y="0" width="130" height="30" backcolor="#CCCCCC" uuid="6df9dcd8-69d0-4d0b-9870-e3e7c89a468b"/> |
| 330 | <box leftPadding="5" rightPadding="3"> | 333 | <box leftPadding="5" rightPadding="3"> |
| 331 | <pen lineWidth="1.0"/> | 334 | <pen lineWidth="1.0"/> |
| 332 | <topPen lineWidth="1.0"/> | 335 | <topPen lineWidth="1.0"/> |
| @@ -342,7 +345,7 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -342,7 +345,7 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 342 | </jr:columnHeader> | 345 | </jr:columnHeader> |
| 343 | <jr:detailCell height="25" rowSpan="1"> | 346 | <jr:detailCell height="25" rowSpan="1"> |
| 344 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 347 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 345 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="140" height="25" uuid="89c24ae1-9089-4a3a-859d-c0b737b24509"/> | 348 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="130" height="25" uuid="89c24ae1-9089-4a3a-859d-c0b737b24509"/> |
| 346 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> | 349 | <box topPadding="2" leftPadding="5" bottomPadding="2" rightPadding="3"> |
| 347 | <pen lineWidth="1.0"/> | 350 | <pen lineWidth="1.0"/> |
| 348 | <topPen lineWidth="1.0"/> | 351 | <topPen lineWidth="1.0"/> |
cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
| @@ -70,25 +70,48 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -70,25 +70,48 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 70 | <band splitType="Stretch"/> | 70 | <band splitType="Stretch"/> |
| 71 | </background> | 71 | </background> |
| 72 | <detail> | 72 | <detail> |
| 73 | - <band height="115" splitType="Prevent"> | ||
| 74 | - <staticText> | ||
| 75 | - <reportElement x="0" y="0" width="549" height="25" uuid="b507a610-f7ee-4c3b-9d62-3ac4f2da7706"/> | ||
| 76 | - <box topPadding="0" leftPadding="5"/> | ||
| 77 | - <textElement verticalAlignment="Middle"> | ||
| 78 | - <font size="13" isBold="true"/> | ||
| 79 | - </textElement> | ||
| 80 | - <text><![CDATA[1. Informações gerais]]></text> | ||
| 81 | - </staticText> | 73 | + <band height="90" splitType="Prevent"> |
| 74 | + <frame> | ||
| 75 | + <reportElement positionType="Float" x="5" y="10" width="544" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> | ||
| 76 | + <staticText> | ||
| 77 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> | ||
| 78 | + <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 79 | + <pen lineWidth="0.0"/> | ||
| 80 | + <topPen lineWidth="0.0"/> | ||
| 81 | + <leftPen lineWidth="0.0"/> | ||
| 82 | + <bottomPen lineWidth="0.0"/> | ||
| 83 | + <rightPen lineWidth="0.0"/> | ||
| 84 | + </box> | ||
| 85 | + <textElement textAlignment="Left" verticalAlignment="Middle"> | ||
| 86 | + <font isBold="true"/> | ||
| 87 | + </textElement> | ||
| 88 | + <text><![CDATA[Período]]></text> | ||
| 89 | + </staticText> | ||
| 90 | + <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> | ||
| 91 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> | ||
| 92 | + <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 93 | + <pen lineWidth="0.0"/> | ||
| 94 | + <topPen lineWidth="0.0"/> | ||
| 95 | + <leftPen lineWidth="0.0"/> | ||
| 96 | + <bottomPen lineWidth="0.0"/> | ||
| 97 | + <rightPen lineWidth="0.0"/> | ||
| 98 | + </box> | ||
| 99 | + <textElement textAlignment="Left" verticalAlignment="Middle"/> | ||
| 100 | + <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : | ||
| 101 | +($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + | ||
| 102 | +($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> | ||
| 103 | + </textField> | ||
| 104 | + </frame> | ||
| 82 | <frame> | 105 | <frame> |
| 83 | - <reportElement positionType="Float" x="15" y="35" width="534" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> | 106 | + <reportElement positionType="Float" x="5" y="35" width="544" height="25" uuid="f96ac29b-e8ab-44fd-b943-3abe7589504e"/> |
| 84 | <staticText> | 107 | <staticText> |
| 85 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> | 108 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="9dc4d075-c3fa-467f-bbcc-84727a545527"/> |
| 86 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 109 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 87 | - <pen lineWidth="1.0"/> | ||
| 88 | - <topPen lineWidth="1.0"/> | ||
| 89 | - <leftPen lineWidth="1.0"/> | ||
| 90 | - <bottomPen lineWidth="1.0"/> | ||
| 91 | - <rightPen lineWidth="1.0"/> | 110 | + <pen lineWidth="0.0"/> |
| 111 | + <topPen lineWidth="0.0"/> | ||
| 112 | + <leftPen lineWidth="0.0"/> | ||
| 113 | + <bottomPen lineWidth="0.0"/> | ||
| 114 | + <rightPen lineWidth="0.0"/> | ||
| 92 | </box> | 115 | </box> |
| 93 | <textElement textAlignment="Left" verticalAlignment="Middle"> | 116 | <textElement textAlignment="Left" verticalAlignment="Middle"> |
| 94 | <font isBold="true"/> | 117 | <font isBold="true"/> |
| @@ -96,40 +119,40 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -96,40 +119,40 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 96 | <text><![CDATA[Número / Ano do contrato]]></text> | 119 | <text><![CDATA[Número / Ano do contrato]]></text> |
| 97 | </staticText> | 120 | </staticText> |
| 98 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 121 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 99 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/> | 122 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" isRemoveLineWhenBlank="true" uuid="afc850e0-f7e1-47ec-a9de-090502bfdadd"/> |
| 100 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 123 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 101 | - <pen lineWidth="1.0"/> | ||
| 102 | - <topPen lineWidth="1.0"/> | ||
| 103 | - <leftPen lineWidth="1.0"/> | ||
| 104 | - <bottomPen lineWidth="1.0"/> | ||
| 105 | - <rightPen lineWidth="1.0"/> | 124 | + <pen lineWidth="0.0"/> |
| 125 | + <topPen lineWidth="0.0"/> | ||
| 126 | + <leftPen lineWidth="0.0"/> | ||
| 127 | + <bottomPen lineWidth="0.0"/> | ||
| 128 | + <rightPen lineWidth="0.0"/> | ||
| 106 | </box> | 129 | </box> |
| 107 | <textElement textAlignment="Left" verticalAlignment="Middle"/> | 130 | <textElement textAlignment="Left" verticalAlignment="Middle"/> |
| 108 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> | 131 | <textFieldExpression><![CDATA[$F{numanocontrato}.substring(0,9) + "/" + $F{numanocontrato}.substring(9,13)]]></textFieldExpression> |
| 109 | </textField> | 132 | </textField> |
| 110 | </frame> | 133 | </frame> |
| 111 | <frame> | 134 | <frame> |
| 112 | - <reportElement positionType="Float" x="15" y="60" width="534" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> | 135 | + <reportElement positionType="Float" x="5" y="60" width="544" height="25" uuid="af3077ce-5d6b-44cb-879e-5e216ade93d0"/> |
| 113 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> | 136 | <textField isStretchWithOverflow="true" isBlankWhenNull="true"> |
| 114 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> | 137 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="394" height="25" uuid="f1e51c51-3e1c-4e9d-a254-252c38ee2908"/> |
| 115 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 138 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 116 | - <pen lineWidth="1.0"/> | ||
| 117 | - <topPen lineWidth="1.0"/> | ||
| 118 | - <leftPen lineWidth="1.0"/> | ||
| 119 | - <bottomPen lineWidth="1.0"/> | ||
| 120 | - <rightPen lineWidth="1.0"/> | 139 | + <pen lineWidth="0.0"/> |
| 140 | + <topPen lineWidth="0.0"/> | ||
| 141 | + <leftPen lineWidth="0.0"/> | ||
| 142 | + <bottomPen lineWidth="0.0"/> | ||
| 143 | + <rightPen lineWidth="0.0"/> | ||
| 121 | </box> | 144 | </box> |
| 122 | <textElement textAlignment="Left" verticalAlignment="Middle"/> | 145 | <textElement textAlignment="Left" verticalAlignment="Middle"/> |
| 123 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> | 146 | <textFieldExpression><![CDATA[$F{contratada}]]></textFieldExpression> |
| 124 | </textField> | 147 | </textField> |
| 125 | <staticText> | 148 | <staticText> |
| 126 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> | 149 | + <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="25" backcolor="#FFFFFF" uuid="b6fc395c-4e28-49d9-b9ea-a49dd16f358a"/> |
| 127 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | 150 | <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> |
| 128 | - <pen lineWidth="1.0"/> | ||
| 129 | - <topPen lineWidth="1.0"/> | ||
| 130 | - <leftPen lineWidth="1.0"/> | ||
| 131 | - <bottomPen lineWidth="1.0"/> | ||
| 132 | - <rightPen lineWidth="1.0"/> | 151 | + <pen lineWidth="0.0"/> |
| 152 | + <topPen lineWidth="0.0"/> | ||
| 153 | + <leftPen lineWidth="0.0"/> | ||
| 154 | + <bottomPen lineWidth="0.0"/> | ||
| 155 | + <rightPen lineWidth="0.0"/> | ||
| 133 | </box> | 156 | </box> |
| 134 | <textElement textAlignment="Left" verticalAlignment="Middle"> | 157 | <textElement textAlignment="Left" verticalAlignment="Middle"> |
| 135 | <font isBold="true"/> | 158 | <font isBold="true"/> |
| @@ -137,41 +160,13 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -137,41 +160,13 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 137 | <text><![CDATA[Contratada]]></text> | 160 | <text><![CDATA[Contratada]]></text> |
| 138 | </staticText> | 161 | </staticText> |
| 139 | </frame> | 162 | </frame> |
| 140 | - <frame> | ||
| 141 | - <reportElement positionType="Float" x="15" y="85" width="534" height="25" uuid="38d5011b-885b-4c06-ae9f-8ae5f9101873"/> | ||
| 142 | - <staticText> | ||
| 143 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="150" height="25" backcolor="#CCCCCC" uuid="ae43a2db-f404-4c5d-b934-87a70c8b5716"/> | ||
| 144 | - <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 145 | - <pen lineWidth="1.0"/> | ||
| 146 | - <topPen lineWidth="1.0"/> | ||
| 147 | - <leftPen lineWidth="1.0"/> | ||
| 148 | - <bottomPen lineWidth="1.0"/> | ||
| 149 | - <rightPen lineWidth="1.0"/> | ||
| 150 | - </box> | ||
| 151 | - <textElement textAlignment="Left" verticalAlignment="Middle"> | ||
| 152 | - <font isBold="true"/> | ||
| 153 | - </textElement> | ||
| 154 | - <text><![CDATA[Período]]></text> | ||
| 155 | - </staticText> | ||
| 156 | - <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="false"> | ||
| 157 | - <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="150" y="0" width="384" height="25" uuid="263dadd4-8d94-4de9-a045-a741d1d6f127"/> | ||
| 158 | - <box topPadding="0" leftPadding="5" bottomPadding="0" rightPadding="3"> | ||
| 159 | - <pen lineWidth="1.0"/> | ||
| 160 | - <topPen lineWidth="1.0"/> | ||
| 161 | - <leftPen lineWidth="1.0"/> | ||
| 162 | - <bottomPen lineWidth="1.0"/> | ||
| 163 | - <rightPen lineWidth="1.0"/> | ||
| 164 | - </box> | ||
| 165 | - <textElement textAlignment="Left" verticalAlignment="Middle"/> | ||
| 166 | - <textFieldExpression><![CDATA[($P{DATA_INICIAL} == null && $P{DATA_FINAL} == null) ? "Não informado" : | ||
| 167 | -($P{DATA_INICIAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_INICIAL})) + " à " + | ||
| 168 | -($P{DATA_FINAL} == null ? "Não informado" : new SimpleDateFormat("dd/MM/yyyy").format($P{DATA_FINAL}))]]></textFieldExpression> | ||
| 169 | - </textField> | ||
| 170 | - </frame> | 163 | + <line> |
| 164 | + <reportElement x="5" y="85" width="544" height="1" uuid="966cf623-bcb2-4497-8bc1-2a8a7ffd1484"/> | ||
| 165 | + </line> | ||
| 171 | </band> | 166 | </band> |
| 172 | - <band height="70" splitType="Stretch"> | 167 | + <band height="75" splitType="Stretch"> |
| 173 | <componentElement> | 168 | <componentElement> |
| 174 | - <reportElement key="table 1" positionType="Float" x="15" y="10" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/> | 169 | + <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/> |
| 175 | <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd"> | 170 | <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd"> |
| 176 | <datasetRun subDataset="repactuacoes" uuid="164d2db9-5e45-482b-b184-e729be724bfd"> | 171 | <datasetRun subDataset="repactuacoes" uuid="164d2db9-5e45-482b-b184-e729be724bfd"> |
| 177 | <datasetParameter name="REPORT_CONNECTION"> | 172 | <datasetParameter name="REPORT_CONNECTION"> |
| @@ -288,6 +283,14 @@ where c.id = $P{CONTRATO_ID}]]> | @@ -288,6 +283,14 @@ where c.id = $P{CONTRATO_ID}]]> | ||
| 288 | </jr:column> | 283 | </jr:column> |
| 289 | </jr:table> | 284 | </jr:table> |
| 290 | </componentElement> | 285 | </componentElement> |
| 286 | + <staticText> | ||
| 287 | + <reportElement x="5" y="10" width="544" height="25" uuid="b507a610-f7ee-4c3b-9d62-3ac4f2da7706"/> | ||
| 288 | + <box topPadding="0" leftPadding="5"/> | ||
| 289 | + <textElement verticalAlignment="Middle"> | ||
| 290 | + <font size="13" isBold="true"/> | ||
| 291 | + </textElement> | ||
| 292 | + <text><![CDATA[1. Relatórios]]></text> | ||
| 293 | + </staticText> | ||
| 291 | </band> | 294 | </band> |
| 292 | </detail> | 295 | </detail> |
| 293 | </jasperReport> | 296 | </jasperReport> |
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js
| @@ -68,8 +68,9 @@ citApp.controller('ConsultaRelatoriosController', ['$scope', '$filter', '$timeou | @@ -68,8 +68,9 @@ citApp.controller('ConsultaRelatoriosController', ['$scope', '$filter', '$timeou | ||
| 68 | } | 68 | } |
| 69 | }); | 69 | }); |
| 70 | 70 | ||
| 71 | + var idContrato = $scope.contrato ? $scope.contrato.id : null; | ||
| 71 | $scope.url = '/cit-contratos-web/rest/contratoEvento/pdfGerarRelatorios?idsTiposRelatorio=' | 72 | $scope.url = '/cit-contratos-web/rest/contratoEvento/pdfGerarRelatorios?idsTiposRelatorio=' |
| 72 | - + idsRelatoriosSelecionados + '&idContrato=' + $scope.contrato.id + '&dataInicial=' + $scope.dataInicial + '&dataFinal=' + $scope.dataFinal; | 73 | + + idsRelatoriosSelecionados + '&idContrato=' + idContrato + '&dataInicial=' + $scope.dataInicial + '&dataFinal=' + $scope.dataFinal; |
| 73 | $scope.visualizarRelatorio($scope.url, $translate.instant('CONTRATOS.LABEL.RELATORIOS')); | 74 | $scope.visualizarRelatorio($scope.url, $translate.instant('CONTRATOS.LABEL.RELATORIOS')); |
| 74 | $scope.setLoading(false); | 75 | $scope.setLoading(false); |
| 75 | 76 |
cit-contratos-web/src/main/webapp/html/consultaRelatorios/consultaRelatoriosList.html
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | <div class="row"> | 43 | <div class="row"> |
| 44 | <div class="col-sm-4"> | 44 | <div class="col-sm-4"> |
| 45 | <auto-complete ng-id="contrato" ng-label="LABEL.NUMERO_ANO_CONTRATO" ng-find="findContrato(value)" ng-item="item.numeroAnoContratoFormatado" | 45 | <auto-complete ng-id="contrato" ng-label="LABEL.NUMERO_ANO_CONTRATO" ng-find="findContrato(value)" ng-item="item.numeroAnoContratoFormatado" |
| 46 | - ng-acao-borracha="resetForm()" ng-model="contrato" form="consultaRelatoriosForm" ng-obrigatorio="true"> | 46 | + ng-acao-borracha="resetForm()" ng-model="contrato" form="consultaRelatoriosForm" ng-obrigatorio="false"> |
| 47 | </auto-complete> | 47 | </auto-complete> |
| 48 | </div> | 48 | </div> |
| 49 | <div class="col-sm-4"> | 49 | <div class="col-sm-4"> |