Changeset 681 for trunk

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.

Location:

trunk

Files:

• grails-app/controllers/ReportController.groovy (modified) (1 diff)
• grails-app/services/AssetReportService.groovy (modified) (2 diffs)
• grails-app/views/appCore/start.gsp (modified) (1 diff)
• web-app/reports/assetRegister.jrxml (modified) (4 diffs)

trunk/grails-app/controllers/ReportController.groovy

@@ -161 +161 @@
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
-        if(params.section.id == 'all')
-            params.section = "All"
-        else
-            params.section = Section.get(params.section.id.toLong())
 
         def dataModel = assetReportService.getAssetRegister(params, RCU.getLocale(request))

trunk/grails-app/services/AssetReportService.groovy

@@ -24 +24 @@
         def result = [:]
 
+        result.section = Section.get(params.section.id.toLong())
+        result.site = result.section.site
+
         // Inner join used to return only attribTypes that are used by AssetExtendedAttributes.
         // So the result is only asset extendedAttributeTypes.
@@ -44 +47 @@
                     'left join asset.assetExtendedAttributes as attrib',
                     'left join attrib.extendedAttributeType as attribT'
-            if(params.section instanceof Section) {
-                namedParams.section = params.section
-                where 'asset.section = :section'
-            }
+            where 'asset.section = :section'
+                    namedParams.section = result.section
             order 'by asset.name asc, attribT.name asc'
         }

trunk/grails-app/views/appCore/start.gsp

@@ -156 +156 @@
                                                 <g:select optionKey="id"
                                                                     from="${Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
-                                                                    name="section.id"
-                                                                    noSelection="['all':/${g.message(code:'default.all.select.text')}/]">
+                                                                    name="section.id">
                                                 </g:select>
                                             </g:jasperReport>

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>