From 5f215a89f0038daf602fc0c252cdf1dae5589fef Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 28 Dec 2009 13:13:36 +0100
Subject: [PATCH]  ItEr41S12CUInformeListaAvancesTrabajoItEr40S17: Add order
 header on top

---
 .../jasper/workingProgressPerTaskReport.jrxml   | 17 +++++++++++++++--
 .../WorkingProgressPerTaskController.java       |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
index ac9d0468d..28206347c 100644
--- a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
@@ -5,6 +5,7 @@
 	<style name="Column header" isDefault="false" forecolor="#666666" fontName="Arial" fontSize="12" isBold="true"/>
 	<style name="Detail" isDefault="false" fontName="Arial" fontSize="12"/>
 	<parameter name="referenceDate" class="java.util.Date"/>
+	<parameter name="orderName" class="java.lang.String"/>
 	<field name="taskName" class="java.lang.String"/>
 	<field name="estimatedHours" class="java.lang.Integer"/>
 	<field name="totalPlannedHours" class="java.lang.Integer"/>
@@ -42,14 +43,14 @@
 				<imageExpression class="java.lang.String"><![CDATA["logos/navalpro_logo.gif"]]></imageExpression>
 			</image>
 			<staticText>
-				<reportElement x="0" y="76" width="85" height="20"/>
+				<reportElement x="1" y="96" width="85" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font isBold="true"/>
 				</textElement>
 				<text><![CDATA[Reference date:]]></text>
 			</staticText>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="85" y="76" width="100" height="20"/>
+				<reportElement x="86" y="96" width="100" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{referenceDate}]]></textFieldExpression>
 			</textField>
@@ -244,6 +245,18 @@
 				</textElement>
 				<text><![CDATA[Progress]]></text>
 			</staticText>
+			<staticText>
+				<reportElement x="1" y="76" width="85" height="20"/>
+				<textElement verticalAlignment="Middle">
+					<font isBold="true"/>
+				</textElement>
+				<text><![CDATA[Order:]]></text>
+			</staticText>
+			<textField>
+				<reportElement x="86" y="76" width="100" height="20"/>
+				<textElement verticalAlignment="Middle"/>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{orderName}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
index db73ced15..1fafabe33 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
@@ -85,6 +85,7 @@ public class WorkingProgressPerTaskController extends NavalplannerReportControll
     protected Map<String, Object> getParameters() {
         Map<String, Object> result = new HashMap<String, Object>();
 
+        result.put("orderName", getSelectedOrder().getName());
         result.put("referenceDate", getDeadlineDate());
 
         return result;