From 7f080a63262e9d31de670fb8866ac9bbfda2b678 Mon Sep 17 00:00:00 2001
From: Carlos Alberto <carlos.alberto@centralit.com.br>
Date: Wed, 6 Apr 2016 13:39:20 -0300
Subject: [PATCH] Implementação dos recursos de relatório

---
 cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/JasperReportManagerImpl.java |  8 ++++++--
 cit-esi-web/src/main/resources/reports/empregado.jrxml                                                |  9 ++++++---
 cit-esi-web/src/main/resources/reports/empregado_telefone.jrxml                                       |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/JasperReportManagerImpl.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/JasperReportManagerImpl.java
index e939f36..bec5e25 100644
--- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/JasperReportManagerImpl.java
+++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/resource/service/impl/JasperReportManagerImpl.java
@@ -5,6 +5,7 @@ import java.io.FileOutputStream;
 import java.sql.Connection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
@@ -52,12 +53,15 @@ public class JasperReportManagerImpl extends ReportManagerImpl implements Jasper
 			throw new EsiExecutionException(e1);
 		}
 		
+		Map<String, Object> params = this.buildParams(report, inputMap);
+		params.put("SUBREPORT_DIR", servletContext.getRealPath(path)+"/");
+		
 		switch (report.getDataSource().getType()) {
 			case CONNECTION:
 				Connection connection = dataSourceService.connect(report.getDataSource().getConnection());
 				
 				try {
-					print = JasperFillManager.fillReport(pathReportJasper, this.buildParams(report, inputMap), connection);
+					print = JasperFillManager.fillReport(pathReportJasper, params, connection);
 				} catch (JRException e) {
 					e.printStackTrace();
 					try {
@@ -71,7 +75,7 @@ public class JasperReportManagerImpl extends ReportManagerImpl implements Jasper
 
 			default:
 				try {
-					print = JasperFillManager.fillReport(pathReportJasper, this.buildParams(report, inputMap), this.buildDataSource(report, inputMap));
+					print = JasperFillManager.fillReport(pathReportJasper, params, this.buildDataSource(report, inputMap));
 				} catch (JRException e) {
 					throw new EsiExecutionException(e);
 				}
diff --git a/cit-esi-web/src/main/resources/reports/empregado.jrxml b/cit-esi-web/src/main/resources/reports/empregado.jrxml
index 0494b95..40a8513 100644
--- a/cit-esi-web/src/main/resources/reports/empregado.jrxml
+++ b/cit-esi-web/src/main/resources/reports/empregado.jrxml
@@ -4,8 +4,11 @@
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["D:\\cit\\cit-grp-esi\\cit-esi-web\\src\\main\\resources\\reports\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA[]]></defaultValueExpression>
 	</parameter>
+	<queryString language="JSON">
+		<![CDATA[]]>
+	</queryString>
 	<field name="id" class="java.lang.Integer">
 		<fieldDescription><![CDATA[id]]></fieldDescription>
 	</field>
@@ -55,8 +58,8 @@
 				<textFieldExpression><![CDATA[$F{id}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement x="438" y="0" width="106" height="20" uuid="904cdc0b-98c8-40ac-af91-baaed29629f0"/>
-				<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
+				<reportElement x="434" y="0" width="110" height="22" uuid="10ec63c0-9a3b-4c31-bb52-8e3a6296b10b"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{telefones})]]></dataSourceExpression>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "empregado_telefone.jasper"]]></subreportExpression>
 			</subreport>
 		</band>
diff --git a/cit-esi-web/src/main/resources/reports/empregado_telefone.jrxml b/cit-esi-web/src/main/resources/reports/empregado_telefone.jrxml
index e50f151..6c5cef3 100644
--- a/cit-esi-web/src/main/resources/reports/empregado_telefone.jrxml
+++ b/cit-esi-web/src/main/resources/reports/empregado_telefone.jrxml
@@ -10,9 +10,9 @@
 		<band splitType="Stretch"/>
 	</background>
 	<detail>
-		<band height="42" splitType="Stretch">
+		<band height="23" splitType="Stretch">
 			<textField>
-				<reportElement x="11" y="12" width="100" height="20" uuid="42865c6c-27a5-48de-9549-8c87e20aa594"/>
+				<reportElement x="0" y="0" width="100" height="20" uuid="2b62387e-af3c-4c0c-81b8-e211519c1d4a"/>
 				<textFieldExpression><![CDATA[$F{numero}]]></textFieldExpression>
 			</textField>
 		</band>
--
libgit2 0.21.2