Changeset 671 for trunk

Timestamp:

Oct 3, 2010, 10:51:52 PM (14 years ago)

Author:

gav

Message:

Rename Inventory Value report to Inventory Detailed Value.

Location:

trunk

Files:

• grails-app/controllers/ReportController.groovy (modified) (1 diff)
• grails-app/services/InventoryReportService.groovy (modified) (2 diffs)
• grails-app/views/appCore/start.gsp (modified) (1 diff)
• grails-app/views/report/inventoryValueDetailed.gsp (moved) (moved from trunk/grails-app/views/report/inventoryValue.gsp) (4 diffs)
• web-app/reports/inventoryValueDetailed.jrxml (moved) (moved from trunk/web-app/reports/inventoryValue.jrxml)

trunk/grails-app/controllers/ReportController.groovy

@@ -196 +196 @@
     } // equipmentRegister
 
-    def inventoryValueGsp = {
-        render(view: 'inventoryValue')
+    def inventoryValueDetailedGsp = {
+        render(view: 'inventoryValueDetailed')
     }
 
-    def inventoryValue = {
-
-        params.reportTitle = "Inventory Value"
-        params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
-        params.currentUser = authService.currentUser
-
-        def dataModel = inventoryReportService.getInventoryValue(params, RCU.getLocale(request))
+    def inventoryValueDetailed = {
+
+        params.reportTitle = "Inventory Value Detailed"
+        params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
+        params.currentUser = authService.currentUser
+
+        def dataModel = inventoryReportService.getInventoryValueDetailed(params, RCU.getLocale(request))
 
         // Jasper plugin controller expects data to be a Collection.

trunk/grails-app/services/InventoryReportService.groovy

@@ -167 +167 @@
 
     /**
-    * Get the data for the inventory value.
+    * Get the data for the inventory value with detail.
     * @param params The request params, may contain params to specify the search.
     * @param locale The locale to use when generating result.message.
     */
-    def getInventoryValue(params, locale) {
+    def getInventoryValueDetailed(params, locale) {
         def result = [:]
 
@@ -241 +241 @@
         return result
 
-    } // getInventoryValueByGroupAndType()
+    } // getInventoryValueDetailed()
 
 } // end class

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

@@ -201 +201 @@
                                         </td>
                                         <td valign="top" class="value">
-                                                <g:link controller="report" action="inventoryValueGsp">
-                                                    Inventory Value
+                                                <g:link controller="report" action="inventoryValueDetailedGsp">
+                                                    Detailed Value
                                                 </g:link>
                                         </td>

trunk/grails-app/views/report/inventoryValueDetailed.gsp

@@ -3 +3 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Inventory Value Report</title>
+        <title>Inventory Detailed Value Report</title>
         <nav:resources override="true"/>
     </head>
@@ -11 +11 @@
         </div>
         <div class="body">
-            <h1>Inventory Value Report</h1>
+            <h1>Inventory Detailed Value Report</h1>
             <g:render template="/shared/messages" />
             <div class="dialog">
@@ -18 +18 @@
 
                         <g:jasperForm controller="report"
-                                                    action="inventoryValue"
-                                                    jasper="inventoryValue"
-                                                    name="Inventory Value">
+                                                    action="inventoryValueDetailed"
+                                                    jasper="inventoryValueDetailed"
+                                                    name="Inventory Value Detailed">
 
                             <tr class="prop">
@@ -67 +67 @@
                                 </td>
                                 <td valign="top" class="value">
-                                    <custom:jasperButtons formName="inventoryValue" format="PDF, XLS" text="PDF" />
+                                    <custom:jasperButtons formName="inventoryValueDetailed" format="PDF, XLS" text="PDF" />
                                 </td>
                             </tr>