Ignore:
Timestamp:
Nov 25, 2011, 3:36:45 PM (11 years ago)
Author:
s.h.sikkema@…
Message:

# GDT

  • fixed issue where dynamically populated template select boxes would open pop-up on wrong option
  • gdt version 0.1.9

# GDT Importer

  • fixed bug in gdtImporter where importer would hang when first choosing sample as data type and then changing to some other data type to import
  • when there are errors in the import, table editor is now always enabled (can be really slow still!)
  • changed text message under data preview
  • fixed bug where going from page 2 to 1 would show all rows instead of just 5
  • replaced "Please make any adjustments if required" with "The following data will be imported" when user can't change anything
  • removed space between import preview and next button
  • gdtImporter version 0.4.6.7

# GSCF

  • now includes sampletokens when retrieving assay data from modules to ensure match between data and samples (was mixed up!)
Location:
trunk/grails-app/services/dbnp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/services/dbnp/modules/ModuleCommunicationService.groovy

    r2049 r2120  
    183183                // Store the response in cache
    184184                storeInCache( restUrl, restResponse, args );
    185                
     185
    186186                return restResponse
    187187
     
    205205                def user = authenticationService.getLoggedInUser();
    206206                def userId = user ? user.id : -1;
    207                
     207
    208208                url = cacheUrl( url, args )
    209209               
  • trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

    r2095 r2120  
    171171
    172172                // Find samples and sort by name
    173                 if( !samples )
    174                         samples = assay.samples.toList().sort { it.name }
     173                if ( !samples ) samples = assay.samples.toList()
     174                samples = samples.sort { it.name }
    175175
    176176                def eventFieldMap = [:]
     
    194194                        } catch (e) {
    195195                                moduleMeasurementData = ['error' : ['Module error, module not available or unknown assay'] * samples.size() ]
     196                                e.printStackTrace()
    196197                                moduleError =  e.message
    197198                        }
     
    311312                def query = "assayToken=$assay.assayUUID$tokenString"
    312313
     314                if (samples) {
     315                         query += '&' + samples*.sampleUUID.collect { "sampleToken=$it" }.join('&')
     316                }
     317
    313318                def sampleTokens = [], measurementTokens = [], moduleData = []
    314319
     
    316321                        (sampleTokens, measurementTokens, moduleData) = moduleCommunicationService.callModuleMethod(moduleUrl, path, query, "POST", remoteUser)
    317322                } catch (e) {
     323                        e.printStackTrace()
    318324                        throw new Exception("An error occured while trying to get the measurement data from the $assay.module.name. \
    319325             This means the module containing the measurement data is not available right now. Please try again \
Note: See TracChangeset for help on using the changeset viewer.