Changeset 177 for trunk/grails-app/controllers

Timestamp:

Nov 2, 2009, 1:17:03 PM (14 years ago)

Author:

gav

Message:

Inventory movement quantity adjustments now done in a service.
InventoryMovementType now has an incrementsInventory flag, so not dependant on the text name.

Location:

trunk/grails-app/controllers

Files:

• InventoryMovementDetailedController.groovy (modified) (3 diffs)
• InventoryMovementTypeController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/InventoryMovementDetailedController.groovy

@@ -2 +2 @@
 
 class InventoryMovementDetailedController extends BaseController {
+
+    def inventoryMovementService
 
     def index = { redirect(action:list,params:params) }
@@ -24 +26 @@
 
     def delete = {
-        def inventoryMovementInstance = InventoryMovement.get( params.id )
-        if(inventoryMovementInstance) {
-            try {
-                def taskId = inventoryMovementInstance.task?.id
-                inventoryMovementInstance.delete(flush:true)
-                flash.message = "InventoryMovement ${params.id} deleted"
-                redirect(controller:"taskDetailed", action:"show", id:taskId)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "InventoryMovement ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
+        def result = inventoryMovementService.reverseMove(params)
+
+        if(!result.error) {
+            flash.message = "InventoryMovement ${params.id} deleted"
+            redirect(controller:"taskDetailed", action:"show", id:result.taskId)
         }
         else {
-            flash.message = "InventoryMovement not found with id ${params.id}"
-            redirect(action:list)
+            if(result.inventoryMovementInstance) {
+                render(view:'show',model:[inventoryMovementInstance:result.inventoryMovementInstance])
+            }
+            else {
+                flash.message = "Could not delete inventory movement."
+                redirect(controller:"taskDetailed", action:"search", id:result.taskId)
+            }
         }
     }
@@ -54 +54 @@
 
     def save = {
-        def inventoryMovementInstance = new InventoryMovement(params)
-        if(!inventoryMovementInstance.hasErrors() && inventoryMovementInstance.save()) {
-            flash.message = "Inventory Movement for ${inventoryMovementInstance.inventoryItem.name} created."
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
+        def result = inventoryMovementService.move(params)
+
+        if(!result.error) {
+            flash.message = "Inventory Movement for ${result.inventoryMovementInstance.inventoryItem.name} created."
+            redirect(controller:"taskDetailed", action:"show", id: result.taskId)
         }
         else {
-            render(view:'create',model:[inventoryMovementInstance:inventoryMovementInstance])
+            if(result.inventoryMovementInstance) {
+                render(view:'create',model:[inventoryMovementInstance:result.inventoryMovementInstance])
+            }
+            else {
+                flash.message = "Could not create inventory movement."
+                redirect(controller:"taskDetailed", action:"search", id:result.taskId)
+            }
+
         }
     }
+
 }

trunk/grails-app/controllers/InventoryMovementTypeController.groovy

@@ -27 +27 @@
         if(inventoryMovementTypeInstance) {
             try {
-                inventoryMovementTypeInstance.delete()
+                inventoryMovementTypeInstance.delete(flush:true)
                 flash.message = "InventoryMovementType ${params.id} deleted"
                 redirect(action:list)
@@ -77 +77 @@
         else {
             flash.message = "InventoryMovementType not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }