Changeset 232 for trunk/grails-app/domain

Timestamp:

Mar 3, 2010, 5:18:22 PM (13 years ago)

Author:

keesvb

Message:

adjusted Event-Sample relationship to go into EventGroup?, added EventGroups? in BootStrap?, added a Study template to BootStrap?

Location:

trunk/grails-app/domain/dbnp/studycapturing

Files:

• Event.groovy (modified) (2 diffs)
• Sample.groovy (modified) (1 diff)
• SamplingEvent.groovy (modified) (1 diff)
• Study.groovy (modified) (1 diff)
• TemplateField.groovy (modified) (2 diffs)

trunk/grails-app/domain/dbnp/studycapturing/Event.groovy

@@ -14 +14 @@
  */
 class Event implements Serializable {
-        Subject subject
         EventDescription eventDescription
         Date startTime
@@ -29 +28 @@
 
         static constraints = {
-                subject(nullable: true, blank: true)    // TODO: subject is to be removed from Event, and into EventGroup
                 startTime(nullable:false)
                 endTime(validator: {val, obj ->

trunk/grails-app/domain/dbnp/studycapturing/Sample.groovy

@@ -6 +6 @@
  * The Sample class describes an actual sample which results from a SamplingEvent.
  */
-class Sample {
+class Sample extends TemplateEntity {
         static searchable = true
 
+        Subject parentSubject
+        SamplingEvent parentEvent
 
+        String name      // should be unique with respect to the parent study (which can be inferred)
+        Term material
+        // a member that describes the quantity of the sample? --> should be in the templates
 
-    String name      // should be unique with respect to the parent study (which can be inferred)
-    Term material
-    // don't we need a member that describes the quantity of the sample? --> should be in the templates
-
-    static constraints = {
-    }
+        static constraints = {
+        }
 
 }

trunk/grails-app/domain/dbnp/studycapturing/SamplingEvent.groovy

@@ -5 +5 @@
  *
  * NOTE: according to documentation, super classes and subclasses share the same table.
- *       thus, there is actually no reason not to merge the sampling with the Event super class.
- *       this is especially true, since the subclass adds only one has-many relation ship.
+ *       thus, we could merge the sampling with the Event super class and include a boolean
+ *       However, using a separate class makes it more clear in the code that Event and SamplingEvent are treated differently
  */
 
 class SamplingEvent extends Event {
 
-    static hasMany = [samples : Sample]
-
     static constraints = {
     }

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -28 +28 @@
                 events: Event,
                 samplingEvents: SamplingEvent,
+                eventGroups: EventGroup,
                 samples: Sample,
                 assays: Assay,

trunk/grails-app/domain/dbnp/studycapturing/TemplateField.groovy

@@ -14 +14 @@
         String unit
 
-    static hasMany = [listEntries : String] // to store the entries to choose from when the type is 'item from predefined list'
-        //TODO: make TemplateFieldListItem and make a convenience setter for a string array
+    static hasMany = [listEntries : TemplateFieldListItem] // to store the entries to choose from when the type is 'item from predefined list'
 
         static constraints = {
@@ -25 +24 @@
                 return name
         }
+
+        //TODO: make a convenience setter for a string array
+        /*def setListEntries(ArrayList entries) {
+                list=[]
+                entries.each {
+                        list.add(new TemplateFieldListItem(name: it))
+                }
+                this
+        }*/
+
 }