Changeset 133 for trunk/grails-app/controllers

Timestamp:

May 8, 2009, 11:51:25 PM (16 years ago)

Author:

gav

Message:

Work on Detail views for Task, TaskProcedure? and MaintenanceAction?.

Location:

trunk/grails-app/controllers

Files:

• MaintenanceActionDetailedController.groovy (modified) (1 diff)
• TaskDetailedController.groovy (modified) (3 diffs)
• TaskProcedureDetailedController.groovy (added)

trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class MaintenanceActionDetailedController extends BaseAppAdminController {
+class MaintenanceActionDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -20 +20 @@
     }
 
+//     def show = {
+//         def taskInstance = Task.get( params.id )
+// 
+//         if(!taskInstance) {
+//             flash.message = "Task not found with id ${params.id}"
+//             redirect(action:list)
+//         }
+//         else { 
+//             def taskProcedureInstance = TaskProcedure.get(taskInstance?.taskProcedure?.id)
+//             return [ taskInstance : taskInstance,  taskProcedureInstance: taskProcedureInstance] 
+// 
+//         }
+//     }
+
     def show = {
         def taskInstance = Task.get( params.id )
@@ -27 +41 @@
             redirect(action:list)
         }
-        else { 
-            def taskProcedureInstance = TaskProcedure.get(taskInstance?.taskProcedure?.id)
-            return [ taskInstance : taskInstance,  taskProcedureInstance: taskProcedureInstance] 
+        else {
+            def taskProcedureInstance = TaskProcedure.get(taskInstance.taskProcedure?.id)
+            def taskProcedureExits = new Boolean("true")
+            def showTaskTab = new String("true")
 
+            if(!taskProcedureInstance) {
+                taskProcedureExits = false
+            }
+            return [ taskInstance : taskInstance,
+                            taskProcedureInstance: taskProcedureInstance,
+                            taskProcedureExits: taskProcedureExits,
+                            showTaskTab: showTaskTab] 
         }
     }
@@ -114 +136 @@
         }
     }
+
+    //Generate a new TaskProcedure for a taskInstance.
+    def generateProcedure = {
+        def taskProcedureInstance = new TaskProcedure()
+        taskProcedureInstance.properties = params
+
+        def taskInstance = Task.get(params.taskInstance.id)
+        def taskProcedureExits = new Boolean("true")
+        def showProcedureTab = new String("true")
+
+        if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save()) {
+            taskProcedureInstance.addToTasks(taskInstance)
+            flash.message = "Procedure created, you can now add steps to the procedure"
+//             redirect(action:show, id:params.taskInstance.id)
+        }
+        else {
+            taskProcedureExits = false
+        }
+
+        render(view:'show',model:[ taskInstance : taskInstance,  
+                                                        taskProcedureInstance: taskProcedureInstance, 
+                                                        taskProcedureExits: taskProcedureExits,
+                                                        showProcedureTab: showProcedureTab])
+    }
+
+    def findProcedure = {
+        redirect(controller:"taskProcedureDetailed", action:"list", id:params.taskInstance.id) 
+    }
+        
 }