Changeset 2151

Timestamp:

Jan 26, 2012, 2:20:59 PM (10 years ago)

Author:

work@…

Message:

fixed the json handling of selecting criteria

Location:

trunk/grails-app

Files:

• controllers/generic/AjaxController.groovy (modified) (1 diff)
• views/studyCompare/common/_on_page.gsp (modified) (1 diff)
• views/studyCompare/pages/_page_one.gsp (modified) (2 diffs)

trunk/grails-app/controllers/generic/AjaxController.groovy

@@ -92 +92 @@
 
         def studyCount = {
-                println params
-                println params.containsKey('data')
-//              println params['data']['uniqueSpecies']
-
-                def matched     = false
+                def matched     = true
                 def user        = authenticationService.getLoggedInUser()
                 def studies     = Study.giveReadableStudies(user)
                 def matchedStudies = []
 
-                // parameters
-/*
-                def uniqueSpecies =     (params['data']['uniqueSpecies']) ? params['data']['uniqueSpecies'] : []
-                println uniqueSpecies.class
-                println uniqueSpecies.size()
+                // closure to transform criteria arguments to an array of Longs
+                def getAsArray = { paramText ->
+                        def result = []
 
-                // iterate through studies
+                        if (paramText == null) {
+                                result = []
+                        } else if (paramText.toString().contains(",")) {
+                                result = paramText.collect { it as Long }
+                        } else {
+                                result = [paramText as Long]
+                        }
+
+                        return result
+                }
+
+                // define criteria arrays based on JSON arguments
+                def uniqueSpecies = (params.containsKey('uniqueSpecies[]')) ? getAsArray(params['uniqueSpecies[]']) : []
+                def uniqueEventTemplateNames = (params.containsKey('uniqueEventTemplateNames[]')) ? getAsArray(params['uniqueEventTemplateNames[]']) : []
+                def uniqueSamplingEventTemplateNames = (params.containsKey('uniqueSamplingEventTemplateNames[]')) ? getAsArray(params['uniqueSamplingEventTemplateNames[]']) : []
+                
+                // iterate through readable studies for this user
                 studies.each { study ->
-matched = false
-//                      matched = (study.subjects.find{uniqueSpecies.contains(it.species.id)}) ? true : false;
-println "study: ${study} -> matched: ${matched}"
+                        matched = true
 
+                        // match to selection criteria
+                        // 1. if any species were selected, see if this study contains any subject of this species
+                        matched = (matched && (!uniqueSpecies.size() || study.subjects.find{uniqueSpecies.contains(it.species.id)})) ? true : false;
+                        // 2. if any eventTemplateNames were selected, see if this study contains any of these
+                        matched = (matched && (!uniqueEventTemplateNames.size() || study.events.find{uniqueEventTemplateNames.contains(it.template.id)})) ? true : false;
+                        // 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;
+
+                        // if criteria are met, add this study to the matchedStudies array
                         if (matched) matchedStudies.add(study)
                 }
-*/
-println "------"
 
-                def result = ['count':matchedStudies.size()];
+                // define json result
+                def result = ['total':studies.size(),'matched':matchedStudies.size()];
 
                 // set output header to json

trunk/grails-app/views/studyCompare/common/_on_page.gsp

@@ -35 +35 @@
                                 var options = '<h2>'+that.getAttribute('name')+'</h2>';
                                 for (var i=0;i<data.length;i++) {
-                                        options += '<input type="checkbox" name="species[]" value="'+data[i].id+'"/>'+data[i].name+'<br/>';
+                                        options += '<input type="checkbox" name="species[]" value="'+data[i].id+'"/>'+data[i].name+' ('+data[i].id+')<br/>';
                                 }
                                 element.removeClass('waitForLoad').html(options);

trunk/grails-app/views/studyCompare/pages/_page_one.gsp

@@ -17 +17 @@
 
 function handleCheckEvent(event) {
+        var check = $(event);
+        var value = check.attr('value');
+        var parent = check.parent();
+        var parentId = parent.attr('id');
+
+        if (criteria[parentId] == undefined) criteria[parentId] = [];
+
+        // add or remove data
+        if (check.is(':checked') && criteria[parentId].indexOf(value) < 0) {
+                criteria[parentId].push(value);
+        } else if (criteria[parentId].indexOf(value) >= 0) {
+                criteria[parentId].splice(criteria[parentId].indexOf(value),1);
+        }
+
+        console.log(criteria);
+
+
+        $.getJSON(
+                baseUrl + "/ajax/studyCount",
+                criteria,
+                function(data) {
+                        $('#matchedStudies').html(data.matched+' of '+data.total+' readable studies matched your criteria');
+                }
+        );
+
+//      $.ajax({
+//              url: baseUrl + "/ajax/studyCount",
+//              dataType: 'json',
+//              data: criteria,
+//              success: function(data) {
+//                      $('#matchedStudies').html(data.matched+' of '+data.total+' readable studies matched your criteria');
+//              }
+//      });
+/*
         var check = $(event);
         var value = check.attr('value');
@@ -42 +76 @@
         );
 
-//      $.ajax({
-//              url: baseUrl + "/ajax/studyCount",
-//              dataType: 'json',
-//              data: data,
-//              success: function(data) {
-//                      $('#matchedStudies').html(data.count+' studies matched your criteria');
-//              }
-//      });
+        $.ajax({
+                url: baseUrl + "/ajax/studyCount",
+                dataType: 'json',
+                data: data,
+                success: function(data) {
+                        $('#matchedStudies').html(data.count+' studies matched your criteria');
+                }
+        });
+*/
 
 }