Changeset 687 for trunk/web-app

Timestamp:

Oct 6, 2010, 1:55:47 AM (14 years ago)

Author:

gav

Message:

Change assetDetail report to allow reporting by section and display site in report.

File:

• trunk/web-app/reports/assetDetail.jrxml (modified) (3 diffs)

trunk/web-app/reports/assetDetail.jrxml

@@ -39 +39 @@
         <parameter name="currentUser" class="java.lang.String"/>
         <parameter name="logoUrl" class="java.lang.String"/>
-        <parameter name="asset" 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>
         </parameter>
+        <parameter name="site" class="java.lang.String"/>
         <queryString language="SQL">
                 <![CDATA[]]>
@@ -86 +87 @@
         </background>
         <pageHeader>
-                <band height="93" splitType="Stretch">
-                        <textField isStretchWithOverflow="true">
-                                <reportElement key="staticText-1" stretchType="RelativeToTallestObject" x="0" y="57" width="340" height="20" isPrintWhenDetailOverflows="true"/>
+                <band height="60" splitType="Stretch">
+                        <textField isStretchWithOverflow="true">
+                                <reportElement key="staticText-1" stretchType="RelativeToTallestObject" x="352" y="9" width="225" height="20" isPrintWhenDetailOverflows="true"/>
                                 <textElement textAlignment="Center" verticalAlignment="Top" markup="none">
                                         <font fontName="Serif" size="14"/>
@@ -99 +100 @@
                         </image>
                         <textField isStretchWithOverflow="true">
-                                <reportElement stretchType="RelativeToTallestObject" x="0" y="77" width="340" height="12" isPrintWhenDetailOverflows="true">
-                                        <printWhenExpression><![CDATA[$P{asset}.equals( "All" )]]></printWhenExpression>
-                                </reportElement>
+                                <reportElement stretchType="RelativeToTallestObject" x="352" y="29" width="225" height="15" isPrintWhenDetailOverflows="true"/>
                                 <textElement textAlignment="Center" verticalAlignment="Middle">
-                                        <font fontName="Serif" size="8"/>
-                                </textElement>
-                                <textFieldExpression class="java.lang.String"><![CDATA["For All Assets"]]></textFieldExpression>
+                                        <font fontName="Serif" size="10"/>
+                                </textElement>
+                                <textFieldExpression class="java.lang.String"><![CDATA["Site: "+$P{site}+", "+"Section: "+$P{section}]]></textFieldExpression>
                         </textField>
                 </band>