Changeset 2060

Show
Ignore:
Timestamp:
17-10-11 10:09:28 (3 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

Location:
trunk
Files:
1 added
4 modified

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 
  • trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

    r2049 r2060  
    8282         * @param measurementTokens     selection of measurementTokens 
    8383         * @param samples                               list of samples for which the data should be retrieved.  
    84          *                                                              Defaults to all samples from this assay. 
     84         *                                                              Defaults to all samples from this assay. Supply [] or 
     85         *                                                              null to include all samples. 
    8586         * @return                              The assay data structure as described above. 
    8687         */ 
    87         def collectAssayData(assay, fieldMap, measurementTokens, samples = null, SecUser remoteUser = null) throws Exception { 
     88        def collectAssayData(assay, fieldMap, measurementTokens, samples, SecUser remoteUser = null) throws Exception { 
    8889 
    8990                def collectFieldValuesForTemplateEntities = { headerFields, templateEntities -> 
  • trunk/grails-app/views/home/index.gsp

    r1886 r2060  
    355355                        </p> 
    356356                        <p> 
    357                                 <i>A more in depth quickstart guide is available for download <a href="${resource(dir:'downloads', file: 'quickstart_'+session.style+'.pdf')}">here</a>.</i> 
     357                                <i>A more in depth user guide is available for download <a href="${resource(dir:'downloads', file: 'gscf_user_guide.pdf')}">here</a>.</i> 
    358358                        </p> 
    359359                </div> 
  • trunk/test/unit/dbnp/studycapturing/AssayServiceTests.groovy

    r1882 r2060  
    55import org.apache.poi.ss.usermodel.WorkbookFactory 
    66import org.apache.poi.ss.usermodel.Cell 
    7 import grails.converters.JSON 
    87import org.dbnp.gdt.* 
    98import org.dbnp.gdt.AssayModule 
    10 import org.dbnp.gdt.TemplateEntity 
    11 import groovy.mock.interceptor.MockFor 
    12 import org.dbnp.gdt.GdtService 
    139import org.dbnp.gdt.TemplateStringField 
    1410 
     
    210206        String.metaClass.'encodeAsURL' = {delegate} 
    211207 
    212         def assayData = service.collectAssayData(assay, fieldMap, measurementTokens) 
     208        def assayData = service.collectAssayData(assay, fieldMap, measurementTokens, []) 
    213209 
    214210        def sample1index = assayData.'Sample Data'.'name'.findIndexOf{it == 'sample1'}