Changeset 537 for trunk/web-app

Timestamp:

May 18, 2010, 12:37:05 PM (15 years ago)

Author:

gav

Message:

Improvements to Reactive Ratio Report, standardise colours and small correction to 4th pie chart.

File:

• trunk/web-app/reports/reactiveRatio.jrxml (modified) (4 diffs)

trunk/web-app/reports/reactiveRatio.jrxml

@@ -4 +4 @@
         <property name="ireport.encoding" value="UTF-8"/>
         <property name="ireport.zoom" value="1.0"/>
-        <property name="ireport.x" value="0"/>
-        <property name="ireport.y" value="432"/>
+        <property name="ireport.x" value="153"/>
+        <property name="ireport.y" value="597"/>
         <import value="java.util.*"/>
         <import value="net.sf.jasperreports.engine.*"/>
@@ -195 +195 @@
                                                 <seriesColor seriesOrder="0" color="#FF0000"/>
                                                 <seriesColor seriesOrder="1" color="#00CC00"/>
-                                                <seriesColor seriesOrder="2" color="#FFFF66"/>
+                                                <seriesColor seriesOrder="2" color="#FF9900"/>
                                         </plot>
                                         <itemLabel color="#000000" backgroundColor="#FFFFFF"/>
@@ -274 +274 @@
                                                 <seriesColor seriesOrder="0" color="#FF0000"/>
                                                 <seriesColor seriesOrder="1" color="#00CC00"/>
-                                                <seriesColor seriesOrder="2" color="#F7C240"/>
+                                                <seriesColor seriesOrder="2" color="#FF9900"/>
                                         </plot>
                                         <itemLabel color="#000000" backgroundColor="#FFFFFF"/>
@@ -457 +457 @@
                                         <pieSeries>
                                                 <keyExpression><![CDATA["Immediate"]]></keyExpression>
-                                                <valueExpression><![CDATA[$F{immediateCalloutWorkDone}.minutes]]></valueExpression>
+                                                <valueExpression><![CDATA[$F{immediateCalloutWorkDone}.total]]></valueExpression>
                                                 <labelExpression><![CDATA[$F{immediateCalloutWorkDone}.hours+":"+$F{immediateCalloutWorkDone}.minutes]]></labelExpression>
                                         </pieSeries>
                                         <pieSeries>
                                                 <keyExpression><![CDATA["Preventative Maintenance"]]></keyExpression>
-                                                <valueExpression><![CDATA[$F{preventativeMaintenanceWorkDone}.minutes]]></valueExpression>
+                                                <valueExpression><![CDATA[$F{preventativeMaintenanceWorkDone}.total]]></valueExpression>
                                                 <labelExpression><![CDATA[$F{preventativeMaintenanceWorkDone}.hours+":"+$F{preventativeMaintenanceWorkDone}.minutes]]></labelExpression>
                                         </pieSeries>
                                         <pieSeries>
                                                 <keyExpression><![CDATA["Unscheduled Breakin"]]></keyExpression>
-                                                <valueExpression><![CDATA[$F{unscheduledBreakinWorkDone}.minutes]]></valueExpression>
+                                                <valueExpression><![CDATA[$F{unscheduledBreakinWorkDone}.total]]></valueExpression>
                                                 <labelExpression><![CDATA[$F{unscheduledBreakinWorkDone}.hours+":"+$F{unscheduledBreakinWorkDone}.minutes]]></labelExpression>
                                         </pieSeries>