Changeset 585

Timestamp:

Jun 8, 2010, 10:41:21 PM (15 years ago)

Author:

gav

Message:

First draft of displaying work load on task calendar, see ticket #66.

Location:

trunk

Files:

• grails-app/controllers/TaskDetailedController.groovy (modified) (5 diffs)
• grails-app/services/TaskReportService.groovy (modified) (2 diffs)
• grails-app/views/taskDetailed/searchCalendar.gsp (modified) (1 diff)
• src/groovy/org (added)
• src/groovy/org/gnumims (added)
• src/groovy/org/gnumims/RichUiCalendarItem.groovy (added)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -10 +10 @@
     def taskService
     def taskSearchService
+    def taskReportService
     def filterService
     def exportService
@@ -197 +198 @@
         params.max = Math.min( params.max ? params.max.toInteger() : 100,  1000 )
 
+        def displayList = []
         def taskInstanceList = []
         def taskInstanceTotal
@@ -261 +263 @@
         }
 
+        displayList = taskReportService.getWorkLoadSummary(
+                                    [taskInstanceList: taskInstanceList], RCU.getLocale(request)
+                                ).displayList
+
         // export plugin:
         if(params?.format && params.format != "html") {
@@ -286 +292 @@
         }
 
-        if(taskInstanceTotal > params.max)
-            params.errorMessage = g.message(code:"task.search.calendar.text.too.many.results", args:[params.max])
+//         if(taskInstanceTotal > params.max)
+//             params.errorMessage = g.message(code:"task.search.calendar.text.too.many.results", args:[params.max])
 
         // Add some basic params to filterParams.
@@ -293 +299 @@
         filterParams.offset = params.offset?.toInteger() ?: 0
 
-        return[taskInstanceList: taskInstanceList,
+        return[displayList: displayList,
+                        taskInstanceList: taskInstanceList,
                         taskInstanceTotal: taskInstanceTotal,
                         filterParams: filterParams,

trunk/grails-app/services/TaskReportService.groovy

@@ +1 @@
+import org.gnumims.RichUiCalendarItem
 
 /**
@@ -256 +257 @@
     } // getImmediateCallouts()
 
+    /**
+    * Builds and returns a list of RichUiCalendarItem's.
+    * @param params The request params, may contain params to specify the search.
+    * @param locale The locale to use when generating result.message.
+    */
+    def getWorkLoadSummary(params, locale) {
+
+        def result = [:]
+        result.displayList = []
+
+        def listItem
+
+        def dayMap = [:]
+        def assignedGroupMap = [:]
+
+        params.taskInstanceList.each { task ->
+            def dayKey = task.targetStartDate /// @todo: make this key more stable.
+            def assignedTime = 0
+
+            task.assignedGroups.each{ assignedGroup ->
+                assignedTime = assignedGroup.estimatedHour*60 + assignedGroup.estimatedMinute
+            }
+
+            if(dayMap.containsKey(dayKey)) {
+                if(task.description) {
+                    dayMap[dayKey] = dayMap[dayKey] + assignedTime
+                }
+            }
+            else {
+                dayMap[(dayKey)] = assignedTime
+            }
+        }
+
+        dayMap.each { k, v ->
+                listItem = new RichUiCalendarItem(date:k, text:('assignedTime: '+v.toString()))
+                result.displayList << listItem
+        }
+
+        // Success.
+        return result
+
+    } // getWorkLoadSummary()
 
 } // end class

trunk/grails-app/views/taskDetailed/searchCalendar.gsp

@@ -101 +101 @@
                     <br />
 
-                <richui:calendarMonthView items="${taskInstanceList}"
-                                                                        createLink="true"
-                                                                        constraintDateFields="['targetStartDate']"
+                <richui:calendarMonthView items="${displayList}"
+                                                                        displayField="text"
+                                                                        createLink="false"
+                                                                        constraintDateFields="['date']"
                                                                         month="${showDate}"
                                                                         controller="taskDetailed"