Changeset 557

Timestamp:

Jun 11, 2010, 3:50:48 PM (13 years ago)

Author:

duh

Message:

• fixed issues with templates not refreshing properly in the wizard after editting them in the templateEditor
• tried to centralize some functionality
• dev version of samples

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (9 diffs)
• domain/dbnp/data/Term.groovy (modified) (1 diff)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)
• views/wizard/pages/_samples.gsp (modified) (1 diff)

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

@@ -218 +218 @@
                         }
                         on("refresh") {
+                                println ".refreshing...."
                                 flash.values = params
 
                                 // handle study data
                                 this.handleStudy(flow, flash, params)
+
+                                // force refresh of the template
+                                if (flow.study.template) {
+                                        flow.study.template.refresh()
+                                }
 
                                 // remove errors as we don't want any warnings now
@@ -233 +239 @@
                                 // handle study data
                                 this.handleStudy(flow, flash, params)
+
+                                // force refresh of the template
+                                if (flow.study.template) {
+                                        flow.study.template.refresh()
+                                }
 
                                 // remove errors as we don't want any warnings now
@@ -285 +296 @@
                         on("refresh") {
                                 flash.values = params
+
+                                // refresh templates
+                                flow.subjectTemplates.each() {
+                                        it.value.template.refresh()
+                                }
+
                                 success()
                         }.to "subjects"
@@ -409 +426 @@
                                 // handle study data
                                 this.handleEvents(flow, flash, params)
+
+                                // refresh event templates
+                                flow.eventTemplates.each() {
+                                        it.value.template.refresh()
+                                }
+
+                                // refresh flow template
+                                if (flow.event.template) flow.event.template.refresh()
+
+                                // remove errors as we don't want any warnings now
+                                flash.errors = [:]
+                        }.to "events"
+                        on("refresh") {
+                                flash.values = params
+
+                                // handle study data
+                                this.handleEvents(flow, flash, params)
+
+                                // refresh templates
+                                flow.eventTemplates.each() {
+                                        it.value.template.refresh()
+                                }
+
+                                // refresh flow template
+                                if (flow.event.template) flow.event.template.refresh()
 
                                 // remove errors as we don't want any warnings now
@@ -581 +623 @@
                         onRender {
                                 flow.page = 6
-                                flow.bla = "samples"
+
+                                flow.samples = []
 
                                 // iterate through eventGroups
@@ -595 +638 @@
 
                                                                 println sampleName
+                                                                flow.samples[ flow.samples.size() ] = [
+                                                                        sample          : new Sample(
+                                                                                parentSubject: subject,
+                                                                                parentEvent: event,
+                                                                                name: sampleName
+                                                                        ),
+                                                                    name                : sampleName,
+                                                                        eventGroup      : eventGroup,
+                                                                        event           : event,
+                                                                        subject         : subject
+                                                                ]
                                                         }
                                                 }
@@ -600 +654 @@
                                 }
 
+                                println flow.samples
+
                                 success()
                         }
@@ -607 +663 @@
                         on("next") {
                                 success()
-                        }.to "confirm"
+                        }.to "samples"
                         on("quickSave") {
                                 success()
@@ -1013 +1069 @@
         }
 
-
         /**
          * groovy / java equivalent of php's ucwords function

trunk/grails-app/domain/dbnp/data/Term.groovy

@@ -30 +30 @@
                 return name
         }
+
+        /**
+         * Return all terms for a string of comma separated ontology ncboId's.
+         * @see Ontology.groovy
+         * @param ontologies
+         * @return
+         */
+        def giveAllByOntologies( ontologies ) {
+                // this method does not seem to work (see taglibrary:termSelect)
+                // i'll try to get it working later, or delete this altogether
+                // - Jeroen
+                def data = []
+                def terms = []
+
+                // got a string?
+                if (ontologies instanceof String) {
+                        // split the ontologies string
+                        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() {
+                                                data[ data.size() ] = it
+                                        }
+                                }
+                        }
+
+                        ontologies = data
+                }
+
+                // iterate through ontologies
+                ontologies.each() { ontology ->
+                        Term.findAllByOntology( ontology ).each() { term ->
+                                terms[ terms.size() ] = term
+                        }
+                }
+
+                // sort alphabetically
+                terms.sort()
+        }
 }

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

@@ -601 +601 @@
                         // sort alphabetically
                         from.sort()
-                        
+
                         // define 'from'
                         attrs.from = from

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

@@ -22 +22 @@
         </span>
 
-        
-
+        <g:if test="${samples}">
+                <div class="table">
+                <g:each var="sampleData" in="${samples}">
+                        ${sampleData}
+                        <div class="row">
+                                <!-- wizard:templateColumns class="column" id="1" entity="${sampleData['sample']}" //-->
+                                <!-- div class="column"><wizard:templateSelect entity="${sampleData.sample}" /></div //-->
+                        </div>
+                </g:each>
+                </div>
+        </g:if>
 
 </wizard:pageContent>