Changeset 809 for trunk/grails-app/controllers

Timestamp:

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

Author:

gav

Message:

Domain change, first draft of TaskProcedureRevisions.

Location:

trunk/grails-app/controllers

Files:

• TaskDetailedController.groovy (modified) (3 diffs)
• TaskProcedureDetailedController.groovy (modified) (6 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,

trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -43 +43 @@
         if(!taskProcedureInstance) {
             flash.errorMessage = "TaskProcedure not found with id ${params.id}"
-            redirect(controller:'taskDetailed', action:'search')
+            redirect(action:'list')
             return
         }
 
-        redirect(controller:'taskDetailed',
-                        action:'show',
-                        id:taskProcedureInstance.linkedTask?.id,
-                        params:[showTab:"showProcedureTab"])
-    }
+        def taskProcedureRevision
+        if(params.revision?.toInteger())
+             taskProcedureRevision = taskProcedureInstance.getRevision( params.revision )
+        else
+             taskProcedureRevision = taskProcedureInstance.latestRevision
 
-    def delete = {
-        def taskProcedureInstance = TaskProcedure.get( params.id )
-        if(taskProcedureInstance) {
-            def taskInstance = taskProcedureInstance.linkedTask
-            try {
-                taskProcedureInstance.tasks.each {
-                    it.taskProcedure = null
-                }
-                taskProcedureInstance.delete(flush:true)
-                flash.message = "TaskProcedure ${params.id} deleted"
-                redirect(controller:'taskDetailed',
-                                action:'show',
-                                id:taskInstance.id,
-                                params:[showTab:"showProcedureTab"])
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.errorMessage = "TaskProcedure ${params.id} could not be deleted"
-                redirect(controller:'taskDetailed',
-                                action:'show',
-                                id:taskInstance.id,
-                                params:[showTab:"showProcedureTab"])
-            }
+        if(!taskProcedureRevision) {
+            flash.errorMessage = "TaskProcedure ${params.id} revision ${params.revision} not found"
+            redirect(action:'list')
+            return
         }
-        else {
-            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
-            redirect(action:list)
-        }
+
+        return [taskProcedureRevision: taskProcedureRevision]
+
     }
 
@@ -85 +66 @@
 
         // In the case of an actionSubmit button, rewrite action name from 'index'.
-        if(params._action_Edit)
+        //if(params._action_Edit)
             params.action='edit'
 
@@ -106 +87 @@
         if(!result.error) {
             flash.message = g.message(code: "default.update.success", args: ["TaskProcedure", params.id])
-            redirect(controller:'taskDetailed',
-                            action:'show',
-                            id:result.taskProcedureInstance.linkedTask.id,
-                            params:[showTab:"showProcedureTab"])
+            redirect(action:'show', id:result.taskProcedureInstance.id)
             return
         }
@@ -121 +99 @@
         if(result.error.code == "default.optimistic.locking.failure") {
             flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
-            redirect(controller:'taskDetailed',
-                            action:'show',
-                            id:result.taskProcedureInstance.linkedTask.id,
-                            params:[showTab:"showProcedureTab"])
+            redirect(action:'show', id:result.taskProcedureInstance.id)
             return
         }
@@ -144 +119 @@
 
         // Task already has a taskProcedure.
-        if(params.linkedTask.taskProcedure) {
+        if(params.linkedTask.taskProcedureRevision) {
             flash.errorMessage = g.message(code: 'default.optimistic.locking.failure')
             redirect(controller:'taskDetailed',
@@ -183 +158 @@
         if(!result.error) {
             flash.message = g.message(code: "default.create.success", args: ["TaskProcedure", result.taskProcedureInstance.id])
-            redirect(controller:'taskDetailed',
-                            action:'show',
-                            id:result.taskProcedureInstance.linkedTask.id,
-                            params:[showTab:"showProcedureTab"])
+            redirect(action:'show', id:result.taskProcedureInstance.id)
             return
         }
 
+        // Task already has a taskProcedure.
         if(result.error.code == "default.optimistic.locking.failure") {
             flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
             redirect(controller:'taskDetailed',
                             action:'show',
-                            id:result.taskProcedureInstance.linkedTask.id,
+                            id:params.linkedTask.id,
                             params:[showTab:"showProcedureTab"])
             return