Changeset 175 for trunk/grails-app/controllers/TaskDetailedController.groovy

Timestamp:

Oct 29, 2009, 8:30:58 PM (14 years ago)

Author:

gav

Message:

Substantial refactor of the Inventory domain.
InventoryItems can now be added to tasks, no quantity adjustments done yet.
Removed StoredItem and with it the ability to store an inventoryItem in multiple places, just too complex right now.
Svn move StoreLocation to InventoryLocation.

File:

• trunk/grails-app/controllers/TaskDetailedController.groovy (modified) (3 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -182 +182 @@
 
                         def subTaskInstanceList = Task.findAllByParentTask(taskInstance, params)
-                        def subTaskInstanceTotal = Task.countByParentTask(taskInstance)                                 
+                        def subTaskInstanceTotal = Task.countByParentTask(taskInstance)
             def showTaskTab = new String("true")
+
+            def inventoryMovementList = InventoryMovement.findAllByTask(taskInstance, [max:100, sort:"id", order:"desc", offset:0])
 
             def taskProcedureInstance = TaskProcedure.get(taskInstance.taskProcedure?.id)
@@ -190 +192 @@
                 taskProcedureExits = false
             }
-//                      else {
-                                params.order = "asc"
-                                params.sort = "procedureStepNumber"
-                                def maintenanceActionList = MaintenanceAction.findAllByTaskProcedure(taskProcedureInstance, params)
-//                      }
-                                                
+
+            params.order = "asc"
+            params.sort = "procedureStepNumber"
+            def maintenanceActionList = MaintenanceAction.findAllByTaskProcedure(taskProcedureInstance, params)
+
             def taskRecurringScheduleInstance = TaskRecurringSchedule.get(taskInstance.taskRecurringSchedule?.id)
             def taskRecurringScheduleExits= new Boolean("true")
-                        if(!taskRecurringScheduleInstance) {
+            if(!taskRecurringScheduleInstance) {
                 taskRecurringScheduleExits = false
             }
@@ -213 +214 @@
                                                         maintenanceActionList: maintenanceActionList,
                                                         taskRecurringScheduleInstance: taskRecurringScheduleInstance,
-                                                        taskRecurringScheduleExits: taskRecurringScheduleExits] 
+                                                        taskRecurringScheduleExits: taskRecurringScheduleExits,
+                            inventoryMovementList: inventoryMovementList]
         }
     }