Changeset 1583 for trunk/grails-app/services

Timestamp:

Mar 2, 2011, 5:40:25 PM (13 years ago)

Author:

s.h.sikkema@…

Message:

UI improvements to assay exporter (ticket #159)

File:

• trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy (modified) (4 diffs)

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

@@ -33 +33 @@
     def collectAssayTemplateFields(assay) throws Exception {
 
-        def getUsedTemplateFieldNames = { templateEntities ->
+        def getUsedTemplateFields = { templateEntities ->
 
             // gather all unique and non null template fields that haves values
@@ -40 +40 @@
                 field && templateEntities.any { it.fieldExists(field.name) && it.getFieldValue(field.name) }
 
-            }*.name
+            }.collect{[name: it.name, comment: it.comment]}
 
         }
@@ -53 +53 @@
         def samples = assay.samples
 
-        [   'Subject Data' :            getUsedTemplateFieldNames( samples*."parentSubject".unique() ),
-            'Sampling Event Data' :     getUsedTemplateFieldNames( samples*."parentEvent".unique() ),
-            'Sample Data' :             getUsedTemplateFieldNames( samples ),
-            'Event Group' :             ['name'],
+        [   'Subject Data' :            getUsedTemplateFields( samples*."parentSubject".unique() ),
+            'Sampling Event Data' :     getUsedTemplateFields( samples*."parentEvent".unique() ),
+            'Sample Data' :             getUsedTemplateFields( samples ),
+            'Event Group' :             [[name: 'name', comment: 'Name of Event Group']],
             'Module Measurement Data':  requestModuleMeasurementNames(assay)
         ]
@@ -172 +172 @@
         }
 
-        [   'Subject Data' :            getFieldValues(samples, fieldMap['Subject Data'], 'parentSubject'),
-            'Sampling Event Data' :     getFieldValues(samples, fieldMap['Sampling Event Data'], 'parentEvent'),
-            'Sample Data' :             getFieldValues(samples, fieldMap['Sample Data']),
+        [   'Subject Data' :            getFieldValues(samples, fieldMap['Subject Data']*.name, 'parentSubject'),
+            'Sampling Event Data' :     getFieldValues(samples, fieldMap['Sampling Event Data']*.name, 'parentEvent'),
+            'Sample Data' :             getFieldValues(samples, fieldMap['Sample Data']*.name),
             'Event Group' :             eventFieldMap,
-            'Module Measurement Data':  measurementTokens ? requestModuleMeasurements(assay, measurementTokens) : [:]
+            'Module Measurement Data':  measurementTokens*.name ? requestModuleMeasurements(assay, measurementTokens) : [:]
         ]
     }