This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit bcf2053061bdfa54d4ff956a16cb4b9cc6e6b066 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jun 19 14:36:30 2014 +0200 view result order by scoreResult --- pollen-ui-angular/src/main/webapp/index.html | 1 + pollen-ui-angular/src/main/webapp/js/app.js | 11 ++++++++++- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index a40155a..4423296 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -35,6 +35,7 @@ <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.pieRenderer.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.categoryAxisRenderer.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.pointLabels.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.highlighter.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 5be379d..feaad42 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -347,6 +347,11 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC xaxis: { renderer: $.jqplot.CategoryAxisRenderer, } + }, + highlighter: { + showMaker:false, + tooltipLocation: 'ne', + formatString:'<div style="display:none">%s</div>%s Vote(s)' } }); } @@ -384,11 +389,15 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC padding: 8, sliceMargin: 4, showDataLabels: true, - varyBarColor: true + varyBarColor: true, + startAngle:-90 } }, legend:{ show:true + }, + highlighter:{ + show:false } }); } diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 92bc020..a11de83 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -928,7 +928,7 @@ angular.module('pollControllers', []) Poll.result({pollId:$routeParams.pollId}, function (result) { $scope.data.result = result; choicesDeferred.promise.then(function () { - var scoresSorted = []; + var scores = []; $scope.data.result.scoreTotal = 0; angular.forEach(result.scores, function(value, key) { $scope.data.result.scoreTotal += value.scoreValue; @@ -936,21 +936,21 @@ angular.module('pollControllers', []) if ($scope.data.choices[i].id == value.choiceId) { value.choice = $scope.data.choices[i]; - scoresSorted[$scope.data.choices[i].choiceOrder] = [value.choice.name, value.scoreValue]; + scores.push([value.choice.name, value.scoreValue]); // finish loop i = $scope.data.choices.length; } } }) - $scope.data.result.scoresChart = scoresSorted; + $scope.data.result.scoresChart = scores; resultDeferred.resolve('result load'); }); }); votesDeferred.promise.then(function () { angular.forEach($scope.data.result.scoresChart, function (value, key) { - value.push( Math.floor(value[1] * 100 / $scope.data.result.scoreTotal) + '% - '+value[1]+' Vote(s)'); + value.push( Math.floor(value[1] * 100 / $scope.data.result.scoreTotal) + '%'); }); }) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.