Changeset 866 for trunk/grails-app

Timestamp:

Mar 15, 2011, 7:54:54 PM (14 years ago)

Author:

gav

Message:

Small update to showSubTaskTab template, mainly to show primary asset.

File:

• trunk/grails-app/views/taskDetailed/_showSubTaskTab.gsp (modified) (3 diffs)

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

@@ -6 +6 @@
                     <tr>
 
-                        <th>Id</th>
+                        <th>Task #</th>
 
                         <th>Target Start Date</th>
@@ -12 +12 @@
                         <th>Description</th>
 
-                        <th>Lead Person</th>
+                        <th>
+                            <img src="${resource(dir:'images/skin',file:'status.png')}" title="Status" alt="Status" />
+                        </th>
 
-                        <th>Task Priority</th>
-
-                        <th>Task Status</th>
+                        <th>Priority</th>
 
                         <th></th>
@@ -35 +35 @@
 
                         <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${subTaskInstance.id}"'>
+                            <g:if test="${taskInstance.primaryAsset}">
+                                ${fieldValue(bean:taskInstance, field:'primaryAsset')}:
+                            </g:if>
                             ${fieldValue(bean:subTaskInstance, field:'description')}
                         </td>
 
-
-                        <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${subTaskInstance.id}"'>
-                            ${fieldValue(bean:subTaskInstance, field:'leadPerson')}
+                        <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
+                            <g:if test="${taskInstance.taskStatus.id == 1}" >
+                                <img  src="${resource(dir:'images/skin',file:'not_started.png')}" alt="Not Started" title="Not Started" />
+                            </g:if>
+                            <g:if test="${taskInstance.taskStatus.id == 2}" >
+                                <img  src="${resource(dir:'images/skin',file:'arrow_right.png')}" alt="In Progress" title="In Progress" />
+                            </g:if>
+                            <g:if test="${taskInstance.taskStatus.id == 3}" >
+                                <img  src="${resource(dir:'images/skin',file:'tick.png')}" alt="Complete" title="Complete" />
+                            </g:if>
                         </td>
 
                         <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${subTaskInstance.id}"'>
                             ${fieldValue(bean:subTaskInstance, field:'taskPriority')}
-                        </td>
-
-                        <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${subTaskInstance.id}"'>
-                            ${fieldValue(bean:subTaskInstance, field:'taskStatus')}
                         </td>