Changeset 226 for trunk/grails-app/controllers

Timestamp:

Dec 9, 2009, 4:36:55 AM (14 years ago)

Author:

gav

Message:

Complete functionality for inventory movement types other than "Used".

Location:

trunk/grails-app/controllers

Files:

• InventoryItemDetailedController.groovy (modified) (1 diff)
• InventoryMovementDetailedController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -166 +166 @@
     def useInventoryItem = {
 
-        params.inventoryMovementType = InventoryMovementType.get(1) // used.
+        params.inventoryMovementType = InventoryMovementType.get(1) // Set type to "Used".
         def result = inventoryMovementService.move(params)
 

trunk/grails-app/controllers/InventoryMovementDetailedController.groovy

@@ -27 +27 @@
     /**
     * List the inventory movements for an InventoryItem.
-    * @param params.id The id of an existing inventory item.
+    * @param params.inventoryItem.id The id of an existing inventory item.
     */
     def listInventoryMovements = {
-        def inventoryItemInstance = InventoryItem.get(params.id)
+        def inventoryItemInstance = InventoryItem.get(params.inventoryItem.id)
 
         if(!inventoryItemInstance) {
@@ -65 +65 @@
 
     def create = {
-        if(!params.task?.id) {
-            flash.message = "Please select a task, then the Inventory tab."
-            redirect(controller:"taskDetailed", action:"search")
-        }
         def inventoryMovementInstance = new InventoryMovement()
         inventoryMovementInstance.properties = params
-        return ['inventoryMovementInstance':inventoryMovementInstance]
+        def inventoryMovementTypeList = InventoryMovementType.withCriteria { gt("id", 1L) } // Don't include "Used".
+
+        return ['inventoryMovementInstance': inventoryMovementInstance,
+                        inventoryMovementTypeList: inventoryMovementTypeList]
     }
 
+    /**
+    * Handles all inventory movements except those of type "Used".
+     * The "Used" type is handled directly by InventoryItemDetailedController and useInventoryItem.
+    */
     def save = {
         def result = inventoryMovementService.move(params)
@@ -79 +82 @@
         if(!result.error) {
             flash.message = "Inventory Movement for ${result.inventoryMovementInstance.inventoryItem.name} created."
-            redirect(controller:"taskDetailed", action:"show", id: result.taskId)
+            if(result.taskId) {
+                redirect(controller:"taskDetailed", action:"show", id: result.taskId)
+                return
+            }
+            redirect(controller:"inventoryItemDetailed", action:"show", id: result.inventoryMovementInstance.inventoryItem.id)
         }
         else {
             if(result.inventoryMovementInstance) {
-                render(view:'create',model:[inventoryMovementInstance:result.inventoryMovementInstance])
+                def inventoryMovementTypeList = InventoryMovementType.withCriteria { gt("id", 1L) } // Don't include "Used".
+                render(view:'create', model:[inventoryMovementInstance: result.inventoryMovementInstance,
+                                                            inventoryMovementTypeList: inventoryMovementTypeList])
             }
             else {