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

Timestamp:

Feb 16, 2011, 8:10:39 PM (14 years ago)

Author:

gav

Message:

Domain change, first draft of TaskProcedureRevisions.

File:

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

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -434 +434 @@
             def assignedPersonList = taskInstance.assignedPersons.sort { p1, p2 -> p1.person.firstName.compareToIgnoreCase(p2.person.firstName) }
 
-            def taskProcedureInstance = TaskProcedure.get(taskInstance.taskProcedure?.id)
+            def taskProcedureRevision = TaskProcedureRevision.get(taskInstance.taskProcedureRevision?.id)
             def taskProcedureExits = new Boolean("true")
-            if(!taskProcedureInstance) {
+            if(!taskProcedureRevision) {
                 taskProcedureExits = false
             }
-
-            def maParams = [:]
-            maParams.max = 100
-            maParams.order = "asc"
-            maParams.sort = "procedureStepNumber"
-            def maintenanceActionList = MaintenanceAction.findAllByTaskProcedure(taskProcedureInstance, maParams)
 
             def taskRecurringScheduleInstance = TaskRecurringSchedule.get(taskInstance.taskRecurringSchedule?.id)
@@ -456 +450 @@
                             entryCauseList: entryCauseList,
                             entryWorkDoneList: entryWorkDoneList,
-                            taskProcedureInstance: taskProcedureInstance,
+                            taskProcedureRevision: taskProcedureRevision,
                             taskProcedureExits: taskProcedureExits,
                             showTab: showTab,
@@ -462 +456 @@
                             subTaskInstanceTotal: subTaskInstanceTotal,
                             subTaskInstanceMax: params.max,
-                            maintenanceActionList: maintenanceActionList,
                             taskRecurringScheduleInstance: taskRecurringScheduleInstance,
                             taskRecurringScheduleExits: taskRecurringScheduleExits,