Ignore:
Timestamp:
Oct 17, 2011, 10:09:28 AM (6 years ago)
Author:
s.h.sikkema@…
Message:
  • removed default value for samples argument in AssayService?.collectAssayData to comply with default value for remoteUser. Made adjustments where necessary
  • updated user guide to new one by Janneke
File:
1 edited

Legend:

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

    r2053 r2060  
    177177
    178178                                // collect the assay data according to user selecting
    179                                 def assayData           = assayService.collectAssayData(flow.assay, fieldMapSelection, measurementTokens)
     179                                def assayData           = assayService.collectAssayData(flow.assay, fieldMapSelection, measurementTokens, [])
    180180
    181181                                flash.errorMessage      = assayData.remove('Module Error')
     
    295295
    296296                def measurementTokens = fieldMap.remove('Module Measurement Data');
    297                 def assayData = assayService.collectAssayData(assay, fieldMap, measurementTokens, null, remoteUser)
     297                def assayData = assayService.collectAssayData(assay, fieldMap, measurementTokens, [], remoteUser)
    298298
    299299                def rowData   = assayService.convertColumnToRowStructure(assayData)
     
    406406
    407407                                // Retrieve row based data for this assay
    408                                 def assayData = assayService.collectAssayData( assay, fieldMap, measurementTokens );
     408                                def assayData = assayService.collectAssayData( assay, fieldMap, measurementTokens, [] );
    409409                                def rowData   = assayService.convertColumnToRowStructure(assayData)
    410410
     
    448448
    449449                                // Retrieve row based data for this assay
    450                                 def assayData = assayService.collectAssayData( assay, fieldMap, measurementTokens );
     450                                def assayData = assayService.collectAssayData( assay, fieldMap, measurementTokens, [] );
    451451
    452452                                // Prepend study and assay data to the list
Note: See TracChangeset for help on using the changeset viewer.