Changeset 770 for branches/features/taskProcedureRework/grails-app/controllers

Timestamp:

Feb 2, 2011, 8:38:20 PM (14 years ago)

Author:

gav

Message:

Domain change, improved draft of creating taskProcedure dynamic form.

File:

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

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

@@ -40 +40 @@
 
         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 +54 @@
         def taskProcedureInstance = TaskProcedure.get( params.id )
         if(taskProcedureInstance) {
+            def taskInstance = taskProcedureInstance.linkedTask
             try {
                 taskProcedureInstance.tasks.each {
@@ -55 +61 @@
                 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)
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskInstance.id,
+                                params:[showTab:"showProcedureTab"])
             }
         }
@@ -99 +111 @@
             taskProcedureInstance.properties = params
 
-            def toBeDeleted = taskProcedureInstance.maintenanceActions.findAll {it.deleted}
-            if(toBeDeleted) {
+            // Gaps in the html index's can be created by adding 2 items and removing the first one.
+            // This creates a gap at the missing index where LazyList will return a null.
+            def nullMaintenanceActions = taskProcedureInstance.maintenanceActions.findAll {!it}
+            if (nullMaintenanceActions) {
+                taskProcedureInstance.maintenanceActions.removeAll(nullMaintenanceActions)
+            }
+
+            // Save for restoration if validation fails.
+            def savedMaintenanceActions = new ArrayList(taskProcedureInstance.maintenanceActions)
+
+            // Remove toBeDeleted before validation.
+            def toBeDeleted = taskProcedureInstance.maintenanceActions.findAll {it.toBeDeleted}
+            if (toBeDeleted) {
                 taskProcedureInstance.maintenanceActions.removeAll(toBeDeleted)
             }
@@ -106 +129 @@
             if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
                 flash.message = "TaskProcedure ${params.id} updated"
-                redirect(action:show,id:taskProcedureInstance.id)
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskProcedureInstance.linkedTask.id,
+                                params:[showTab:"showProcedureTab"])
             }
             else {
+                // Restore the saved items, some of which contain toBeDeleted flags but
+                // have not been deleted yet since validation failed.
+                // The toBeDeleted items are hidden in the view.
+                taskProcedureInstance.maintenanceActions = savedMaintenanceActions
+                // Populate maintenanceAction errors for display.
+                taskProcedureInstance.maintenanceActions.each { it.validate() }
                 render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
             }
@@ -119 +151 @@
 
     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)
+
+        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
+        return ['taskProcedureInstance':taskProcedureInstance]
     }
 
@@ -136 +175 @@
         def taskInstance = Task.get(params.linkedTask.id)
 
+        // Gaps in the html index's can be created by adding 2 items and removing the first one.
+        // This creates a gap at the missing index where LazyList will return a null.
+        def nullMaintenanceActions = taskProcedureInstance.maintenanceActions.findAll {!it}
+        if (nullMaintenanceActions) {
+            taskProcedureInstance.maintenanceActions.removeAll(nullMaintenanceActions)
+        }
+
         if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
-            taskProcedureInstance.addToTasks(taskInstance) // also sets: taskInstance.taskProcedure = taskProcedureInstance
+             // Also sets: taskInstance.taskProcedure = taskProcedureInstance
+            taskProcedureInstance.addToTasks(taskInstance)
             flash.message = "TaskProcedure ${taskProcedureInstance.id} created."
-            redirect(action:show,id:taskProcedureInstance.id)
-        }
-        else {
-            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance, taskInstance: taskInstance])
-        }
-    }
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:taskProcedureInstance.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+        }
+        else {
+            // Populate maintenanceAction errors for display.
+            taskProcedureInstance.maintenanceActions.each { it.validate() }
+            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance])
+        }
+    }
+
 }