Changeset 678 for trunk/web-app/reports/equipmentRegister.jrxml

Timestamp:

Oct 4, 2010, 8:32:56 PM (14 years ago)

Author:

gav

Message:

Update asset and equipment register reports with new headers.

File:

• trunk/web-app/reports/equipmentRegister.jrxml (modified) (11 diffs)

trunk/web-app/reports/equipmentRegister.jrxml

@@ -5 +5 @@
         <property name="ireport.zoom" value="1.5"/>
         <property name="ireport.x" value="31"/>
-        <property name="ireport.y" value="672"/>
+        <property name="ireport.y" value="0"/>
         <import value="net.sf.jasperreports.engine.*"/>
         <import value="java.util.*"/>
@@ -43 +43 @@
                 <field name="Model Number" class="java.lang.String"/>
                 <field name="Manufacturer" class="java.lang.String"/>
-                <field name="Hazards Identified" class="java.lang.String"/>
-                <field name="Risk Assesment" class="java.lang.String"/>
+                <field name="ecr" class="java.lang.String"/>
+                <field name="Risk Level" class="java.lang.String"/>
                 <field name="Safe Work Procedure" class="java.lang.String"/>
-                <field name="Maintenance Frequency" class="java.lang.String"/>
-                <field name="Maintenance Date" class="java.lang.String"/>
+                <field name="Regulatory Requirement" class="java.lang.String"/>
+                <field name="Maintenance % Completion" class="java.lang.String"/>
                 <field name="Registration Required" class="java.lang.String"/>
                 <field name="Registration Expiry Date" class="java.lang.String"/>
@@ -241 +241 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Hazards Identified]]></text>
+                                                                <text><![CDATA[Equipment Criticality (ecr)]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -250 +250 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Hazards Identified}]]></textFieldExpression>
+                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{ecr}]]></textFieldExpression>
                                                         </textField>
                                                 </jr:detailCell>
@@ -261 +261 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Risk Assesment (Y/N)]]></text>
+                                                                <text><![CDATA[Risk Level]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -270 +270 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Assesment}]]></textFieldExpression>
+                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Risk Level}]]></textFieldExpression>
                                                         </textField>
                                                 </jr:detailCell>
@@ -281 +281 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Safe Work Procedure (Y/N)]]></text>
+                                                                <text><![CDATA[Safe Work Procedure]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -301 +301 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Maintenance Frequency]]></text>
+                                                                <text><![CDATA[Regulatory Requirement (Y/N)]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -310 +310 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Frequency}]]></textFieldExpression>
+                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Regulatory Requirement}]]></textFieldExpression>
                                                         </textField>
                                                 </jr:detailCell>
@@ -321 +321 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Maintenance Date]]></text>
+                                                                <text><![CDATA[Maintenance % Completion]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -330 +330 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance Date}]]></textFieldExpression>
+                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance % Completion}]]></textFieldExpression>
                                                         </textField>
                                                 </jr:detailCell>