Changeset 687

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.

Location:

trunk

Files:

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

trunk/grails-app/controllers/AppCoreController.groovy

@@ -63 +63 @@
         def plugins = pluginProperties.collect{ it.key + '-' + it.value }.join(", ")
 
+        def sections = Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+
         return [grailsVersion: grailsVersion,
                     applicationString: applicationString,
-                    plugins: plugins]
+                    plugins: plugins,
+                    sections: sections]
     }
 

trunk/grails-app/controllers/ReportController.groovy

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

trunk/grails-app/services/AssetReportService.groovy

@@ -111 +111 @@
                     'left join asset.assetExtendedAttributes as attrib',
                     'left join attrib.extendedAttributeType as attribT'
-            if(params.asset instanceof Asset) {
-                namedParams.asset = params.asset
-                where 'asset = :asset'
+            if(params.section instanceof Section) {
+                namedParams.section = params.section
+                where 'asset.section = :section'
             }
             order 'by asset.name asc, attribT.name asc'

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

@@ -143 +143 @@
                                                                             format="PDF, XLS">
                                                 <g:select optionKey="id"
-                                                                    from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
-                                                                    name="asset.id"
+                                                                    from="${sections}"
+                                                                    name="section.id"
                                                                     noSelection="['all':/${g.message(code:'default.all.select.text')}/]">
                                                 </g:select>
@@ -155 +155 @@
                                                                             format="PDF, XLS">
                                                 <g:select optionKey="id"
-                                                                    from="${Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                                    from="${sections}"
                                                                     name="section.id">
                                                 </g:select>
@@ -166 +166 @@
                                                                             format="PDF, XLS">
                                                 <g:select optionKey="id"
-                                                                    from="${Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                                    from="${sections}"
                                                                     name="section.id">
                                                 </g:select>

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>