From c6f4febc1ccc164922cb1606ee0ce8ece97b5cbc Mon Sep 17 00:00:00 2001
From: 96409975520 <96409975520@MPBSA171301.mp.intra>
Date: Tue, 29 Aug 2017 14:36:36 -0300
Subject: [PATCH] Redimencionamento do tamanho da fonte da "página" no relatório.

---
 src/main/java/br/com/ases/controller/AvaliacaoController.java          | 11 +++++++----
 src/main/webapp/WEB-INF/templates-relatorios/relatorio-avaliacao.jrxml | 25 +++++++++++++------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/br/com/ases/controller/AvaliacaoController.java b/src/main/java/br/com/ases/controller/AvaliacaoController.java
index 3b8f360..2637726 100644
--- a/src/main/java/br/com/ases/controller/AvaliacaoController.java
+++ b/src/main/java/br/com/ases/controller/AvaliacaoController.java
@@ -118,8 +118,10 @@ public class AvaliacaoController {
     this.criterioProperties = new CriterioProperties(application);
     this.utilitiesProperties = new UtilitiesProperties(application);
     this.chaveIdentificaAvaliacao =
-        DateUtil.dataHoraMinutoAtual().replace("/", "").replace(":", "").replace(" ", "");
+        DateUtil.dataHoraMinutoAtual().replace("/", "").replace(":", "").replace(" ", "").replace(".", "");
     result.include("chaveIdentificaAvaliacao", chaveIdentificaAvaliacao);
+    
+    //VRaptorRequestHolder.currentRequest().getServletContext().setAttribute("chaveIdentificaAvaliacao", chaveIdentificaAvaliacao);
 
   }
 
@@ -504,9 +506,7 @@ public class AvaliacaoController {
         (List<SummarizedOccurrence>) VRaptorRequestHolder.currentRequest().getServletContext()
             .getAttribute(novaChave);
 
-    novaChave = "urlAvaliada" + chaveAvaliacao;
-    String urlAvaliada =
-        (String) VRaptorRequestHolder.currentRequest().getServletContext().getAttribute(novaChave);
+  
 
     novaChave = "contentLenght" + chaveAvaliacao;
     String contentLenght =
@@ -535,6 +535,9 @@ public class AvaliacaoController {
       map.put("pPercentualAses", "0");
     }
 
+    novaChave = "urlAvaliada" + chaveAvaliacao;
+    String urlAvaliada = (String) VRaptorRequestHolder.currentRequest().getServletContext().getAttribute(novaChave);
+    
     map.put("pPagina", urlAvaliada != "" ? urlAvaliada : "Código Fonte ou Arquivo");
 
     if (urlAvaliada != "") {
diff --git a/src/main/webapp/WEB-INF/templates-relatorios/relatorio-avaliacao.jrxml b/src/main/webapp/WEB-INF/templates-relatorios/relatorio-avaliacao.jrxml
index 1faf393..46bf5be 100644
--- a/src/main/webapp/WEB-INF/templates-relatorios/relatorio-avaliacao.jrxml
+++ b/src/main/webapp/WEB-INF/templates-relatorios/relatorio-avaliacao.jrxml
@@ -191,57 +191,58 @@
 				<text><![CDATA[Página Avaliada]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="123" y="182" width="432" height="20" uuid="c14e0918-43d2-4d71-bed9-c32949d0af5f"/>
+				<reportElement x="90" y="182" width="1024" height="20" uuid="c14e0918-43d2-4d71-bed9-c32949d0af5f"/>
 				<textElement>
-					<font size="15"/>
+					<font size="13"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{pPagina}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="1" y="182" width="122" height="20" uuid="3074f848-51c0-46d8-af4d-fd9299d1a62c"/>
 				<textElement>
-					<font size="15" isBold="true"/>
+					<font size="13" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Página:]]></text>
 			</staticText>
 			<staticText>
 				<reportElement x="1" y="202" width="122" height="20" uuid="11782da5-1a64-4e6e-a7e4-9f9fd6611681"/>
 				<textElement>
-					<font size="15" isBold="true"/>
+					<font size="13" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Título:]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="123" y="202" width="432" height="20" uuid="ee935205-bcf5-4980-a48c-eac3915fdf4c"/>
+				<reportElement x="90" y="202" width="432" height="20" uuid="ee935205-bcf5-4980-a48c-eac3915fdf4c"/>
 				<textElement>
-					<font size="15"/>
+					<font size="13"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{pTitulo}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="1" y="222" width="122" height="20" uuid="13e0fafd-2c61-4926-9084-6aca97af9450"/>
 				<textElement>
-					<font size="15" isBold="true"/>
+					<font size="13" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Tamanho:]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="123" y="222" width="433" height="20" uuid="1a736f75-5fc3-44b6-b2c2-05bcba62c6fe"/>
+				<reportElement x="90" y="222" width="433" height="20" uuid="1a736f75-5fc3-44b6-b2c2-05bcba62c6fe"/>
 				<textElement>
-					<font size="15"/>
+					<font size="13"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{pTamanho}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="1" y="242" width="122" height="20" uuid="c3ef6f0a-8daa-494c-b8de-cb7591fd39e6"/>
 				<textElement>
-					<font size="15" isBold="true"/>
+					<font size="13" isBold="true"/>
 				</textElement>
+				<text><![CDATA[Data/ Hora:]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="123" y="242" width="433" height="20" uuid="e02bad1d-cc4c-4cfc-a093-41b6a2433dd1"/>
+				<reportElement x="90" y="242" width="433" height="20" uuid="e02bad1d-cc4c-4cfc-a093-41b6a2433dd1"/>
 				<textElement>
-					<font size="15"/>
+					<font size="13"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{pDataHoraAvaliacao}]]></textFieldExpression>
 			</textField>
--
libgit2 0.21.2