From 37100a4ca598359fa84c7bb9e5de50433e894d86 Mon Sep 17 00:00:00 2001
From: joyfas.silva <joyfas.silva@centralit.com.br>
Date: Mon, 9 May 2016 17:27:30 -0300
Subject: [PATCH] {Redmine tarefa-4836}

---
 citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml b/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
index 832f6cb..f71ddf2 100644
--- a/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
+++ b/citgrp-patrimonio-web/src/main/resources/reports/BemPatrimonialAnaliticoUAeEndereco.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="1.8150000000000004"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
@@ -37,6 +37,8 @@ CONCAT(estruturalocalizadora.codigo, ' - ', estruturalocalizadora.nome, ' - ', e
 CONCAT(parceirocolaborador.matricula , ' - ', pessoa.nome) AS RESPONSAVELLOCALIZADORA,
 CONCAT(localizacao.codigo , ' - ' , endereco.nome, ' - ', localizacao.nome) AS ENDERECO,
 numeropatrimonial AS NUMEROPATRIMONIAL,
+dataFinalGarantia AS DATAFINALGARANTIA,
+dataInicialGarantia AS DATAINICIALGARANTIA,
 material.descricao AS MATERIALDESCRICAO,
 (SELECT array_to_string(ARRAY(
 	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}]]>
 	<field name="valorliquido" class="java.math.BigDecimal"/>
 	<field name="idorgao" class="java.lang.Long"/>
 	<field name="idgestora" class="java.lang.Long"/>
+	<field name="dataFinalGarantia" class="java.sql.Timestamp"/>
+	<field name="dataInicialGarantia" class="java.sql.Timestamp"/>
 	<sortField name="idorgao"/>
 	<sortField name="idgestora"/>
 	<sortField name="estruturaadministrativaid"/>
@@ -265,7 +269,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 					<text><![CDATA[Patrimônio]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="88" y="32" width="180" height="30" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
+					<reportElement x="88" y="32" width="125" height="30" uuid="7f75ae5e-1e4b-478a-83b2-45693bf9253a"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -287,7 +291,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 					<text><![CDATA[Data Aquisição]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="268" y="32" width="74" height="30" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
+					<reportElement style="table" x="213" y="32" width="70" height="30" uuid="4d0449aa-a6a8-4f4b-90c4-d405271c1a9c"/>
 					<box>
 						<topPen lineWidth="0.5"/>
 						<leftPen lineWidth="0.5"/>
@@ -335,6 +339,17 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 					<textElement verticalAlignment="Middle" markup="styled"/>
 					<textFieldExpression><![CDATA["<b>Endereço: </b>" + $F{endereco}]]></textFieldExpression>
 				</textField>
+				<staticText>
+					<reportElement x="283" y="32" width="59" height="30" uuid="91805779-9ffa-45d7-abd8-7ad17084c305"/>
+					<box>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<text><![CDATA[Garantia]]></text>
+				</staticText>
 			</band>
 		</groupHeader>
 		<groupFooter>
@@ -386,7 +401,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 				<textFieldExpression><![CDATA[$F{numeropatrimonial}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="180" height="20" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="88" y="0" width="125" height="20" uuid="60b42d10-a6c2-448b-89d5-22cde01bc01d"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -411,7 +426,7 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 				<textFieldExpression><![CDATA[$F{dataaquisicao}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="268" y="0" width="74" height="20" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
+				<reportElement stretchType="RelativeToTallestObject" x="213" y="0" width="70" height="20" uuid="04dd801f-38ab-4df9-a9a8-fa4e34cdc0d8"/>
 				<box>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
@@ -455,11 +470,24 @@ WHERE $X{IN,bp.id,IDS_BEM_PATRIMONIAL}]]>
 					<bottomPen lineWidth="0.5"/>
 					<rightPen lineWidth="0.5"/>
 				</box>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<paragraph leftIndent="2"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{contacontabil}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
+				<reportElement stretchType="RelativeToTallestObject" x="283" y="0" width="59" height="20" uuid="1235bb7c-b8b2-44a8-92b0-156d7bca75f9">
+					<printWhenExpression><![CDATA[$F{dataInicialGarantia} != null && $F{dataFinalGarantia} != null]]></printWhenExpression>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
+				<textFieldExpression><![CDATA[new SimpleDateFormat("dd-MM-yyyy").format($F{dataInicialGarantia})+"\nà\n"+new SimpleDateFormat("dd-MM-yyyy").format($F{dataFinalGarantia})]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
--
libgit2 0.21.2