Changeset 678 for trunk/web-app/reports/assetRegister.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/assetRegister.jrxml (modified) (9 diffs)

trunk/web-app/reports/assetRegister.jrxml

@@ -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"/>
@@ -223 +223 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Hazards Identified]]></text>
-                                                        </staticText>
-                                                </jr:columnHeader>
-                                                <jr:detailCell style="table_TD" height="36" rowSpan="1">
-                                                        <textField isStretchWithOverflow="true">
-                                                                <reportElement stretchType="RelativeToTallestObject" x="2" y="0" width="59" height="35" isPrintWhenDetailOverflows="true"/>
-                                                                <textElement textAlignment="Center" verticalAlignment="Middle">
-                                                                        <font fontName="Serif" size="8"/>
-                                                                </textElement>
-                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Hazards Identified}]]></textFieldExpression>
+                                                                <text><![CDATA[Equipment Criticality (ecr)]]></text>
+                                                        </staticText>
+                                                </jr:columnHeader>
+                                                <jr:detailCell style="table_TD" height="36" rowSpan="1">
+                                                        <textField>
+                                                                <reportElement x="0" y="0" width="63" height="36"/>
+                                                                <textElement textAlignment="Center" verticalAlignment="Middle">
+                                                                        <font fontName="Serif" size="8"/>
+                                                                </textElement>
+                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{ecr}]]></textFieldExpression>
                                                         </textField>
                                                 </jr:detailCell>
@@ -243 +243 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Risk Assesment (Y/N)]]></text>
+                                                                <text><![CDATA[Risk Level]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -252 +252 @@
                                                                         <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>
@@ -263 +263 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Safe Work Procedure (Y/N)]]></text>
+                                                                <text><![CDATA[Safe Work Procedure]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -283 +283 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Maintenance Frequency]]></text>
+                                                                <text><![CDATA[Regulatory Requirement (Y/N)]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -292 +292 @@
                                                                         <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>
@@ -303 +303 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Maintenance Date]]></text>
+                                                                <text><![CDATA[Maintenance % Completion]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -312 +312 @@
                                                                         <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>