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

02/02: Add Comment
by Chorem.org scm May 27, 2014

May 27, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 93c91efcb981f481ed34c4a3d2a7274b373a5664 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 27 17:06:53 2014 +0200 Add Comment --- pollen-rest-api/src/main/resources/mapping | 2 +- pollen-ui-angular/src/main/webapp/css/style.css | 24 ++++++- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 78 +++++++++++++++------- pollen-ui-angular/src/main/webapp/js/services.js | 24 +++++++ .../src/main/webapp/partials/poll-comment.html | 46 +++++++++++++ .../src/main/webapp/partials/poll.html | 6 +- 7 files changed, 153 insertions(+), 28 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index c60deeb..b782d82 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -72,7 +72,7 @@ DELETE /v1/polls/{pollId}/choices/{choiceId} ChoiceApi.deleteChoice GET /v1/polls/{pollId}/comments CommentApi.getComments POST /v1/polls/{pollId}/comments CommentApi.addComment GET /v1/polls/{pollId}/comments/{commentId} CommentApi.getComment -PUT /v1/polls/{pollId}/comments/{commentId} CommentApi.editComment +POST /v1/polls/{pollId}/comments/{commentId} CommentApi.editComment DELETE /v1/polls/{pollId}/comments/{commentId} CommentApi.deleteComment # FavoriteListApi diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index d6ef705..66fad89 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -104,11 +104,11 @@ i.icon-collapse { width:99%; } -.pollAnim { +.pollAnim, #comments tr { background-color:inherit; transition-duration:0.8s; } -.pollAnim:hover { +.pollAnim:hover, #comments tr:hover { background:#DDDDDD; transition-duration: 0.8s; } @@ -209,3 +209,23 @@ i.icon-collapse { .danger { color: #a94442; } + +#comments { + margin-top:30px; + width:100%; + border-collapse:collapse; +} + +#comments tr td{ + border-bottom:1px solid #DDD; + padding-top:5px; + padding-bottom:15px; + padding-left:5px; + padding-right:5px; + vertical-align:top; +} + +#comments tr>td:first-child { + width:200px; + border-right:1px solid #DDD; +} diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index a7b5d62..ee998d0 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -64,6 +64,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) .when('/poll/result/:pollId', {templateUrl: './partials/poll.html', controller :"PollResultCtrl"}) + .when('/poll/comment/:pollId', {templateUrl: './partials/poll.html', controller :"PollCommentCtrl"}) .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) 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 bc74f2b..1f24c1f 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -23,6 +23,14 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', function ($scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage) { + $scope.setTab = function (defaultValue) { + if (angular.isDefined($routeParams.tab)) { + return $routeParams.tab; + } + else { + return defaultValue; + } + }; $scope.url = window.location.origin+window.location.pathname+'#'+$location.path(); if ($location.search().length != 0) { @@ -74,12 +82,14 @@ angular.module('pollControllers', []) if (angular.isDefined($routeParams.pollId)) { var baseUrl = window.location.origin+window.location.pathname; - $scope.globalVariables.linkVote = baseUrl; - $scope.globalVariables.linkEdit = baseUrl; - $scope.globalVariables.linkResult = baseUrl; - $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; - $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; - $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; + $scope.globalVariables.linkVote = baseUrl; + $scope.globalVariables.linkComment = baseUrl; + $scope.globalVariables.linkEdit = baseUrl; + $scope.globalVariables.linkResult = baseUrl; + $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; + $scope.globalVariables.linkComment += '#/poll/comment/'+$routeParams.pollId; + $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; + $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; if (angular.isDefined($scope.globalVariables.permission)) { $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; @@ -122,12 +132,7 @@ angular.module('pollControllers', []) .controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', function ($scope, $controller, $modal, $timeout, $routeParams) { $controller('PollCtrl', {$scope:$scope}); - if (angular.isDefined($routeParams.tab)) { - $scope.tab = $routeParams.tab; - } - else { - $scope.tab = 'edit'; - } + $scope.tab = $scope.setTab('edit'); var initChoice = function () { return { @@ -372,12 +377,7 @@ angular.module('pollControllers', []) .controller('PollVoteCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { $controller('PollCtrl', {$scope:$scope}); - if (angular.isDefined($routeParams.tab)) { - $scope.tab = $routeParams.tab; - } - else { - $scope.tab = 'vote'; - } + $scope.tab = $scope.setTab('vote'); var initPoll = function () { var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { @@ -422,6 +422,7 @@ angular.module('pollControllers', []) initPoll(); $scope.globalVariables.editMode = false; + $scope.globalVariables.voteMode = true; var initVote = function () { $scope.data.vote = {}; @@ -452,16 +453,45 @@ angular.module('pollControllers', []) } }]) -.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { +.controller('PollCommentCtrl', ['$scope', '$controller', '$routeParams', 'PollComment', function ($scope, $controller, $routeParams, PollComment) { $controller('PollCtrl', {$scope:$scope}); - if (angular.isDefined($routeParams.tab)) { - $scope.tab = $routeParams.tab; - } - else { - $scope.tab = 'result'; + $scope.globalVariables.commentMode = true; + + if (angular.isUndefined($scope.data.poll.id)) { + $scope.data.poll.id = $routeParams.pollId; } + $scope.tab = $scope.setTab('comment'); + $scope.comment = {text:''}; + + PollComment.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { + $scope.data.comments = data; + }); + + $scope.postComment = function () { + PollComment.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, $scope.comment, function (data) { + $scope.globalVariables.saved = true; + + // add ID and Permission and push in list of comments + $scope.comment.id = data.id; + $scope.comment.permission = data.permission; + $scope.comment.postDate = new Date(); + $scope.data.comments.push(angular.copy($scope.comment)); + + //clean form + $scope.comment = {text:''}; + }, function (error) { + $scope.restError = error.data; + }); + }; +}]) + +.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { + $controller('PollCtrl', {$scope:$scope}); + + $scope.tab = $scope.setTab('result'); + var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { $scope.data.poll = poll; }).$promise; diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 1c5fe2d..785de6f 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -88,6 +88,30 @@ angular.module('pollenServices', ['ngResource']) ); }]) +.factory('PollComment', ['$resource', function ($resource) { + var transformParam = function (data) { + return 'comment='+encodeURIComponent(JSON.stringify(data)); + }; + + return $resource(conf.restURL+'/polls/:pollId/comments/:commentId', {commentId : '@id'}, + { + 'add' : { + method:'POST', + transformRequest : function (data, headersGetter) { + return transformParam(data); + } + }, + 'update' : + { + method:'POST', + transformRequest : function (data, headersGetter) { + return transformParam(data); + } + } + } + ); +}]) + .factory('User', ['$resource', function ($resource) { var transformParam = function (data) { return 'user='+encodeURIComponent(JSON.stringify(data))+'&generatePassword=false'; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html new file mode 100644 index 0000000..d35a4b1 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -0,0 +1,46 @@ + +<div ng-controller="PollCommentCtrl"> + <h2>Commentaire:</h2> + +  + <form ng-submit="postComment()"> + name : <input type="text" ng-model="comment.authorName" /> <info-error error="restError['author.name'][0]" data="comment.authorName"></info-error><br/> + text : <info-error error="restError.text[0]" data="comment.text"></info-error> <br/> + <textarea data-ck-editor ng-model="comment.text"></textarea> + <button type="submit" class="btn btn-primary" ng-click="postComment()">Commenter</button> + </form> +  + +  + <table id="comments"> + <tr ng-repeat="comment in data.comments"> + <td> + <i class="glyphicon glyphicon-user"></i>{{comment.authorName}}<br/> + <i class="glyphicon glyphicon-calendar"></i>{{comment.postDate | date:'dd/MM/yyyy HH:mm'}} + </td> + <td> + <div ng-bind-html="toHTML(comment.text)"></div> + </td> + </tr> + </table> +  +</div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index eb56255..6d35af1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -21,11 +21,13 @@ <form class="form-horizontal" novalidate> <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> Vous devez avoir au moins 1 choix </alert> <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Sondage sauvegardé..</alert> - <alert type="success" class="alert-float" ng-if="!globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> + <alert type="success" class="alert-float" ng-if="globalVariables.voteMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> + <alert type="success" class="alert-float" ng-if="globalVariables.commentMode && globalVariables.saved" close="globalVariables.saved = false"> Commentaire effectué..</alert> <ul class="nav nav-tabs"> <li ng-class="{active: tab == 'home'}"><a href="{{url}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}">Voter</a></li> + <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}">Commenter</a></li> <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}">Résultat</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create">Créer</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}">Editer</a></li> @@ -78,6 +80,8 @@ <div ng-include="'partials/poll-settings.html'" ng-if="tab == 'conf'"></div> + <div ng-include="'partials/poll-comment.html'" ng-if="tab == 'comment'"></div> + <div ng-include="'./partials/poll-result.html'" ng-if="tab == 'result'"></div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: suppr debug code
by Chorem.org scm May 27, 2014

