Changeset 798 for trunk/grails-app/domain

Timestamp:

Feb 8, 2011, 11:00:27 PM (14 years ago)

Author:

gav

Message:

Svn merge -r752:r797 branches/features/taskProcedureRework into trunk/.

Location:

trunk/grails-app/domain

Files:

• DocumentReference.groovy (copied) (copied from branches/features/taskProcedureRework/grails-app/domain/DocumentReference.groovy)
• MaintenanceAction.groovy (modified) (2 diffs)
• TaskProcedure.groovy (modified) (1 diff)

trunk/grails-app/domain/MaintenanceAction.groovy

@@ -8 +8 @@
 
     String description
-    String reasoning = ""
+    String pageRef = ""
     Integer procedureStepNumber
-    boolean isActive = true
+
+    Boolean toBeDeleted
+    Boolean isNew
+    static transients = [ 'toBeDeleted', 'isNew' ]
 
 //     static hasMany = []
 
-//     static belongsTo = []
+    static belongsTo = [TaskProcedure]
 
     static constraints = {
@@ -22 +25 @@
         maintenancePolicy(nullable:true)
         procedureStepNumber(nullable:true)
-        description()
-        reasoning()
-        isActive()
+        description(blank:false,maxSize:100)
+        pageRef(maxSize:100)
     }
 

trunk/grails-app/domain/TaskProcedure.groovy

@@ +1 @@
+import org.apache.commons.collections.list.LazyList
+import org.apache.commons.collections.FactoryUtils
+
 class TaskProcedure {
 
-    String name
-    String description = ""
-    Boolean isActive = true
+    Task linkedTask
+    Person createdBy
+    Person lastUpdatedBy
+    Date dateCreated = new Date() // autoTimestamp
+    Date lastUpdated = new Date() // autoTimestamp
 
-    static hasMany = [tasks: Task, maintenanceActions: MaintenanceAction]
+    def getDescription() { linkedTask.description }
+    def getAsset() { linkedTask.primaryAsset }
+
+    List maintenanceActions = new ArrayList()
+    List documentReferences = new ArrayList()
+
+    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))
+    }
+
+    static mappedBy = [tasks:"taskProcedure"]
+
+    static mapping = {
+        maintenanceActions cascade:"all-delete-orphan"
+        documentReferences cascade:"all-delete-orphan"
+    }
 
 //     static belongsTo = []
 
     static constraints = {
-        name(maxSize:75,unique:true,blank:false)
-        description(maxSize:100)
     }
 
     String toString() {
-        "${this.name}"
+        "${this.id}"
     }
 }