Changeset 793 for branches/features

Timestamp:

Feb 7, 2011, 3:43:55 PM (14 years ago)

Author:

gav

Message:

Domain change, add DocumentReference.

Location:

branches/features/taskProcedureRework/grails-app

Files:

• domain/DocumentReference.groovy (added)
• domain/TaskProcedure.groovy (modified) (2 diffs)
• services/TaskProcedureService.groovy (modified) (4 diffs)
• views/taskDetailed/show.gsp (modified) (1 diff)
• views/taskProcedureDetailed/_documentReference.gsp (added)
• views/taskProcedureDetailed/_documentReferences.gsp (added)
• views/taskProcedureDetailed/_taskProcedure.gsp (modified) (1 diff)
• views/taskProcedureDetailed/create.gsp (modified) (1 diff)
• views/taskProcedureDetailed/edit.gsp (modified) (1 diff)

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

@@ -14 +14 @@
 
     List maintenanceActions = new ArrayList()
+    List documentReferences = new ArrayList()
 
-    static hasMany = [tasks: Task, maintenanceActions: MaintenanceAction]
+    static hasMany = [tasks: Task,
+                                    maintenanceActions: MaintenanceAction,
+                                    documentReferences: DocumentReference]
 
     def getMaintenanceActionLazyList() {
         return LazyList.decorate(maintenanceActions, FactoryUtils.instantiateFactory(MaintenanceAction.class))
+    }
+
+    def getDocumentReferenceLazyList() {
+        return LazyList.decorate(documentReferences, FactoryUtils.instantiateFactory(DocumentReference.class))
     }
 
@@ -25 +32 @@
     static mapping = {
         maintenanceActions cascade:"all-delete-orphan"
+        documentReferences cascade:"all-delete-orphan"
     }
 

branches/features/taskProcedureRework/grails-app/services/TaskProcedureService.groovy

@@ -49 +49 @@
                 result.taskProcedureInstance.maintenanceActions.removeAll(nullMaintenanceActions)
             }
+            def nullDocumentReferences = result.taskProcedureInstance.documentReferences.findAll {!it}
+            if (nullDocumentReferences) {
+                result.taskProcedureInstance.documentReferences.removeAll(nullDocumentReferences)
+            }
 
             // Save for restoration if validation fails.
             def savedMaintenanceActions = new ArrayList(result.taskProcedureInstance.maintenanceActions)
+            def savedDocumentReferences = new ArrayList(result.taskProcedureInstance.documentReferences)
 
             // Remove toBeDeleted before validation.
-            def toBeDeleted = result.taskProcedureInstance.maintenanceActions.findAll {it.toBeDeleted}
-            if (toBeDeleted) {
-                result.taskProcedureInstance.maintenanceActions.removeAll(toBeDeleted)
+            def ma_toBeDeleted = result.taskProcedureInstance.maintenanceActions.findAll {it.toBeDeleted}
+            if (ma_toBeDeleted) {
+                result.taskProcedureInstance.maintenanceActions.removeAll(ma_toBeDeleted)
+            }
+            def docRef_toBeDeleted = result.taskProcedureInstance.documentReferences.findAll {it.toBeDeleted}
+            if (docRef_toBeDeleted) {
+                result.taskProcedureInstance.documentReferences.removeAll(docRef_toBeDeleted)
             }
 
@@ -64 +73 @@
                 // The toBeDeleted items are hidden in the view.
                 result.taskProcedureInstance.maintenanceActions = savedMaintenanceActions
-                // Populate maintenanceAction errors for display.
+                result.taskProcedureInstance.documentReferences = savedDocumentReferences
+                // Populate collection errors for display.
                 result.taskProcedureInstance.maintenanceActions.each { it.validate() }
+                result.taskProcedureInstance.documentReferences.each { it.validate() }
                 return fail(code:"default.update.failure")
             }
@@ -108 +119 @@
                 result.taskProcedureInstance.maintenanceActions.removeAll(nullMaintenanceActions)
             }
+            def nullDocumentReferences = result.taskProcedureInstance.documentReferences.findAll {!it}
+            if (nullDocumentReferences) {
+                result.taskProcedureInstance.documentReferences.removeAll(nullDocumentReferences)
+            }
 
             // Also sets: taskInstance.taskProcedure = taskProcedureInstance
@@ -113 +128 @@
 
             if(result.taskProcedureInstance.hasErrors() || !result.taskProcedureInstance.save()) {
-                // Populate maintenanceAction errors for display.
+                // Populate collection errors for display.
                 result.taskProcedureInstance.maintenanceActions.each { it.validate() }
+                result.taskProcedureInstance.documentReferences.each { it.validate() }
                 return fail(code:"default.create.failure")
             }

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

@@ -561 +561 @@
                             </div>
 
+                            <br />
+
+                            <g:if test="${taskProcedureInstance.documentReferences}">
+                                <div class="list">
+                                    <table>
+                                        <thead>
+                                            <tr>
+                                                <th>Document Reference</th>
+                                                <th>Location</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <g:each in="${taskProcedureInstance.documentReferences}" status="i" var="docRef">
+                                                <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+
+                                                    <td valign="top" class="name">
+                                                        ${fieldValue(bean:docRef, field:'name')}
+                                                    </td>
+
+                                                    <td  valign="top" style="text-align:left;" class="value">
+                                                        ${fieldValue(bean:docRef, field:'location')}
+                                                    </td>
+
+                                                </tr>
+                                            </g:each>
+
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </g:if>
+
+                            <br />
+
                             <div class="list">
                                 <table>

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

@@ -62 +62 @@
 
     <br />
+    <g:render template="documentReferences" model="['taskProcedureInstance': taskProcedureInstance]" />
+
+    <br />
     <g:render template="maintenanceActions" model="['taskProcedureInstance': taskProcedureInstance,
                                                                                         'assemblies': assemblies]" />

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

@@ -33 +33 @@
         </div>
         <table style="display:none;">
+            <g:render template="documentReference" model="['docRef': null,
+                                                                                                        'i': '_clone']" />
+        </table>
+        <table style="display:none;">
             <g:render template="maintenanceAction" model="['tp': null,
                                                                                                 'ma': null,

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

@@ -36 +36 @@
         </div>
         <table style="display:none;">
+            <g:render template="documentReference" model="['docRef': null,
+                                                                                                        'i': '_clone']" />
+        </table>
+        <table style="display:none;">
             <g:render template="maintenanceAction" model="['tp': null,
                                                                                                 'ma': null,