Changeset 736 for trunk/grails-app
- Timestamp:
- Dec 3, 2010, 8:03:59 PM (14 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 3 edited
-
services/TaskSearchService.groovy (modified) (2 diffs)
-
views/taskDetailed/search.gsp (modified) (5 diffs)
-
views/taskDetailed/show.gsp (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/services/TaskSearchService.groovy
r731 r736 305 305 } 306 306 else 307 orderBy = "by task.task Status, task.taskPriority, task.targetStartDate"307 orderBy = "by task.taskPriority, task.targetStartDate, task.taskStatus" 308 308 309 309 def q = new HqlBuilder().query { … … 366 366 } 367 367 else 368 orderBy = "by task.taskStatus, task.ta skPriority, task.targetStartDate"368 orderBy = "by task.taskStatus, task.targetStartDate" 369 369 370 370 def q = new HqlBuilder().query { -
trunk/grails-app/views/taskDetailed/search.gsp
r713 r736 90 90 imgSrc="${resource(dir:'images/skin',file:'flag_red.png')}" 91 91 imgAlt="Flag" 92 imgTitle="Attention Flag" 92 93 params="${filterParams}" /> 93 94 … … 100 101 <g:sortableColumn property="taskType" title="Type" params="${filterParams}" /> 101 102 103 <custom:sortableColumnWithImg property="taskStatus" 104 imgSrc="${resource(dir:'images/skin',file:'status.png')}" 105 imgAlt="Status" 106 imgTitle="Status" 107 params="${filterParams}" /> 108 102 109 <g:sortableColumn property="taskPriority" title="Priority" params="${filterParams}" /> 103 104 <g:sortableColumn property="taskStatus" title="Status" params="${filterParams}" />105 110 106 111 <custom:sortableColumnWithImg property="defaultSort" … … 119 124 <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 120 125 <g:if test="${taskInstance.attentionFlag}"> 121 <img src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" />126 <img src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" title="Attention Flag"/> 122 127 </g:if> 123 128 </td> … … 129 134 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 130 135 <b> 131 Task #${fieldValue(bean:taskInstance, field:'id')}<br /> 132 ${fieldValue(bean:taskInstance, field:'description')} 136 Task #${fieldValue(bean:taskInstance, field:'id')} 133 137 </b> 138 <g:if test="${taskInstance.approved}" > 139 <img src="${resource(dir:'images/skin',file:'cog.png')}" alt="Approved" title="Approved" /> 140 </g:if> 141 <g:if test="${taskInstance.taskRecurringSchedule?.enabled}" > 142 <img src="${resource(dir:'images/skin',file:'arrow_refresh.png')}" alt="Recurrence Enabled" title="Recurrence Enabled" /> 143 </g:if> 144 <br /> 145 146 <b> 147 ${fieldValue(bean:taskInstance, field:'description')} 148 </b> 149 <g:if test="${taskInstance.safetyRequirement}" > 150 <br /> 151 <img src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" /> 152 Safety 153 </g:if> 154 <g:if test="${taskInstance.regulatoryRequirement}" > 155 <br /> 156 <img src="${resource(dir:'images/skin',file:'script_lightning.png')}" alt="Regulatory Requirement" title="Regulatory Requirement" /> 157 Regulatory 158 </g:if> 159 <g:if test="${taskInstance.mandatoryRequirement}" > 160 <br /> 161 <img src="${resource(dir:'images/skin',file:'script.png')}" alt="Mandatory Requirement" title="Mandatory Requirement" /> 162 Mandatory 163 </g:if> 134 164 <br /> 135 165 <br /> … … 161 191 </td> 162 192 193 <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 194 <g:if test="${taskInstance.taskStatus.id == 1}" > 195 <img src="${resource(dir:'images/skin',file:'not_started.png')}" alt="Not Started" title="Not Started" /> 196 </g:if> 197 <g:if test="${taskInstance.taskStatus.id == 2}" > 198 <img src="${resource(dir:'images/skin',file:'arrow_right.png')}" alt="In Progress" title="In Progress" /> 199 </g:if> 200 <g:if test="${taskInstance.taskStatus.id == 3}" > 201 <img src="${resource(dir:'images/skin',file:'tick.png')}" alt="Complete" title="Complete" /> 202 </g:if> 203 </td> 204 163 205 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 164 206 ${fieldValue(bean:taskInstance, field:'taskPriority')} 165 </td>166 167 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>168 ${fieldValue(bean:taskInstance, field:'taskStatus')}169 207 </td> 170 208 171 209 <td class="notClickable"> 172 210 <g:link action="show" id="${taskInstance.id}"> 173 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />211 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" /> 174 212 </g:link> 175 213 </td> -
trunk/grails-app/views/taskDetailed/show.gsp
r730 r736 35 35 </g:if> 36 36 <g:if test="${taskInstance.taskStatus.id == 2}" > 37 <img src="${resource(dir:'images/skin',file:' bullet_go.png')}" alt="In Progress" title="In Progress" />37 <img src="${resource(dir:'images/skin',file:'arrow_right.png')}" alt="In Progress" title="In Progress" /> 38 38 </g:if> 39 39 <g:if test="${taskInstance.attentionFlag}" > … … 254 254 255 255 <g:if test="${taskInstance.trash}" > 256 <span class="button"><g:actionSubmit class="restore" onclick="return confirm('Are you sure?');" value="Restore" 256 <span class="button"><g:actionSubmit class="restore" onclick="return confirm('Are you sure?');" value="Restore"/></span> 257 257 </g:if> 258 258 <g:else> … … 341 341 <td class="notClickable"> 342 342 <g:link controller="entryDetailed" action="edit" id="${entry.id}"> 343 <img src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />343 <img src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" title="Edit" /> 344 344 </g:link> 345 345 </td> … … 398 398 <td class="notClickable"> 399 399 <g:link controller="entryDetailed" action="edit" id="${entry.id}"> 400 <img src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />400 <img src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" title="Edit" /> 401 401 </g:link> 402 402 </td> … … 460 460 <td class="notClickable"> 461 461 <g:link controller="entryDetailed" action="edit" id="${entry.id}"> 462 <img src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" />462 <img src="${resource(dir:'images/skin',file:'database_edit.png')}" alt="Edit" title="Edit" /> 463 463 </g:link> 464 464 </td> … … 609 609 <div class="buttons"> 610 610 <span class="button"> 611 <g:actionSubmit value="Add" action="create" class="add"/>611 <g:actionSubmit value="Add" action="create" class="add" /> 612 612 </span> 613 613 </div> … … 731 731 <td class="notClickable"> 732 732 <g:link controller="inventoryMovementDetailed" action="show" id="${inventoryMovementInstance.id}"> 733 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />733 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" /> 734 734 </g:link> 735 735 </td> … … 750 750 </g:if> 751 751 <span class="button"> 752 <g:actionSubmit action="findInventoryItemForMovement" class="add" value="Add" />752 <g:actionSubmit action="findInventoryItemForMovement" class="add" value="Add" /> 753 753 </span> 754 754 </div> … … 813 813 <td class="notClickable"> 814 814 <g:link action="show" id="${subTaskInstance.id}"> 815 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />815 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" /> 816 816 </g:link> 817 817 </td>
Note: See TracChangeset
for help on using the changeset viewer.
