Changeset 763 for branches

Timestamp:

Jan 28, 2011, 10:42:00 PM (14 years ago)

Author:

gav

Message:

Re-enable createDemoMaintenanceActions() and add list action to MaintenanceActionController?.

Location:

branches/features/taskProcedureRework/grails-app

Files:

• controllers/MaintenanceActionDetailedController.groovy (modified) (1 diff)
• services/CreateDataService.groovy (modified) (6 diffs)

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

@@ -6 +6 @@
     // the delete, save and update actions only accept POST requests
     static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        render "MaintenanceActions: ${MaintenanceAction.list()}"
+    }
 
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])

branches/features/taskProcedureRework/grails-app/services/CreateDataService.groovy

@@ -140 +140 @@
         createDemoAssignedPersons()
         createDemoTaskProcedure()
-        //createDemoMaintenanceActions()
+        createDemoMaintenanceActions()
         createDemoTaskRecurringSchedules()
 
@@ -1114 +1114 @@
         //MaintenanceAction
         def maintenanceActionInstance
+        def taskProcedure = TaskProcedure.get(1)
 
         //MaintenanceAction #1
@@ -1119 +1120 @@
                                                                                                         procedureStepNumber: 10,
                                                                                                         maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
 
         //MaintenanceAction #2
@@ -1126 +1127 @@
                                                                                                         procedureStepNumber: 20,
                                                                                                         maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
 
         //MaintenanceAction #3
@@ -1133 +1134 @@
                                                                                                         procedureStepNumber: 30,
                                                                                                         maintenancePolicy: MaintenancePolicy.get(1),
-                                                                                                        taskProcedure: TaskProcedure.get(1))
-        saveAndTest(maintenanceActionInstance)
+                                                                                                        taskProcedure: taskProcedure)
+        taskProcedure.addToMaintenanceActions(maintenanceActionInstance)
+
+        saveAndTest(taskProcedure)
     }
 
@@ -1478 +1481 @@
                                                                 section: Section.get(1))
         saveAndTest(assetInstance1)
-//        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
 
         //Asset #2