Index: /trunk/grails-app/controllers/ReportController.groovy
===================================================================
--- /trunk/grails-app/controllers/ReportController.groovy (revision 545)
+++ /trunk/grails-app/controllers/ReportController.groovy (revision 546)
@@ -8,4 +8,5 @@
def dateUtilService
def taskReportService
+ def inventoryReportService
def index = { redirect(action:templatePortrait,params:params) }
@@ -111,3 +112,29 @@
} // 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.
Index: /trunk/grails-app/i18n/messages.properties
===================================================================
--- /trunk/grails-app/i18n/messages.properties (revision 545)
+++ /trunk/grails-app/i18n/messages.properties (revision 546)
@@ -313,2 +313,9 @@
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
Index: /trunk/grails-app/services/InventoryReportService.groovy
===================================================================
--- /trunk/grails-app/services/InventoryReportService.groovy (revision 546)
+++ /trunk/grails-app/services/InventoryReportService.groovy (revision 546)
@@ -0,0 +1,103 @@
+
+/**
+* Service class that encapsulates the business logic for Inventory Reports.
+*/
+class InventoryReportService {
+
+ boolean transactional = false
+
+// def authService
+// def dateUtilService
+// def messageSource
+
+ def g = new org.codehaus.groovy.grails.plugins.web.taglib.ApplicationTagLib()
+
+// def paramsMax = 100000
+
+ /**
+ * Get the data for the inventory stock take overiew report.
+ * @param params The request params, may contain params to specify the search.
+ * @param locale The locale to use when generating result.message.
+ */
+ def getStockTakeOverview(params, locale) {
+ def result = [:]
+
+ result.summaryOfCalculationMethod = 'This report should be used in conjunction with the `Stock Take (By Location)` Report.'
+
+ def namedParams = [:]
+
+ result.query = "from InventoryLocation as inventoryLocation \
+ left join inventoryLocation.inventoryStore as inventoryStore \
+ where (inventoryLocation.isActive = true \
+ ) \
+ order by inventoryStore.name, inventoryLocation.name"
+
+ result.query = "select new Map(inventoryLocation.name as location, inventoryStore.name as store) " + result.query
+ result.queryResult = InventoryLocation.executeQuery(result.query, namedParams)
+ result.inventoryLocationCount = result.queryResult.size()
+
+ result.inventoryLocationList = result.queryResult
+
+ // Success.
+ return result
+
+ } // getStockTakeOverview()
+
+ /**
+ * Get the data for the inventory stock take by location report.
+ * @param params The request params, may contain params to specify the search.
+ * @param locale The locale to use when generating result.message.
+ */
+ def getStockTakeByLocation(params, locale) {
+ def result = [:]
+
+ result.summaryOfCalculationMethod = 'This report should be used in conjunction with the `Stock Take (Overview)` Report.'
+
+ // Sanitise the locations string and convert to a list.
+ result.locations = params.locationString.trim()
+ if(result.locations.startsWith('e.g:'))
+ result.locations = result.locations.split(':')[-1].trim()
+ result.locations = result.locations.split(',')
+ result.locations = result.locations.collect {it.trim()}
+
+ def namedParams = [:]
+ namedParams.locationList = [null] // null protects against HQL unexpected end of subtree exception with an empty list.
+
+ // Fill namedParams.locationList
+ result.locations.each() {
+ InventoryLocation.findAllByNameIlike(it).each() {
+ namedParams.locationList << it
+ }
+ }
+
+ // Note: HQL docs advise not using fetch aliases in where clause (or any other clause).
+ // Access is via the parent object, however that does not work for the order by clause in this case.
+ result.query = "from InventoryItem as inventoryItem \
+ left join fetch inventoryItem.unitOfMeasure as unitOfMeasure \
+ left join fetch inventoryItem.inventoryLocation as inventoryLocation \
+ left join fetch inventoryLocation.inventoryStore as inventoryStore \
+ left join fetch inventoryItem.picture as picture \
+ left join fetch picture.images as Image \
+ where (inventoryItem.isActive = true \
+ and inventoryItem.inventoryLocation in (:locationList) \
+ ) \
+ order by inventoryStore.name, inventoryLocation.name"
+
+ result.query = "select distinct inventoryItem " + result.query
+ result.queryResult = InventoryLocation.executeQuery(result.query, namedParams)
+ result.inventoryItemCount = result.queryResult.size()
+
+ // Return the actual locations as a string.
+ if(namedParams.locationList.size() > 1)
+ result.locations = namedParams.locationList[1..-1].toString()[1..-2]
+ else
+ result.locations = g.message(code: 'default.none.text')
+
+ result.inventoryItemList = result.queryResult
+
+ // Success.
+ return result
+
+ } // getStockTakeOverview()
+
+} // end class
Index: /trunk/grails-app/views/appCore/start.gsp
===================================================================
--- /trunk/grails-app/views/appCore/start.gsp (revision 545)
+++ /trunk/grails-app/views/appCore/start.gsp (revision 546)
@@ -123,11 +123,29 @@
+
+
+
+
+
+
+
+
+
-
- Download
-
+ format="PDF, XLS">
+
+ Download
+
+
-
- Download
-
+ format="PDF, XLS">
+
+ Download
+
+
Index: /trunk/web-app/reports/stockTakeByLocation.jrxml
===================================================================
--- /trunk/web-app/reports/stockTakeByLocation.jrxml (revision 546)
+++ /trunk/web-app/reports/stockTakeByLocation.jrxml (revision 546)
@@ -0,0 +1,344 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/web-app/reports/stockTakeOverview.jrxml
===================================================================
--- /trunk/web-app/reports/stockTakeOverview.jrxml (revision 546)
+++ /trunk/web-app/reports/stockTakeOverview.jrxml (revision 546)
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+