Changeset 687 for trunk/grails-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.

Location:

trunk/grails-app

Files:

• controllers/AppCoreController.groovy (modified) (1 diff)
• controllers/ReportController.groovy (modified) (1 diff)
• services/AssetReportService.groovy (modified) (1 diff)
• views/appCore/start.gsp (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>