Changeset 2160

Timestamp:

Feb 3, 2012, 2:04:04 PM (10 years ago)

Author:

work@…

Message:

• moved common logic into a generic service
• show a list of study names that match the selection criteria

Location:

trunk/grails-app

Files:

• controllers/generic/AjaxController.groovy (modified) (2 diffs)
• services/dbnp/generic (added)
• services/dbnp/generic/AjaxService.groovy (added)
• views/studyCompare/pages/_page_one.gsp (modified) (3 diffs)

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

@@ -19 +19 @@
 class AjaxController {
         def authenticationService
+        def ajaxService
 
         /**
@@ -92 +93 @@
 
         def studyCount = {
-                def matched     = true
                 def user        = authenticationService.getLoggedInUser()
-                def studies     = Study.giveReadableStudies(user)
-                def matchedStudies = []
-
-                // closure to transform criteria arguments to an array of Longs
-                def getAsArray = { paramText ->
-                        def result = []
-
-                        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 = 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)
-                }
+                def total       = Study.giveReadableStudies(user).size()
+                def studies = ajaxService.getStudiesByCriteriaForCurrentUser(params)
 
                 // define json result
-                def result = ['total':studies.size(),'matched':matchedStudies.size()];
+                def result = ['total':total,'matched':studies.size()]
+
+                // set output header to json
+                response.contentType = 'application/json'
+
+                // render result
+                if (params.callback) {
+                        render "${params.callback}(${result as JSON})"
+                } else {
+                        render result as JSON
+                }
+        }
+
+        def studies = {
+                def studies = ajaxService.getStudiesByCriteriaForCurrentUser(params)
+
+                // define json result
+                def result = ['studies':studies.collect{ it.title }]
 
                 // set output header to json

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

@@ -31 +31 @@
         }
 
-        console.log(criteria);
-
-
         $.getJSON(
                 baseUrl + "/ajax/studyCount",
@@ -42 +39 @@
         );
 
-//      $.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');
-        var parent = check.parent();
-        var parentId = parent.attr('id');
-        if (criteria[parentId] == undefined) criteria[parentId] = [];
-        var c = criteria[parentId];
-
-        // add or remove data
-        if (check.is(':checked') && c.indexOf(value) < 0) {
-                c.push(value);
-        } else if (c.indexOf(value) >= 0) {
-                c.splice(c.indexOf(value),1);
-        }
-
-        console.log(criteria);
-
-        // ajax call
         $.getJSON(
-                "<g:createLink controller="ajax" action="studyCount"/>",
+                baseUrl + "/ajax/studies",
                 criteria,
                 function(data) {
-                        $('#matchedStudies').html(data.count+' studies matched your criteria');
+                        var studies = '';
+                        for (var i=0; i<data.studies.length; i++) {
+                                studies = studies + data.studies[i] + '<br/>';
+                        }
+                        $('#studyOverview').html(studies);
                 }
         );
-
-        $.ajax({
-                url: baseUrl + "/ajax/studyCount",
-                dataType: 'json',
-                data: data,
-                success: function(data) {
-                        $('#matchedStudies').html(data.count+' studies matched your criteria');
-                }
-        });
-*/
-
 }
 </script>
-
 
 <div class="selector">
@@ -96 +59 @@
 </div>
 <div id="matchedStudies"></div>
+<div id="studyOverview" style="margin-top:20px;border: 1px solid blue;"></div>
 
 </af:page>