Changeset 137 for trunk/grails-app/controllers/TaskDetailedController.groovy

Timestamp:

Sep 1, 2009, 10:10:43 PM (16 years ago)

Author:

gav

Message:

Update to grails-1.1.1 release.
Fix WorkDone? and Fault entries not showing after update, now using criteria.
Work on TaskRecurringSchedule, add DateUtilService class, regenerate views to suite.
Finally have correct rollback behaviour on TaskRecurringSchedule? domain object updates by using transactions.
Added name to copyright since the license has no meaning without it.

File:

• trunk/grails-app/controllers/TaskDetailedController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -31 +31 @@
                         params.order = "desc"
                         params.sort = "id"
+                        
+                        def entryWorkDoneList = Entry.withCriteria {
+                                                                                                                                def entryType = EntryType.findByName("WorkDone")
+                                                                                                                                eq("entryType", entryType)
+                                                                                                                                eq("task", taskInstance)
+                                                                                                                }
+                        
+                        def entryFaultList = Entry.withCriteria {
+                                                                                                                                def entryType = EntryType.findByName("Fault")
+                                                                                                                                eq("entryType", entryType)
+                                                                                                                                eq("task", taskInstance)
+                                                                                                                }
 
                         def subTaskInstanceList = Task.findAllByParentTask(taskInstance, params)
@@ -53 +65 @@
             }
                         
-            return [ taskInstance : taskInstance,
+            return [ taskInstance: taskInstance,
+                                                        entryWorkDoneList: entryWorkDoneList,
+                                                        entryFaultList: entryFaultList,
                             taskProcedureInstance: taskProcedureInstance,
                             taskProcedureExits: taskProcedureExits,