Changeset 177

Timestamp:

Feb 8, 2010, 12:46:19 PM (13 years ago)

Author:

keesvb

Message:

added mouse genotype fields to bootstrap, replaced giveAllFields in Study to return template fields

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/Study.groovy (modified) (1 diff)

trunk/grails-app/conf/BootStrap.groovy

@@ -117 +117 @@
                                 name: 'Mouse'
                         ).addToSubjectFields(new TemplateSubjectField(
-                                name: 'Genotype',type: TemplateFieldType.STRINGLIST))
+                                name: 'Genotype',type: TemplateFieldType.STRINGLIST,
+                                listEntries: ['C57/Bl6j','wild type']))
                         .addToSubjectFields(new TemplateSubjectField(
-                                name: 'Gender',type: TemplateFieldType.STRINGLIST, listEntries: ['Male','Female']))
+                                name: 'Gender',type: TemplateFieldType.STRINGLIST,
+                                listEntries: ['Male','Female']))
                         .addToSubjectFields(new TemplateSubjectField(
                                 name: 'Age',type: TemplateFieldType.INTEGER))

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

@@ -46 +46 @@
         }
 
-        Map giveAllFields() {
-                def result = [:]
-
-                // Using reflection here gives way too many properties, like searchable, hasMany,
-                // and it will probably extend when we use new plugins
-                // It is probably best
-                // - to either hardcode the above given properties
-                // - or to move all fields to the template
-                
-                this.properties.each{ //public fields only
-                        println it.name
-                        result[it.name] = it.type.name //name of field and name of type
-                }
-
-                return result;
+        def giveAllFields() {
+                return template.studyFields;
         }
 }