Changeset 192

Timestamp:

Feb 11, 2010, 5:47:49 PM (14 years ago)

Author:

duh

Message:

• temporary commit
• rewriting grouping javascript
• uncommented the bootstrap part I commented previously, it appeared to be a grails cache issue that was resolved after issuing a 'grails clean' command...

Location:

trunk

Files:

• grails-app/conf/BootStrap.groovy (modified) (2 diffs)
• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (2 diffs)
• grails-app/domain/dbnp/studycapturing/AssayType.groovy (modified) (1 diff)
• web-app/css/wizard.css (modified) (3 diffs)
• web-app/js/grouping.js (modified) (2 diffs)
• web-app/js/wizard.js (modified) (1 diff)

trunk/grails-app/conf/BootStrap.groovy

@@ -239 +239 @@
                         }
 
-                        println 'Adding PPSH study... --> DISABLED due to bootstrapping errors'
-/*
+                        println 'Adding PPSH study'
+                        
             def humanStudy = new Study(
                                 title:"NuGO PPS human study",
@@ -355 +355 @@
                         humanStudy.addToAssays(lipidAssayRef);
                         humanStudy.save()
-*/
                 }
         }

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

@@ -127 +127 @@
                                 flash.errors = new LinkedHashMap()
 
-                                // handle form data
-                                if (!this.handleSubjects(flow, flash, params)) {
+                                // check if we have at least one subject
+                                // and check form data
+                                if (flow.subjects.size() < 1) {
+                                        // append error map
+                                        this.appendErrorMap(['subjects': 'You need at least to create one subject for your study'], flash.errors)
+                                        error()
+                                } else if (!this.handleSubjects(flow, flash, params)) {
                                         error()
                                 } else {
@@ -182 +187 @@
         /**
          * re-usable code for handling subject form data in a web flow
-         * @param Map   LocalAttributeMap (the flow scope)
-         * @param Map   localAttributeMap (the flash scope)
-         * @param Map   GrailsParameterMap (the flow parameters = form data)
+         * @param Map LocalAttributeMap (the flow scope)
+         * @param Map localAttributeMap (the flash scope)
+         * @param Map GrailsParameterMap (the flow parameters = form data)
          * @returns boolean
          */
         def handleSubjects(flow, flash, params) {
-                if (flow.subjects.size() < 1) {
-                        return false
-                } else {
-                        def names = new LinkedHashMap();
-                        def errors = false;
-                        def id = 0;
-
-                        // iterate through subjects
-                        flow.subjects.each() {
-                                // store subject properties
-                                def name = params.get('subject_' + id + '_name')
-                                it.name = params.get('subject_' + id + '_name')
-                                it.species = Term.findByName(params.get('subject_' + id + '_species'))
-
-                                // remember name and check for duplicates
-                                if (!names[ it.name ]) {
-                                        names[ it.name ] = [count: 1, first: 'subject_' + id + '_name'] 
-                                } else {
-                                        // duplicate name found, set error flag
-                                        names[ it.name ]['count']++
-
-                                        // second occurence?
-                                        if (names[ it.name ]['count'] == 2) {
-                                                // yeah, also mention the first
-                                                // occurrence in the error message
-                                                this.appendErrorMap([[names[ it.name ]['first']]: 'The subject name needs to be unique!'], flash.errors)
+                def names = new LinkedHashMap();
+                def errors = false;
+                def id = 0;
+
+                // iterate through subjects
+                flow.subjects.each() {
+                        // store subject properties
+                        def name = params.get('subject_' + id + '_name')
+                        it.name = params.get('subject_' + id + '_name')
+                        it.species = Term.findByName(params.get('subject_' + id + '_species'))
+
+                        // remember name and check for duplicates
+                        if (!names[it.name]) {
+                                names[it.name] = [count: 1, first: 'subject_' + id + '_name']
+                        } else {
+                                // duplicate name found, set error flag
+                                names[it.name]['count']++
+
+                                // second occurence?
+                                if (names[it.name]['count'] == 2) {
+                                        // yeah, also mention the first
+                                        // occurrence in the error message
+                                        this.appendErrorMap([[names[it.name]['first']]: 'The subject name needs to be unique!'], flash.errors)
+                                }
+
+                                // add to error map
+                                this.appendErrorMap([['subject_' + id + '_name']: 'The subject name needs to be unique!'], flash.errors)
+                                errors = true
+                        }
+
+                        // clear lists
+                        def stringList = new LinkedHashMap();
+                        def intList = new LinkedHashMap();
+                        def floatList = new LinkedHashMap();
+                        def termList = new LinkedHashMap();
+
+                        // get all template fields
+                        flow.study.template.subjectFields.each() {
+                                // valid type?
+                                if (!it.type) throw new NoSuchFieldException("Field name ${fieldName} not recognized")
+
+                                // get value
+                                def value = params.get('subject_' + id + '_' + it.name);
+                                if (value) {
+                                        // add to template parameters
+                                        switch (it.type) {
+                                                case 'STRINGLIST':
+                                                        stringList[it.name] = value
+                                                        break;
+                                                case 'INTEGER':
+                                                        intList[it.name] = value
+                                                        break;
+                                                case 'FLOAT':
+                                                        floatList[it.name] = value
+                                                        break;
+                                                default:
+                                                        // unsupported type?
+                                                        throw new NoSuchFieldException("Field type ${it.type} not recognized")
+                                                        break;
                                         }
-
-                                        // add to error map
-                                        this.appendErrorMap([['subject_' + id + '_name']: 'The subject name needs to be unique!'], flash.errors)
-                                        errors = true
-                                }
-
-                                // clear lists
-                                def stringList  = new LinkedHashMap();
-                                def intList             = new LinkedHashMap();
-                                def floatList   = new LinkedHashMap();
-                                def termList    = new LinkedHashMap();
-
-                                // get all template fields
-                                flow.study.template.subjectFields.each() {
-                                        // valid type?
-                                        if (!it.type) throw new NoSuchFieldException("Field name ${fieldName} not recognized")
-
-                                        // get value
-                                        def value = params.get('subject_' + id + '_' + it.name);
-                                        if (value) {
-                                                // add to template parameters
-                                                switch (it.type) {
-                                                        case 'STRINGLIST':
-                                                                stringList[it.name]     = value
-                                                                break;
-                                                        case 'INTEGER':
-                                                                intList[it.name]        = value
-                                                                break;
-                                                        case 'FLOAT':
-                                                                floatList[it.name]      = value
-                                                                break;
-                                                        default:
-                                                                // unsupported type?
-                                                                throw new NoSuchFieldException("Field type ${it.type} not recognized")
-                                                                break;
-                                                }
-                                        }
-                                }
-
-                                // set field data
-                                it.templateStringFields         = stringList
-                                it.templateIntegerFields        = intList
-                                it.templateFloatFields          = floatList
-                                it.templateTermFields           = termList
-
-                                // validate subject
-                                if (!it.validate()) {
-                                        errors = true
-                                        println id + ' :: ' + it.errors.getAllErrors()
-                                        this.appendErrors(it, flash.errors)
-                                }
-
-                                id++;
-                        }
-
-                        return !errors
-                }
+                                }
+                        }
+
+                        // set field data
+                        it.templateStringFields = stringList
+                        it.templateIntegerFields = intList
+                        it.templateFloatFields = floatList
+                        it.templateTermFields = termList
+
+                        // validate subject
+                        if (!it.validate()) {
+                                errors = true
+                                println id + ' :: ' + it.errors.getAllErrors()
+                                this.appendErrors(it, flash.errors)
+                        }
+
+                        id++;
+                }
+
+                return !errors
         }
 

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

@@ -3 +3 @@
 /**
  * Enum describing the different assay types (aka omics submodules).
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
  */
 public enum AssayType {
-    TRANSCRIPTOMICS('Transcriptomics'),
-    METABOLOMICS('Metabolomics'),
-    CLINICAL_DATA('Clinical data')
+        TRANSCRIPTOMICS('Transcriptomics'),
+        METABOLOMICS('Metabolomics'),
+        CLINICAL_DATA('Clinical data')
 
-    String name
+        String name
 
-    AssayType(String name) {
-     this.name = name
-    }
+        AssayType(String name) {
+                this.name = name
+        }
 
-    static list() {
-     [TRANSCRIPTOMICS, METABOLOMICS, CLINICAL_DATA]
-    }
+        static list() {
+                [TRANSCRIPTOMICS, METABOLOMICS, CLINICAL_DATA]
+        }
 
-    /*def String toString() {
-        return this.name
-    }*/
-
+        /*
+        def String toString() {
+                return this.name
+        }
+        */
 }

trunk/web-app/css/wizard.css

@@ -217 +217 @@
 }
 
-.wizard .grouping .subjects {
-    display: block;
-    float: left;
-}
 .wizard .grouping .ui-selected {
     background-color: red;
@@ -228 +224 @@
 }
 
+.wizard .grouping .subjects {
+    display: block;
+    float: left;
+}
+.wizard .grouping .subjects .subject {
+    margin: 1px;
+    padding: 0.2em;
+    font-size: .8em;
+    height: 14px;
+}
 .wizard .grouping .right {
     display: inline-block;
@@ -252 +258 @@
 .wizard .grouping .group .subjects {
     display: inline-block;
+    height: auto;
 }
 .wizard .grouping .group .subject {
-    display: block;
+    display: inline-block;
     width: 100%;
     font-size: 10px;

trunk/web-app/js/grouping.js

@@ -29 +29 @@
 
         this.initItems();
+        this.initGroupItems();
+        this.initGroups();
+        //this.initGroups();
+        
+        console.log('bla')
     },
 
     initItems: function() {
+        var that = this;
+        
         //$(this.itemsIdentifier).
+        $(this.itemsIdentifier).first().selectable({
+            filter: that.itemIdentifier,
+            stop: function() {
+                // done selecting, make all selected items draggable
+                //that.makeDraggable(this);
+            }
+        });
+    },
+
+    initGroups: function() {
+        this.initGroupItems();
+    },
+
+    initGroupItems: function() {
+        var that = this;
+
+        $(this.groupsIdentifier).selectable({
+            filter: that.itemIdentifier
+        })
     }
 }
@@ -156 +182 @@
 }
 */
+
+// for debugging purposes this is here
+// TODO: to be be migrated to wizard.js....
+$(document).ready(function() {
+    new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
+});

trunk/web-app/js/wizard.js

@@ -43 +43 @@
     
     // GROUPING PAGE
-    new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
+    //new Grouping().init('div.subjects', 'div.subject', 'div.groups', 'div.group');
 }