Changeset 652 for trunk

Timestamp:

Sep 18, 2010, 9:57:20 PM (14 years ago)

Author:

gav

Message:

Two new asset reports: Asset Detail and Asset Register.

Location:

trunk

Files:

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

trunk/grails-app/controllers/ReportController.groovy

@@ -8 +8 @@
     def dateUtilService
     def taskReportService
+    def assetReportService
     def inventoryReportService
 
@@ -138 +139 @@
     } // stockTakeByLocation
 
+    def assetDetail = {
+
+        params.reportTitle = "Asset Detail"
+        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())
+
+        def dataModel = assetReportService.getAssetDetail(params, RCU.getLocale(request))
+
+        // Jasper plugin controller expects data to be a Collection.
+        chain(controller:'jasper', action:'index', model:[data: dataModel], params:params)
+
+    } // assetDetail
+
+    def assetRegister = {
+
+        params.reportTitle = "Asset Register"
+        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))
+
+        // Jasper plugin controller expects data to be a Collection.
+        chain(controller:'jasper', action:'index', model:[data: [dataModel]], params:params)
+
+    } // assetRegister
+
 } // end of class.

trunk/grails-app/i18n/messages.properties

@@ -292 +292 @@
 default.please.select.text=--Please-Select--
 default.none.select.text=--None--
+default.all.select.text=--All--
 
 #

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

@@ -138 +138 @@
                                             <br />
                                             <g:jasperReport controller="report"
+                                                                            action="assetDetail"
+                                                                            jasper="assetDetail"
+                                                                            name="Asset Detail"
+                                                                            format="PDF, XLS">
+                                                <g:select optionKey="id"
+                                                                    from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                                    name="asset.id"
+                                                                    noSelection="['all':/${g.message(code:'default.all.select.text')}/]">
+                                                </g:select>
+                                            </g:jasperReport>
+                                            <g:jasperReport controller="report"
+                                                                            action="assetRegister"
+                                                                            jasper="assetRegister"
+                                                                            name="Asset Register"
+                                                                            format="PDF, XLS">
+                                                <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')}/]">
+                                                </g:select>
+                                            </g:jasperReport>
+                                            <br />
+                                            <g:jasperReport controller="report"
                                                                             action="templatePortrait"
                                                                             jasper="templatePortrait"