Changeset 134 for trunk/grails-app/controllers

Timestamp:

May 13, 2009, 12:51:15 PM (16 years ago)

Author:

gav

Message:

Add icons from famfamfam silk icons, add acknowledgement page to suite.
Adjust AssignedPerson? controller so that a task.id is required to create.
Move Add AssignedPerson? link up to TaskDetailed? show page.
Further improvements to taskDetailed show tabs.
Adjust TaskProcedureDetailed? controller to allow linking a Procedure to a task during creation.
Adjust TaskRecurringSchedule? to a one-to-one cascading relationship.
Modify CSS class duration to time and added icons.
Regenerate some pages.

Location:

trunk/grails-app/controllers

Files:

• AppCoreController.groovy (modified) (1 diff)
• AssignedPersonDetailedController.groovy (modified) (1 diff)
• TaskDetailedController.groovy (modified) (3 diffs)
• TaskProcedureDetailedController.groovy (modified) (2 diffs)
• TaskRecurringScheduleDetailedController.groovy (modified) (1 diff)

trunk/grails-app/controllers/AppCoreController.groovy

@@ -23 +23 @@
 
     def options = {
+    }
+
+    def acknowledgements = {
     }
 

trunk/grails-app/controllers/AssignedPersonDetailedController.groovy

@@ -82 +82 @@
 
     def create = {
+                if(!params.task?.id) {
+                        flash.message = "Please select a task and then 'Add Assigned Person'"
+                        redirect(controller: "taskDetailed", action: list)
+                }
+                else {
         def assignedPersonInstance = new AssignedPerson()
         assignedPersonInstance.properties = params
         return ['assignedPersonInstance':assignedPersonInstance]
+                }
     }
 

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 )
@@ -42 +28 @@
         }
         else {
+                        params.max = 10
+                        params.order = "desc"
+                        params.sort = "id"
+
+                        def subTaskInstanceList = Task.findAllByParentTask(taskInstance, params)
+                        def subTaskInstanceTotal = Task.countByParentTask(taskInstance)                                 
+            def showTaskTab = new String("true")
+
             def taskProcedureInstance = TaskProcedure.get(taskInstance.taskProcedure?.id)
             def taskProcedureExits = new Boolean("true")
-            def showTaskTab = new String("true")
-
             if(!taskProcedureInstance) {
                 taskProcedureExits = false
             }
+//                      else {
+                                params.order = "asc"
+                                params.sort = "procedureStepNumber"
+                                def maintenanceActionList = MaintenanceAction.findAllByTaskProcedure(taskProcedureInstance, params)
+//                      }
+                                                
+            def taskRecurringScheduleInstance = TaskRecurringSchedule.get(taskInstance.taskRecurringSchedule?.id)
+            def taskRecurringScheduleExits= new Boolean("true")
+                        if(!taskRecurringScheduleInstance) {
+                taskRecurringScheduleExits = false
+            }
+                        
             return [ taskInstance : taskInstance,
                             taskProcedureInstance: taskProcedureInstance,
                             taskProcedureExits: taskProcedureExits,
-                            showTaskTab: showTaskTab] 
+                            showTaskTab: showTaskTab,
+                                                        subTaskInstanceList: subTaskInstanceList,
+                                                        subTaskInstanceTotal: subTaskInstanceTotal,
+                                                        subTaskInstanceMax: params.max,
+                                                        maintenanceActionList: maintenanceActionList,
+                                                        taskRecurringScheduleInstance: taskRecurringScheduleInstance,
+                                                        taskRecurringScheduleExits: taskRecurringScheduleExits] 
         }
     }
@@ -136 +146 @@
         }
     }
-
-    //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)
+        
+        def listSubTasks = {
+                def parentTaskInstance = Task.get(params.id)
+                                
+        if(!parentTaskInstance) {
+            flash.message = "Task not found with id ${params.id}"
+            redirect(action:list)
         }
         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) 
-    }
+                params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+                def subTaskInstanceList = Task.findAllByParentTask(parentTaskInstance, params)
+                def subTaskInstanceTotal = Task.countByParentTask(parentTaskInstance)
+                                
+        [ taskInstanceList: subTaskInstanceList,
+                        taskInstanceTotal:  subTaskInstanceTotal,
+                        parentTaskInstance: parentTaskInstance]
+                }
+        }
         
 }

trunk/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -11 +11 @@
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
         [ taskProcedureInstanceList: TaskProcedure.list( params ), taskProcedureInstanceTotal: TaskProcedure.count() ]
+    }
+        
+    def search = {
+        redirect(action:list)
     }
 
@@ -82 +86 @@
 
     def create = {
+                def taskInstance = Task.get(params.taskInstance?.id)
+                
         def taskProcedureInstance = new TaskProcedure()
         taskProcedureInstance.properties = params
-        return ['taskProcedureInstance':taskProcedureInstance]
+        return ['taskProcedureInstance':taskProcedureInstance,
+                                                taskInstance: taskInstance]
     }
 
     def save = {
         def taskProcedureInstance = new TaskProcedure(params)
+                def taskInstance = Task.get(params.taskInstance.id)
+                                
         if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save()) {
+                        taskProcedureInstance.addToTasks(taskInstance)
             flash.message = "TaskProcedure ${taskProcedureInstance.id} created"
             redirect(action:show,id:taskProcedureInstance.id)

trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy

@@ -80 +80 @@
         }
     }
-
+        
     def create = {
-        def taskRecurringScheduleInstance = new TaskRecurringSchedule()
-        taskRecurringScheduleInstance.properties = params
-        return ['taskRecurringScheduleInstance':taskRecurringScheduleInstance]
+        try {
+            def taskInstance = Task.get(params.taskInstance.id)
+                        def taskRecurringScheduleInstance = new TaskRecurringSchedule()
+            taskRecurringScheduleInstance.task = taskInstance
+            return [taskRecurringScheduleInstance: taskRecurringScheduleInstance]
+        }
+        catch(Exception e) {
+            flash.message = "Please select a task, then Create a Recurring Schedule for it.'"
+            redirect(controller:"taskDetailed", action:"list")
+        }
     }
 
     def save = {
         def taskRecurringScheduleInstance = new TaskRecurringSchedule(params)
-        if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) {
-            flash.message = "TaskRecurringSchedule ${taskRecurringScheduleInstance.id} created"
-            redirect(action:show,id:taskRecurringScheduleInstance.id)
-        }
-        else {
-            render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])
-        }
+                def taskInstance = Task.get(params.task.id)
+                
+                if(!taskRecurringScheduleInstance.hasErrors() && taskRecurringScheduleInstance.save()) {
+                        
+                        taskInstance.taskRecurringSchedule = taskRecurringScheduleInstance
+                                        
+                        if(taskInstance.save()) {
+                                flash.message = "TaskRecurringSchedule ${taskRecurringScheduleInstance.id} created"
+                                redirect(action:show,id:taskRecurringScheduleInstance.id)
+                        }
+                        else {
+                                flash.message = "Task could not be saved and therefore the Recurring Schedule has been disgarded, cause unknown."                               
+                                render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])
+                        }
+                }
+                else {
+                        render(view:'create',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance])
+                }
+
     }
+        
 }