Download as
Browse Code »

Commit 37100a4ca598359fa84c7bb9e5de50433e894d86

Authored by joyfas.silva
1 parent 549f8246
Exists in master

{Redmine tarefa-4836}

Showing 1 changed file with 34 additions and 6 deletions   Show diff stats
citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
  Diff comments   View file @37100a4
1 1 <?xml version="1.0" encoding="UTF-8"?>
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="BemPatrimonialAnaliticoUAeEndereco" language="groovy" pageWidth="555" pageHeight="802" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9fdf75fd-580c-4f39-b59f-a80b7105f175">
3   - <property name="ireport.zoom" value="1.5"/>
  3 + <property name="ireport.zoom" value="1.8150000000000004"/>
4 4 <property name="ireport.x" value="0"/>
5 5 <property name="ireport.y" value="0"/>
6 6 <style name="table">
... ... @@ -37,6 +37,8 @@ CONCAT(estruturalocalizadora.codigo, &#39; - &#39;, estruturalocalizadora.nome, &#39; - &#39;, e
37 37 CONCAT(parceirocolaborador.matricula , ' - ', pessoa.nome) AS RESPONSAVELLOCALIZADORA,
38 38 CONCAT(localizacao.codigo , ' - ' , endereco.nome, ' - ', localizacao.nome) AS ENDERECO,
39 39 numeropatrimonial AS NUMEROPATRIMONIAL,
  40 +dataFinalGarantia AS DATAFINALGARANTIA,
  41 +dataInicialGarantia AS DATAINICIALGARANTIA,
40 42 material.descricao AS MATERIALDESCRICAO,
41 43 (SELECT array_to_string(ARRAY(
42 44 SELECT CONCAT(CASE WHEN (dominio.codigo = 6 and descricaodominio.descricao IS NOT NULL) THEN CONCAT(caracteristica.descricao, ': ', descricaodominio.descricao, ' - ')
... ... @@ -94,6 +96,8 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
94 96 <field name="valorliquido" class="java.math.BigDecimal"/>
95 97 <field name="idorgao" class="java.lang.Long"/>
96 98 <field name="idgestora" class="java.lang.Long"/>
  99 + <field name="dataFinalGarantia" class="java.sql.Timestamp"/>
  100 + <field name="dataInicialGarantia" class="java.sql.Timestamp"/>
97 101 <sortField name="idorgao"/>
98 102 <sortField name="idgestora"/>
99 103 <sortField name="estruturaadministrativaid"/>
... ... @@ -265,7 +269,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
265 269 <text><![CDATA[Patrimônio]]></text>
266 270 </staticText>
267 271 <staticText>
268   - <reportElement x="88" y="32" width="180" height="30" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
  272 + <reportElement x="88" y="32" width="125" height="30" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
269 273 <box>
270 274 <topPen lineWidth="0.5"/>
271 275 <leftPen lineWidth="0.5"/>
... ... @@ -287,7 +291,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
287 291 <text><![CDATA[Data Aquisição]]></text>
288 292 </staticText>
289 293 <staticText>
290   - <reportElement x="268" y="32" width="74" height="30" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
  294 + <reportElement style="table" x="213" y="32" width="70" height="30" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
291 295 <box>
292 296 <topPen lineWidth="0.5"/>
293 297 <leftPen lineWidth="0.5"/>
... ... @@ -335,6 +339,17 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
335 339 <textElement verticalAlignment="Middle" markup="styled"/>
336 340 <textFieldExpression><![CDATA["<b>Endereço: </b>" + $F{endereco}]]></textFieldExpression>
337 341 </textField>
  342 + <staticText>
  343 + <reportElement x="283" y="32" width="59" height="30" uuid="91805779-9ffa-45d7-abd8-7ad17084c305"/>
  344 + <box>
  345 + <topPen lineWidth="0.5"/>
  346 + <leftPen lineWidth="0.5"/>
  347 + <bottomPen lineWidth="0.5"/>
  348 + <rightPen lineWidth="0.5"/>
  349 + </box>
  350 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
  351 + <text><![CDATA[Garantia]]></text>
  352 + </staticText>
338 353 </band>
339 354 </groupHeader>
340 355 <groupFooter>
... ... @@ -386,7 +401,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
386 401 <textFieldExpression><![CDATA[$F{numeropatrimonial}]]></textFieldExpression>
387 402 </textField>
388 403 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
389   - <reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="180" height="20" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
  404 + <reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="125" height="20" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
390 405 <box>
391 406 <topPen lineWidth="0.5"/>
392 407 <leftPen lineWidth="0.5"/>
... ... @@ -411,7 +426,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
411 426 <textFieldExpression><![CDATA[$F{dataaquisicao}]]></textFieldExpression>
412 427 </textField>
413 428 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
414   - <reportElement stretchType="RelativeToTallestObject" x="268" y="0" width="74" height="20" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
  429 + <reportElement stretchType="RelativeToTallestObject" x="213" y="0" width="70" height="20" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
415 430 <box>
416 431 <topPen lineWidth="0.5"/>
417 432 <leftPen lineWidth="0.5"/>
... ... @@ -455,11 +470,24 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]&gt;
455 470 <bottomPen lineWidth="0.5"/>
456 471 <rightPen lineWidth="0.5"/>
457 472 </box>
458   - <textElement textAlignment="Left" verticalAlignment="Middle">
  473 + <textElement textAlignment="Center" verticalAlignment="Middle">
459 474 <paragraph leftIndent="2"/>
460 475 </textElement>
461 476 <textFieldExpression><![CDATA[$F{contacontabil}]]></textFieldExpression>
462 477 </textField>
  478 + <textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
  479 + <reportElement stretchType="RelativeToTallestObject" x="283" y="0" width="59" height="20" uuid="1235bb7c-b8b2-44a8-92b0-156d7bca75f9">
  480 + <printWhenExpression><![CDATA[$F{dataInicialGarantia} != null && $F{dataFinalGarantia} != null]]></printWhenExpression>
  481 + </reportElement>
  482 + <box>
  483 + <topPen lineWidth="0.5"/>
  484 + <leftPen lineWidth="0.5"/>
  485 + <bottomPen lineWidth="0.5"/>
  486 + <rightPen lineWidth="0.5"/>
  487 + </box>
  488 + <textElement textAlignment="Center" verticalAlignment="Middle"/>
  489 + <textFieldExpression><![CDATA[new SimpleDateFormat("dd-MM-yyyy").format($F{dataInicialGarantia})+"\nà\n"+new SimpleDateFormat("dd-MM-yyyy").format($F{dataFinalGarantia})]]></textFieldExpression>
  490 + </textField>
463 491 </band>
464 492 </detail>
465 493 <summary>
... ...