Changeset 681 for trunk/web-app

Timestamp:

Oct 5, 2010, 2:24:33 AM (14 years ago)

Author:

gav

Message:

Improvements to assetRegister report, adding site and section to page header.

File:

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

trunk/web-app/reports/assetRegister.jrxml

@@ -5 +5 @@
         <property name="ireport.zoom" value="1.5"/>
         <property name="ireport.x" value="15"/>
-        <property name="ireport.y" value="0"/>
+        <property name="ireport.y" value="729"/>
         <import value="net.sf.jasperreports.engine.*"/>
         <import value="java.util.*"/>
@@ -57 +57 @@
         <parameter name="currentUser" class="java.lang.String"/>
         <parameter name="logoUrl" class="java.lang.String"/>
-        <parameter name="section" class="java.lang.String"/>
         <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
                 <defaultValueExpression><![CDATA["C:\\Documents and Settings\\kromhoutg\\My Documents\\reports\\"]]></defaultValueExpression>
@@ -66 +65 @@
         <field name="dataList" class="java.util.List"/>
         <field name="attribTypes" class="java.util.List"/>
+        <field name="site" class="java.lang.Object"/>
+        <field name="section" class="java.lang.Object"/>
         <background>
                 <band splitType="Stretch"/>
@@ -83 +84 @@
                         </image>
                         <textField>
-                                <reportElement x="398" y="34" width="340" height="12"/>
+                                <reportElement x="398" y="34" width="340" height="15" isPrintWhenDetailOverflows="true"/>
                                 <textElement textAlignment="Center">
-                                        <font fontName="Serif" size="8"/>
-                                </textElement>
-                                <textFieldExpression class="java.lang.String"><![CDATA["Section: "+$P{section}]]></textFieldExpression>
+                                        <font fontName="Serif" size="10"/>
+                                </textElement>
+                                <textFieldExpression class="java.lang.String"><![CDATA["Site: "+$F{site}.name+", "+"Section: "+$F{section}.name]]></textFieldExpression>
                         </textField>
                 </band>