- Pollen-commits - mailman.cloud.codelutin.com

01/02: delete module ngCookies
by chorem.org scm 17 Jun '14

17 Jun '14

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 7c7c12791e8e8c054a8ad78b4cd932a0ad6f3e77 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 09:54:57 2014 +0200 delete module ngCookies --- pollen-ui-angular/src/main/webapp/index.html | 1 - pollen-ui-angular/src/main/webapp/js/app.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 58e1889..6a9835f 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -40,7 +40,6 @@ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-resource.min…"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-cookies.min.…"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/bower-angular-translate/2.0.1/angula…"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.0/ui-boots…"></script> <script src="js/libs/ckeditor/ckeditor.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 40155ae..f56eade 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'ngCookies', 'pascalprecht.translate']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: Improve print result
by chorem.org scm 16 Jun '14

16 Jun '14

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 804dde1a276f68f1766cb02522d89f8f498bf7c4 Merge: d1be9fa a5fc320 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 16 15:32:49 2014 +0200 Improve print result pollen-ui-angular/src/main/webapp/css/style.css | 8 ++ pollen-ui-angular/src/main/webapp/index.html | 12 ++- pollen-ui-angular/src/main/webapp/js/app.js | 89 ++++++++++++++++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 28 +++++-- .../src/main/webapp/partials/inline-poll.html | 6 +- .../src/main/webapp/partials/poll-comment.html | 1 + .../src/main/webapp/partials/poll-link.html | 1 + .../main/webapp/partials/poll-listParticipant.html | 1 + .../src/main/webapp/partials/poll-result.html | 8 +- .../src/main/webapp/partials/poll-settings.html | 2 +- 10 files changed, 142 insertions(+), 14 deletions(-) diff --cc pollen-ui-angular/src/main/webapp/js/app.js index e2e148f,03fb078..40155ae --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@@ -277,3 -277,77 +277,92 @@@ angular.module('pollen', ['pollenServic } }) + .directive('chart', function ($timeout) { + return { + restrict : 'E', + scope : { + data:'=', + }, + template:'<div class="jqplot-target"></div>', + link: function(scope, element, attrs) { ++ + var initChart = function () { + if (angular.isDefined(scope.data)) { - var plot = $.jqplot.config.enablePlugins = true; - $(element).find('div').jqplot([scope.data], { ++ $.jqplot.config.enablePlugins = true; ++ scope.plot = $(element).find('div').jqplot([scope.data], { + // Only animate if we're not using excanvas (not in IE 7 or IE 8).. - animate: !$.jqplot.use_excanvas, ++ //animate: !$.jqplot.use_excanvas, + seriesDefaults:{ + renderer:$.jqplot.BarRenderer, + pointLabels: { show: true }, + rendererOptions : { + varyBarColor: true + } + }, ++ axesDefaults: { ++ showTicks: true, ++ showTickMarks: true, ++ tickOptions: { ++ showGridline: false, ++ show:true, ++ showLabel: true, ++ } ++ }, + axes: { + xaxis: { + renderer: $.jqplot.CategoryAxisRenderer, + } + } + }); + } + }; + + scope.$watch('data', function () { - initChart(); - }); ++ if (angular.isDefined(scope.plot)) { ++ scope.plot.html(''); ++ initChart() ++ } else { ++ initChart(); ++ } ++ }, true); + } + } + }) + + .directive('pie', function ($timeout) { + return { + restrict : 'E', + scope : { + data:'=', + }, + template:'<div class="jqplot-target"></div>', + link: function(scope, element, attrs) { + var initChart = function () { + if (angular.isDefined(scope.data)) { + $.jqplot.config.enablePlugins = true; + $(element).find('div').jqplot([scope.data], { + // Only animate if we're not using excanvas (not in IE 7 or IE 8).. + animate: !$.jqplot.use_excanvas, + seriesDefaults:{ + renderer:$.jqplot.PieRenderer, + rendererOptions : { + padding: 8, + sliceMargin: 4, + showDataLabels: true, + varyBarColor: true + } + }, + legend:{ + show:true + } + }); + } + }; + + scope.$watch('data', function () { + initChart(); + }); + } + } + }) + diff --cc pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index c3d2c18,086adb2..0f20f1c --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@@ -902,13 -900,16 +900,18 @@@ angular.module('pollControllers', [] var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; - $scope.data.result.nbVotant = $scope.data.votants.length; + resultPromise.then(function () { + $scope.data.result.nbVotant = $scope.data.votants.length; + }); }).$promise; - choicesPromise.then(function () { - Poll.result({pollId:$routeParams.pollId}, function (result) { - $scope.data.result = result; + var resultPromise = Poll.result({pollId:$routeParams.pollId}, function (result) { + $scope.data.result = result; + choicesPromise.then(function () { + var scoresSorted = []; ++ $scope.data.result.scoreTotal = 0; angular.forEach(result.scores, function(value, key) { ++ $scope.data.result.scoreTotal += value.scoreValue; for (var i = 0; i < $scope.data.choices.length; i++) { if ($scope.data.choices[i].id == value.choiceId) { value.choice = $scope.data.choices[i]; @@@ -916,9 -921,10 +923,16 @@@ } } }) + $scope.data.result.scoresChart = scoresSorted; }); - }); + }).$promise; + ++ votesPromise.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)'); ++ }); ++ }) + }]) .controller('PollListCtrl', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: improve print vote with color
by chorem.org scm 16 Jun '14

16 Jun '14

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 a5fc320b42560cfffee04b9355e42a13dc806d81 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 16 15:25:35 2014 +0200 improve print vote with color --- pollen-ui-angular/src/main/webapp/css/style.css | 8 ++++++++ pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 6 +++--- pollen-ui-angular/src/main/webapp/partials/poll-result.html | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 11ae47b..a71f43a 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -153,6 +153,14 @@ i.icon-collapse { height:25px; } +.pollChoice.voteTrue { + background-color:rgba(0,255,0,0.5); +} + +.pollChoice.voteFalse { + background-color:rgba(255,0,0,0.5); +} + .right-inner-addon .glyphicon-input { position: absolute; right: 30px; diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 37a85c4..b7ba9d6 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -66,12 +66,12 @@  <tr ng-repeat="vote in data.votants track by $index" class="pollAnim"> <td class="pollChoice"> {{vote.voterName}}</td> - <td ng-repeat="choice in vote.choice" class="pollChoice"> + <td ng-repeat="choice in vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}"> <input type="checkbox" ng-model="choice.voteValue" disabled /> </td> <td> - <button class="btn btn-info" ng-if="vote.permission" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> - <button class="btn btn-danger" ng-if="vote.permission" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-remove"></span></button> + <button class="btn btn-info" ng-if="vote.permission && !globalVariables.editMode" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> + <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-remove"></span></button> </td> </tr>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html index 20fb3f0..8ff8bb9 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -1,6 +1,6 @@ <h1>{{data.poll.title}}</h1> -<h2> Résultats : {{data.result.nbVotant}}</h2> +<h2> Résultats : {{data.result.nbVotant}} Votants</h2> <chart data="data.result.scoresChart"></chart> <pie data="data.result.scoresChart"></pie> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: add visualize graphically results
by chorem.org scm 16 Jun '14

16 Jun '14

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 4f3077d608e345e863f5bae57b7c28a89c1fc3f4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 16 14:52:12 2014 +0200 add visualize graphically results --- pollen-ui-angular/src/main/webapp/index.html | 12 +++- pollen-ui-angular/src/main/webapp/js/app.js | 74 ++++++++++++++++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 20 ++++-- .../src/main/webapp/partials/poll-comment.html | 1 + .../src/main/webapp/partials/poll-link.html | 1 + .../main/webapp/partials/poll-listParticipant.html | 1 + .../src/main/webapp/partials/poll-result.html | 6 ++ .../src/main/webapp/partials/poll-settings.html | 2 +- 8 files changed, 107 insertions(+), 10 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 0d0106a..58e1889 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -23,12 +23,20 @@ <head> <title>Pollen</title> <meta charset="utf-8" /> - <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet"/> + <link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" /> + <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/jquery.jqplot.min.css" /> <link rel="stylesheet" href="css/style.css"/> <script src="js/conf.js"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/jquery.jqplot.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.barRende…"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.pieRende…"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.category…"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.pointLab…"></script> + + <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-resource.min…"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index e2e148f..03fb078 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -277,3 +277,77 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC } }) +.directive('chart', function ($timeout) { + return { + restrict : 'E', + scope : { + data:'=', + }, + template:'<div class="jqplot-target"></div>', + link: function(scope, element, attrs) { + var initChart = function () { + if (angular.isDefined(scope.data)) { + var plot = $.jqplot.config.enablePlugins = true; + $(element).find('div').jqplot([scope.data], { + // Only animate if we're not using excanvas (not in IE 7 or IE 8).. + animate: !$.jqplot.use_excanvas, + seriesDefaults:{ + renderer:$.jqplot.BarRenderer, + pointLabels: { show: true }, + rendererOptions : { + varyBarColor: true + } + }, + axes: { + xaxis: { + renderer: $.jqplot.CategoryAxisRenderer, + } + } + }); + } + }; + + scope.$watch('data', function () { + initChart(); + }); + } + } +}) + +.directive('pie', function ($timeout) { + return { + restrict : 'E', + scope : { + data:'=', + }, + template:'<div class="jqplot-target"></div>', + link: function(scope, element, attrs) { + var initChart = function () { + if (angular.isDefined(scope.data)) { + $.jqplot.config.enablePlugins = true; + $(element).find('div').jqplot([scope.data], { + // Only animate if we're not using excanvas (not in IE 7 or IE 8).. + animate: !$.jqplot.use_excanvas, + seriesDefaults:{ + renderer:$.jqplot.PieRenderer, + rendererOptions : { + padding: 8, + sliceMargin: 4, + showDataLabels: true, + varyBarColor: true + } + }, + legend:{ + show:true + } + }); + } + }; + + scope.$watch('data', function () { + initChart(); + }); + } + } +}) + 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 c3d2c18..086adb2 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -385,7 +385,6 @@ angular.module('pollControllers', []) } $scope.callBackEditChoice = function (choice) { - console.log('save choice'); PollChoice.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, choice, function() { delete choice.restError; $scope.globalVariables.saved = true; @@ -449,7 +448,6 @@ angular.module('pollControllers', []) $scope.saveVoterList = function (voterList) { if (angular.isDefined(voterList.group.id)) { - console.log(voterList); PollVoterList.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, voterList.group, function (data) { $scope.globalVariables.saved = true; delete voterList.group.restError; @@ -902,22 +900,30 @@ angular.module('pollControllers', []) var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; - $scope.data.result.nbVotant = $scope.data.votants.length; + resultPromise.then(function () { + $scope.data.result.nbVotant = $scope.data.votants.length; + }); }).$promise; - choicesPromise.then(function () { - Poll.result({pollId:$routeParams.pollId}, function (result) { - $scope.data.result = result; + var resultPromise = Poll.result({pollId:$routeParams.pollId}, function (result) { + $scope.data.result = result; + choicesPromise.then(function () { + var scoresSorted = []; angular.forEach(result.scores, function(value, key) { for (var i = 0; i < $scope.data.choices.length; i++) { 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]; + + // finish loop i = $scope.data.choices.length; } } }) + $scope.data.result.scoresChart = scoresSorted; }); - }); + }).$promise; }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 381b03b..0e3110e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -19,6 +19,7 @@ #L% --> <div> + <h1>{{ data.poll.title }}</h1> <h2>{{ 'title.comment' | translate }}</h2>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index 36e3e4c..fc2b4cb 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -19,6 +19,7 @@ #L% --> <div> + <h1>{{data.poll.title}}</h1> <h2>Sondage:</h2> <alert type="warning" ng-if="globalVariables.linkEdit && data.poll.permission"> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index e36d9ee..dcf7068 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> +<h1>{{data.poll.title}}</h1> <h2>{{ 'poll.restricted.pollType' | translate }}</h2> <div> <label for="formFree"> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html index d21b64c..20fb3f0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -1,4 +1,10 @@ +<h1>{{data.poll.title}}</h1> + <h2> Résultats : {{data.result.nbVotant}}</h2> + +<chart data="data.result.scoresChart"></chart> +<pie data="data.result.scoresChart"></pie> + <div ng-repeat="score in data.result.scores"> <h4> {{score.choice.name}} </h4> <p> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html index 0f277d5..960d5c7 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> - +<h1>{{data.poll.title}}</h1> <form class="form-horizontal" novalidate> <h4>Confiuration global</h4> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: get lib by bower
by chorem.org scm 13 Jun '14

13 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit f9964d75b743e3d7c7ebe0c7df25ffb319fb4dfd Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 13 17:02:26 2014 +0200 get lib by bower --- pollen-ui-angular/.bowerrc | 4 ++++ pollen-ui-angular/.gitignore | 4 +++- pollen-ui-angular/bower.json | 20 ++++++++++++++++++++ pollen-ui-angular/pom.xml | 24 ++++++++++++++++++++++++ pollen-ui-angular/src/main/webapp/index.html | 18 ++++++++---------- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- 6 files changed, 60 insertions(+), 12 deletions(-) diff --git a/pollen-ui-angular/.bowerrc b/pollen-ui-angular/.bowerrc new file mode 100644 index 0000000..20d69e9 --- /dev/null +++ b/pollen-ui-angular/.bowerrc @@ -0,0 +1,4 @@ +{ + "directory" : "./src/main/webapp/bower" +} + diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index 797b705..9b808b5 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1 +1,3 @@ -*.iml \ No newline at end of file +*.iml +src/main/webapp/bower + diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json new file mode 100644 index 0000000..b1d655f --- /dev/null +++ b/pollen-ui-angular/bower.json @@ -0,0 +1,20 @@ +{ + "name": "pollen-ui-angular", + "version": "2.0", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "angular-route": "1.2.16", + "angular": "1.2.16", + "angular-resource": "1.2.16", + "angular-translate": "2.0.0", + "angular-bootstrap": "0.11.0", + "lodash": "2.4.1", + "bootstrap": "~3.1.1" + } +} diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index b0b6b99..957e34c 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -21,6 +21,30 @@ <skipPostRelease>false</skipPostRelease> </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>bower</executable> + <arguments> + <argument>install</argument> + </arguments> + <workingDirectory>${basedir}</workingDirectory> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 0d0106a..2720c63 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -19,22 +19,20 @@ #L% --> -<html lang="en" ng-app="pollen"> +<html ng-app="pollen"> <head> <title>Pollen</title> <meta charset="utf-8" /> - <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet"/> + <link href="bower/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> <link rel="stylesheet" href="css/style.css"/> <script src="js/conf.js"></script> - - <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.min.js"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-resource.min…"></script> - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-cookies.min.…"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/bower-angular-translate/2.0.1/angula…"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.0/ui-boots…"></script> + <script src="bower/lodash/dist/lodash.min.js"></script> + <script src="bower/angular/angular.min.js"></script> + <script src="bower/angular-route/angular-route.min.js"></script> + <script src="bower/angular-resource/angular-resource.min.js"></script> + <script src="bower/angular-translate/angular-translate.min.js"></script> + <script src="bower/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> <script src="js/libs/ckeditor/ckeditor.js"></script> <script src="js/app.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 e2e148f..66707ed 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'ngCookies', 'pascalprecht.translate']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: Optimize get Result of poll
by chorem.org scm 13 Jun '14

13 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch feature/addBuilder in repository pollen. See http://git.chorem.org/pollen.git commit d1be9fad882497b08fa63ba24541ef986bb34043 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 13 14:28:57 2014 +0200 Optimize get Result of poll --- .../src/main/webapp/js/controllers/pollCtrl.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) 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 7601924..c3d2c18 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -902,19 +902,10 @@ angular.module('pollControllers', []) var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; - angular.forEach($scope.data.votants, function (vote) { - angular.forEach(vote.choice, function (choice) { - if (choice.voteValue != null && choice.voteValue != 0.0) { - choice.voteValue = true; - } - else { - choice.voteValue = false; - } - }) - }) + $scope.data.result.nbVotant = $scope.data.votants.length; }).$promise; - $q.all([choicesPromise, votesPromise]).then(function () { + choicesPromise.then(function () { Poll.result({pollId:$routeParams.pollId}, function (result) { $scope.data.result = result; angular.forEach(result.scores, function(value, key) { @@ -925,7 +916,6 @@ angular.module('pollControllers', []) } } }) - $scope.data.result.nbVotant = $scope.data.votants.length; }); }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix header when 'Transfer-Encoding:chunked'
by chorem.org scm 13 Jun '14

13 Jun '14

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 39a97d5daba46dafb862b31e740d5a19ed0e7aa5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 13 11:18:13 2014 +0200 fix header when 'Transfer-Encoding:chunked' --- .../java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index a31f7c3..5a15085 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -61,8 +61,6 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { prepareRequestContext(context); - doProcess(); - if (HttpContext.METHOD_OPTIONS.equals(context.getMethod())) { Render render = call.getRender(); @@ -79,6 +77,8 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { PollenRestApiUtil.prepareResponse(context); + doProcess(); + } protected PollenRestApiRequestContext prepareRequestContext(HttpContext context) throws PollenInvalidSessionTokenException { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: confrim delete poll
by chorem.org scm 13 Jun '14

13 Jun '14

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 30e666436ca75b1c171d3397d1814a7ca7013359 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 13 09:50:46 2014 +0200 confrim delete poll --- .../src/main/webapp/js/controllers/pollCtrl.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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 879495e..7601924 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -619,10 +619,18 @@ angular.module('pollControllers', []) } $scope.deletePoll = function () { - $scope.data.poll.$remove({permission:$scope.globalVariables.permission}, function() { - $location.path('/'); - }); - } + var confirmMessage; + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + $scope.data.poll.$remove({permission:$scope.globalVariables.permission}, function() { + $location.path('/'); + }); + } + }); + }; }]) .controller('PollVoteCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

05/05: delete vote
by chorem.org scm 12 Jun '14

12 Jun '14

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 926f8a47e5516d50f08a59325914639b56c6421a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 12 18:20:56 2014 +0200 delete vote --- .../src/main/webapp/js/controllers/pollCtrl.js | 24 +++++++++++++++++++++- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-poll.html | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) 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 6d298b4..879495e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -625,7 +625,8 @@ angular.module('pollControllers', []) } }]) -.controller('PollVoteCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { +.controller('PollVoteCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', + function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('vote'); @@ -715,6 +716,27 @@ angular.module('pollControllers', []) $scope.data.vote = vote; } + $scope.deleteVote = function (vote) { + var confirmMessage; + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + // delete if edit + if ($scope.data.vote.id == vote.id) { + initVote(); + } + + var index = $scope.data.votants.indexOf(vote); + PollVote.remove({pollId:$routeParams.pollId}, vote, function (data) { + $scope.data.votants.splice(index, 1); + }) + } + }); + + } + }]) .controller('PollCommentCtrl', diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 196300b..37a85c4 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -71,7 +71,7 @@ </td> <td> <button class="btn btn-info" ng-if="vote.permission" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> - <button class="btn btn-danger" ng-if="vote.permission" disabled><span class="glyphicon glyphicon-remove"></span></button> + <button class="btn btn-danger" ng-if="vote.permission" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-remove"></span></button> </td> </tr>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html index d9eec6d..a88d3e6 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<div class="pollTitle" edit-me="showEditTitle"> +<div class="pollTitle" edit-me="showEditTitle" novalidate> <h1 ng-hide="showEditTitle"> {{data.poll.title || 'poll.edit' | translate }} <info-error error="restError.title[0]" data="data.poll.title"></info-error> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/05: edit Vote
by chorem.org scm 12 Jun '14

12 Jun '14

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 da6bc80ed94a21af72b7ad2f2fb5b529439d8427 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 12 17:53:46 2014 +0200 edit Vote --- pollen-rest-api/src/main/resources/mapping | 14 +++---- .../src/main/webapp/js/controllers/pollCtrl.js | 48 +++++++++++++++++----- pollen-ui-angular/src/main/webapp/js/services.js | 4 +- .../src/main/webapp/partials/inline-poll.html | 3 +- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 661740f..3d8011e 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -146,10 +146,10 @@ DELETE /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} Vote # VoteApi -GET /v1/polls/{pollId}/votes VoteApi.getVotes -GET /v1/polls/{pollId}/votes/add VoteApi.addVote -GET /v1/polls/{pollId}/votes/{voteId}/edit VoteApi.editVote -POST /v1/polls/{pollId}/votes VoteApi.addVote -GET /v1/polls/{pollId}/votes/{voteId} VoteApi.getVote -PUT /v1/polls/{pollId}/votes/{voteId} VoteApi.editVote -DELETE /v1/polls/{pollId}/votes/{voteId} VoteApi.deleteVote +GET /v1/polls/{pollId}/votes VoteApi.getVotes +GET /v1/polls/{pollId}/votes/add VoteApi.addVote +GET /v1/polls/{pollId}/votes/{voteId}/edit VoteApi.editVote +POST /v1/polls/{pollId}/votes VoteApi.addVote +GET /v1/polls/{pollId}/votes/{voteId} VoteApi.getVote +PUT,POST /v1/polls/{pollId}/votes/{voteId} VoteApi.editVote +DELETE /v1/polls/{pollId}/votes/{voteId} VoteApi.deleteVote 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 0388b6d..6d298b4 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -657,12 +657,24 @@ angular.module('pollControllers', []) } initPoll(); + var initAuthor = function () { + if (angular.isDefined($scope.session.user)) { + if (angular.isDefined($scope.session.user.name)) { + $scope.data.vote.voterName = $scope.session.user.name; + } + else { + $scope.data.vote.voterName = $scope.session.user.email; + } + } + }; + $scope.globalVariables.editMode = false; $scope.globalVariables.voteMode = true; var initVote = function () { $scope.data.vote = {}; $scope.data.vote.voterName = ""; + initAuthor(); $scope.data.vote.anonymous = false; $scope.data.vote.choice = []; for (var i = 0; i < $scope.data.choices.length; ++i) { @@ -676,17 +688,33 @@ angular.module('pollControllers', []) choice.voteValue = (choice.voteValue) ? 1.0 : 0.0; }); - PollVote.add({pollId:$routeParams.pollId}, sendVote, function (returnRequest) { - $scope.data.vote.id = returnRequest.id; - $scope.data.vote.permission = returnRequest.permission; + if (angular.isDefined($scope.data.vote.id)) { + // edit vote + PollVote.update({pollId:$routeParams.pollId}, sendVote, function (data) { + $scope.globalVariables.saved = true; + }, function (error) { + $scope.data.vote.restError = { voterName : error.data["voter.name"]}; + }) + } + else { + // add vote + PollVote.add({pollId:$routeParams.pollId}, sendVote, function (returnRequest) { + $scope.data.vote.id = returnRequest.id; + $scope.data.vote.permission = returnRequest.permission; - $scope.data.votants.push(angular.copy($scope.data.vote)); - $scope.globalVariables.saved = true; - initVote(); - }, function (error) { - $scope.data.vote.restError = { voterName : error.data["voter.name"]}; - }); + $scope.data.votants.push(angular.copy($scope.data.vote)); + $scope.globalVariables.saved = true; + initVote(); + }, function (error) { + $scope.data.vote.restError = { voterName : error.data["voter.name"]}; + }); + } } + + $scope.editVote = function (vote) { + $scope.data.vote = vote; + } + }]) .controller('PollCommentCtrl', @@ -709,7 +737,7 @@ angular.module('pollControllers', []) $scope.comment.authorName = $scope.session.user.name; } else { - $scope.comment.authorName = $scope.session.user.login; + $scope.comment.authorName = $scope.session.user.email; } } }; initAuthor(); diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 3a82d25..c4dd105 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -77,7 +77,7 @@ angular.module('pollenServices', ['ngResource']) return 'vote='+encodeURIComponent(JSON.stringify(data)); }; - return $resource(conf.restURL+'/polls/:pollId/votes/:voteId', {voteId : '@id'}, + return $resource(conf.restURL+'/polls/:pollId/votes/:voteId', {voteId : '@id', permission : '@permission'}, { 'add' : { method:'POST', @@ -101,7 +101,7 @@ angular.module('pollenServices', ['ngResource']) return 'comment='+encodeURIComponent(JSON.stringify(data)); }; - return $resource(conf.restURL+'/polls/:pollId/comments/:commentId', {commentId : '@id'}, + return $resource(conf.restURL+'/polls/:pollId/comments/:commentId', {commentId : '@id', permission : '@permission'}, { 'add' : { method:'POST', diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 0b0b620..196300b 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -70,7 +70,8 @@ <input type="checkbox" ng-model="choice.voteValue" disabled /> </td> <td> - <a href="#/poll/vote/{{data.poll.id}}" ng-if="vote.permission"><span class="glyphicon glyphicon-pencil"></span></a> + <button class="btn btn-info" ng-if="vote.permission" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> + <button class="btn btn-danger" ng-if="vote.permission" disabled><span class="glyphicon glyphicon-remove"></span></button> </td> </tr>  -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0