May 27, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit e2c26fb90573aa8b78a5f53ed157e0e26c73e20b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 27 15:14:05 2014 +0200 suppr debug code --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 -- 1 file changed, 2 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 85f5ea8..bc74f2b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -72,8 +72,6 @@ angular.module('pollControllers', []) $scope.data = {}; $scope.data.poll = {}; - console.log($location); - console.log(window.location); if (angular.isDefined($routeParams.pollId)) { var baseUrl = window.location.origin+window.location.pathname; $scope.globalVariables.linkVote = baseUrl; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: Fix url
by Chorem.org scm May 27, 2014

May 27, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit bda66d98813de731d4ea4902ff3e569aae2927ad Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 27 11:02:10 2014 +0200 Fix url --- .../src/main/webapp/js/controllers/pollCtrl.js | 14 ++++++++++---- 1 file changed, 10 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 d9eab78..85f5ea8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -24,7 +24,7 @@ angular.module('pollControllers', []) .controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', function ($scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage) { - $scope.url = $location.protocol()+'://'+$location.host()+'/#'+$location.path(); + $scope.url = window.location.origin+window.location.pathname+'#'+$location.path(); if ($location.search().length != 0) { $scope.url += '?'; angular.forEach($location.search(), function(value, key) { @@ -72,10 +72,16 @@ angular.module('pollControllers', []) $scope.data = {}; $scope.data.poll = {}; + console.log($location); + console.log(window.location); if (angular.isDefined($routeParams.pollId)) { - $scope.globalVariables.linkVote = $location.protocol()+'://'+$location.host()+'/#/poll/vote/'+$routeParams.pollId; - $scope.globalVariables.linkEdit = $location.protocol()+'://'+$location.host()+'/#/poll/edit/'+$routeParams.pollId; - $scope.globalVariables.linkResult = $location.protocol()+'://'+$location.host()+'/#/poll/result/'+$routeParams.pollId; + var baseUrl = window.location.origin+window.location.pathname; + $scope.globalVariables.linkVote = baseUrl; + $scope.globalVariables.linkEdit = baseUrl; + $scope.globalVariables.linkResult = baseUrl; + $scope.globalVariables.linkVote += '#/poll/vote/'+$routeParams.pollId; + $scope.globalVariables.linkEdit += '#/poll/edit/'+$routeParams.pollId; + $scope.globalVariables.linkResult += '#/poll/result/'+$routeParams.pollId; if (angular.isDefined($scope.globalVariables.permission)) { $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix test
by Chorem.org scm May 27, 2014

May 27, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 6dcac7d9768f853375bc8b2048e1390a65ffba4f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 27 10:09:42 2014 +0200 fix test --- .../services/service/VoteCountingServiceTest.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java index 100a223..5210f86 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java @@ -29,9 +29,8 @@ import org.chorem.pollen.services.bean.ChoiceBean; import org.chorem.pollen.services.bean.PollBean; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.bean.VoteBean; +import org.chorem.pollen.services.bean.VoteCountingResultBean; import org.chorem.pollen.services.bean.VoteToChoiceBean; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -130,16 +129,16 @@ public class VoteCountingServiceTest extends AbstractPollenServiceTest { vote3.addChoice(vote3Choice1); voteService.addVote(pollId, vote3); - VoteCountingResult mainResult = service.getMainResult(pollId); + VoteCountingResultBean mainResult = service.getMainResult(pollId); Assert.assertNotNull(mainResult); Assert.assertNotNull(mainResult.getScores()); Assert.assertEquals(2, mainResult.getScores().size()); - Assert.assertNotNull(mainResult.getTopRanking()); - Assert.assertEquals(1, mainResult.getTopRanking().size()); - - ChoiceScore choiceScore = mainResult.getTopRanking().get(0); - Assert.assertEquals(createdChoiceBean1.getEntityId(), choiceScore.getChoiceId()); - Assert.assertEquals(2, choiceScore.getScoreValue().intValue()); +// Assert.assertNotNull(mainResult.getTopRanking()); +// Assert.assertEquals(1, mainResult.getTopRanking().size()); +// +// ChoiceScore choiceScore = mainResult.getTopRanking().get(0); +// Assert.assertEquals(createdChoiceBean1.getEntityId(), choiceScore.getChoiceId()); +// Assert.assertEquals(2, choiceScore.getScoreValue().intValue()); } -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: use bean for vote counting result (to encore ids)
by Chorem.org scm May 27, 2014

May 27, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit d85e3bc3e6ab6b2377d1e6d99e6002b7616a4d1f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 27 08:39:57 2014 +0200 use bean for vote counting result (to encore ids) --- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 12 +-- .../pollen/services/bean/ChoiceScoreBean.java | 95 ++++++++++++++++++++++ .../services/bean/GroupVoteCountingResultBean.java | 46 +++++++++++ .../services/bean/VoteCountingResultBean.java | 71 ++++++++++++++++ .../services/service/VoteCountingService.java | 31 ++++--- 5 files changed, 239 insertions(+), 16 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java index a4b83ac..ec19159 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java @@ -24,10 +24,10 @@ package org.chorem.pollen.rest.api.v1; */ import org.chorem.pollen.persistence.entity.Poll; +import org.chorem.pollen.services.bean.GroupVoteCountingResultBean; import org.chorem.pollen.services.bean.PollenEntityId; +import org.chorem.pollen.services.bean.VoteCountingResultBean; import org.chorem.pollen.services.service.VoteCountingService; -import org.chorem.pollen.votecounting.model.GroupVoteCountingResult; -import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.debux.webmotion.server.WebMotionController; /** @@ -38,16 +38,16 @@ import org.debux.webmotion.server.WebMotionController; */ public class VoteCountingApi extends WebMotionController { - public VoteCountingResult getMainResult(VoteCountingService voteCountingService, PollenEntityId<Poll> pollId) { + public VoteCountingResultBean getMainResult(VoteCountingService voteCountingService, PollenEntityId<Poll> pollId) { - VoteCountingResult result = voteCountingService.getMainResult(pollId.getEntityId()); + VoteCountingResultBean result = voteCountingService.getMainResult(pollId.getEntityId()); return result; } - public GroupVoteCountingResult getGroupResult(VoteCountingService voteCountingService, PollenEntityId<Poll> pollId) { + public GroupVoteCountingResultBean getGroupResult(VoteCountingService voteCountingService, PollenEntityId<Poll> pollId) { - GroupVoteCountingResult result = voteCountingService.getGroupResult(pollId.getEntityId()); + GroupVoteCountingResultBean result = voteCountingService.getGroupResult(pollId.getEntityId()); return result; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceScoreBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceScoreBean.java new file mode 100644 index 0000000..0f07a0d --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceScoreBean.java @@ -0,0 +1,95 @@ +package org.chorem.pollen.services.bean; + +/* + * #%L + * Pollen :: Service + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.google.common.base.Preconditions; +import org.chorem.pollen.persistence.entity.Choice; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; + +import java.math.BigDecimal; + +/** + * Created on 5/27/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ChoiceScoreBean { + + /** Id of the choice. */ + protected PollenEntityId<Choice> choiceId; + + /** + * Global score for this choice (in some vote count it does not mean a + * lot (and it should be improved to take account of the notion of round)). + */ + protected BigDecimal scoreValue; + + /** Order of this score (0 is winner, 1 is second,...). */ + protected int scoreOrder; + + public ChoiceScoreBean() { + this.choiceId = PollenEntityId.newId(Choice.class); + } + + public void fromResult(ChoiceScore result) { + + setChoiceId(result.getChoiceId()); + setScoreOrder(result.getScoreOrder()); + setScoreValue(result.getScoreValue()); + + } + + public PollenEntityId<Choice> getChoiceId() { + return choiceId; + } + + public void setChoiceId(String choiceId) { + + Preconditions.checkNotNull("choiceId can not be null", choiceId); + this.choiceId.setEntityId(choiceId); + } + + + public void setChoiceId(PollenEntityId<Choice> choiceId) { + Preconditions.checkNotNull("choiceId can not be null", choiceId); + this.choiceId = choiceId; + } + + + public BigDecimal getScoreValue() { + return scoreValue; + } + + public void setScoreValue(BigDecimal scoreValue) { + this.scoreValue = scoreValue; + } + + public int getScoreOrder() { + return scoreOrder; + } + + public void setScoreOrder(int scoreOrder) { + this.scoreOrder = scoreOrder; + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/GroupVoteCountingResultBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/GroupVoteCountingResultBean.java new file mode 100644 index 0000000..0a91df6 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/GroupVoteCountingResultBean.java @@ -0,0 +1,46 @@ +package org.chorem.pollen.services.bean; + +/* + * #%L + * Pollen :: Service + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.pollen.votecounting.model.GroupVoteCountingResult; + +/** + * //FIXME + * Created on 5/27/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class GroupVoteCountingResultBean { + + + public void fromResult(GroupVoteCountingResult result) { + + //FIXME + + } + + public VoteCountingResultBean getMainResult() { + return null; + } + +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingResultBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingResultBean.java new file mode 100644 index 0000000..d76b13b --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingResultBean.java @@ -0,0 +1,71 @@ +package org.chorem.pollen.services.bean; + +/* + * #%L + * Pollen :: Service + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; + +import java.util.LinkedList; +import java.util.List; + +/** + * Created on 5/27/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class VoteCountingResultBean { + + /** + * Results for each choice. + * <p/> + * <strong>Note:</strong> Natural order is used to describe choice scores + * (first is winner,...). + */ + protected List<ChoiceScoreBean> scores; + + public VoteCountingResultBean() { + scores = new LinkedList<>(); + } + + public void fromResult(VoteCountingResult result) { + + scores.clear(); + + for (ChoiceScore choiceScore : result.getScores()) { + + ChoiceScoreBean choiceScoreBean = new ChoiceScoreBean(); + choiceScoreBean.fromResult(choiceScore); + scores.add(choiceScoreBean); + + } + + } + + public List<ChoiceScoreBean> getScores() { + return scores; + } + + public void setScores(List<ChoiceScoreBean> scores) { + this.scores = scores; + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java index cd3a08d..90fb857 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java @@ -32,6 +32,8 @@ import org.chorem.pollen.persistence.entity.Vote; import org.chorem.pollen.persistence.entity.VoteToChoice; import org.chorem.pollen.persistence.entity.VoterList; import org.chorem.pollen.persistence.entity.VoterListMember; +import org.chorem.pollen.services.bean.GroupVoteCountingResultBean; +import org.chorem.pollen.services.bean.VoteCountingResultBean; import org.chorem.pollen.votecounting.VoteCounting; import org.chorem.pollen.votecounting.VoteCountingFactory; import org.chorem.pollen.votecounting.VoteCountingStrategy; @@ -55,18 +57,18 @@ import java.util.Set; */ public class VoteCountingService extends PollenServiceSupport { - public VoteCountingResult getMainResult(String pollId) { + public VoteCountingResultBean getMainResult(String pollId) { Preconditions.checkNotNull(pollId); Poll poll = getPollService().getPoll0(pollId); - VoteCountingResult mainResult; + VoteCountingResultBean mainResult; if (Polls.isPollGroup(poll)) { - GroupVoteCountingResult groupResult = getGroupResult(pollId); + GroupVoteCountingResultBean groupResult = getGroupResult(pollId); mainResult = groupResult.getMainResult(); } else { @@ -78,7 +80,7 @@ public class VoteCountingService extends PollenServiceSupport { } - public VoteCountingResult getSimpleResult(String pollId) { + public VoteCountingResultBean getSimpleResult(String pollId) { Preconditions.checkNotNull(pollId); @@ -90,14 +92,18 @@ public class VoteCountingService extends PollenServiceSupport { GroupOfVoter groupOfVoter = toSimpleVotersGroup(votes); - GroupVoteCountingResult result = strategy.votecount(groupOfVoter); + GroupVoteCountingResult groupVoteCountingResult = strategy.votecount(groupOfVoter); - VoteCountingResult mainResult = result.getMainResult(); - return mainResult; + VoteCountingResult mainResult = groupVoteCountingResult.getMainResult(); + + VoteCountingResultBean result = new VoteCountingResultBean(); + result.fromResult(mainResult); + + return result; } - public GroupVoteCountingResult getGroupResult(String pollId) { + public GroupVoteCountingResultBean getGroupResult(String pollId) { Preconditions.checkNotNull(pollId); @@ -111,14 +117,19 @@ public class VoteCountingService extends PollenServiceSupport { // Create a groupVoter including of the root voters GroupOfVoter group = toGroupOfVoters(poll, voterLists, votes); - GroupVoteCountingResult result = strategy.votecount(group); + GroupVoteCountingResult groupVoteCountingResult = strategy.votecount(group); + + + GroupVoteCountingResultBean result = new GroupVoteCountingResultBean(); + result.fromResult(groupVoteCountingResult); + return result; } /** - * Collect all vote for all voters of the givne poll. + * Collect all vote for all voters of the given poll. * <p/> * The result (a set of simple voters) are stored in a fictiv group of voter. * <p/> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/04: update home interface of poll
by Chorem.org scm May 26, 2014

May 26, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 106624546e9212dc20fc354dddc1881a3eb522ee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 26 16:00:00 2014 +0200 update home interface of poll --- pollen-ui-angular/src/main/webapp/js/app.js | 11 +++++++++++ pollen-ui-angular/src/main/webapp/partials/poll-link.html | 6 ++++-- .../src/main/webapp/partials/poll-popupChoice.html | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 0cc6144..a7b5d62 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -162,6 +162,17 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +.directive('selectOnClick', function () { + return { + restrict: 'A', + link: function (scope, element, attrs) { + element.on('click', function () { + this.select(); + }); + } + }; +}) + .directive('autoSave', function ($timeout) { return { restrict : 'A', 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 0e00f8b..fefdde1 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,8 @@ #L% --> <div> - <alert type="warning" ng-if="globalVariables.linkEdit && data.poll.permission"> Lien d'édition : <a href="{{globalVariables.linkEdit}}">{{globalVariables.linkEdit}}</a> </alert> - <alert type="success" ng-if="globalVariables.linkVote"> Lien de vote : <a href="{{globalVariables.linkVote}}"> {{globalVariables.linkVote}}</a> </alert> + <h2>Sondage:</h2> + + <alert type="warning" ng-if="globalVariables.linkEdit && data.poll.permission"> Lien d'édition : <input type="text" select-on-click value="{{globalVariables.linkEdit}}" readonly class="form-control"/> </alert> + <alert type="success" ng-if="globalVariables.linkVote"> Lien de partage pour le vote : <input type="text" select-on-click value="{{globalVariables.linkVote}}" readonly class="form-control"/> </alert> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index d17db00..a2d05ce 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -39,7 +39,7 @@ <label for="popNameChoiceCheck" class="col-sm-4 control-label">Nom du Choix : </label> <div class="col-sm-6"> - <input id="popNameChoiceCheck" type="text" ng-model="choice.name" class="form-control" /> + <input id="popNameChoiceCheck" type="text" ng-model="choice.name" class="form-control" focus-me="choice.choiceType == 'TEXT'"/> </div> </div> @@ -49,7 +49,7 @@ <div class="col-sm-6"> <div class="right-inner-addon "> <i class="glyphicon glyphicon-calendar glyphicon-input"></i> - <input id="popNameChoiceDate" class="form-control" datepicker-popup="dd/MM/yyyy" type="text" ng-model="choice.date" is-open="opened" ng-click="opened = true"/> + <input id="popNameChoiceDate" class="form-control" datepicker-popup="dd/MM/yyyy" type="text" ng-model="choice.date" is-open="opened" ng-click="opened = true" focus-me="choice.choiceType == 'DATE'"/> </div> </div> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/04: create a page for result
by Chorem.org scm May 26, 2014

May 26, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit d250985c1ebc52f74c0b0c428562fb59acda3adf Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 26 14:59:29 2014 +0200 create a page for result --- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 60 ++++++++++++++++++++-- .../src/main/webapp/partials/poll.html | 2 +- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 0794019..0cc6144 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -63,6 +63,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/create', {templateUrl: './partials/poll.html', controller: "PollCreateCtrl"}) .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) + .when('/poll/result/:pollId', {templateUrl: './partials/poll.html', controller :"PollResultCtrl"}) .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) 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 f19bd8e..d9eab78 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -75,9 +75,11 @@ angular.module('pollControllers', []) if (angular.isDefined($routeParams.pollId)) { $scope.globalVariables.linkVote = $location.protocol()+'://'+$location.host()+'/#/poll/vote/'+$routeParams.pollId; $scope.globalVariables.linkEdit = $location.protocol()+'://'+$location.host()+'/#/poll/edit/'+$routeParams.pollId; + $scope.globalVariables.linkResult = $location.protocol()+'://'+$location.host()+'/#/poll/result/'+$routeParams.pollId; if (angular.isDefined($scope.globalVariables.permission)) { $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; } } @@ -113,7 +115,7 @@ angular.module('pollControllers', []) }]) -.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$filter', '$timeout', '$routeParams', function ($scope, $controller, $modal, $filter, $timeout, $routeParams) { +.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', function ($scope, $controller, $modal, $timeout, $routeParams) { $controller('PollCtrl', {$scope:$scope}); if (angular.isDefined($routeParams.tab)) { @@ -184,7 +186,7 @@ angular.module('pollControllers', []) } - var PollPopChoiceCtrl = function ($scope, $filter, $modalInstance, title, choice) { + var PollPopChoiceCtrl = function ($scope, $modalInstance, title, choice) { $scope.title = title; $scope.choice = choice; @@ -363,7 +365,7 @@ angular.module('pollControllers', []) } }]) -.controller('PollVoteCtrl', ['$scope', '$q', '$filter', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $filter, $controller, $routeParams, Poll, PollChoice, PollVote) { +.controller('PollVoteCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { $controller('PollCtrl', {$scope:$scope}); if (angular.isDefined($routeParams.tab)) { @@ -373,8 +375,6 @@ angular.module('pollControllers', []) $scope.tab = 'vote'; } - $scope.globalVariables.results = true; - var initPoll = function () { var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { $scope.data.poll = poll; @@ -448,6 +448,56 @@ angular.module('pollControllers', []) } }]) +.controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { + $controller('PollCtrl', {$scope:$scope}); + + if (angular.isDefined($routeParams.tab)) { + $scope.tab = $routeParams.tab; + } + else { + $scope.tab = 'result'; + } + + var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { + $scope.data.poll = poll; + }).$promise; + + var choicesPromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { + $scope.data.choices = choices; + }).$promise; + + + 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; + } + }) + }) + }).$promise; + + $q.all([choicesPromise, votesPromise]).then(function () { + Poll.get({pollId:$routeParams.pollId, cmd:'results'}, function (result) { + $scope.data.result = result; + 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]; + i = $scope.data.choices.length; + } + } + }) + $scope.data.result.nbVotant = $scope.data.votants.length; + }); + }); + +}]) + .controller('PollListCtrl', ['$scope', '$controller', '$routeParams', 'Poll', function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index f77abba..eb56255 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -26,7 +26,7 @@ <ul class="nav nav-tabs"> <li ng-class="{active: tab == 'home'}"><a href="{{url}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}">Voter</a></li> - <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{url}}tab=result">Résultat</a></li> + <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}">Résultat</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create">Créer</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}">Editer</a></li> <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{url}}tab=conf">Configuration</a></li> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/04: update tab and save permission on offline
by Chorem.org scm May 26, 2014

May 26, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 214d089987eb80136a30d776e5eecb48333c9aff Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 26 14:37:21 2014 +0200 update tab and save permission on offline --- .../src/main/webapp/js/controllers/pollCtrl.js | 65 ++++++++++++++++------ .../src/main/webapp/partials/poll.html | 12 ++-- 2 files changed, 55 insertions(+), 22 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 202b551..f19bd8e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -23,12 +23,6 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', function ($scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage) { - if (angular.isDefined($routeParams.tab)) { - $scope.tab = $routeParams.tab; - } - else { - $scope.tab = 'poll'; - } $scope.url = $location.protocol()+'://'+$location.host()+'/#'+$location.path(); if ($location.search().length != 0) { @@ -51,7 +45,30 @@ angular.module('pollControllers', []) $scope.globalVariables.saved = false; }, 5000); }); + + /** + * Sauvegarde du token si non connecté + */ + var session = SessionStorage.get(); + if (angular.isUndefined($routeParams.token) && angular.isUndefined(session.id)) { // pas de paramètre url et non connecté + if (angular.isDefined(session.permission) && session.permission != '') { // existe une permission + $scope.globalVariables.permission = session.permission; + } + else if (session.permission == '') { + SessionStorage.remove('permission'); + } + } + else if (angular.isDefined(session.id)) { // connecté + if (angular.isDefined(session.permission)) { // connecté => pas besoin de permission + SessionStorage.remove('permission'); + } + } + else { //token dans l'URL + SessionStorage.save({permission:$routeParams.token}); + $scope.globalVariables.permission = $routeParams.token; + } } + $scope.data = {}; $scope.data.poll = {}; @@ -59,8 +76,8 @@ angular.module('pollControllers', []) $scope.globalVariables.linkVote = $location.protocol()+'://'+$location.host()+'/#/poll/vote/'+$routeParams.pollId; $scope.globalVariables.linkEdit = $location.protocol()+'://'+$location.host()+'/#/poll/edit/'+$routeParams.pollId; - if (angular.isDefined($routeParams.token)) { - $scope.globalVariables.linkEdit += '?token='+$routeParams.token; + if (angular.isDefined($scope.globalVariables.permission)) { + $scope.globalVariables.linkEdit += '?token='+$scope.globalVariables.permission; } } @@ -96,9 +113,16 @@ angular.module('pollControllers', []) }]) -.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$filter', '$timeout', function ($scope, $controller, $modal, $filter, $timeout) { +.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$filter', '$timeout', '$routeParams', function ($scope, $controller, $modal, $filter, $timeout, $routeParams) { $controller('PollCtrl', {$scope:$scope}); + if (angular.isDefined($routeParams.tab)) { + $scope.tab = $routeParams.tab; + } + else { + $scope.tab = 'edit'; + } + var initChoice = function () { return { name: '', @@ -237,7 +261,7 @@ angular.module('pollControllers', []) $scope.globalVariables.edit = true; $scope.callBackAddChoice = function (choice) { - PollChoice.add({pollId:$routeParams.pollId, permission:$routeParams.token}, choice, function (data) { + PollChoice.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, choice, function (data) { delete choice.restError; choice.topiaId = data.topiaId; $scope.globalVariables.saved = true; @@ -247,7 +271,7 @@ angular.module('pollControllers', []) } $scope.callBackEditChoice = function (choice) { - PollChoice.update({pollId:$routeParams.pollId, permission:$routeParams.token}, choice, function() { + PollChoice.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, choice, function() { delete choice.restError; $scope.globalVariables.saved = true; }, function (error) { @@ -256,7 +280,7 @@ angular.module('pollControllers', []) } $scope.deleteChoice = function (choice) { - PollChoice.remove({pollId:$routeParams.pollId, permission:$routeParams.token, choiceId: choice.id}, function () { + PollChoice.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, choiceId: choice.id}, function () { $scope.globalVariables.saved = true; var index = $scope.data.choices.indexOf(choice); if (index > -1) { @@ -268,14 +292,14 @@ angular.module('pollControllers', []) } var initPoll = function () { - var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$routeParams.token}, function (poll) { + var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { if (angular.isUndefined(poll.permission)) { $location.path('/'); } $scope.data.poll = poll; }).$promise; - var choicesPromise = PollChoice.query({pollId:$routeParams.pollId, permission:$routeParams.token}).$promise.then(function (choices) { + var choicesPromise = PollChoice.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}).$promise.then(function (choices) { $scope.data.choices = choices; $scope.data.vote = {}; $scope.data.vote.choice = $scope.data.choices; @@ -314,7 +338,7 @@ angular.module('pollControllers', []) initPoll(); $scope.savePoll = function () { - $scope.data.poll.$update({permission:$routeParams.token}, function (data) { + $scope.data.poll.$update({permission:$scope.globalVariables.permission}, function (data) { $scope.globalVariables.saved = true; }, function (error) { angular.extend($scope.restError, error.data); @@ -333,7 +357,7 @@ angular.module('pollControllers', []) } $scope.deletePoll = function () { - $scope.data.poll.$remove({permission:$routeParams.token}, function() { + $scope.data.poll.$remove({permission:$scope.globalVariables.permission}, function() { $location.path('/'); }); } @@ -342,10 +366,17 @@ angular.module('pollControllers', []) .controller('PollVoteCtrl', ['$scope', '$q', '$filter', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $filter, $controller, $routeParams, Poll, PollChoice, PollVote) { $controller('PollCtrl', {$scope:$scope}); + if (angular.isDefined($routeParams.tab)) { + $scope.tab = $routeParams.tab; + } + else { + $scope.tab = 'vote'; + } + $scope.globalVariables.results = true; var initPoll = function () { - var pollPromise = Poll.get({pollId:$routeParams.pollId}, function (poll) { + var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { $scope.data.poll = poll; }).$promise; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index e20217c..f77abba 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -24,15 +24,17 @@ <alert type="success" class="alert-float" ng-if="!globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> <ul class="nav nav-tabs"> - <li ng-class="{active: tab == 'home'}" ng-click="tab = 'home'"><a href="{{url}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> - <li ng-class="{active: tab == 'poll'}" ng-click="tab = 'poll'"><a href="{{url}}tab=poll">Sondage</a></li> - <li ng-class="{active: tab == 'result'}" ng-click="tab = 'result'" ng-show="!globalVariables.create"><a href="{{url}}tab=result">Result</a></li> - <li ng-class="{active: tab == 'conf'}" ng-click="tab = 'conf'" ng-show="globalVariables.editMode"><a href="{{url}}tab=conf">Configuration</a></li> + <li ng-class="{active: tab == 'home'}"><a href="{{url}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> + <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}">Voter</a></li> + <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{url}}tab=result">Résultat</a></li> + <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create">Créer</a></li> + <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}">Editer</a></li> + <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{url}}tab=conf">Configuration</a></li> </ul> <div ng-include="'partials/poll-link.html'" ng-if="tab == 'home'"></div> -<div ng-if="tab == 'poll'"> +<div ng-if="tab == 'edit' || tab == 'vote'"> <div class="pollTitle" edit-me="showEditTitle"> <h1 ng-hide="showEditTitle"> {{data.poll.title || 'Click pour éditer'}} -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/04: set home page for poll
by Chorem.org scm May 26, 2014

May 26, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit c64514a5471fcb8d2d2b0c7151c69dd12abf2e6f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri May 23 17:13:01 2014 +0200 set home page for poll --- .../src/main/webapp/js/controllers/pollCtrl.js | 77 ++++++++++++++++------ .../src/main/webapp/partials/poll-link.html | 24 +++++++ .../src/main/webapp/partials/poll.html | 26 ++++---- 3 files changed, 96 insertions(+), 31 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 19526d4..202b551 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -22,11 +22,29 @@ angular.module('pollControllers', []) .controller('HomeCtrl', ['$scope', function ($scope) { }]) -.controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$cookies', function ($scope, $controller, $sce, $timeout, $cookies) { +.controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', function ($scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage) { + if (angular.isDefined($routeParams.tab)) { + $scope.tab = $routeParams.tab; + } + else { + $scope.tab = 'poll'; + } + + $scope.url = $location.protocol()+'://'+$location.host()+'/#'+$location.path(); + if ($location.search().length != 0) { + $scope.url += '?'; + angular.forEach($location.search(), function(value, key) { + if (key != 'tab') + $scope.url += key+'='+value+'&'; + }) + } + else { + $scope.url += '?'; + } - if (!angular.isDefined($scope.globalVariables)) { - $scope.globalVariables = {saved : $cookies.saved}; - delete $cookies.saved + if (angular.isUndefined($scope.globalVariables)) { + $scope.globalVariables = {saved : SessionStorage.get().saved}; + SessionStorage.remove('saved'); $scope.$watch('globalVariables.saved', function() { $timeout(function () { @@ -37,6 +55,15 @@ angular.module('pollControllers', []) $scope.data = {}; $scope.data.poll = {}; + if (angular.isDefined($routeParams.pollId)) { + $scope.globalVariables.linkVote = $location.protocol()+'://'+$location.host()+'/#/poll/vote/'+$routeParams.pollId; + $scope.globalVariables.linkEdit = $location.protocol()+'://'+$location.host()+'/#/poll/edit/'+$routeParams.pollId; + + if (angular.isDefined($routeParams.token)) { + $scope.globalVariables.linkEdit += '?token='+$routeParams.token; + } + } + $scope.toHTML = function (data) { return $sce.trustAsHtml(data); } @@ -165,7 +192,7 @@ angular.module('pollControllers', []) } }]) -.controller('PollCreateCtrl', ['$scope', '$controller', '$location', 'Poll', '$cookies', function ($scope, $controller, $location, Poll, $cookies) { +.controller('PollCreateCtrl', ['$scope', '$controller', '$location', 'Poll', 'SessionStorage', function ($scope, $controller, $location, Poll, SessionStorage) { $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.create = true; @@ -185,7 +212,7 @@ angular.module('pollControllers', []) var poll = angular.copy($scope.data.poll); poll.choice = angular.copy($scope.data.choices); Poll.add(poll, function (data) { - $cookies.saved = true; + SessionStorage.save({saved: true}); $location.url('/poll/edit/'+data.id+'?token='+data.permission); }, function (error) { $scope.globalVariables.restError = true; @@ -204,16 +231,10 @@ angular.module('pollControllers', []) }]) -.controller('PollEditCtrl', ['$scope', '$controller', '$routeParams', '$location', '$timeout', 'Poll', 'PollChoice', 'PollVote', function ($scope, $controller, $routeParams, $location, $timeout, Poll, PollChoice, PollVote) { +.controller('PollEditCtrl', ['$scope', '$q', '$controller', '$routeParams', '$location', '$timeout', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, $location, $timeout, Poll, PollChoice, PollVote) { $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.edit = true; - $scope.globalVariables.hostName = $location.protocol()+'://'+$location.host(); - - $scope.globalVariables.linkEdit = $location.protocol()+'://'+$location.host()+'/#/poll/edit/'+$routeParams.pollId - if (angular.isDefined($routeParams.token)) { - $scope.globalVariables.linkEdit += '?token='+$routeParams.token; - } $scope.callBackAddChoice = function (choice) { PollChoice.add({pollId:$routeParams.pollId, permission:$routeParams.token}, choice, function (data) { @@ -247,18 +268,20 @@ angular.module('pollControllers', []) } var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$routeParams.token}, function (poll) { + var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$routeParams.token}, function (poll) { if (angular.isUndefined(poll.permission)) { $location.path('/'); } $scope.data.poll = poll; - }); - PollChoice.query({pollId:$routeParams.pollId, permission:$routeParams.token}).$promise.then(function (choices) { + }).$promise; + + var choicesPromise = PollChoice.query({pollId:$routeParams.pollId, permission:$routeParams.token}).$promise.then(function (choices) { $scope.data.choices = choices; $scope.data.vote = {}; $scope.data.vote.choice = $scope.data.choices; - }); - PollVote.query({pollId:$routeParams.pollId}, function (votes) { + }).$promise; + + 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) { @@ -270,7 +293,23 @@ angular.module('pollControllers', []) } }) }) - }) + }).$promise; + + $q.all([choicesPromise, votesPromise]).then(function () { + Poll.get({pollId:$routeParams.pollId, cmd:'results'}, function (result) { + $scope.data.result = result; + 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]; + i = $scope.data.choices.length; + } + } + }) + $scope.data.result.nbVotant = $scope.data.votants.length; + }); + }); + } initPoll(); diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html new file mode 100644 index 0000000..0e00f8b --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -0,0 +1,24 @@ + +<div> + <alert type="warning" ng-if="globalVariables.linkEdit && data.poll.permission"> Lien d'édition : <a href="{{globalVariables.linkEdit}}">{{globalVariables.linkEdit}}</a> </alert> + <alert type="success" ng-if="globalVariables.linkVote"> Lien de vote : <a href="{{globalVariables.linkVote}}"> {{globalVariables.linkVote}}</a> </alert> +</div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index d8529fb..e20217c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -23,11 +23,16 @@ <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Sondage sauvegardé..</alert> <alert type="success" class="alert-float" ng-if="!globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> - <alert type="warning" ng-if="globalVariables.linkEdit"> Lien d'édition : <a href="{{globalVariables.linkEdit}}">{{globalVariables.linkEdit}}</a> </alert> - <alert type="success" ng-if="globalVariables.edit"> Lien de vote : <a href="#/poll/vote/{{data.poll.id}}"> {{globalVariables.hostName}}/#/poll/vote/{{data.poll.id}}</a> </alert> -<tabset> -<tab heading="Sondage"> + <ul class="nav nav-tabs"> + <li ng-class="{active: tab == 'home'}" ng-click="tab = 'home'"><a href="{{url}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> + <li ng-class="{active: tab == 'poll'}" ng-click="tab = 'poll'"><a href="{{url}}tab=poll">Sondage</a></li> + <li ng-class="{active: tab == 'result'}" ng-click="tab = 'result'" ng-show="!globalVariables.create"><a href="{{url}}tab=result">Result</a></li> + <li ng-class="{active: tab == 'conf'}" ng-click="tab = 'conf'" ng-show="globalVariables.editMode"><a href="{{url}}tab=conf">Configuration</a></li> + </ul> +<div ng-include="'partials/poll-link.html'" ng-if="tab == 'home'"></div> + +<div ng-if="tab == 'poll'"> <div class="pollTitle" edit-me="showEditTitle"> <h1 ng-hide="showEditTitle"> {{data.poll.title || 'Click pour éditer'}} @@ -56,14 +61,6 @@ </div> -</tab> -<tab heading="Configuration" ng-show="globalVariables.editMode" > - <div ng-include="'partials/poll-settings.html'"></div> -</tab> -</tabset> - - <div ng-include="'./partials/poll-result.html'" ng-if="globalVariables.results"></div> - <div ng-if="globalVariables.create"> <hr/> <button type="button" class="btn btn-default" ng-model="globalVariables.editMode" btn-checkbox>Mode Edition</button> @@ -75,5 +72,10 @@ <button type="button" class="btn btn-default" ng-model="globalVariables.editMode" btn-checkbox>Mode Edition</button> <button class="btn btn-danger" ng-click="deletePoll();">Supprimer</button> </div> +</div> + + <div ng-include="'partials/poll-settings.html'" ng-if="tab == 'conf'"></div> + + <div ng-include="'./partials/poll-result.html'" ng-if="tab == 'result'"></div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

Build failed in Jenkins: pollen-rest-api-ci #284
by admin+ci-chorem.org＠codelutin.com May 25, 2014

May 25, 2014

See <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/284/> ------------------------------------------ Started by an SCM change Building in workspace <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/> Fetching changes from the remote Git repository Fetching upstream changes from https://git.chorem.org/pollen.git FATAL: Failed to fetch from https://git.chorem.org/pollen.git hudson.plugins.git.GitException: Failed to fetch from https://git.chorem.org/pollen.git at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:623) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:855) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:880) at hudson.model.AbstractProject.checkout(AbstractProject.java:1251) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:605) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:514) at hudson.model.Run.execute(Run.java:1703) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:525) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:231) Caused by: hudson.plugins.git.GitException: Failed to connect to https://git.chorem.org/pollen.git (status = 404) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.checkCredentials(CliGitAPIImpl.java:1929) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1123) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$200(CliGitAPIImpl.java:87) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:254) at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:621) ... 10 more

1 15