From 1a8ab420f089b5632ca7e3356eb34c5eb0ab641b Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 25 Oct 2012 11:15:53 +0200
Subject: [PATCH] Add hours and cost mark in status report header too

FEA: ItEr77S09WBSReport
---
 .../src/main/jasper/projectStatusReport.jrxml | 36 ++++++++++++++++---
 .../ProjectStatusReportController.java        |  2 ++
 .../web/reports/ProjectStatusReportModel.java |  1 +
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
index 65c423041..d44123b60 100644
--- a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
@@ -16,16 +16,28 @@
 			</style>
 		</conditionalStyle>
 	</style>
+	<style name="project-hours-red" style="dejavu-sans">
+		<conditionalStyle>
+			<conditionExpression><![CDATA[!$P{hoursMark}.isEmpty()]]></conditionExpression>
+			<style forecolor="#FF0000"/>
+		</conditionalStyle>
+	</style>
+	<style name="project-cost-red" style="dejavu-sans">
+		<conditionalStyle>
+			<conditionExpression><![CDATA[!$P{costMark}.isEmpty()]]></conditionExpression>
+			<style forecolor="#FF0000"/>
+		</conditionalStyle>
+	</style>
 	<style name="hours-red" style="row-grey">
 		<conditionalStyle>
 			<conditionExpression><![CDATA[!$F{hoursMark}.isEmpty()]]></conditionExpression>
-			<style forecolor="#FF0000" isBold="true" />
+			<style forecolor="#FF0000" isBold="true"/>
 		</conditionalStyle>
 	</style>
 	<style name="cost-red" style="row-grey">
 		<conditionalStyle>
 			<conditionExpression><![CDATA[!$F{costMark}.isEmpty()]]></conditionExpression>
-			<style forecolor="#FF0000" isBold="true" />
+			<style forecolor="#FF0000" isBold="true"/>
 		</conditionalStyle>
 	</style>
 	<parameter name="logo" class="java.lang.String"/>
@@ -34,10 +46,12 @@
 	<parameter name="estimatedHours" class="java.lang.String"/>
 	<parameter name="plannedHours" class="java.lang.String"/>
 	<parameter name="imputedHours" class="java.lang.String"/>
+	<parameter name="hoursMark" class="java.lang.String"/>
 	<parameter name="budget" class="java.lang.String"/>
 	<parameter name="hoursCost" class="java.lang.String"/>
 	<parameter name="expensesCost" class="java.lang.String"/>
 	<parameter name="totalCost" class="java.lang.String"/>
+	<parameter name="costMark" class="java.lang.String"/>
 	<field name="code" class="java.lang.String"/>
 	<field name="name" class="java.lang.String"/>
 	<field name="estimatedHours" class="java.lang.String"/>
@@ -141,12 +155,19 @@
 				<textFieldExpression><![CDATA[$R{project_imputed_hours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="500" y="28" width="100" height="12"/>
+				<reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" style="project-hours-red" x="500" y="28" width="100" height="12"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="9" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{imputedHours}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="16348737-c53b-4739-8f53-2d68cc499821" style="project-hours-red" x="600" y="28" width="5" height="12"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{hoursMark}]]></textFieldExpression>
+			</textField>
 			<textField>
 				<reportElement uuid="9048c4a2-964c-4863-a30e-36b520a9d54b" x="0" y="41" width="100" height="12"/>
 				<textElement>
@@ -197,12 +218,19 @@
 				<textFieldExpression><![CDATA[$R{project_total_cost}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" x="700" y="41" width="100" height="12"/>
+				<reportElement uuid="a0596a94-5c29-4eb0-940a-3b561ce5893d" style="project-cost-red" x="700" y="41" width="97" height="12"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="9" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{totalCost}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="16348737-c53b-4739-8f53-2d68cc499821" style="project-cost-red" x="797" y="41" width="5" height="12"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="9" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{costMark}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java
index 1cfdf5365..3b0dde6f8 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java
@@ -136,12 +136,14 @@ public class ProjectStatusReportController extends LibrePlanReportController {
         result.put("estimatedHours", totalDTO.getEstimatedHours());
         result.put("plannedHours", totalDTO.getPlannedHours());
         result.put("imputedHours", totalDTO.getImputedHours());
+        result.put("hoursMark", totalDTO.getHoursMark());
 
         result.put("budget", Util.addCurrencySymbol(totalDTO.getBudget()));
         result.put("hoursCost", Util.addCurrencySymbol(totalDTO.getHoursCost()));
         result.put("expensesCost",
                 Util.addCurrencySymbol(totalDTO.getExpensesCost()));
         result.put("totalCost", Util.addCurrencySymbol(totalDTO.getTotalCost()));
+        result.put("costMark", totalDTO.getCostMark());
 
         return result;
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java
index 7a5ee64e2..30753d34a 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportModel.java
@@ -236,6 +236,7 @@ public class ProjectStatusReportModel implements IProjectStatusReportModel {
 
             totalDTO = new ProjectStatusReportDTO(estimatedHours, plannedHours,
                     imputedHours, budget, hoursCost, expensesCost, totalCost);
+            totalDTO.calculateMarks();
         }
     }