Changeset 706 for trunk/web-app

Timestamp:

Nov 10, 2010, 5:30:28 AM (14 years ago)

Author:

gav

Message:

Implement ticket #88 - "Implement Regulatory Task Completion on Equipmet Register Report OH&S"

File:

• trunk/web-app/reports/equipmentRegisterOhs.jrxml (modified) (8 diffs)

trunk/web-app/reports/equipmentRegisterOhs.jrxml

@@ -4 +4 @@
         <property name="ireport.encoding" value="UTF-8"/>
         <property name="ireport.zoom" value="1.5"/>
-        <property name="ireport.x" value="0"/>
-        <property name="ireport.y" value="624"/>
+        <property name="ireport.x" value="337"/>
+        <property name="ireport.y" value="0"/>
         <import value="net.sf.jasperreports.engine.*"/>
         <import value="java.util.*"/>
@@ -49 +49 @@
                 <field name="Safe Work Procedure" class="java.lang.String"/>
                 <field name="Regulatory Requirement" class="java.lang.String"/>
-                <field name="Maintenance % Completion" class="java.lang.String"/>
+                <field name="Regulatory Task Completion" class="java.lang.String"/>
                 <field name="Registration Required" class="java.lang.String"/>
                 <field name="Registration Expiry Date" class="java.lang.String"/>
@@ -64 +64 @@
                 <defaultValueExpression><![CDATA["C:\\Documents and Settings\\kromhoutg\\My Documents\\reports\\"]]></defaultValueExpression>
         </parameter>
+        <parameter name="startDateString" class="java.lang.String"/>
+        <parameter name="endDateString" class="java.lang.String"/>
         <queryString language="SQL">
                 <![CDATA[]]>
@@ -78 +80 @@
                 <band height="57" splitType="Stretch">
                         <textField>
-                                <reportElement key="staticText-1" x="398" y="14" width="340" height="20"/>
+                                <reportElement key="staticText-1" x="398" y="5" width="340" height="20"/>
                                 <textElement textAlignment="Center" verticalAlignment="Top" markup="none">
                                         <font fontName="Serif" size="14"/>
@@ -89 +91 @@
                         </image>
                         <textField>
-                                <reportElement x="398" y="34" width="340" height="15" isPrintWhenDetailOverflows="true"/>
+                                <reportElement x="398" y="25" width="340" height="15" isPrintWhenDetailOverflows="true"/>
                                 <textElement textAlignment="Center">
                                         <font fontName="Serif" size="10"/>
                                 </textElement>
                                 <textFieldExpression class="java.lang.String"><![CDATA["Site: "+$F{site}.name+", "+"Section: "+$F{section}.name]]></textFieldExpression>
+                        </textField>
+                        <textField pattern="dd-MMM-yyyy" isBlankWhenNull="true">
+                                <reportElement x="398" y="40" width="340" height="12"/>
+                                <textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
+                                        <font fontName="Serif" size="8"/>
+                                </textElement>
+                                <textFieldExpression class="java.lang.String"><![CDATA[$P{startDateString}+" to "+$P{endDateString}]]></textFieldExpression>
                         </textField>
                 </band>
@@ -324 +333 @@
                                                                         <font fontName="Serif" size="8" isBold="false"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Regulatory Requirement (Y/N)]]></text>
+                                                                <text><![CDATA[Regulatory Requirement]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -344 +353 @@
                                                                         <font fontName="Serif" size="8" isBold="false"/>
                                                                 </textElement>
-                                                                <text><![CDATA[Maintenance % Completion]]></text>
+                                                                <text><![CDATA[Regulatory Task Complete]]></text>
                                                         </staticText>
                                                 </jr:columnHeader>
@@ -353 +362 @@
                                                                         <font fontName="Serif" size="8"/>
                                                                 </textElement>
-                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Maintenance % Completion}]]></textFieldExpression>
+                                                                <textFieldExpression class="java.lang.String"><![CDATA[$F{Regulatory Task Completion}]]></textFieldExpression>
                                                         </textField>
                                                 </jr:detailCell>