Changeset 1730


Ignore:
Timestamp:
Apr 8, 2011, 12:07:56 PM (6 years ago)
Author:
s.h.sikkema@…
Message:

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

Location:
trunk/grails-app
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

    r1724 r1730  
    138138                flow.fieldMap = assayService.collectAssayTemplateFields(flow.assay)
    139139
    140                 flow.measurementTokens = flow.fieldMap.remove('Module Measurement Data')*.name
     140                flow.measurementTokens = flow.fieldMap.remove('Module Measurement Data')
    141141            }.to "selectFields"
    142142
  • trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

    r1727 r1730  
    191191        def moduleUrl = assay.module.url
    192192
    193         def path = moduleUrl + "/rest/getMeasurementMetaData/query?assayToken=$assay.assayUUID"
     193        def path = moduleUrl + "/rest/getMeasurements/query?assayToken=$assay.assayUUID"
    194194
    195195        def jsonArray = moduleCommunicationService.callModuleRestMethodJSON(moduleUrl, path)
    196196
    197         // convert the JSONArray of JSONObjects to an array of hash maps
    198         jsonArray.collect{ jo -> // JSONObject
    199             [(jo.keys()[0]): jo.values().toList()[0]]
    200         }
     197        jsonArray*.toString()
    201198
    202199    }
     
    231228                //
    232229                // [ "measurement 1": [ value1, value2, value3 ],
    233                 //   "measurement 2": [ value4, value5, value6 ]
     230                //   "measurement 2": [ value4, value5, value6 ] ]
    234231                //
    235232                def map = [:]
  • trunk/grails-app/views/common/_topnav.gsp

    r1716 r1730  
    2323      </ul>
    2424    </li>
    25     <sec:ifLoggedIn>
    2625    <li>
    2726      <a href="#">Assays</a>
     
    3029      </ul>
    3130    </li>
    32     </sec:ifLoggedIn>
    3331        <li>
    3432                <a href="#">Templates</a>
Note: See TracChangeset for help on using the changeset viewer.