Changeset 798 for trunk/grails-app/controllers

Timestamp:

Feb 8, 2011, 11:00:27 PM (13 years ago)

Author:

gav

Message:

Svn merge -r752:r797 branches/features/taskProcedureRework into trunk/.

Location:

trunk/grails-app/controllers

Files:

• MaintenanceActionDetailedController.groovy (deleted)
• TaskProcedureController.groovy (deleted)
• TaskProcedureDetailedController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -5 +5 @@
 
     def filterService
+    def assetService
+    def taskProcedureService
 
     def index = { redirect(action:list,params:params) }
@@ -40 +42 @@
 
         if(!taskProcedureInstance) {
-            flash.message = "TaskProcedure not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ taskProcedureInstance : taskProcedureInstance ] }
+            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
+            redirect(controller:'taskDetailed', action:'search')
+            return
+        }
+
+        redirect(controller:'taskDetailed',
+                        action:'show',
+                        id:taskProcedureInstance.linkedTask?.id,
+                        params:[showTab:"showProcedureTab"])
     }
 
@@ -49 +56 @@
         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(action:list)
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskInstance.id,
+                                params:[showTab:"showProcedureTab"])
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "TaskProcedure ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
+                flash.errorMessage = "TaskProcedure ${params.id} could not be deleted"
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskInstance.id,
+                                params:[showTab:"showProcedureTab"])
             }
         }
         else {
-            flash.message = "TaskProcedure not found with id ${params.id}"
+            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
             redirect(action:list)
         }
@@ -74 +91 @@
 
         if(!taskProcedureInstance) {
-            flash.message = "TaskProcedure not found with id ${params.id}"
+            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ taskProcedureInstance : taskProcedureInstance ]
+            def assemblies = assetService.getAssemblies(taskProcedureInstance.linkedTask.primaryAsset)
+            return [ taskProcedureInstance : taskProcedureInstance,
+                            assemblies: assemblies ]
         }
     }
 
     def update = {
-        def taskProcedureInstance = TaskProcedure.get( params.id )
-        if(taskProcedureInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(taskProcedureInstance.version > version) {
-
-                    taskProcedureInstance.errors.rejectValue("version", "default.optimistic.locking.failure")
-                    render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
-                    return
-                }
-            }
-            taskProcedureInstance.properties = params
-            if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
-                flash.message = "TaskProcedure ${params.id} updated"
-                redirect(action:show,id:taskProcedureInstance.id)
-            }
-            else {
-                render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
-            }
-        }
-        else {
-            flash.message = "TaskProcedure not found with id ${params.id}"
+        def result = taskProcedureService.update(params)
+
+        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"])
+            return
+        }
+
+        if(result.error.code == "default.not.found") {
+            flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
             redirect(action:list)
-        }
+            return
+        }
+
+        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"])
+            return
+        }
+
+        def assemblies = assetService.getAssemblies(result.taskProcedureInstance.linkedTask.primaryAsset)
+        render(view:'edit', model:[taskProcedureInstance: result.taskProcedureInstance,
+                                                assemblies: assemblies])
     }
 
     def create = {
-        if(params.taskInstance?.id) {
-            def taskInstance = Task.get(params.taskInstance.id)
-
-            def taskProcedureInstance = new TaskProcedure()
-            taskProcedureInstance.properties = params
-            return ['taskProcedureInstance':taskProcedureInstance,
-                            taskInstance: taskInstance]
-        } else {
-            flash.message = "Please select or create a task, then go to the Procedure tab."
+
+        if(!params.taskInstance?.id) {
+            flash.errorMessage = "Please select or create a task, then go to the Procedure tab."
             redirect(controller:"taskDetailed", action:"search")
-        }
+            return
+        }
+
+        params.linkedTask = Task.get(params.taskInstance.id)
+
+        // Task already has a taskProcedure.
+        if(params.linkedTask.taskProcedure) {
+            flash.errorMessage = g.message(code: 'default.optimistic.locking.failure')
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:params.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+            return
+        }
+
+        // Task does not have a primaryAsset.
+        if(!params.linkedTask?.primaryAsset) {
+            flash.errorMessage = "Please set a Primary Asset first, then go to the Procedure tab."
+            redirect(controller:"taskDetailed", action:"show", id:params.linkedTask?.id)
+            return
+        }
+
+        def taskProcedureInstance = new TaskProcedure()
+        taskProcedureInstance.properties = params
+
+        // Populate a couple of maintenanceActions for the first assembly.
+        def assemblies = assetService.getAssemblies(params.linkedTask.primaryAsset)
+        if(assemblies) {
+            def assembly = assemblies[0]
+            def ma = taskProcedureInstance.maintenanceActionLazyList.get(0)
+            ma.assetSubItem = assembly
+            ma.procedureStepNumber = 10
+            ma = taskProcedureInstance.maintenanceActionLazyList.get(1)
+            ma.assetSubItem = assembly
+            ma.procedureStepNumber = 20
+        }
+
+        return ['taskProcedureInstance':taskProcedureInstance, 'assemblies': assemblies]
     }
 
     def save = {
-        def taskProcedureInstance = new TaskProcedure(params)
-        def taskInstance = Task.get(params.taskInstance.id)
-
-        if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
-            taskProcedureInstance.addToTasks(taskInstance)
-            flash.message = "TaskProcedure ${taskProcedureInstance.id} created."
-            redirect(action:show,id:taskProcedureInstance.id)
-        }
-        else {
-            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance, taskInstance: taskInstance])
-        }
-    }
+        def result = taskProcedureService.save(params)
+
+        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"])
+            return
+        }
+
+        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"])
+            return
+        }
+
+        def assemblies = assetService.getAssemblies(result.taskProcedureInstance.linkedTask.primaryAsset)
+        render(view:'create', model:[taskProcedureInstance: result.taskProcedureInstance,
+                                                    assemblies: assemblies])
+    }
+
 }