Changeset 225 for trunk/grails-app/controllers

Timestamp:

Dec 8, 2009, 4:03:29 AM (14 years ago)

Author:

gav

Message:

Complete inventory movement implementation as per ticket #24.
Refactor showTab function in both Task and Inventory (which now has tabs).

Location:

trunk/grails-app/controllers

Files:

• InventoryItemDetailedController.groovy (modified) (3 diffs)
• TaskDetailedController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/InventoryItemDetailedController.groovy

@@ -4 +4 @@
 
     def filterService
+    def inventoryItemService
+    def inventoryMovementService
 
     def index = { redirect(action:search, params:params) }
 
     // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+    static allowedMethods = [delete:'POST', save:'POST', update:'POST', useInventoryItem:'POST']
 
     def list = {
@@ -29 +31 @@
     }
 
+    /**
+    * Simply assigns a passed in task id to a session variable and redirects to search.
+    */
+    def findInventoryItemForMovement = {
+        if(!params.task?.id) {
+            flash.message = "No task id supplied, please select a task then the inventory tab."
+            redirect(controller: "taskDetailed", action: "search")
+            return
+        }
+
+        session.inventoryMovementTaskId = params.task.id
+        flash.message = "Please find and then select the inventory item."
+        redirect(action: search)
+    }
+
     def show = {
-        
+
         // In the case of an actionSubmit button, rewrite action name from 'index'.
         if(params._action_Show)
         { params.action='show' }
-        
-        def inventoryItemInstance = InventoryItem.get( params.id )
 
-        if(!inventoryItemInstance) {
+        if(!InventoryItem.exists(params.id)) {
             flash.message = "InventoryItem not found with id ${params.id}"
             redirect(action:search)
+            return
         }
-        else { return [ inventoryItemInstance : inventoryItemInstance ] }
+
+        def result = inventoryItemService.prepareShowData(params)
+
+        if(result.error) {
+            flash.message = "Could not to prepare the data to show item with id: ${params.id}."
+            redirect(action:search)
+            return
+        }
+
+        def model = [ inventoryItemInstance: result.inventoryItemInstance,
+                                inventoryMovementList: result.inventoryMovementList,
+                                inventoryMovementListTotal: result.inventoryMovementListTotal,
+                                inventoryMovementListMax: result.inventoryMovementListMax,
+                                showTab: result.showTab]
+
+        if(session.inventoryMovementTaskId) {
+            model.inventoryMovementInstance = new InventoryMovement()
+            model.inventoryMovementInstance.task = Task.get(session.inventoryMovementTaskId)
+            model.inventoryMovementInstance.quantity = 1
+        }
+
+        return model
     }
 
@@ -123 +160 @@
         }
     }
+
+    /**
+    * Handles the use inventory item form submit in the show view.
+    */
+    def useInventoryItem = {
+
+        params.inventoryMovementType = InventoryMovementType.get(1) // used.
+        def result = inventoryMovementService.move(params)
+
+        if(!result.error) {
+            flash.message = "Inventory Movement for ${result.inventoryMovementInstance.inventoryItem.name.encodeAsHTML()} created."
+            redirect(controller:"taskDetailed", action:"show", id: result.taskId)
+        }
+        else {
+            if(result.inventoryMovementInstance) {
+                def p = [:]
+                p.id = result.inventoryMovementInstance.inventoryItem?.id
+                def r = inventoryItemService.prepareShowData(p)
+
+                def model = [ inventoryItemInstance: r.inventoryItemInstance,
+                                        inventoryMovementList: r.inventoryMovementList,
+                                        inventoryMovementListTotal: r.inventoryMovementListTotal,
+                                        inventoryMovementListMax: r.inventoryMovementListMax,
+                                        showTab: r.showTab]
+
+                model.inventoryMovementInstance = result.inventoryMovementInstance
+
+                render(view: 'show', model: model)
+            }
+            else {
+                flash.message = "Could not create inventory movement."
+                redirect(action:"search")
+            }
+
+        }
+    }
+
 }

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -154 +154 @@
         { params.action='show' }
 
+        def showTab = [:]
+        switch (params.showTab) {
+            case "showProcedureTab":
+                showTab.procedure =  new String("true")
+                break
+            case "showRecurrenceTab":
+                showTab.recurrence =  new String("true")
+                break
+            case "showInventoryTab":
+                showTab.inventory = new String("true")
+                break
+            case "showSubTasksTab":
+                showTab.subTasks = new String("true")
+                break
+            default:
+                showTab.task = new String("true")
+        }
+
         def taskInstance = Task.get( params.id )
 
@@ -177 +195 @@
             def subTaskInstanceList = Task.findAllByParentTaskAndTrash(taskInstance, false, params)
             def subTaskInstanceTotal = Task.countByParentTaskAndTrash(taskInstance, false)
-            def showTaskTab = new String("true")
 
             def inventoryMovementList = InventoryMovement.findAllByTask(taskInstance, [max:100, sort:"id", order:"desc", offset:0])
@@ -204 +221 @@
                             taskProcedureInstance: taskProcedureInstance,
                             taskProcedureExits: taskProcedureExits,
-                            showTaskTab: showTaskTab,
+                            showTab: showTab,
                             subTaskInstanceList: subTaskInstanceList,
                             subTaskInstanceTotal: subTaskInstanceTotal,