Index: /trunk/web-app/reports/reactiveRatio.jrxml
===================================================================
--- /trunk/web-app/reports/reactiveRatio.jrxml	(revision 747)
+++ /trunk/web-app/reports/reactiveRatio.jrxml	(revision 748)
@@ -3,7 +3,7 @@
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="2.0"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="594"/>
+	<property name="ireport.y" value="170"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
@@ -128,18 +128,4 @@
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="40" width="117" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="Serif"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{immediateCalloutCount}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="60" width="117" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="Serif"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{totalPreventativeCount}]]></textFieldExpression>
-			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
 				<reportElement x="0" y="80" width="157" height="20"/>
 				<textElement verticalAlignment="Middle">
@@ -154,22 +140,15 @@
 				</textElement>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="80" width="117" height="20"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="Serif"/>
-				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{totalAssetsOnTasksCount}]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement x="0" y="100" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<line>
-				<reportElement x="0" y="79" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<line>
-				<reportElement x="0" y="60" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<line>
-				<reportElement x="0" y="39" width="353" height="1" forecolor="#999999"/>
+			<line>
+				<reportElement x="0" y="100" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<line>
+				<reportElement x="0" y="79" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<line>
+				<reportElement x="0" y="60" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<line>
+				<reportElement x="0" y="39" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField isBlankWhenNull="true">
@@ -177,8 +156,4 @@
 				<textElement verticalAlignment="Middle" markup="none"/>
 			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="20" width="117" height="20"/>
-				<textElement verticalAlignment="Middle"/>
-			</textField>
 			<textField pattern="#,##0.00 %" isBlankWhenNull="true">
 				<reportElement x="157" y="20" width="79" height="20"/>
@@ -186,5 +161,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="20" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="20" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<pie3DChart>
@@ -217,10 +192,10 @@
 			</pie3DChart>
 			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="257" width="117" height="20"/>
+				<reportElement x="236" y="257" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{preventativeMaintenanceCount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="277" width="117" height="20"/>
+				<reportElement x="236" y="277" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -235,5 +210,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="297" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="297" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField isBlankWhenNull="true">
@@ -242,5 +217,5 @@
 					<font fontName="Serif"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Preventative Maintenance"]]></textFieldExpression>
+				<textFieldExpression class="java.lang.String"><![CDATA["Preventative Maintenance: "]]></textFieldExpression>
 			</textField>
 			<textField pattern="#,##0.00 %" isBlankWhenNull="true">
@@ -251,14 +226,14 @@
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="217" width="117" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Serif"/>
-				</textElement>
-			</textField>
-			<line>
-				<reportElement x="0" y="257" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="197" width="117" height="20"/>
+				<reportElement x="236" y="217" width="130" height="20"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="Serif"/>
+				</textElement>
+			</textField>
+			<line>
+				<reportElement x="0" y="257" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement x="236" y="197" width="130" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -274,5 +249,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="276" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="276" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<pie3DChart>
@@ -316,5 +291,5 @@
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="237" width="117" height="20"/>
+				<reportElement x="236" y="237" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -323,5 +298,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="217" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="217" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField pattern="#,##0.00 %" isBlankWhenNull="true">
@@ -332,5 +307,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="236" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="236" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField isBlankWhenNull="true">
@@ -375,5 +350,30 @@
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="0" width="117" height="20"/>
+				<reportElement x="236" y="40" width="130" height="20"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="Serif"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{immediateCalloutCount}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="236" y="60" width="130" height="20"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="Serif"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{totalPreventativeCount}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement x="236" y="80" width="130" height="20"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="Serif"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$F{totalAssetsOnTasksCount}]]></textFieldExpression>
+			</textField>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement x="236" y="20" width="130" height="20"/>
+				<textElement verticalAlignment="Middle"/>
+			</textField>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement x="236" y="0" width="130" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -419,11 +419,11 @@
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="20" width="117" height="20"/>
-				<textElement verticalAlignment="Middle">
-					<font fontName="Serif"/>
-				</textElement>
-			</textField>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="0" width="117" height="20"/>
+				<reportElement x="236" y="20" width="130" height="20"/>
+				<textElement verticalAlignment="Middle">
+					<font fontName="Serif"/>
+				</textElement>
+			</textField>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement x="236" y="0" width="130" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -432,8 +432,8 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="100" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<line>
-				<reportElement x="0" y="20" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="100" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<line>
+				<reportElement x="0" y="20" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField pattern="#,##0.00 %" isBlankWhenNull="true">
@@ -464,8 +464,8 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="60" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="60" width="117" height="20"/>
+				<reportElement x="0" y="60" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<textField isBlankWhenNull="true">
+				<reportElement x="236" y="60" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -474,5 +474,5 @@
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="80" width="117" height="20"/>
+				<reportElement x="236" y="80" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -488,5 +488,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="79" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="79" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField isBlankWhenNull="true">
@@ -505,5 +505,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="39" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="39" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField pattern="#,##0.00 %" isBlankWhenNull="true">
@@ -521,5 +521,5 @@
 			</textField>
 			<textField pattern="#,##0.00 %" isBlankWhenNull="true">
-				<reportElement x="236" y="40" width="117" height="20"/>
+				<reportElement x="236" y="40" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -574,5 +574,5 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="276" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="276" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField isBlankWhenNull="true">
@@ -589,5 +589,5 @@
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="197" width="117" height="20"/>
+				<reportElement x="236" y="197" width="130" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -614,8 +614,8 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="257" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<line>
-				<reportElement x="0" y="297" width="353" height="1" forecolor="#999999"/>
+				<reportElement x="0" y="257" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<line>
+				<reportElement x="0" y="297" width="366" height="1" forecolor="#999999"/>
 			</line>
 			<textField pattern="###0.00" isBlankWhenNull="true">
@@ -627,5 +627,5 @@
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="277" width="117" height="20"/>
+				<reportElement x="236" y="277" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -634,8 +634,8 @@
 			</textField>
 			<line>
-				<reportElement x="0" y="236" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="217" width="117" height="20"/>
+				<reportElement x="0" y="236" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement x="236" y="217" width="130" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -654,11 +654,11 @@
 					<font fontName="Serif"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Preventative Maintenance"]]></textFieldExpression>
-			</textField>
-			<line>
-				<reportElement x="0" y="217" width="353" height="1" forecolor="#999999"/>
-			</line>
-			<textField isBlankWhenNull="true">
-				<reportElement x="236" y="257" width="117" height="20"/>
+				<textFieldExpression class="java.lang.String"><![CDATA["Preventative Maintenance: "]]></textFieldExpression>
+			</textField>
+			<line>
+				<reportElement x="0" y="217" width="366" height="1" forecolor="#999999"/>
+			</line>
+			<textField isBlankWhenNull="true">
+				<reportElement x="236" y="257" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>
@@ -667,5 +667,5 @@
 			</textField>
 			<textField pattern="###0.00" isBlankWhenNull="true">
-				<reportElement x="236" y="237" width="117" height="20"/>
+				<reportElement x="236" y="237" width="130" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif"/>