Changeset 762 for branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed

Timestamp:

Jan 28, 2011, 10:04:40 PM (14 years ago)

Author:

gav

Message:

Domain change on TaskProcedure and MaintenanceAction, continue task procedure rework.

Location:

branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed

Files:

• _maintenanceActions.gsp (modified) (2 diffs)
• create.gsp (modified) (1 diff)
• edit.gsp (modified) (2 diffs)
• list.gsp (modified) (2 diffs)
• show.gsp (modified) (2 diffs)

branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp

@@ -6 +6 @@
         var deleteIcon = "${resource(dir:'images/skin', file:'database_delete.png')}";
         var templateHtml = "<div id='" + htmlId + "' name='" + htmlId + "'>\n";
-        templateHtml += "<input type='text' id='expandableMaintenanceActionList[" + childCount + "].description' name='expandableMaintenanceActionList[" + childCount + "].description' />\n";
+        templateHtml += "<input type='text' id='maintenanceActionLazyList[" + childCount + "].description' name='maintenanceActionLazyList[" + childCount + "].description' />\n";
         templateHtml += "<span onClick='jQuery(\"#" + htmlId + "\").remove();'><img src='" + deleteIcon + "' /></span>\n";
         templateHtml += "</div>\n";
@@ -15 +15 @@
 
 <div id="childList">
-    <g:each var="m" in="${taskProcedureInstance.maintenanceActions}" status="i">
+    <g:each var="ma" in="${taskProcedureInstance.maintenanceActions}" status="i">
         <div id="maintenanceAction${i}">
-            <g:hiddenField name='expandableMaintenanceActionList[${i}].id' value='${maintenanceAction.id}'/>
-            <g:textField name='expandableMaintenanceActionList[${i}].description' value='${maintenanceAction.description}'/>
-            <input type="hidden" name='expandableMaintenanceActionList[${i}].deleted' id='expandableMaintenanceActionList[${i}].deleted' value='false'/>
-            <span onClick="jQuery('#expandableMaintenanceActionList\\[${i}\\]\\.deleted').val('true'); jQuery('#maintenanceAction${i}').hide()"><img src="${resource(dir:'images/skin', file:'database_delete.png')}" /></span>
+            <g:hiddenField name='maintenanceActionLazyList[${i}].id' value='${ma.id}'/>
+            <g:textField name='maintenanceActionLazyList[${i}].description' value='${ma.description}'/>
+            <input type="hidden" name='maintenanceActionLazyList[${i}].deleted' id='maintenanceActionLazyList[${i}].deleted' value='false'/>
+            <span onClick="jQuery('#maintenanceActionLazyList\\[${i}\\]\\.deleted').val('true'); jQuery('#maintenanceAction${i}').hide()">
+                <img src="${resource(dir:'images/skin', file:'database_delete.png')}" />
+            </span>
         </div>
     </g:each>

branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/create.gsp

@@ -23 +23 @@
 
             <g:form action="save" method="post" >
-            <input type="hidden" name="parentTask.id" value="${taskInstance.id}" />
+            <input type="hidden" name="linkedTask.id" value="${taskInstance.id}" />
 
                 <div class="dialog">

branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/edit.gsp

@@ -35 +35 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="taskInstance">Parent Task:</label>
+                                    <label for="taskInstance">Linked Task:</label>
                                 </td>
                                 <td valign="top" name="taskInstance" class="value">
-                                    <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.parentTask.id}">
-                                        ${taskProcedureInstance.parentTask.encodeAsHTML()}
+                                    <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.linkedTask.id}">
+                                        ${taskProcedureInstance.linkedTask.encodeAsHTML()}
                                     </g:link>
                                 </td>
@@ -48 +48 @@
                                     <label for="maintenanceActions">Maintenance Actions:</label>
                                 </td>
+
                                 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'maintenanceActions','errors')}">
-
-                                    <ul>
-                                        <g:each var="m" in="${taskProcedureInstance?.maintenanceActions?}">
-                                            <li>
-                                                <g:link controller="maintenanceActionDetailed"
-                                                                action="show"
-                                                                id="${m.id}">
-                                                    ${m?.encodeAsHTML()}
-                                                </g:link>
-                                            </li>
-                                        </g:each>
-                                    </ul>
-                                    <g:link controller="maintenanceActionDetailed"
-                                                params="['taskProcedure.id':taskProcedureInstance?.id]"
-                                                action="create">
-                                        +Add MaintenanceAction
-                                    </g:link>
-
+                                    <g:render template="maintenanceActions" model="['taskProcedureInstance': taskProcedureInstance]" />
                                 </td>
                             </tr>

branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/list.gsp

@@ -39 +39 @@
 
                                 <g:sortableColumn property="id" title="Id"  params="${filterParams}" />
-                                <th>Task Description</th>
+                                <th>Description</th>
                                 <th>Asset</th>
 
@@ -52 +52 @@
                                 <td>${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
 
-                                <td>${taskProcedureInstance.parentTask.description.encodeAsHTML()}</td>
+                                <td>${taskProcedureInstance.description.encodeAsHTML()}</td>
 
-                                <td>${taskProcedureInstance.parentTask.primaryAsset?.encodeAsHTML()}</td>
+                                <td>${taskProcedureInstance.asset?.encodeAsHTML()}</td>
 
                                 <td>

branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/show.gsp

@@ -26 +26 @@
 
                         <tr class="prop">
-                            <td valign="top" class="name">Parent Task:</td>
+                            <td valign="top" class="name">Linked Task:</td>
                             <td valign="top" class="value">
-                                <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.parentTask.id}">
-                                    ${taskProcedureInstance.parentTask.encodeAsHTML()}
+                                <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.linkedTask.id}">
+                                    ${taskProcedureInstance.linkedTask.encodeAsHTML()}
                                 </g:link>
                             </td>
@@ -40 +40 @@
                                 <ul>
                                 <g:each var="m" in="${taskProcedureInstance.maintenanceActions}">
-                                    <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                    <li>${m?.encodeAsHTML()}</li>
                                 </g:each>
                                 </ul>