Changeset 770 for branches/features/taskProcedureRework/grails-app

Timestamp:

Feb 2, 2011, 8:38:20 PM (14 years ago)

Author:

gav

Message:

Domain change, improved draft of creating taskProcedure dynamic form.

Location:

branches/features/taskProcedureRework/grails-app

Files:

• controllers/TaskProcedureDetailedController.groovy (modified) (7 diffs)
• domain/MaintenanceAction.groovy (modified) (1 diff)
• views/taskDetailed/show.gsp (modified) (4 diffs)
• views/taskProcedureDetailed/_maintenanceAction.gsp (added)
• views/taskProcedureDetailed/_maintenanceActions.gsp (modified) (1 diff)
• views/taskProcedureDetailed/_taskProcedure.gsp (added)
• views/taskProcedureDetailed/create.gsp (modified) (2 diffs)
• views/taskProcedureDetailed/edit.gsp (modified) (2 diffs)
• views/taskProcedureDetailed/show.gsp (deleted)

branches/features/taskProcedureRework/grails-app/controllers/TaskProcedureDetailedController.groovy

@@ -40 +40 @@
 
         if(!taskProcedureInstance) {
-            flash.message = "TaskProcedure not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ taskProcedureInstance : taskProcedureInstance ] }
+            flash.errorMessage = "TaskProcedure not found with id ${params.id}"
+            redirect(controller:'taskDetailed', action:'search')
+            return
+        }
+
+        redirect(controller:'taskDetailed',
+                        action:'show',
+                        id:taskProcedureInstance.linkedTask?.id,
+                        params:[showTab:"showProcedureTab"])
     }
 
@@ -49 +54 @@
         def taskProcedureInstance = TaskProcedure.get( params.id )
         if(taskProcedureInstance) {
+            def taskInstance = taskProcedureInstance.linkedTask
             try {
                 taskProcedureInstance.tasks.each {
@@ -55 +61 @@
                 taskProcedureInstance.delete(flush:true)
                 flash.message = "TaskProcedure ${params.id} deleted"
-                redirect(action:list)
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskInstance.id,
+                                params:[showTab:"showProcedureTab"])
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
                 flash.message = "TaskProcedure ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskInstance.id,
+                                params:[showTab:"showProcedureTab"])
             }
         }
@@ -99 +111 @@
             taskProcedureInstance.properties = params
 
-            def toBeDeleted = taskProcedureInstance.maintenanceActions.findAll {it.deleted}
-            if(toBeDeleted) {
+            // Gaps in the html index's can be created by adding 2 items and removing the first one.
+            // This creates a gap at the missing index where LazyList will return a null.
+            def nullMaintenanceActions = taskProcedureInstance.maintenanceActions.findAll {!it}
+            if (nullMaintenanceActions) {
+                taskProcedureInstance.maintenanceActions.removeAll(nullMaintenanceActions)
+            }
+
+            // Save for restoration if validation fails.
+            def savedMaintenanceActions = new ArrayList(taskProcedureInstance.maintenanceActions)
+
+            // Remove toBeDeleted before validation.
+            def toBeDeleted = taskProcedureInstance.maintenanceActions.findAll {it.toBeDeleted}
+            if (toBeDeleted) {
                 taskProcedureInstance.maintenanceActions.removeAll(toBeDeleted)
             }
@@ -106 +129 @@
             if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
                 flash.message = "TaskProcedure ${params.id} updated"
-                redirect(action:show,id:taskProcedureInstance.id)
+                redirect(controller:'taskDetailed',
+                                action:'show',
+                                id:taskProcedureInstance.linkedTask.id,
+                                params:[showTab:"showProcedureTab"])
             }
             else {
+                // Restore the saved items, some of which contain toBeDeleted flags but
+                // have not been deleted yet since validation failed.
+                // The toBeDeleted items are hidden in the view.
+                taskProcedureInstance.maintenanceActions = savedMaintenanceActions
+                // Populate maintenanceAction errors for display.
+                taskProcedureInstance.maintenanceActions.each { it.validate() }
                 render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
             }
