Changeset 1488

Timestamp:

03-02-11 16:46:41 (4 years ago)

Author:

work@…

Message:

- moved biological parts of gdt into a sub-plugin bgdt (biological grails domain templates) which extends gdt
- refactored dynamic validators in gdt
- installed bgdt 0.0.2
- installed gdt 0.0.8

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/conf/BootStrap.groovy (modified) (1 diff)
• grails-app/conf/BootStrapStudies.groovy (modified) (1 diff)
• grails-app/conf/BootStrapTemplates.groovy (modified) (1 diff)
• grails-app/conf/BuildConfig.groovy (modified) (1 diff)
• grails-app/controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (2 diffs)
• grails-app/domain/dbnp/studycapturing/Sample.groovy (modified) (1 diff)
• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (1 diff)
• grails-app/domain/dbnp/studycapturing/Subject.groovy (modified) (1 diff)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)
• web-app/js/importer.js (deleted)
• web-app/js/studywizard.js (modified) (1 diff)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Tue Feb 01 15:44:54 CET 2011
+#Thu Feb 03 16:39:44 CET 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -10 +10 @@
 app.version=0.6.4
 plugins.ajaxflow=0.1.19
+plugins.bgdt=0.0.2
 plugins.crypto=2.0
 plugins.db-util=0.4
 plugins.famfamfam=1.0.1
-plugins.gdt=0.0.7
+plugins.gdt=0.0.8
 plugins.grom=0.2.2
 plugins.hibernate=1.3.6

trunk/grails-app/conf/BootStrap.groovy

@@ -3 +3 @@
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import org.dbnp.gdt.*
+import org.dbnp.bgdt.*
 import dbnp.studycapturing.Study
 import dbnp.studycapturing.Subject

trunk/grails-app/conf/BootStrapStudies.groovy

@@ -11 +11 @@
 import dbnp.studycapturing.*
 import org.dbnp.gdt.*
+import org.dbnp.bgdt.*
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import grails.util.GrailsUtil

trunk/grails-app/conf/BootStrapTemplates.groovy

@@ -11 +11 @@
 import dbnp.studycapturing.*
 import org.dbnp.gdt.*
+import org.dbnp.bgdt.*
 import org.codehaus.groovy.grails.commons.GrailsApplication
 

trunk/grails-app/conf/BuildConfig.groovy

@@ -47 +47 @@
 //grails.plugin.location.'ajaxflow' = '../ajaxflow'
 //grails.plugin.location.'gdt' = '../gdt'
+//grails.plugin.location.'bgdt' = '../bgdt'
 //grails.plugin.location.'jumpbar' = '../jumpbar'

trunk/grails-app/controllers/dbnp/studycapturing/StudyWizardController.groovy

@@ -6 +6 @@
 import org.codehaus.groovy.grails.plugins.web.taglib.ValidationTagLib
 import org.dbnp.gdt.*
+import org.dbnp.bgdt.*
 
 /**
@@ -1100 +1101 @@
                         on("toPageFive").to "assays"
                         on("toPageSix").to "confirm"
-                        on("toPageSeven").to "save"             }
+                        on("toPageSeven").to "save"
+                }
 
                 // render finish page

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

@@ -1 +1 @@
 package dbnp.studycapturing
 import org.dbnp.gdt.*
+import org.dbnp.bgdt.*
 
 /**

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

@@ -53 +53 @@
 
         static constraints = {
+                title(nullable:false, blank: false, maxSize: 255)
                 owner(nullable: true, blank: true)
-                code(nullable: false, blank: true, unique: true)
-                studyUUID(nullable:true, unique:true)
+                code(nullable: false, blank: true, unique: true, maxSize: 255)
+                studyUUID(nullable:true, unique:true, maxSize: 255)
                 // TODO: add custom validator for 'published' to assess whether the study meets all quality criteria for publication
                 // tested by SampleTests.testStudyPublish

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

@@ -1 +1 @@
 package dbnp.studycapturing
 import org.dbnp.gdt.*
+import org.dbnp.bgdt.*
 
 /**

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -3 +3 @@
 import dbnp.authentication.SecUser
 import org.dbnp.gdt.*
+import org.dbnp.bgdt.*
 
 /**

trunk/web-app/js/studywizard.js

@@ -251 +251 @@
 
         $.ajax({
-                url      : baseUrl + '/wizard/ajaxParseRelTime?reltime=' + inputfield.value,
+                url      : baseUrl + '/studyWizard/ajaxParseRelTime?reltime=' + inputfield.value,
                 success : successFunc,
                 error   : errorFunc