Changeset 843
- Timestamp:
- Mar 4, 2011, 12:46:19 PM (14 years ago)
- Location:
- trunk/grails-app/views/taskDetailed
- Files:
-
- 1 added
- 2 edited
-
_list.gsp (added)
-
search.gsp (modified) (1 diff)
-
workLoad.gsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/taskDetailed/search.gsp
r838 r843 81 81 </g:if> 82 82 83 <g:if test="${taskInstanceList.size() > 0}"> 84 <div class="list"> 85 <table> 86 <thead> 87 <tr> 83 <g:render template="list" /> 88 84 89 <custom:sortableColumnWithImg property="attentionFlag"90 imgSrc="${resource(dir:'images/skin',file:'flag_red.png')}"91 imgAlt="Flag"92 imgTitle="Attention Flag"93 params="${filterParams}" />94 95 <custom:sortableColumnWithImg property="highestSeverity"96 imgSrc="${resource(dir:'images/skin',file:'award_star_silver_3.png')}"97 imgAlt="Severity"98 imgTitle="Highest Severity"99 params="${filterParams}" />100 101 <g:sortableColumn property="targetStartDate" title="Target Start Date" params="${filterParams}" />102 103 <g:sortableColumn property="description" title="Description" params="${filterParams}" />104 105 <g:sortableColumn property="taskGroup" title="Group" params="${filterParams}" />106 107 <g:sortableColumn property="taskType" title="Type" params="${filterParams}" />108 109 <custom:sortableColumnWithImg property="taskStatus"110 imgSrc="${resource(dir:'images/skin',file:'status.png')}"111 imgAlt="Status"112 imgTitle="Status"113 params="${filterParams}" />114 115 <g:sortableColumn property="taskPriority" title="Priority" params="${filterParams}" />116 117 <custom:sortableColumnWithImg property="defaultSort"118 imgSrc="${resource(dir:'images/skin',file:'table_sort.png')}"119 imgAlt="Sort"120 imgTitle="Default Sort"121 params="${filterParams}" />122 123 </tr>124 </thead>125 </tbody>126 <tbody>127 <g:each in="${taskInstanceList}" status="i" var="taskInstance">128 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}">129 130 <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>131 <g:if test="${taskInstance.attentionFlag}">132 <img src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" title="Attention Flag"/>133 </g:if>134 </td>135 136 <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>137 <g:if test="${taskInstance.highestSeverity}">138 ${taskInstance.highestSeverity.code.encodeAsHTML()}139 </g:if>140 </td>141 142 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>143 <g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/>144 </td>145 146 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>147 <b>148 Task #${fieldValue(bean:taskInstance, field:'id')}149 </b>150 <g:if test="${taskInstance.approved}" >151 <img src="${resource(dir:'images/skin',file:'cog.png')}" alt="Approved" title="Approved" />152 </g:if>153 <g:if test="${taskInstance.taskRecurringSchedule?.enabled}" >154 <img src="${resource(dir:'images/skin',file:'arrow_refresh.png')}" alt="Recurrence Enabled" title="Recurrence Enabled" />155 </g:if>156 <br />157 158 <b>159 <g:if test="${taskInstance.primaryAsset}">160 ${fieldValue(bean:taskInstance, field:'primaryAsset')}:161 </g:if>162 ${fieldValue(bean:taskInstance, field:'description')}163 </b>164 <g:if test="${taskInstance.taskProcedureRevision?.maintenanceActions}" >165 <br />166 <custom:taskProcedureMachines taskProcedureRevision="${taskInstance.taskProcedureRevision}" />167 </g:if>168 <g:if test="${taskInstance.safetyRequirement}" >169 <br />170 <img src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" />171 Safety172 </g:if>173 <g:if test="${taskInstance.regulatoryRequirement}" >174 <br />175 <img src="${resource(dir:'images/skin',file:'script_lightning.png')}" alt="Regulatory Requirement" title="Regulatory Requirement" />176 Regulatory177 </g:if>178 <g:if test="${taskInstance.mandatoryRequirement}" >179 <br />180 <img src="${resource(dir:'images/skin',file:'script.png')}" alt="Mandatory Requirement" title="Mandatory Requirement" />181 Mandatory182 </g:if>183 <br />184 <br />185 <g:each in="${taskInstance.assignedGroups}" status="j" var="assignedGroup">186 ${assignedGroup.encodeAsHTML()}<br />187 </g:each>188 <g:each in="${taskInstance.assignedPersons}" status="k" var="assignedPerson">189 ${assignedPerson.encodeAsHTML()}<br />190 </g:each>191 <g:each in="${taskInstance.entries}" status="m" var="entry">192 <g:if test="${entry.entryType.id == 3}">193 <em>${'WD: ' +entry.toShortString().encodeAsHTML()}</em><br />194 </g:if>195 </g:each>196 <g:if test="${taskInstance.subTasks}">197 Sub Tasks: ${taskInstance.subTasks.size()}<br />198 </g:if>199 </td>200 201 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>202 ${fieldValue(bean:taskInstance, field:'taskGroup')}203 </td>204 205 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>206 ${fieldValue(bean:taskInstance, field:'taskType')}207 </td>208 209 <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>210 <g:if test="${taskInstance.taskStatus.id == 1}" >211 <img src="${resource(dir:'images/skin',file:'not_started.png')}" alt="Not Started" title="Not Started" />212 </g:if>213 <g:if test="${taskInstance.taskStatus.id == 2}" >214 <img src="${resource(dir:'images/skin',file:'arrow_right.png')}" alt="In Progress" title="In Progress" />215 </g:if>216 <g:if test="${taskInstance.taskStatus.id == 3}" >217 <img src="${resource(dir:'images/skin',file:'tick.png')}" alt="Complete" title="Complete" />218 </g:if>219 </td>220 221 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>222 ${fieldValue(bean:taskInstance, field:'taskPriority')}223 </td>224 225 <td class="notClickable">226 <g:link action="show" id="${taskInstance.id}">227 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" title="Show" />228 </g:link>229 </td>230 231 </tr>232 </g:each>233 </tbody>234 </table>235 </div>236 </g:if>237 85 <div class="paginateButtons"> 238 86 <g:paginate action="search" total="${taskInstanceTotal}" params="${filterParams}" /> -
trunk/grails-app/views/taskDetailed/workLoad.gsp
r836 r843 66 66 <h1>Task Results: ${tasks.size()} / ${tasks.totalCount}</h1> 67 67 68 <g:if test="${tasks.size() > 0}"> 69 <div class="list"> 70 <table> 71 <thead> 72 <tr> 73 74 <th> 75 <img src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" /> 76 </th> 77 78 <th>Target Start Date</th> 79 80 <th>Description</th> 81 82 <th>Group</th> 83 84 <th>Type</th> 85 86 <th>Priority</th> 87 88 <th>Status</th> 89 90 <th></th> 91 92 </tr> 93 </thead> 94 <tbody> 95 <g:each in="${tasks}" status="i" var="taskInstance"> 96 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}"> 97 98 <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 99 <g:if test="${taskInstance.attentionFlag}"> 100 <img src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" /> 101 </g:if> 102 </td> 103 104 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 105 <g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/> 106 </td> 107 108 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 109 <b> 110 Task #${fieldValue(bean:taskInstance, field:'id')}<br /> 111 ${fieldValue(bean:taskInstance, field:'description')} 112 </b> 113 <br /> 114 <br /> 115 <g:if test="${taskInstance.primaryAsset}"> 116 ${fieldValue(bean:taskInstance, field:'primaryAsset')}<br /> 117 </g:if> 118 <g:each in="${taskInstance.assignedGroups}" status="j" var="assignedGroup"> 119 ${assignedGroup.encodeAsHTML()}<br /> 120 </g:each> 121 <g:each in="${taskInstance.assignedPersons}" status="k" var="assignedPerson"> 122 ${assignedPerson.encodeAsHTML()}<br /> 123 </g:each> 124 <g:each in="${taskInstance.entries}" status="m" var="entry"> 125 <g:if test="${entry.entryType.id == 3}"> 126 <em>${'WD: ' +entry.toShortString().encodeAsHTML()}</em><br /> 127 </g:if> 128 </g:each> 129 <g:if test="${taskInstance.subTasks}"> 130 Sub Tasks: ${taskInstance.subTasks.size()}<br /> 131 </g:if> 132 </td> 133 134 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 135 ${fieldValue(bean:taskInstance, field:'taskGroup')} 136 </td> 137 138 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 139 ${fieldValue(bean:taskInstance, field:'taskType')} 140 </td> 141 142 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 143 ${fieldValue(bean:taskInstance, field:'taskPriority')} 144 </td> 145 146 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'> 147 ${fieldValue(bean:taskInstance, field:'taskStatus')} 148 </td> 149 150 <td class="notClickable"> 151 <g:link action="show" id="${taskInstance.id}"> 152 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" /> 153 </g:link> 154 </td> 155 156 </tr> 157 </g:each> 158 </tbody> 159 </table> 160 </div> 161 </g:if> 68 <g:render template="list" model="[taskInstanceList:tasks]"/> 162 69 163 70 <!-- Start Search Pane -->
Note: See TracChangeset
for help on using the changeset viewer.