@@ -119 +151 @@
 
     def create = {
-        if(params.taskInstance?.id) {
-            def taskInstance = Task.get(params.taskInstance.id)
-
-            def taskProcedureInstance = new TaskProcedure()
-            taskProcedureInstance.properties = params
-            return ['taskProcedureInstance':taskProcedureInstance,
-                            taskInstance: taskInstance]
-        } else {
-            flash.message = "Please select or create a task, then go to the Procedure tab."
+
+        if(!params.taskInstance?.id) {
+            flash.errorMessage = "Please select or create a task, then go to the Procedure tab."
             redirect(controller:"taskDetailed", action:"search")
-        }
+            return
+        }
+
+        params.linkedTask = Task.get(params.taskInstance.id)
+
+        if(!params.linkedTask?.primaryAsset) {
+            flash.errorMessage = "Please set a Primary Asset first, then go to the Procedure tab."
+            redirect(controller:"taskDetailed", action:"show", id:params.linkedTask?.id)
+            return
+        }
+
+        def taskProcedureInstance = new TaskProcedure()
+        taskProcedureInstance.properties = params
+        return ['taskProcedureInstance':taskProcedureInstance]
     }
 
@@ -136 +175 @@
         def taskInstance = Task.get(params.linkedTask.id)
 
+        // Gaps in the html index's can be created by adding 2 items and removing the first one.
+        // This creates a gap at the missing index where LazyList will return a null.
+        def nullMaintenanceActions = taskProcedureInstance.maintenanceActions.findAll {!it}
+        if (nullMaintenanceActions) {
+            taskProcedureInstance.maintenanceActions.removeAll(nullMaintenanceActions)
+        }
+
         if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
-            taskProcedureInstance.addToTasks(taskInstance) // also sets: taskInstance.taskProcedure = taskProcedureInstance
+             // Also sets: taskInstance.taskProcedure = taskProcedureInstance
+            taskProcedureInstance.addToTasks(taskInstance)
             flash.message = "TaskProcedure ${taskProcedureInstance.id} created."
-            redirect(action:show,id:taskProcedureInstance.id)
-        }
-        else {
-            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance, taskInstance: taskInstance])
-        }
-    }
+            redirect(controller:'taskDetailed',
+                            action:'show',
+                            id:taskProcedureInstance.linkedTask.id,
+                            params:[showTab:"showProcedureTab"])
+        }
+        else {
+            // Populate maintenanceAction errors for display.
+            taskProcedureInstance.maintenanceActions.each { it.validate() }
+            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance])
+        }
+    }
+
 }

branches/features/taskProcedureRework/grails-app/domain/MaintenanceAction.groovy

@@ -11 +11 @@
     Integer procedureStepNumber
 
-    Boolean deleted
-    static transients = [ 'deleted' ]
+    Boolean toBeDeleted
+    Boolean isNew
+    static transients = [ 'toBeDeleted', 'isNew' ]
 
 //     static hasMany = []

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

@@ -513 +513 @@
                                         <tr class="prop">
                                             <td valign="top" class="name">Procedure Id:</td>
-
-                                            <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
-
-                                        </tr>
-
-                        <tr class="prop">
-                            <td valign="top" class="name">Linked Task:</td>
-                            <td valign="top" class="value">
-                                <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.linkedTask.id}">
-                                    ${taskProcedureInstance.linkedTask.encodeAsHTML()}
-                                </g:link>
-                            </td>
-                        </tr>
+                                            <td valign="top" class="value">
+                                                ${fieldValue(bean:taskProcedureInstance, field:'id')}
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Linked Task:</td>
+                                            <td valign="top" class="value">
+                                                <g:link controller="taskDetailed"
+                                                                action="show"
+                                                                id="${taskProcedureInstance.linkedTask.id}">
+                                                    ${taskProcedureInstance.linkedTask.encodeAsHTML()}
+                                                </g:link>
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Linked Asset:</td>
+                                            <td valign="top" class="value">
+                                                ${fieldValue(bean:taskProcedureInstance, field:'linkedTask.primaryAsset')}
+                                            </td>
+                                        </tr>
+
+                                        <tr class="prop">
+                                            <td valign="top" class="name">Version:</td>
+                                            <td valign="top" class="value">
+                                                    ${fieldValue(bean:taskProcedureInstance, field:'version')}
+                                            </td>
+                                        </tr>
 
                                     </tbody>
