Changeset 2237 for trunk/grails-app/services/dbnp

Timestamp:

May 29, 2012, 4:24:52 PM (10 years ago)

Author:

work@…

Message:

• improved initial study compare page gives visual feedback

File:

• trunk/grails-app/services/dbnp/generic/AjaxService.groovy (modified) (2 diffs)

trunk/grails-app/services/dbnp/generic/AjaxService.groovy

@@ -51 +51 @@
                 def uniqueEventTemplateNames = (params.containsKey('uniqueEventTemplateNames[]')) ? getAsArray(params['uniqueEventTemplateNames[]']) : []
                 def uniqueSamplingEventTemplateNames = (params.containsKey('uniqueSamplingEventTemplateNames[]')) ? getAsArray(params['uniqueSamplingEventTemplateNames[]']) : []
+        def modules = (params.containsKey('modules[]')) ? getAsArray(params['modules[]']) : []
 
                 // iterate through readable studies for this user
@@ -63 +64 @@
                         // 3. if any samplingEventTemplateNames were selected, see if this study contains any of these
                         matched = (matched && (!uniqueSamplingEventTemplateNames.size() || study.samplingEvents.find{uniqueSamplingEventTemplateNames.contains(it.template.id)})) ? true : false;
+            // 4. if any modules were selected, see if this study contains any of these
+            matched = (matched && (!modules.size() || study.assays.find{modules.contains(it.module.id)})) ? true : false;
 
                         // if criteria are met, add this study to the matchedStudies array