Changeset 225 for trunk/grails-app/services

Timestamp:

Dec 8, 2009, 4:03:29 AM (15 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/services

Files:

• InventoryItemService.groovy (added)
• InventoryMovementService.groovy (modified) (3 diffs)

trunk/grails-app/services/InventoryMovementService.groovy

@@ -10 +10 @@
             result.inventoryMovementInstance = InventoryMovement.lock(params.id)
             if(result.inventoryMovementInstance) {
+
+                // Used type must have a task that is not complete or in the trash
+                if(result.inventoryMovementInstance.inventoryMovementType.id == 1)  {
+
+                    // Unlike move, if the task does not exist at all then deletion is still allowed.
+                    if(result.inventoryMovementInstance.task?.trash) {
+                        status.setRollbackOnly()
+                        result.inventoryMovementInstance.errors.rejectValue("task", "task.operationNotPermittedOnTaskInTrash")
+                        result.error = true
+                        return result
+                    }
+
+                    if(result.inventoryMovementInstance.task?.taskStatus?.id == 3) {
+                        status.setRollbackOnly()
+                        result.inventoryMovementInstance.errors.rejectValue('task', "task.operationNotPermittedOnCompleteTask")
+                        result.error = true
+                        return result
+                    }
+                }
+
                 def inventoryItem = InventoryItem.lock(result.inventoryMovementInstance.inventoryItem.id)
-                result.taskId = result.inventoryMovementInstance.task.id
+                result.taskId = result.inventoryMovementInstance.task?.id
 
                 if(!inventoryItem) {
@@ -70 +90 @@
             result.inventoryMovementInstance.person = personService.currentUser
 
+            // Used type must have a task that is not complete or in the trash
+            if(result.inventoryMovementInstance.inventoryMovementType.id == 1)  {
+
+                if(!result.inventoryMovementInstance.task) {
+                    status.setRollbackOnly()
+                    result.inventoryMovementInstance.errors.rejectValue('task', "task.notFound")
+                    result.error = true
+                    return result
+                }
+
+                if(result.inventoryMovementInstance.task.trash) {
+                    status.setRollbackOnly()
+                    result.inventoryMovementInstance.errors.rejectValue("task", "task.operationNotPermittedOnTaskInTrash")
+                    result.error = true
+                    return result
+                }
+
+                if(result.inventoryMovementInstance.task.taskStatus.id == 3) {
+                    status.setRollbackOnly()
+                    result.inventoryMovementInstance.errors.rejectValue('task', "task.operationNotPermittedOnCompleteTask")
+                    result.error = true
+                    return result
+                }
+            }
+
             if(result.inventoryMovementInstance.validate()) {
                 def inventoryItem = InventoryItem.lock(result.inventoryMovementInstance.inventoryItem.id)
@@ -77 +122 @@
                     status.setRollbackOnly()
                     result.inventoryMovementInstance.errors.rejectValue('inventoryItem', "inventoryMovement.inventoryItem.notFound")
-                    result.error = true
-                    return result
-                }
-
-                if(result.inventoryMovementInstance.task.taskStatus.id == 3) {
-                    status.setRollbackOnly()
-                    result.inventoryMovementInstance.errors.rejectValue('task', "task.operationNotPermittedOnCompleteTask")
                     result.error = true
                     return result