Changeset 793 for branches/features/taskProcedureRework/grails-app/services

Timestamp:

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

Author:

gav

Message:

Domain change, add DocumentReference.

File:

• branches/features/taskProcedureRework/grails-app/services/TaskProcedureService.groovy (modified) (4 diffs)

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")
             }