Ignore:
Timestamp:
May 23, 2011, 4:36:00 PM (9 years ago)
Author:
s.h.sikkema@…
Message:

in exporter: module error display improvements (ie. display on screen but still able to export); removed changes to simplewizard; removed unnecessary imports; should handle 'null' parent subject from samples correctly; should handle non number values from modules correctly; deselects module measurements in case of module error/no measurements; removed obsolete entry in topnav

File:
1 edited

Legend:

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

    r1830 r1864  
    139139                                flow.fieldMap = assayService.collectAssayTemplateFields(flow.assay)
    140140
     141                flash.errorMessage = flow.fieldMap.remove('ModuleError')
    141142                                flow.measurementTokens = flow.fieldMap.remove('Module Measurement Data')
    142143                        }.to "selectFields"
     
    147148                selectFields {
    148149                        on ("submit"){
     150               
    149151                                def fieldMapSelection = [:]
    150152
     
    173175                // collect the assay data according to user selecting
    174176                                def assayData           = assayService.collectAssayData(flow.assay, fieldMapSelection, measurementTokens)
     177
     178                flash.errorMessage      = assayData.remove('ModuleError')
     179
    175180                                flow.rowData            = assayService.convertColumnToRowStructure(assayData)
    176181
Note: See TracChangeset for help on using the changeset viewer.