Changeset 817 for trunk

Timestamp:

Feb 21, 2011, 8:57:41 PM (14 years ago)

Author:

gav

Message:

Display the machines assigned to a tasks procedure, on both the task show and asset life plan views.

Location:

trunk/grails-app

Files:

• taglib/CustomTagLib.groovy (modified) (1 diff)
• views/assetDetailed/show.gsp (modified) (1 diff)
• views/taskDetailed/search.gsp (modified) (1 diff)

trunk/grails-app/taglib/CustomTagLib.groovy

@@ -278 +278 @@
 
     /**
+    * Get a list of the machines assigned on a taskProcedureRevision.
+    *
+    * Fields:
+    *  taskProcedureRevision - TaskProcedureRevision to use.
+    *
+    * Example:
+    * <!--
+    * <custom:taskProcedureMachines taskProcedureRevision="${taskInstance.taskProcedureRevision}" />
+    * -->
+    */
+    def taskProcedureMachines = {attrs ->
+        def taskProcedureRevision = attrs.taskProcedureRevision
+        def machines = taskProcedureRevision.maintenanceActions.collect {it.assetSubItem.parentItem}.unique()
+        out << machines.encodeAsHTML()
+    }
+
+    /**
     * Determine if a supplied string is considered a url or not.
     * The scheme/protocol can be adjusted, file:// has been excluded here.

trunk/grails-app/views/assetDetailed/show.gsp

@@ -143 +143 @@
                                         ${fieldValue(bean:t, field:'description')}
                                         <br />
+                                        <g:if test="${t.taskProcedureRevision?.maintenanceActions}" >
+                                            <custom:taskProcedureMachines taskProcedureRevision="${t.taskProcedureRevision}" />
+                                            <br />
+                                        </g:if>
                                         <g:if test="${t.safetyRequirement}" >
                                             <img  src="${resource(dir:'images/skin',file:'lightning.png')}" alt="Safety Requirement" title="Safety Requirement" />

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

@@ -150 +150 @@
                                     ${fieldValue(bean:taskInstance, field:'description')}
                                     </b>
+                                    <g:if test="${taskInstance.taskProcedureRevision?.maintenanceActions}" >
+                                        <br />
+                                        <custom:taskProcedureMachines taskProcedureRevision="${taskInstance.taskProcedureRevision}" />
+                                    </g:if>
                                     <g:if test="${taskInstance.safetyRequirement}" >
                                         <br />