Changeset 408 for trunk/grails-app/domain

Timestamp:

May 11, 2010, 4:41:05 PM (10 years ago)

Author:

keesvb

Message:

reverted changes which removed domain fields from the domain classes, we are now back again at more or less the situation of #394, added preferredIdentifier property to TemplateField? to facilitate simple import

Location:

trunk/grails-app/domain/dbnp/studycapturing

Files:

• Event.groovy (modified) (2 diffs)
• Sample.groovy (modified) (2 diffs)
• Study.groovy (modified) (3 diffs)
• Subject.groovy (modified) (2 diffs)
• TemplateField.groovy (modified) (2 diffs)

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

@@ -14 +14 @@
  */
 class Event extends TemplateEntity implements Serializable {
-//      Date startTime
-//      Date endTime
+        Date startTime
+        Date endTime
 
         static constraints = {
-/*
                 endTime(validator: {val, obj ->
                         if (val && val.before(obj.startTime)) {
@@ -24 +23 @@
                         }
                 })
-*/
         }
 

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

@@ -12 +12 @@
         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   // a member that describes the quantity of the sample? --> should be in the templates
 
         /**
@@ -23 +23 @@
                         new TemplateField(
                                 name: 'name',
-                                type: TemplateFieldType.STRING),
+                                type: TemplateFieldType.STRING,
+                                preferredIdentifier: true),
                         new TemplateField(
                                 name: 'material',

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

@@ -12 +12 @@
         static searchable = true
         nimble.User owner
+        String title
         Date dateCreated
         Date lastUpdated
+        Date startDate
 
         /**
@@ -45 +47 @@
         static constraints = {
                 owner(nullable: true, blank: true)
-                template(nullable: false, blank: false)
         }
 
@@ -58 +59 @@
          */
         def String toString() {
-                //return title;
-                def title = this.giveDomainFields().find { it.name == 'title' }
-
-                return title.toString()
+                return title;
         }
 

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

@@ -14 +14 @@
 class Subject extends TemplateEntity implements Serializable {
         static searchable = true
-
+        String name
+        Term species
+        
         /**
          * return the domain fields for this domain class
@@ -23 +25 @@
                         new TemplateField(
                                 name: 'name',
-                                type: TemplateFieldType.STRING),
+                                type: TemplateFieldType.STRING,
+                                preferredIdentifier: true),
                         new TemplateField(
                                 name: 'species',

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

@@ -18 +18 @@
         List listEntries
         boolean required
+        boolean preferredIdentifier
 
     static hasMany = [
@@ -29 +30 @@
                 comment(nullable:true, blank: true)
                 required(default: false)
+                preferredIdentifier(default: false)
         }