Changeset 134 for trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy

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.

File:

• trunk/grails-app/controllers/TaskRecurringScheduleDetailedController.groovy (modified) (1 diff)

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])
+                }
+
     }
+        
 }