Changeset 546

Timestamp:

May 26, 2010, 12:29:05 AM (14 years ago)

Author:

gav

Message:

Add new Inventory Stock Take reports.

Location:

trunk

Files:

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

trunk/grails-app/controllers/ReportController.groovy

@@ -8 +8 @@
     def dateUtilService
     def taskReportService
+    def inventoryReportService
 
     def index = { redirect(action:templatePortrait,params:params) }
@@ -111 +112 @@
     } // immediateCallouts
 
+    def stockTakeOverview = {
+
+        params.reportTitle = "Stock Take Overview"
+        params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
+        params.currentUser = authService.currentUser
+
+        def dataModel = inventoryReportService.getStockTakeOverview(params, RCU.getLocale(request))
+
+        // Jasper plugin controller expects data to be a Collection.
+        chain(controller:'jasper', action:'index', model:[data: [dataModel]], params:params)
+
+    } // stockTakeOverview
+
+    def stockTakeByLocation = {
+
+        params.reportTitle = "Stock Take By Location"
+        params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
+        params.currentUser = authService.currentUser
+
+        def dataModel = inventoryReportService.getStockTakeByLocation(params, RCU.getLocale(request))
+
+        // Jasper plugin controller expects data to be a Collection.
+        chain(controller:'jasper', action:'index', model:[data: [dataModel]], params:params)
+
+    } // stockTakeByLocation
+
 } // end of class.

trunk/grails-app/i18n/messages.properties

@@ -313 +313 @@
 inventoryItem.search.text.recently.used.description=Items used in the last {0} days.
 inventoryItem.search.text.recently.used.none.found=No items used in the last {0} days.
+
+# Reports
+report.stock.take.overview=Stock Take (Overview)
+report.stock.take.overview.help=Use this report to manage inventory stock take. Use in conjunction with the Stock Take (By Location) report.
+report.stock.take.by.location=Stock Take (Location)
+report.stock.take.by.location.help=Enter a comma separated list of inventory locations. \
+    Use the Stock Take (Overview) report to get the list of locations. A % symbol may be used as a wild card, e.g: X1, X2, Y%, Z%7

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

@@ -123 +123 @@
                                             <br />
                                             <g:jasperReport controller="report"
+                                                                            action="stockTakeOverview"
+                                                                            jasper="stockTakeOverview"
+                                                                            name="Stock Take (Overview)"
+                                                                            format="PDF, XLS">
+                                                <g:helpBalloon class="helpballoon" code="report.stock.take.overview" />
+                                            </g:jasperReport>
+                                            <br />
+                                            <g:jasperReport controller="report"
+                                                                            action="stockTakeByLocation"
+                                                                            jasper="stockTakeByLocation"
+                                                                            name="Stock Take (By Location)"
+                                                                            format="PDF, XLS">
+                                                <g:textField name="locationString" value="e.g: A1%, C55" />
+                                                <g:helpBalloon class="helpballoon" code="report.stock.take.by.location" />
+                                            </g:jasperReport>
+                                            <br />
+                                            <g:jasperReport controller="report"
                                                                             action="templatePortrait"
                                                                             jasper="templatePortrait"
                                                                             name="Template (Portrait)"
-                                                                            format="PDF, XLS"/>
-                                            <g:link controller="report" action="downloadTemplate" params="[fileName: 'templatePortrait.jrxml']">
-                                                Download
-                                            </g:link>
+                                                                            format="PDF, XLS">
+                                                <g:link controller="report" action="downloadTemplate" params="[fileName: 'templatePortrait.jrxml']">
+                                                    Download
+                                                </g:link>
+                                            </g:jasperReport>
                                             <br />
                                             <g:jasperReport controller="report"
@@ -135 +153 @@
                                                                             jasper="templateLandscape"
                                                                             name="Template (Landscape)"
-                                                                            format="PDF, XLS"/>
-                                            <g:link controller="report" action="downloadTemplate" params="[fileName: 'templateLandscape.jrxml']">
-                                                Download
-                                            </g:link>
+                                                                            format="PDF, XLS">
+                                                <g:link controller="report" action="downloadTemplate" params="[fileName: 'templateLandscape.jrxml']">
+                                                    Download
+                                                </g:link>
+                                            </g:jasperReport>
                                             <br />
                                         </td>