@@ -542 +558 @@
                                         <tr>
                                             <th>Step</th>
+                                            <th>Sub Item</th>
                                             <th>Description</th>
                                             <th>Reasoning</th>
-                                            <th>Sub Item</th>
                                         </tr>
                                     </thead>
@@ -556 +572 @@
 
                                                 <td  valign="top" style="text-align:left;" class="value">
+                                                    ${fieldValue(bean:maintenanceAction, field:'assetSubItem')}
+                                                </td>
+
+                                                <td  valign="top" style="text-align:left;" class="value">
                                                     ${fieldValue(bean:maintenanceAction, field:'description')}
                                                 </td>
@@ -561 +581 @@
                                                 <td  valign="top" style="text-align:left;" class="value">
                                                     ${fieldValue(bean:maintenanceAction, field:'reasoning')}
-                                                </td>
-
-                                                <td  valign="top" style="text-align:left;" class="value">
-                                                    ${fieldValue(bean:maintenanceAction, field:'assetSubItem')}
                                                 </td>
 

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

@@ -1 +1 @@
 <script type="text/javascript">
     var childCount = ${taskProcedureInstance?.maintenanceActions.size()} + 0;
+    var ma_wrapperId = "ma_wrapper";
+    var ma_cloneId = "maintenanceActionLazyList_clone";
+    var ma_lazyList = "maintenanceActionLazyList";
+    var ma_fields = ["toBeDeleted", "isNew", "description", "reasoning", "assetSubItem.id", "procedureStepNumber"];
+    var ma_focusField = "procedureStepNumber";
 
-    function addChild() {
-        var htmlId = "maintenanceAction" + childCount;
-        var deleteIcon = "${resource(dir:'images/skin', file:'database_delete.png')}";
-        var templateHtml = "<div id='" + htmlId + "' name='" + htmlId + "'>\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";
-        jQuery("#childList").append(templateHtml);
+
+    function addChild(wrapperId, cloneId, lazyList, fields, focusField){
+
+        var clone = jQuery("#"+cloneId).clone();
+        clone.attr('id', lazyList+childCount);
+        var htmlId = lazyList+'['+childCount+'].';
+
+        var fieldsMap = {};
+        jQuery.each(fields, function(index, field) {
+            fieldsMap[field] = clone.find('[id$="'+field+'"]');
+            fieldsMap[field].attr('id',htmlId + field)
+                                        .attr('name',htmlId + field);
+            if(field == 'isNew') {
+                fieldsMap[field].attr('value', 'true');
+            }
+        });
+
+        jQuery("#"+wrapperId).append(clone);
+        clone.show();
+        fieldsMap[focusField].focus();
         childCount++;
     }
+
+    // Click event on add button.
+    jQuery('.add-ma').live('click', function() {
+            addChild(ma_wrapperId, ma_cloneId, ma_lazyList, ma_fields, ma_focusField);
+    });
+
+    // Click event on delete buttons.
+    jQuery('.del-ma').live('click', function() {
+        //find the parent div
+        var prnt = jQuery(this).parents(".ma-div");
+        //find the deleted hidden input
+        var delInput = prnt.find("input[id$=toBeDeleted]");
+        //check if this is still not persisted
+        var newValue = prnt.find("input[id$=isNew]").attr('value');
+        //if it is new then i can safely remove from dom
+        if(newValue == 'true'){
+            prnt.remove();
+        }else{
+            //set the deletedFlag to true
+            delInput.attr('value','true');
+            //hide the div
+            prnt.hide();
+        }
+    });
+
+    jQuery(window).load(function() {
+        if(childCount == 0) {
+            addChild(ma_wrapperId, ma_cloneId, ma_lazyList, ma_fields, ma_focusField);
+        }
+    });
+
 </script>
 
-<div id="childList">
-    <g:each var="ma" in="${taskProcedureInstance.maintenanceActions}" status="i">
-        <div id="maintenanceAction${i}">
-            <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>
-</div>
-<input type="button" value="Add MaintenanceAction" onclick="addChild();" />
+
+
+    <div>
+        <table>
+            <thead>
+                <tr>
+
+                    <th>Step</th>
+                    <th>Sub Item</th>
+                    <th>Description</th>
+                    <th>Reasoning</th>
+                    <th></th>
+
+                </tr>
+            </thead>
+            <tbody id="ma_wrapper">
+                    <g:each var="ma" in="${taskProcedureInstance.maintenanceActions}" status="i">
+                            <g:render template="maintenanceAction" model="['tp':taskProcedureInstance, 'ma': ma, 'i':i]" />
+                    </g:each>
+                    </tr>
+            </tbody>
+        </table>
+    </div>
+
+    <br />
+
+    <div style="text-align:right;">
+        <span class="buttons add-ma">
+            <input type="button" class="add" value="Add MaintenanceAction" />
+        </span>
+    </div>

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

@@ -13 +13 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
+
             <g:hasErrors bean="${taskProcedureInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${taskProcedureInstance}" as="list" />
-            </div>
+                <div class="errors">
+                    <g:renderErrors bean="${taskProcedureInstance}" as="list" />
+                </div>
             </g:hasErrors>
 
             <g:form action="save" method="post" >
-            <input type="hidden" name="linkedTask.id" value="${taskInstance.id}" />
+                <input type="hidden" name="linkedTask.id" value="${taskProcedureInstance.linkedTask.id}" />
 
-                <div class="dialog">
-                    <table>
-                        <tbody>
+                <g:render template="taskProcedure" model="['taskProcedureInstance': taskProcedureInstance]" />
 
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskInstance">Parent Task:</label>
-                                </td>
-                                <td valign="top" name="taskInstance" class="value">
-                                    <g:link controller="taskDetailed" action="show" id="${taskInstance.id}">
-                                        ${taskInstance.encodeAsHTML()}
-                                    </g:link>
-                                </td>
-                            </tr>
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="maintenanceActions">Maintenance Actions:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'maintenanceActions','errors')}">
-                                    <g:render template="maintenanceActions" model="['taskProcedureInstance': taskProcedureInstance]" />
-                                </td>
-                            </tr>
-
-                        </tbody>
-                    </table>
-                </div>
                 <div class="buttons">
                     <span class="button"><input class="save" type="submit" value="Create" /></span>
