From ebb362d2fdbe472929646ff034bc9048a4151487 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 25 Feb 2011 12:06:42 +0100
Subject: [PATCH] [Bug #611] [reports] Review font definition in
 hoursWorkedPerWorkerReport.jrxml.

* Removed font definitions and styles
* Added a default font with "reportFont" tag
---
 .../jasper/hoursWorkedPerWorkerReport.jrxml   | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
index 46c32132b..54c907b0d 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="hoursWorkedPerWorker" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="hoursWorkedPerWorker">
-	<style name="Title" isDefault="false" fontName="FreeSans" fontSize="26" isBold="true" pdfFontName="Helvetica-Bold"/>
-	<style name="SubTitle" isDefault="false" forecolor="#666666" fontName="FreeSans" fontSize="18"/>
-	<style name="Column header" isDefault="false" forecolor="#666666" fontName="FreeSans" fontSize="12" isBold="true"/>
-	<style name="Detail" isDefault="false" fontName="FreeSans" fontSize="12"/>
+	<reportFont name="FreeSans" isDefault="true" fontName="FreeSans" size="9"/>
 	<parameter name="startingDate" class="java.util.Date"/>
 	<parameter name="endingDate" class="java.util.Date"/>
 	<parameter name="showNote" class="java.lang.Boolean"/>
@@ -78,7 +75,7 @@
 					<textFieldExpression class="java.util.Date"><![CDATA[$F{date}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Column header" mode="Opaque" x="186" y="24" width="66" height="20" backcolor="#E0E4FB"/>
+					<reportElement mode="Opaque" x="186" y="24" width="66" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -92,7 +89,7 @@
 					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column2}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Column header" mode="Opaque" x="424" y="24" width="135" height="20" backcolor="#E0E4FB"/>
+					<reportElement mode="Opaque" x="424" y="24" width="135" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -106,7 +103,7 @@
 					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column6}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Column header" mode="Opaque" x="13" y="24" width="103" height="20" backcolor="#E0E4FB"/>
+					<reportElement mode="Opaque" x="13" y="24" width="103" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -120,7 +117,7 @@
 					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column4}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Column header" mode="Opaque" x="116" y="24" width="70" height="20" backcolor="#E0E4FB"/>
+					<reportElement mode="Opaque" x="116" y="24" width="70" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -134,7 +131,7 @@
 					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column1}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Column header" mode="Opaque" x="294" y="24" width="130" height="20" backcolor="#E0E4FB"/>
+					<reportElement mode="Opaque" x="294" y="24" width="130" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -148,7 +145,7 @@
 					<textFieldExpression class="java.lang.String"><![CDATA[$R{headers.column5}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Column header" mode="Opaque" x="252" y="24" width="42" height="20" backcolor="#E0E4FB"/>
+					<reportElement mode="Opaque" x="252" y="24" width="42" height="20" backcolor="#E0E4FB"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -189,12 +186,12 @@
 	<title>
 		<band height="118" splitType="Stretch">
 			<textField>
-				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
+				<reportElement x="0" y="13" width="263" height="33"/>
 				<textElement verticalAlignment="Middle" markup="none"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$R{title}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="SubTitle" x="23" y="46" width="295" height="22"/>
+				<reportElement x="23" y="46" width="295" height="22"/>
 				<textElement markup="none"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$R{subtitle}]]></textFieldExpression>
 			</textField>
@@ -294,7 +291,7 @@
 	<pageFooter>
 		<band height="27" splitType="Stretch">
 			<textField pattern="EEEEE dd MMMMM yyyy">
-				<reportElement style="Column header" x="0" y="0" width="197" height="20"/>
+				<reportElement x="0" y="0" width="197" height="20"/>
 				<textElement>
 					<font size="10" isBold="false"/>
 				</textElement>
@@ -311,14 +308,14 @@
 				<textFieldExpression class="java.lang.String"><![CDATA[$R{of}]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement style="Column header" x="515" y="2" width="38" height="20"/>
+				<reportElement x="515" y="2" width="38" height="20"/>
 				<textElement>
 					<font size="10" isBold="false"/>
 				</textElement>
 				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="Column header" x="478" y="2" width="15" height="20"/>
+				<reportElement x="478" y="2" width="15" height="20"/>
 				<textElement textAlignment="Right">
 					<font size="10" isBold="false"/>
 				</textElement>