Changeset 582

Timestamp:

Jun 8, 2010, 4:28:09 PM (15 years ago)

Author:

gav

Message:

New defaultSort for Tasks, sort by status then priority then target start date.
Small improvement to custom:sortableColumnWithImg to allow imgTitle to be specified.

Location:

trunk

Files:

• grails-app/controllers/TaskDetailedController.groovy (modified) (3 diffs)
• grails-app/services/TaskSearchService.groovy (modified) (2 diffs)
• grails-app/taglib/CustomTagLib.groovy (modified) (2 diffs)
• grails-app/views/taskDetailed/search.gsp (modified) (2 diffs)
• web-app/images/skin/table_sort.png (added)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -78 +78 @@
         // Remember sort if supplied, otherwise try to restore.
         if(params.sort && params.order) {
-             session.taskSearchSort = params.sort
-             session.taskSearchOrder = params.order
+            // Reset to defaultSort if requested.
+            if(params.sort == 'defaultSort') {
+                params.sort = null
+                params.order = null
+                session.removeAttribute("taskSearchSort")
+                session.removeAttribute("taskSearchOrder")
+            }
+            else {
+                session.taskSearchSort = params.sort
+                session.taskSearchOrder = params.order
+            }
         }
         else if(session.taskSearchSort && session.taskSearchOrder) {
@@ -88 +97 @@
         if(isFilterApplied) {
             // filterPane:
+            params.sort = params.sort ?: "id"
+            params.order = params.order ?: "desc"
             if(params.sort == "attentionFlag") // See ticket #64 in Trac.
                 params.sort = "id"
@@ -146 +157 @@
         filterParams.max = params.max
         filterParams.offset = params.offset?.toInteger() ?: 0
-        filterParams.sort = params.sort ?: "attentionFlag"
+        filterParams.sort = params.sort ?: "id"
         filterParams.order = params.order ?: "desc"
 

trunk/grails-app/services/TaskSearchService.groovy

@@ -161 +161 @@
         paginateParams.offset = params?.offset?.toInteger() ?: 0
 
-        def sort = "task." + (params?.sort ?: "attentionFlag")
-        def order = params?.order == "asc" ? "asc" : "desc"
-        def orderBy = " order by " + sort + ' ' + order
+        def orderBy = ''
+        if(params.sort?.contains('.')) // protect against filterpane bug.
+            params.sort = null
+        if(params.sort && params.order) {
+            def sort = "task." + params.sort
+            def order = (params.order == "asc") ? "asc" : "desc"
+            orderBy = " order by " + sort + ' ' + order
+        }
+        else
+            orderBy = " order by task.taskStatus, task.taskPriority, task.targetStartDate"
 
         def namedParams = [:]
@@ -198 +205 @@
         paginateParams.offset = params?.offset?.toInteger() ?: 0
 
-        def sort = "task." + (params?.sort ?: "attentionFlag")
-        def order = params?.order == "asc" ? "asc" : "desc"
-        def orderBy = " order by " + sort + ' ' + order
+        def orderBy = ''
+        if(params.sort?.contains('.')) // protect against filterpane bug.
+            params.sort = null
+        if(params.sort && params.order) {
+            def sort = "task." + params.sort
+            def order = (params.order == "asc") ? "asc" : "desc"
+            orderBy = " order by " + sort + ' ' + order
+        }
+        else
+            orderBy = " order by task.taskStatus, task.taskPriority, task.targetStartDate"
 
         def namedParams = [:]

trunk/grails-app/taglib/CustomTagLib.groovy

@@ -173 +173 @@
 
         // Image.
-        def imgSrc = attrs.remove("imgSrc")
-        def imgAlt = attrs.remove("imgAlt")
-        def img = "<img src=${imgSrc} alt=${imgAlt} />"
+        def img = "<img "
+        def imgAttrs = [:]
+        imgAttrs.src = attrs.remove("imgSrc")
+        imgAttrs.alt = attrs.remove("imgAlt")
+        imgAttrs.title = attrs.remove("imgTitle")
+        imgAttrs.each { k, v ->
+            if(v)
+                img += "${k}=\"${v.encodeAsHTML()}\" "
+        }
+        img += "/>"
 
         writer << "<th "
@@ -184 +191 @@
         }
         writer << ">${link(action:action, params:linkParams) { img } }"
-//         writer << body()
         writer << "</th>"
-    }
+
+    } // sortableColumnWithImg
 
 } // end class

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

@@ -89 +89 @@
                                 <custom:sortableColumnWithImg property="attentionFlag"
                                                                                                 imgSrc="${resource(dir:'images/skin',file:'flag_red.png')}"
-                                                                                                imgAlt="Flag" params="${filterParams}" />
+                                                                                                imgAlt="Flag"
+                                                                                                params="${filterParams}" />
 
                                 <g:sortableColumn property="id" title="Id" params="${filterParams}" />
@@ -103 +104 @@
                                 <g:sortableColumn  property="taskStatus" title="Status" params="${filterParams}" />
 
-                                <th></th>
+                                <custom:sortableColumnWithImg property="defaultSort"
+                                                                                                imgSrc="${resource(dir:'images/skin',file:'table_sort.png')}"
+                                                                                                imgAlt="Sort"
+                                                                                                imgTitle="Default Sort"
+                                                                                                params="${filterParams}" />
 
                             </tr>