@@ -57 +31 @@
             </g:form>
         </div>
+        <table style="display:none;">
+            <g:render template="maintenanceAction" model="['tp': null, 'ma': null, 'i': '_clone']" />
+        </table>
     </body>
 </html>

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

@@ -13 +13 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
+
             <g:hasErrors bean="${taskProcedureInstance}">
-            <div class="errors">
-                <g:renderErrors bean="${taskProcedureInstance}" as="list" />
-            </div>
+                <div class="errors">
+                    <g:renderErrors bean="${taskProcedureInstance}" as="list" />
+                </div>
             </g:hasErrors>
+
             <g:form method="post" >
                 <input type="hidden" name="id" value="${taskProcedureInstance?.id}" />
                 <input type="hidden" name="version" value="${taskProcedureInstance?.version}" />
-                <div class="dialog">
-                    <table>
-                        <tbody>
 
-                            <tr class="prop">
-                                <td valign="top" class="name">Id:</td>
-                                <td valign="top" class="value">${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
-                            </tr>
+                <g:render template="taskProcedure" model="['taskProcedureInstance': taskProcedureInstance]" />
 
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="taskInstance">Linked Task:</label>
-                                </td>
-                                <td valign="top" name="taskInstance" class="value">
-                                    <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.linkedTask.id}">
-                                        ${taskProcedureInstance.linkedTask.encodeAsHTML()}
-                                    </g:link>
-                                </td>
-                            </tr>
-
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="maintenanceActions">Maintenance Actions:</label>
-                                </td>
-
-                                <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'maintenanceActions','errors')}">
-                                    <g:render template="maintenanceActions" model="['taskProcedureInstance': taskProcedureInstance]" />
-                                </td>
-                            </tr>
-
-                        </tbody>
-                    </table>
-                </div>
                 <div class="buttons">
                     <span class="button"><g:actionSubmit class="save" value="Update" /></span>
@@ -63 +33 @@
             </g:form>
         </div>
+        <table style="display:none;">
+            <g:render template="maintenanceAction" model="['tp': null, 'ma': null, 'i': '_clone']" />
+        </table>
     </body>
 </html>