Changeset 1659

Show
Ignore:
Timestamp:
22-03-11 17:45:42 (3 years ago)
Author:
s.h.sikkema@…
Message:

Measurements are selected by default in assay excel exporter

Location:
trunk
Files:
6 modified

Legend:

Unmodified
Added
Removed

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

    r1633 r1659  
    177177 
    178178        // remove me 
     179        println '$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$' 
    179180        println flash 
     181        println '$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$' 
    180182 
    181183        [fieldMap: fieldMap, measurementTokens: measurementTokens.name] 
    … …  
    193195 
    194196        // remove me 
     197        println '##############################################################' 
    195198        println flash 
     199        println '##############################################################' 
    196200 
    197201        // did the assay id value come across? 
    … …  
    248252                    measurementTokensSelection = measurementToken.collect{[name: it]} 
    249253 
    250             } else { 
    251                 measurementTokensSelection = flash.measurementTokens 
    252254            } 
    253255 

  • trunk/grails-app/controllers/dbnp/studycapturing/StudyWizardController.groovy

    r1650 r1659  
    12801280        } 
    12811281         
    1282         /** 
     1282    /** 
    12831283        * re-usable code for handling publications form data 
    12841284        * @param study  Study object to update 

  • trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

    r1638 r1659  
    734734        } 
    735735        } 
    736 } 
     736    } 

  • trunk/grails-app/views/assay/selectAssay.gsp

    r1583 r1659  
    4040      onChange="${remoteFunction(controller:'study',action:'ajaxGetAssays',params:'\'id=\'+escape(this.value)',onComplete: 'updateAssay(XMLHttpRequest.responseText, \'assay\')')}"/> 
    4141    <g:select optionKey="id" name="assayId" id="assay" from=""/> 
    42     %{--<g:select optionKey="id" name="assayId" id="assay" from="${assays}"/>--}% 
    4342    <g:submitButton name="submit" value="Submit"/> 
    4443  </g:form> 

  • trunk/grails-app/views/assay/selectFields.gsp

    r1583 r1659  
    5454 
    5555      <assayExporter:categorySelector category="Measurements" ref="cat_${catNum}"/> 
    56       <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" class="field" multiple="true"/> 
     56      <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" value="${measurementTokens}" class="field" multiple="true" /> 
    5757      <br /><br /> 
    5858      <g:submitButton name="submit" value="Submit"/> 

  • trunk/test/unit/dbnp/studycapturing/AssayServiceTests.groovy

    r1594 r1659  
    133133 
    134134            row.eachWithIndex { cell, ci -> 
    135  
     135                // TODO: what happens when there are empty cells 
    136136                readData[ri][ci] = (cell.cellType == Cell.CELL_TYPE_NUMERIC) ? cell.numericCellValue : cell.stringCellValue 
    137137