Changeset 238 for trunk/grails-app/domain

Timestamp:

Mar 5, 2010, 3:21:52 PM (13 years ago)

Author:

duh

Message:

Refectored version of the wizard

• initial template page has been removed, now is a generic 'start' page where one (in the future) may create a new study, or load and modify an already stored study
• study page incorporates study template select element, but does not yet incorporate the study template fields
• subjects page now allows creation of subjects based on a template. This change also implied the study page altogether had to change into a seperate table entity. Now the the page lists as many tables as unique templates have been selected. These tables contain all subjects that were added using that particular template. NOTE: data is not stored yet, due to the fact that templateEntity does not work properly yey (key/value pairs need to be set correctly when calling the setTemplate method)
• the JavaScript? now handles multiple tables in a page as well, and automatically initializes any underlying slider div if that is required

Location:

trunk/grails-app/domain/dbnp/studycapturing

Files:

• Template.groovy (modified) (3 diffs)
• TemplateEntity.groovy (modified) (5 diffs)
• TemplateFieldListItem.groovy (modified) (1 diff)
• TemplateFieldType.groovy (modified) (1 diff)

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

@@ -12 +12 @@
  */
 class Template implements Serializable {
-
         String name
         Class entity
@@ -21 +20 @@
         static constraints = {
                 name(unique:['entity'])
-
         }
 
@@ -64 +62 @@
                 def results = []
 
-                // this should not work in static context, however it does so I'll keep
+                // 'this' should not work in static context, however it does so I'll keep
                 // this in for now :)
                 this.findAll().each() {

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

@@ -4 +4 @@
 import org.codehaus.groovy.runtime.NullObject
 
-class TemplateEntity {
+/**
+ * TemplateEntity Domain Class
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
+ */
+class TemplateEntity implements Serializable {
 
         Template template
@@ -29 +37 @@
 
         static constraints = {
-                template(nullable: true)
+                template(nullable: true, blank: true)
 
         }
@@ -83 +91 @@
                 }
                 else {
-                        if (templateStringFields.containsKey(fieldName) && value.class == String) {
+                        if (templateStringFields && templateStringFields.containsKey(fieldName) && value.class == String) {
                                 this.templateStringFields[fieldName] = value
                         }
-                        if (templateStringListFields.containsKey(fieldName) && value.class == TemplateFieldListItem) {
+                        if (templateStringFields && templateStringListFields.containsKey(fieldName) && value.class == TemplateFieldListItem) {
                                 // TODO: check if item really belongs to the list under fieldName
                                 this.templateStringListFields[fieldName] = value
@@ -93 +101 @@
                                 this.templateTextFields[fieldName] = value
                         }
-                        else if (templateIntegerFields.containsKey(fieldName) && value.class == Integer) {
+                        else if (templateIntegerFields && templateIntegerFields.containsKey(fieldName) && value.class == Integer) {
                                 this.templateIntegerFields[fieldName] = value
                         }
-                        else if (templateFloatFields.containsKey(fieldName) && value.class == Float) {
+                        else if (templateFloatFields && templateFloatFields.containsKey(fieldName) && value.class == Float) {
                                 this.templateFloatFields[fieldName] = value
                         }
-                        else if (templateDoubleFields.containsKey(fieldName) && value.class == Double) {
+                        else if (templateDoubleFields && templateDoubleFields.containsKey(fieldName) && value.class == Double) {
                                 this.templateDoubleFields[fieldName] = value
                         }
-                        else if (templateDateFields.containsKey(fieldName) && value.class == Date) {
+                        else if (templateDateFields && templateDateFields.containsKey(fieldName) && value.class == Date) {
                                 this.templateDateFields[fieldName] = value
                         }
-                        else if (templateTermFields.containsKey(fieldName) && value.class == Term) {
+                        else if (templateTermFields && templateTermFields.containsKey(fieldName) && value.class == Term) {
                                 this.templateTermFields[fieldName] = value
                         }
@@ -129 +137 @@
                 // TODO: initialize all template fields with the necessary keys and null values
 
-                println "Setting template " + newTemplate
+                //println "Setting template " + newTemplate
                 if (template != null) {
 

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

@@ -1 +1 @@
 package dbnp.studycapturing
 
-class TemplateFieldListItem {
-
+/**
+ * TemplateFieldListItem Domain Class
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
+ */
+class TemplateFieldListItem implements Serializable {
         String name
 
-        static constraints = {
-        }
+        static constraints = {
+        }
 
         String toString() {

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

@@ -8 +8 @@
  * $Date$
  */
-public enum TemplateFieldType {
+public enum TemplateFieldType implements Serializable  {
         STRING('String'),
         TEXT('Long string'),