Changeset 399

Timestamp:

May 10, 2010, 4:32:45 PM (11 years ago)

Author:

duh

Message:

• changed term / ontology fields to select elements instead
• todo: bootrstrap needs improvement as genotype and strain do not yet contain ontologies

Location:

trunk

Files:

• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (3 diffs)
• grails-app/views/wizard/pages/_subjects.gsp (modified) (1 diff)
• web-app/js/wizard.js (modified) (1 diff)

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

@@ -439 +439 @@
 
                 // got ontologies?
-                if (attrs.ontology) {
-                        attrs.ontology.split(/\,/).each() { ncboId ->
-                                // trim the id
-                                ncboId.trim()
-                                
-                                // fetch all terms for this ontology
-                                def ontology = Ontology.findAllByNcboId(ncboId)
-
-                                // does this ontology exist?
-                                if (ontology) {
-                                        ontology.each() {
-                                                Term.findAllByOntology(it).each() {
-                                                        // key = ncboId:concept-id
-                                                        from[ from.size() ] = it.name
+                if (attrs.ontologies) {
+                        // are the ontologies a string?
+                        if (attrs.ontologies instanceof String) {
+                                attrs.ontologies.split(/\,/).each() { ncboId ->
+                                        // trim the id
+                                        ncboId.trim()
+
+                                        // fetch all terms for this ontology
+                                        def ontology = Ontology.findAllByNcboId(ncboId)
+
+                                        // does this ontology exist?
+                                        if (ontology) {
+                                                ontology.each() {
+                                                        Term.findAllByOntology(it).each() {
+                                                                // key = ncboId:concept-id
+                                                                from[ from.size() ] = it.name
+                                                        }
                                                 }
                                         }
+                                }
+                        } else if (attrs.ontologies instanceof Set) {
+                                // are they a set instead?
+                                def ontologyList = ""
+
+                                // iterate through set
+                                attrs.ontologies.each() { ontology ->
+                                        ontologyList += ontology.ncboId + ","
+
+                                        Term.findAllByOntology(ontology).each() {
+                                                from[ from.size() ] = it.name
+                                        }
+
+                                        // strip trailing comma
+                                        attrs.ontologies = ontologyList[0..-2]
                                 }
                         }
@@ -469 +487 @@
                         out << select(attrs)
                 } else {
-                        out << "you should specify: <i>ontology=\"id\"</i> or <i>ontology=\"id1,id2,...,idN\"</i>"
+                        out << "<b>ontologies missing!</b>"
                 }
         }
@@ -733 +751 @@
                                                 // @see http://www.bioontology.org/wiki/index.php/NCBO_Widgets#Term-selection_field_on_a_form
                                                 // @see ontology-chooser.js
+                                                inputElement = (renderType == 'element') ? 'termElement' : 'termSelect'
+
+                                                if (it.ontologies) {
+                                                        out << "$inputElement"(
+                                                                description     : it.name,
+                                                                name            : prependName + it.escapedName(),
+                                                                value           : fieldValue,
+                                                                ontologies      : it.ontologies
+                                                        )
+                                                } else {
+                                                        out << "$inputElement"(
+                                                                description     : it.name,
+                                                                name            : prependName + it.escapedName(),
+                                                                value           : fieldValue
+                                                        )
+                                                }
+                                                break
+                                        case 'ONTOLOGYTERM-old':
+                                                // @see http://www.bioontology.org/wiki/index.php/NCBO_Widgets#Term-selection_field_on_a_form
+                                                // @see ontology-chooser.js
                                                 inputElement = (renderType == 'element') ? 'textFieldElement' : 'textField'
                                                 out << "$inputElement"(

trunk/grails-app/views/wizard/pages/_subjects.gsp

@@ -26 +26 @@
                 The number of subjects to add to your study
         </wizard:textFieldElement>
-        <wizard:termElement name="species" description="of species" value="" ontology="1132">
+        <wizard:termElement name="species" description="of species" value="" ontologies="1132">
                 The species of the subjects you would like to add to your study
         </wizard:termElement>

trunk/web-app/js/wizard.js

@@ -51 +51 @@
         rel     : 'term',
         url     : '/gscf/termEditor',
-        vars    : 'ontology',
+        vars    : 'ontologies',
         label   : 'add more...',
         class   : 'addMore',