Changeset 1730

Timestamp:

Apr 8, 2011, 12:07:56 PM (12 years ago)

Author:

s.h.sikkema@…

Message:

Excel export uses getMeasurements rest call; made assay export visible for guests

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/AssayController.groovy (modified) (1 diff)
• services/dbnp/studycapturing/AssayService.groovy (modified) (2 diffs)
• views/common/_topnav.gsp (modified) (2 diffs)

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

@@ -138 +138 @@
                 flow.fieldMap = assayService.collectAssayTemplateFields(flow.assay)
 
-                flow.measurementTokens = flow.fieldMap.remove('Module Measurement Data')*.name
+                flow.measurementTokens = flow.fieldMap.remove('Module Measurement Data')
             }.to "selectFields"
 

trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

@@ -191 +191 @@
         def moduleUrl = assay.module.url
 
-        def path = moduleUrl + "/rest/getMeasurementMetaData/query?assayToken=$assay.assayUUID"
+        def path = moduleUrl + "/rest/getMeasurements/query?assayToken=$assay.assayUUID"
 
         def jsonArray = moduleCommunicationService.callModuleRestMethodJSON(moduleUrl, path)
 
-        // convert the JSONArray of JSONObjects to an array of hash maps
-        jsonArray.collect{ jo -> // JSONObject
-            [(jo.keys()[0]): jo.values().toList()[0]]
-        }
+        jsonArray*.toString()
 
     }
@@ -231 +228 @@
                 //
                 // [ "measurement 1": [ value1, value2, value3 ],
-                //   "measurement 2": [ value4, value5, value6 ]
+                //   "measurement 2": [ value4, value5, value6 ] ]
                 //
                 def map = [:]

trunk/grails-app/views/common/_topnav.gsp

@@ -23 +23 @@
       </ul>
     </li>
-    <sec:ifLoggedIn>
     <li>
       <a href="#">Assays</a>
@@ -30 +29 @@
       </ul>
     </li>
-    </sec:ifLoggedIn>
         <li>
                 <a href="#">Templates</a>