From 850fa3dd00e682ca67cc1a83f4db2f3eb1d0c87f Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 23 Feb 2010 12:40:43 +0100
Subject: [PATCH]  ItEr49S04ValidacionEProbasFuncionaisItEr48S04: [Bug #328]
 Fixing bug. Task names are shown completely.

---
 .../main/jasper/completedEstimatedHours.jrxml | 40 +++++++++----------
 .../schedulingProgressPerOrderReport.jrxml    |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
index 6380c5b57..e588d564e 100644
--- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
+++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
@@ -43,7 +43,7 @@
 				<text><![CDATA[Reference date:]]></text>
 			</staticText>
 			<textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
-				<reportElement x="86" y="92" width="100" height="20"/>
+				<reportElement x="86" y="92" width="164" height="20"/>
 				<textElement verticalAlignment="Middle"/>
 				<textFieldExpression class="java.util.Date"><![CDATA[$P{referenceDate}]]></textFieldExpression>
 			</textField>
@@ -51,7 +51,7 @@
 				<reportElement mode="Opaque" x="64" y="137" width="423" height="15" forecolor="#000000" backcolor="#E0E4FB"/>
 			</rectangle>
 			<staticText>
-				<reportElement style="Column header" x="171" y="137" width="158" height="15"/>
+				<reportElement style="Column header" x="287" y="137" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -65,7 +65,7 @@
 				<text><![CDATA[Total hours]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="Column header" x="329" y="137" width="158" height="15"/>
+				<reportElement style="Column header" x="387" y="137" width="100" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -79,7 +79,7 @@
 				<text><![CDATA[Hours up to date]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="Column header" mode="Opaque" x="171" y="152" width="79" height="15"/>
+				<reportElement style="Column header" mode="Opaque" x="287" y="152" width="50" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -90,7 +90,7 @@
 				<text><![CDATA[Estimated]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="Column header" x="250" y="152" width="79" height="15"/>
+				<reportElement style="Column header" x="337" y="152" width="50" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -101,7 +101,7 @@
 				<text><![CDATA[Planned]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="Column header" x="329" y="152" width="79" height="15"/>
+				<reportElement style="Column header" x="387" y="152" width="50" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -112,7 +112,7 @@
 				<text><![CDATA[Planned]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="Column header" x="408" y="152" width="79" height="15"/>
+				<reportElement style="Column header" x="437" y="152" width="50" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<leftPen lineWidth="1.0"/>
@@ -123,7 +123,7 @@
 				<text><![CDATA[Real]]></text>
 			</staticText>
 			<staticText>
-				<reportElement style="Column header" x="64" y="152" width="107" height="15"/>
+				<reportElement style="Column header" x="64" y="152" width="223" height="15"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -144,7 +144,7 @@
 				<text><![CDATA[Order:]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="86" y="72" width="100" height="20"/>
+				<reportElement x="86" y="72" width="164" height="20"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$P{orderName}]]></textFieldExpression>
 			</textField>
@@ -157,30 +157,30 @@
 		<band splitType="Stretch"/>
 	</columnHeader>
 	<detail>
-		<band height="16" splitType="Stretch">
+		<band height="36" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement x="64" y="0" width="107" height="16"/>
-				<textElement textAlignment="Center"/>
+				<reportElement x="64" y="0" width="223" height="36"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{taskName}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="250" y="0" width="79" height="16"/>
-				<textElement textAlignment="Center"/>
+				<reportElement x="337" y="0" width="50" height="36"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{totalPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="171" y="0" width="79" height="16"/>
-				<textElement textAlignment="Center"/>
+				<reportElement x="287" y="0" width="50" height="36"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{estimatedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="329" y="0" width="79" height="16"/>
-				<textElement textAlignment="Center"/>
+				<reportElement x="387" y="0" width="50" height="36"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{partialPlannedHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="408" y="0" width="79" height="16"/>
-				<textElement textAlignment="Center"/>
+				<reportElement x="437" y="0" width="50" height="36"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{realHours}]]></textFieldExpression>
 			</textField>
 		</band>
diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
index 4878ee5e6..42d021150 100644
--- a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
@@ -187,7 +187,7 @@
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$F{realHours}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="0" y="1" width="123" height="16"/>
+				<reportElement x="0" y="1" width="446" height="16"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
 					<font size="12"/>
 				</textElement>