Changeset 2120

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

Files:

• application.properties (modified) (1 diff)
• grails-app/conf/Config.groovy (modified) (1 diff)
• grails-app/controllers/dbnp/studycapturing/AssayController.groovy (modified) (1 diff)
• grails-app/services/dbnp/modules/ModuleCommunicationService.groovy (modified) (2 diffs)
• grails-app/services/dbnp/studycapturing/AssayService.groovy (modified) (4 diffs)

trunk/application.properties

@@ -13 +13 @@
 plugins.db-util=0.4
 plugins.famfamfam=1.0.1
-plugins.gdt=0.1.8
-plugins.gdtimporter=0.4.6.6
+plugins.gdt=0.1.9
+plugins.gdtimporter=0.4.6.7
 plugins.grom=0.2.2
 plugins.hibernate=1.3.7

trunk/grails-app/conf/Config.groovy

@@ -56 +56 @@
         //    console name:'stdout', layout:pattern(conversionPattern: '%c{2} %m%n')
         //}
-        
+
         // info "grails.app"
 

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

@@ -58 +58 @@
 
                                 // interpret the params set and gather the data
-                                flow.rowData = collectAssayData(flow.assay, fieldMapSelection, measurementTokens, [])
+                                flow.rowData = collectAssayData(flow.assay, fieldMapSelection, measurementTokens, flow.assay.samples)
 
                                 // remember the selected file type

trunk/grails-app/services/dbnp/modules/ModuleCommunicationService.groovy

@@ -183 +183 @@
                 // Store the response in cache
                 storeInCache( restUrl, restResponse, args );
-                
+
                 return restResponse
 
@@ -205 +205 @@
                 def user = authenticationService.getLoggedInUser();
                 def userId = user ? user.id : -1;
-                
+
                 url = cacheUrl( url, args )
                 

trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

@@ -171 +171 @@
 
                 // Find samples and sort by name
-                if( !samples )
-                        samples = assay.samples.toList().sort { it.name }
+                if ( !samples ) samples = assay.samples.toList()
+                samples = samples.sort { it.name }
 
                 def eventFieldMap = [:]
@@ -194 +194 @@
                         } catch (e) {
                                 moduleMeasurementData = ['error' : ['Module error, module not available or unknown assay'] * samples.size() ]
+                                e.printStackTrace()
                                 moduleError =  e.message
                         }
@@ -311 +312 @@
                 def query = "assayToken=$assay.assayUUID$tokenString"
 
+                if (samples) {
+                         query += '&' + samples*.sampleUUID.collect { "sampleToken=$it" }.join('&')
+                }
+
                 def sampleTokens = [], measurementTokens = [], moduleData = []
 
@@ -316 +321 @@
                         (sampleTokens, measurementTokens, moduleData) = moduleCommunicationService.callModuleMethod(moduleUrl, path, query, "POST", remoteUser)
                 } catch (e) {
+                        e.printStackTrace()
                         throw new Exception("An error occured while trying to get the measurement data from the $assay.module.name. \
              This means the module containing the measurement data is not available right now. Please try again \