Changeset 490 for trunk

Timestamp:

Apr 18, 2010, 10:03:40 PM (15 years ago)

Author:

gav

Message:

Add work done by person and date feature with view and search logic.

Location:

trunk

Files:

• grails-app/controllers/TaskDetailedController.groovy (modified) (1 diff)
• grails-app/i18n/messages.properties (modified) (1 diff)
• grails-app/services/TaskSearchService.groovy (modified) (2 diffs)
• grails-app/views/taskDetailed/_quickSearchPane.gsp (modified) (1 diff)
• grails-app/views/taskDetailed/workDone.gsp (added)
• web-app/css/main.css (modified) (2 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -748 +748 @@
 
     }
+
+    /**
+    * Render a users total work done hours.
+    */
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
+    def workDone = {
+        def result = taskSearchService.getWorkDone(params, RCU.getLocale(request))
+
+        params.message = result.message
+
+        return[entries: result.entries,
+                    totalEntries : result.totalEntries,
+                    startOfDay: result.startOfDay,
+                    person: result.person,
+                    totalHours: result.totalHours,
+                    totalMinutes: result.totalMinutes]
+    } // workDone
 
     /**

trunk/grails-app/i18n/messages.properties

@@ -288 +288 @@
 task.search.text.planners.range.none.found=No tasks found in the past week or two weeks ahead.
 task.search.calendar.text.too.many.results=Too many results, only {0} are shown.
+task.search.text.work.done=Work Done
+task.search.text.work.done.none.found=No entries found for {0} on {1}.
+task.search.text.work.done.description=Work done by person and date.
+task.search.text.work.done.message=Work done by {0} on {1}.
 
 # InventoryItemSearch

trunk/grails-app/services/TaskSearchService.groovy

@@ -11 +11 @@
     def dateUtilService
     def messageSource
+
+    def g = new org.codehaus.groovy.grails.plugins.web.taglib.ApplicationTagLib()
 
     def paramsMax = 100000
@@ -317 +319 @@
             } // createCriteria
     }
-}
+
+    /**
+    * Get work done by person and date.
+    * A person ID and date may be specified in params otherwise the currentUser and today are used.
+    * @param params The request params.
+    * @returns A map containing entries, totalEntries, startOfDay, person, totalHours, totalMinutes.
+    */
+    def getWorkDone(params, locale) {
+        def result = [:]
+        result.person = params.person?.id ? Person.get(params.person.id.toInteger()) : authService.currentUser
+
+        if(params.date_year && params.date_month && params.date_day)
+            result.startOfDay = dateUtilService.makeDate(params.date_year, params.date_month, params.date_day)
+        else
+            result.startOfDay = dateUtilService.today
+
+        result.startOfNextDay = result.startOfDay + 1
+
+        def formattedStartOfDay = g.formatDate(format: "EEE, dd-MMM-yyyy", date: result.startOfDay)
+
+        def getMessage = { Map m ->
+            messageSource.getMessage(m.code, m.args == null ? null : m.args.toArray(), locale)
+        }
+
+        result.entries = Entry.createCriteria().list() {
+            eq("enteredBy", result.person)
+            ge("dateDone", result.startOfDay)
+            lt("dateDone", result.startOfNextDay)
+            entryType {
+                eq("id", 3L)
+            }
+        } // createCriteria
+
+        result.totalEntries = result.entries.size()
+
+        if(result.totalEntries > 0)
+            result.message = getMessage(code:"task.search.text.work.done.message",
+                                                                args:[result.person, formattedStartOfDay])
+        else
+            result.message = getMessage(code:"task.search.text.work.done.none.found",
+                                                                args:[result.person, formattedStartOfDay])
+
+        result.totalHours = 0
+        result.totalMinutes = 0
+        result.entries.each() {
+            result.totalMinutes += (it.durationHour*60) + it.durationMinute
+        }
+        result.totalHours = (result.totalMinutes / 60).toInteger()
+        result.totalMinutes = result.totalMinutes % 60
+
+        return result
+    }
+
+} // end class

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

@@ -93 +93 @@
                 </tr>
 
+                <tr class="prop">
+                    <td valign="top" class="name">
+                        <label>Links:</label>
+                    </td>
+                    <td valign="top" class="value">
+                        <g:link controller="taskDetailed"
+                                        action="workDone">
+                            <g:message code="task.search.text.work.done" />
+                        </g:link> - <g:message code="task.search.text.work.done.description" />
+                        <br />
+                    </td>
+                </tr>
+
             </tbody>
         </table>

trunk/web-app/css/main.css

@@ -261 +261 @@
     vertical-align: top;
 }
+tr.total {
+    background: #EDEDED;
+}
+tr.total td{
+    color: #555;
+    font-size: 14px;
+    font-weight: bold;
+}
 td.idColumn {
     width: 25px;
@@ -304 +312 @@
     background: #fff;
     cursor: pointer;
+}
+.clickableEven td.notClickable {
+    cursor: default;
+}
+.clickableOdd td.notClickable {
+    cursor: default;
 }