Changeset 776 for branches/features/taskProcedureRework/grails-app/controllers/TaskProcedureDetailedController.groovy

Timestamp:

Feb 4, 2011, 2:11:45 AM (14 years ago)

Author:

gav

Message:

TaskProcedure? improvements, filter assemblies, pre populate a maintenanceAction for each assembly at creation.

File:

• branches/features/taskProcedureRework/grails-app/controllers/TaskProcedureDetailedController.groovy (modified) (5 diffs)

branches/features/taskProcedureRework/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -5 +5 @@
 
     def filterService
+    def assetService
     def taskProcedureService
 
@@ -94 +95 @@
         }
         else {
-            return [ taskProcedureInstance : taskProcedureInstance ]
+            def assemblies = assetService.getAssemblies(taskProcedureInstance.linkedTask.primaryAsset)
+            return [ taskProcedureInstance : taskProcedureInstance,
+                            assemblies: assemblies ]
         }
     }
@@ -125 +128 @@
         }
 
-        render(view:'edit', model:[taskProcedureInstance: result.taskProcedureInstance])
+        def assemblies = assetService.getAssemblies(result.taskProcedureInstance.linkedTask.primaryAsset)
+        render(view:'edit', model:[taskProcedureInstance: result.taskProcedureInstance,
+                                                assemblies: assemblies])
     }
 
@@ -157 +162 @@
         def taskProcedureInstance = new TaskProcedure()
         taskProcedureInstance.properties = params
-        return ['taskProcedureInstance':taskProcedureInstance]
+
+        // Populate a maintenanceAction for each assembly.
+        def assemblies = assetService.getAssemblies(params.linkedTask.primaryAsset)
+        assemblies.eachWithIndex { assembly, i ->
+            def ma = taskProcedureInstance.maintenanceActionLazyList.get(i)
+            ma.assetSubItem = assembly
+            ma.procedureStepNumber = (i+1)*10
+        }
+
+        return ['taskProcedureInstance':taskProcedureInstance, 'assemblies': assemblies]
     }
 
@@ -181 +195 @@
         }
 
-        render(view:'create', model:[taskProcedureInstance: result.taskProcedureInstance])
+        def assemblies = assetService.getAssemblies(result.taskProcedureInstance.linkedTask.primaryAsset)
+        render(view:'create', model:[taskProcedureInstance: result.taskProcedureInstance,
+                                                    assemblies: assemblies])
     }