Changeset 838 for trunk/grails-app/views/taskDetailed

Timestamp:

Mar 3, 2011, 11:17:40 PM (14 years ago)

Author:

gav

Message:

Update service, controller and view logic to hand Task and Entry highestSeverity.
Also remove associatedAssets from task search panes.

Location:

trunk/grails-app/views/taskDetailed

Files:

• search.gsp (modified) (4 diffs)
• searchCalendar.gsp (modified) (2 diffs)

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

@@ -93 +93 @@
                                                                                                 params="${filterParams}" />
 
+                                <custom:sortableColumnWithImg property="highestSeverity"
+                                                                                                imgSrc="${resource(dir:'images/skin',file:'award_star_silver_3.png')}"
+                                                                                                imgAlt="Severity"
+                                                                                                imgTitle="Highest Severity"
+                                                                                                params="${filterParams}" />
+
                                 <g:sortableColumn property="targetStartDate" title="Target Start Date" params="${filterParams}" />
 
@@ -125 +131 @@
                                     <g:if test="${taskInstance.attentionFlag}">
                                         <img  src="${resource(dir:'images/skin',file:'flag_red.png')}" alt="Flag" title="Attention Flag"/>
+                                    </g:if>
+                                </td>
+
+                                <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
+                                    <g:if test="${taskInstance.highestSeverity}">
+                                        ${taskInstance.highestSeverity.code.encodeAsHTML()}
                                     </g:if>
                                 </td>
@@ -237 +249 @@
                                                                                 leadPerson.firstName,
                                                                                 taskGroup.name,
-                                                                                associatedAssets.name,
+                                                                                highestSeverity.code,
                                                                                 primaryAsset.name,
                                                                                 taskStatus.name,
@@ -245 +257 @@
                                                                                 'leadPerson.firstName':[values: associatedPropertyValues.firstNameList],
                                                                                 'taskGroup.name':[values: associatedPropertyValues.taskGroupList],
-                                                                                'associatedAssets.name':[values: associatedPropertyValues.assetList],
+                                                                                'highestSeverity.code':[values: associatedPropertyValues.highestSeverityList],
                                                                                 'primaryAsset.name':[values: associatedPropertyValues.assetList],
                                                                                 'taskStatus.name':[values: associatedPropertyValues.taskStatusList],

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

@@ -122 +122 @@
                                                                                 leadPerson.firstName,
                                                                                 taskGroup.name,
-                                                                                associatedAssets.name,
+                                                                                highestSeverity.code,
                                                                                 primaryAsset.name,
                                                                                 taskStatus.name,
@@ -130 +130 @@
                                                                                 'leadPerson.firstName':[values: associatedPropertyValues.firstNameList],
                                                                                 'taskGroup.name':[values: associatedPropertyValues.taskGroupList],
-                                                                                'associatedAssets.name':[values: associatedPropertyValues.assetList],
                                                                                 'primaryAsset.name':[values: associatedPropertyValues.assetList],
+                                                                                'highestSeverity.code':[values: associatedPropertyValues.highestSeverityList],
                                                                                 'taskStatus.name':[values: associatedPropertyValues.taskStatusList],
                                                                                 'taskType.name':[values: associatedPropertyValues.taskTypeList],