Changeset 1583 for trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

Timestamp:

02-03-11 17:40:25 (3 years ago)

Author:

s.h.sikkema@…

Message:

UI improvements to assay exporter (ticket #159)

Files:

• trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy (modified) (4 diffs)

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

@@ -150 +150 @@
             flash.errorMessage = e.message
             redirect action: 'selectAssay'
-                        return;
+                        return
 
         }
@@ -159 +159 @@
         flash.assayId = params.assayId
 
-        [fieldMap: fieldMap, measurementTokens: measurementTokens*.name]
+        [fieldMap: fieldMap, measurementTokens: measurementTokens.name]
     }
 
@@ -170 +170 @@
 
         def fieldMap = flash.fieldMap
-        def measurementTokens = flash.measurementTokens
 
         def fieldMapSelection = [:]
@@ -199 +198 @@
         if (params."cat_4" == 'on') {
 
-            measurementTokensSelection = params.measurementToken == 'null' ? measurementTokens : [ name: params.measurementToken]
+            def measurementToken = params.measurementToken
+
+            if (measurementToken) {
+
+                if (measurementToken instanceof String)
+                    measurementTokensSelection = [[name: measurementToken]]
+                else
+                    measurementTokensSelection = measurementToken.collect{[name: it]}
+
+            } else {
+                measurementTokensSelection = flash.measurementTokens
+            }
 
         }