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

01/01: change findByTopiaId() by forTopiaIdEquals().findAny()
by chorem.org scm 04 Jul '14

04 Jul '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 bbb77e43f2c41c08d584adf64813f74dc5d4f0ee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jul 4 10:43:07 2014 +0200 change findByTopiaId() by forTopiaIdEquals().findAny() --- .../java/org/chorem/pollen/services/service/ChoiceService.java | 2 +- .../java/org/chorem/pollen/services/service/CommentService.java | 4 ++-- .../org/chorem/pollen/services/service/FavoriteListService.java | 4 ++-- .../main/java/org/chorem/pollen/services/service/PollService.java | 2 +- .../java/org/chorem/pollen/services/service/PollenUserService.java | 2 +- .../main/java/org/chorem/pollen/services/service/VoteService.java | 6 +++--- .../java/org/chorem/pollen/services/service/VoterListService.java | 4 ++-- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 7 ++++++- pollen-ui-angular/src/main/webapp/less/style.less | 4 ++-- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 1d97812..4609938 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -184,7 +184,7 @@ public class ChoiceService extends PollenServiceSupport { protected Choice getChoice(Poll poll, String choiceId) { - Choice result = getChoiceDao().findByTopiaId(choiceId); + Choice result = getChoiceDao().forTopiaIdEquals(choiceId).findAny(); if (!poll.equals(result.getPoll())) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java index 5ecf45b..2da83ee 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java @@ -146,7 +146,7 @@ public class CommentService extends PollenServiceSupport { protected Comment getComment(Poll poll, String commentId) { - Comment result = getCommentDao().findByTopiaId(commentId); + Comment result = getCommentDao().forTopiaIdEquals(commentId).findAny(); if (!poll.equals(result.getPoll())) { @@ -177,7 +177,7 @@ public class CommentService extends PollenServiceSupport { if (commentExists) { - toSave = getCommentDao().findByTopiaId(comment.getEntityId()); + toSave = getCommentDao().forTopiaIdEquals(comment.getEntityId()).findAny(); } else { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 0e3e8a6..68f5f2f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -290,7 +290,7 @@ public class FavoriteListService extends PollenServiceSupport { protected FavoriteList getFavoriteList0(PollenUser user, String favoriteListId) { - FavoriteList result = getFavoriteListDao().findByTopiaId(favoriteListId); + FavoriteList result = getFavoriteListDao().forTopiaIdEquals(favoriteListId).findAny(); if (!user.equals(result.getPollenUser())) { @@ -311,7 +311,7 @@ public class FavoriteListService extends PollenServiceSupport { protected FavoriteListMember getFavoriteListMember0(FavoriteList favoriteList, String memberId) { - FavoriteListMember result = getFavoriteListMemberDao().findByTopiaId(memberId); + FavoriteListMember result = getFavoriteListMemberDao().forTopiaIdEquals(memberId).findAny(); if (!favoriteList.equals(result.getFavoriteList())) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index e35d911..b3ac539 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -374,7 +374,7 @@ public class PollService extends PollenServiceSupport { protected Poll getPoll0(String pollId) { - return getPollDao().findByTopiaId(pollId); + return getPollDao().forTopiaIdEquals(pollId).findAny(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 4191c45..a447453 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -309,7 +309,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer protected PollenUser getUser0(String userId) { - PollenUser pollenUser = getPollenUserDao().findByTopiaId(userId); + PollenUser pollenUser = getPollenUserDao().forTopiaIdEquals(userId).findAny(); return pollenUser; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index dad35e2..04711f9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -271,7 +271,7 @@ public class VoteService extends PollenServiceSupport { protected Vote getVote(Poll poll, String voteId) { - Vote result = getVoteDao().findByTopiaId(voteId); + Vote result = getVoteDao().forTopiaIdEquals(voteId).findAny(); if (!poll.equals(result.getPoll())) { @@ -292,7 +292,7 @@ public class VoteService extends PollenServiceSupport { protected VoteToChoice getVoteToChoice(Vote vote, String voteToChoiceId) { - VoteToChoice result = getVoteToChoiceDao().findByTopiaId(voteToChoiceId); + VoteToChoice result = getVoteToChoiceDao().forTopiaIdEquals(voteToChoiceId).findAny(); if (!vote.containsVoteToChoice(result)) { @@ -321,7 +321,7 @@ public class VoteService extends PollenServiceSupport { String choiceId = source.getChoiceId().getEntityId(); - Choice choiceLoaded = getChoiceDao().findByTopiaId(choiceId); + Choice choiceLoaded = getChoiceDao().forTopiaIdEquals(choiceId).findAny(); result.setChoice(choiceLoaded); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java index 4fc2f9c..9a43ee7 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java @@ -333,7 +333,7 @@ public class VoterListService extends PollenServiceSupport { protected VoterList getVoterList0(Poll poll, String voterListId) { - VoterList result = getVoterListDao().findByTopiaId(voterListId); + VoterList result = getVoterListDao().forTopiaIdEquals(voterListId).findAny(); if (!poll.equals(result.getPoll())) { @@ -366,7 +366,7 @@ public class VoterListService extends PollenServiceSupport { protected VoterListMember getVoterListMember0(VoterList voterList, String memberId) { - VoterListMember result = getVoterListMemberDao().findByTopiaId(memberId); + VoterListMember result = getVoterListMemberDao().forTopiaIdEquals(memberId).findAny(); if (!voterList.equals(result.getVoterList())) { 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 dd4bbef..e050af6 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -115,7 +115,12 @@ angular.module('pollControllers', []) }) pollDeferred.promise.then(function () { - var baseUrl = window.location.protocol+'//'+window.location.hostname+window.location.pathname; + var baseUrl = window.location.protocol+'//'+window.location.hostname; + if (window.location.port != "") { + baseUrl += ':'+window.location.port; + } + baseUrl += window.location.pathname; + $scope.globalVariables.baseUrl = baseUrl; $scope.globalVariables.linkHome = baseUrl; $scope.globalVariables.linkVote = baseUrl; diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 13d64d0..8f39e9b 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -311,7 +311,7 @@ color: @danger-color; transition-duration:@short-time-transition; - &:hover { + &:hover, &:focus { color: @danger-hover-color; transition-duration:@short-time-transition; } @@ -320,7 +320,7 @@ a { transition-duration:@short-time-transition; - &:hover { + &:hover, &:focus { transition-duration:@short-time-transition; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: Merge branch 'feature/voteCountingApi' into develop
by chorem.org scm 03 Jul '14

03 Jul '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 04caf751191aa4d5e6aa1b66519dcf41404a10d1 Merge: 980786d a02e287 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 3 16:49:02 2014 +0200 Merge branch 'feature/voteCountingApi' into develop .../pollen/rest/api/v1/VoteCountingTypeApi.java | 23 ++++ pollen-rest-api/src/main/resources/mapping | 5 + .../pollen/services/bean/VoteCountingTypeBean.java | 75 ++++++++++++ .../services/service/VoteCountingTypeService.java | 67 +++++++++++ .../src/main/webapp/js/controllers/localeCtrl.js | 3 +- .../src/main/webapp/js/controllers/pollCtrl.js | 126 +++++++++++++-------- pollen-ui-angular/src/main/webapp/js/services.js | 9 ++ .../src/main/webapp/partials/inline-poll.html | 4 +- .../src/main/webapp/partials/poll-settings.html | 12 +- 9 files changed, 265 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: UI get voteCountingType from server
by chorem.org scm 03 Jul '14

03 Jul '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 a02e287b235048245fd512b5006b7b18a0284644 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 3 16:45:23 2014 +0200 UI get voteCountingType from server --- .../pollen/services/bean/VoteCountingTypeBean.java | 23 ++-- .../src/main/webapp/js/controllers/localeCtrl.js | 3 +- .../src/main/webapp/js/controllers/pollCtrl.js | 126 +++++++++++++-------- pollen-ui-angular/src/main/webapp/js/services.js | 9 ++ .../src/main/webapp/partials/inline-poll.html | 4 +- .../src/main/webapp/partials/poll-settings.html | 12 +- 6 files changed, 110 insertions(+), 67 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingTypeBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingTypeBean.java index 8e86c07..4ccb153 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingTypeBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingTypeBean.java @@ -1,12 +1,7 @@ package org.chorem.pollen.services.bean; -import org.chorem.pollen.services.service.VoteCountingService; -import org.chorem.pollen.votecounting.VoteCounting; -import org.chorem.pollen.votecounting.VoteCountingFactory; import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; -import java.util.Locale; - /** * Created on 03/07/14. * @@ -23,7 +18,7 @@ public class VoteCountingTypeBean { protected String shortHelper; - protected ChoiceToVoteRenderType renderType; + protected String renderType; public int getId() { @@ -58,11 +53,23 @@ public class VoteCountingTypeBean { this.shortHelper = shortHelper; } - public ChoiceToVoteRenderType getRenderType() { + public String getRenderType() { return renderType; } - public void setRenderType(ChoiceToVoteRenderType renderType) { + public void setRenderType(String renderType) { this.renderType = renderType; } + + public void setRenderType(ChoiceToVoteRenderType renderType) { + switch (renderType) { + case CHECKBOX: + this.renderType = "checkbox"; + break; + + case TEXTFIELD: + this.renderType = "text"; + break; + } + } } diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js index d370ab8..9805d8b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js @@ -19,7 +19,7 @@ * #L% */ angular.module('localeControllers', []) -.controller('LocaleCtrl', ['$scope', '$translate', 'SessionStorage',function ($scope, $translate, SessionStorage) { +.controller('LocaleCtrl', ['$scope', '$rootScope', '$translate', 'SessionStorage',function ($scope, $rootScope, $translate, SessionStorage) { $scope.debug = conf.debug; $scope.locale = SessionStorage.get().locale; if (angular.isUndefined($scope.locale)) { @@ -42,6 +42,7 @@ angular.module('localeControllers', []) SessionStorage.save({locale:locale}); $scope.locale = locale; $translate.use(locale); + $rootScope.$broadcast('switchLocale'); } } }]) 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 68baa88..dd4bbef 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -67,16 +67,32 @@ angular.module('pollControllers', []) SessionStorage.save({'menuMinify': $scope.globalVariables.minify}); } - $translate('dateFormat').then(function (dateFormat) { - $scope.globalVariables.dateFormat = dateFormat; - }); + var setDateFormat = function () { + $translate('dateFormat').then(function (dateFormat) { + $scope.globalVariables.dateFormat = dateFormat; + }); + }; setDateFormat(); + + $scope.$on('switchLocale', function() { + setDateFormat(); + }) $scope.data = {}; $scope.data.poll = {}; + $scope.pollDeferred = $q.defer(); + + var setVoteCountingType = function () { + $scope.pollDeferred.promise.then(function () { + Poll.voteCountingType({id:$scope.data.poll.voteCountingType}, function (data) { + $scope.data.voteCountingType = data; + $scope.pollDeferred.resolve(); + }) + }); + } + if (angular.isDefined($routeParams.pollId)) { - var pollDeferred = $q.defer(); - $scope.pollDeferred = pollDeferred; + var pollDeferred = $scope.pollDeferred; Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.pollToken}, function (poll) { $scope.data.poll = poll; $scope.globalVariables.pollToken = poll.permission; @@ -95,6 +111,10 @@ angular.module('pollControllers', []) }); pollDeferred.promise.then(function () { + setVoteCountingType(); + }) + + pollDeferred.promise.then(function () { var baseUrl = window.location.protocol+'//'+window.location.hostname+window.location.pathname; $scope.globalVariables.baseUrl = baseUrl; $scope.globalVariables.linkHome = baseUrl; @@ -156,13 +176,6 @@ angular.module('pollControllers', []) } }); - $scope.getInputType = function () { - if ($scope.voteCountingIsBoolean()) { - return 'checkbox'; - } else { - return 'text'; - } - } $scope.getChoiceValue = function (choiceValue) { if ($scope.voteCountingIsBoolean()) { @@ -176,27 +189,32 @@ angular.module('pollControllers', []) return 0.0; } else { - choiceValue; + return choiceValue; } } } $timeout(function () { - $scope.$watch('data.poll.voteCountingType', function (newVal, oldVal) { - if (angular.isDefined(oldVal) && (newVal == 1 || oldVal == 1) && newVal != oldVal) { - angular.forEach($scope.data.votants, function(votant, key) { - angular.forEach(votant.choice, function (choice) { - choice.inputType = $scope.getInputType(); - choice.voteValue = $scope.getChoiceValue(choice.voteValue); - }) - }); - } - }) + $scope.$watch('data.poll.voteCountingType', function (newVal, oldVal) { + if (newVal != oldVal && oldVal !== undefined) { + setVoteCountingType(); + } + }); + + $scope.$watch('data.voteCountingType.renderType', function (newVal, oldVal) { + if (newVal !== undefined) { + angular.forEach($scope.data.votants, function(votant, key) { + angular.forEach(votant.choice, function (choice) { + choice.voteValue = $scope.getChoiceValue(choice.voteValue); + }); + }); + } + }) }); $scope.voteCountingIsBoolean = function () { - if (angular.isDefined($scope.data.poll) && angular.isDefined($scope.data.poll.voteCountingType)) { - return $scope.data.poll.voteCountingType == 1; + if (angular.isDefined($scope.data.voteCountingType)) { + return $scope.data.voteCountingType.renderType == 'checkbox'; } return false; } @@ -247,7 +265,7 @@ angular.module('pollControllers', []) }]) -.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', function ($scope, $controller, $modal, $timeout, $routeParams) { +.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', 'Poll', function ($scope, $controller, $modal, $timeout, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('edit'); @@ -315,8 +333,7 @@ angular.module('pollControllers', []) return { name: '', date: $scope.globalVariables.lastDate, - choiceType: $scope.globalVariables.lastType, - inputType: $scope.getInputType() + choiceType: $scope.globalVariables.lastType }; } @@ -399,6 +416,35 @@ angular.module('pollControllers', []) return 'Non'; } } + + //////////////////////////////// + //// VOTE COUNTING TYPE ///// + //////////////////////////////// + + var initVoteCountingType = function () { + Poll.allVoteCountingType(function (data) { + $scope.data.allVoteCountingType = data; + setHelper(); + }) + }; initVoteCountingType(); + + var setHelper = function () { + angular.forEach($scope.data.allVoteCountingType, function (value) { + if (value.id == $scope.data.poll.voteCountingType) { + $scope.voteCountingTypeHelper = value.helper; + } + }); + }; + + $scope.$on('switchLocale', function() { + initVoteCountingType(); + }); + + $timeout(function () { + $scope.$watch('data.poll.voteCountingType', function (newVal) { + setHelper(); + }) + }); }]) .controller('PollCreateCtrl', ['$scope', '$rootScope', '$controller', '$location', 'Poll', 'SessionStorage', 'PollVoterList', @@ -770,15 +816,7 @@ angular.module('pollControllers', []) $scope.data.votants = votes; angular.forEach($scope.data.votants, function (vote) { angular.forEach(vote.choice, function (choice) { - if ($scope.voteCountingIsBoolean()) { - if (choice.voteValue != null && choice.voteValue != 0.0) { - choice.voteValue = true; - } - else { - choice.voteValue = false; - } - } - choice.inputType = $scope.getInputType(); + choice.voteValue = $scope.getChoiceValue(choice.voteValue); }) }) }); @@ -843,15 +881,7 @@ angular.module('pollControllers', []) $scope.data.votants = votes; angular.forEach($scope.data.votants, function (vote) { angular.forEach(vote.choice, function (choice) { - if ($scope.voteCountingIsBoolean()) { - if (choice.voteValue != null && choice.voteValue != 0.0) { - choice.voteValue = true; - } - else { - choice.voteValue = false; - } - } - choice.inputType = $scope.getInputType(); + choice.voteValue = $scope.getChoiceValue(choice.voteValue); }) }) }); @@ -891,7 +921,7 @@ angular.module('pollControllers', []) for (var i = 0; i < $scope.data.choices.length; ++i) { - $scope.data.vote.choice.push({'choiceId':$scope.data.choices[i].id, 'voteValue': defaultValue, 'inputType': $scope.getInputType()}); + $scope.data.vote.choice.push({'choiceId':$scope.data.choices[i].id, 'voteValue': defaultValue}); } } @@ -956,7 +986,7 @@ angular.module('pollControllers', []) } $scope.toggleValue = function (choice, event) { - if (choice.inputType == 'checkbox') { + if ($scope.data.voteCountingType.renderType == 'checkbox') { choice.voteValue = !choice.voteValue; event.stopPropagation(); } diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 1333cae..c9495f8 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -56,6 +56,15 @@ angular.module('pollenServices', ['ngResource']) 'clone' : { method : 'POST', url : conf.restURL+'/polls/:pollId/clone' + }, + 'allVoteCountingType': { + method : 'GET', + isArray: true, + url : conf.restURL+'/voteCountingTypes/:id' + }, + 'voteCountingType': { + method : 'GET', + url : conf.restURL+'/voteCountingTypes/:id' } }); }]) 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 d5f4474..6061367 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -60,7 +60,7 @@ </input-error> </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}" ng-click="toggleValue(choice, $event);"> - <input type="{{choice.inputType}}" name="{{choice.choiceId}}" ng-model="choice.voteValue" ng-click="toggleValue(choice, $event);" /> + <input type="{{data.voteCountingType.renderType}}" name="{{choice.choiceId}}" ng-model="choice.voteValue" ng-click="toggleValue(choice, $event);" /> </td> <td> <input class="btn btn-primary btn-large" type="button" value="{{ 'action.vote' | translate }}" ng-click="voter()" /> @@ -72,7 +72,7 @@ <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" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}"> - <input type="{{choice.inputType}}" ng-model="choice.voteValue" disabled /> + <input type="{{data.voteCountingType.renderType}}" ng-model="choice.voteValue" disabled /> </td> <td> <button class="btn btn-info" ng-if="vote.permission && !globalVariables.editMode" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> 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 06d4df7..99df8ab 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -130,15 +130,11 @@ <label class="col-sm-4 control-label">Type : </label> <div class="col-sm-8"> <div class="btn-group"> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="1" auto-save="autoSavePoll()">Normal</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="2" auto-save="autoSavePoll()">Pourcentage</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="3" auto-save="autoSavePoll()">Condorcet</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="4" auto-save="autoSavePoll()">Nombre</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="5" auto-save="autoSavePoll()">Borda</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="6" auto-save="autoSavePoll()">Vote alternatif</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="7" auto-save="autoSavePoll()">Coombs</button> + + <button ng-repeat="voteCountingType in data.allVoteCountingType" type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="{{voteCountingType.id}}" auto-save="autoSavePoll()">{{voteCountingType.name}}</button> + </div> - <p>Description du types de vote</p> + <p ng-bind-html="toHTML(voteCountingTypeHelper)"></p> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: add VoteCountingTypeApi
by chorem.org scm 03 Jul '14

03 Jul '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 03df50919f584a82a9303832cbd38bfce2698db1 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 3 14:34:03 2014 +0200 add VoteCountingTypeApi --- .../pollen/rest/api/v1/VoteCountingTypeApi.java | 23 ++++++++ pollen-rest-api/src/main/resources/mapping | 5 ++ .../pollen/services/bean/VoteCountingTypeBean.java | 68 ++++++++++++++++++++++ .../services/service/VoteCountingTypeService.java | 67 +++++++++++++++++++++ 4 files changed, 163 insertions(+) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingTypeApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingTypeApi.java new file mode 100644 index 0000000..1fcd5ad --- /dev/null +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingTypeApi.java @@ -0,0 +1,23 @@ +package org.chorem.pollen.rest.api.v1; + +import org.chorem.pollen.services.bean.VoteCountingTypeBean; +import org.chorem.pollen.services.service.VoteCountingTypeService; +import org.debux.webmotion.server.WebMotionController; + +import java.util.List; + +/** + * Created on 03/07/14. + * + * @author garandel + * @since 2.0 + */ +public class VoteCountingTypeApi extends WebMotionController { + public List<VoteCountingTypeBean> getVoteCountingTypes(VoteCountingTypeService voteCountingTypeService) { + return voteCountingTypeService.getVoteCountingTypes(); + } + + public VoteCountingTypeBean getVoteCountingType(VoteCountingTypeService voteCountingTypeService, int id) { + return voteCountingTypeService.getVoteCountingType(id); + } +} diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 4340a23..0c6b559 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -129,6 +129,11 @@ PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmai GET /v1/polls/{pollId}/results VoteCountingApi.getMainResult GET /v1/polls/{pollId}/groupResults VoteCountingApi.getGroupResult +# VoteCountingTypeApi + +GET /v1/voteCountingTypes VoteCountingTypeApi.getVoteCountingTypes +GET /v1/voteCountingTypes/{id} VoteCountingTypeApi.getVoteCountingType + # VoterListApi PUT /v1/polls/{pollId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteList diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingTypeBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingTypeBean.java new file mode 100644 index 0000000..8e86c07 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteCountingTypeBean.java @@ -0,0 +1,68 @@ +package org.chorem.pollen.services.bean; + +import org.chorem.pollen.services.service.VoteCountingService; +import org.chorem.pollen.votecounting.VoteCounting; +import org.chorem.pollen.votecounting.VoteCountingFactory; +import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; + +import java.util.Locale; + +/** + * Created on 03/07/14. + * + * @author agarandel + * @since 2.0 + */ +public class VoteCountingTypeBean { + + protected int id; + + protected String name; + + protected String helper; + + protected String shortHelper; + + protected ChoiceToVoteRenderType renderType; + + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getHelper() { + return helper; + } + + public void setHelper(String helper) { + this.helper = helper; + } + + public String getShortHelper() { + return shortHelper; + } + + public void setShortHelper(String shortHelper) { + this.shortHelper = shortHelper; + } + + public ChoiceToVoteRenderType getRenderType() { + return renderType; + } + + public void setRenderType(ChoiceToVoteRenderType renderType) { + this.renderType = renderType; + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingTypeService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingTypeService.java new file mode 100644 index 0000000..3bbd957 --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingTypeService.java @@ -0,0 +1,67 @@ +package org.chorem.pollen.services.service; + +import org.chorem.pollen.services.bean.VoteCountingTypeBean; +import org.chorem.pollen.votecounting.VoteCounting; +import org.chorem.pollen.votecounting.VoteCountingFactory; +import org.chorem.pollen.votecounting.VoteCountingNotFound; +import org.chorem.pollen.votecounting.VoteCountingStrategy; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +/** + * Created on 03/07/14. + * + * @author agarandel + * @since 2.0 + */ +public class VoteCountingTypeService extends PollenServiceSupport { + + public List<VoteCountingTypeBean> getVoteCountingTypes() { + List<VoteCountingTypeBean> voteCountingTypes = new ArrayList<VoteCountingTypeBean>(); + + try { + int i = 1; + while ( i > 0 ) { + + voteCountingTypes.add(idToVoteCountingType(i)); + + ++i; + } + } + catch (VoteCountingNotFound e) { + if (voteCountingTypes.size() == 0) { + throw e; + } + } + + return voteCountingTypes; + } + + public VoteCountingTypeBean getVoteCountingType(int id) { + try { + return idToVoteCountingType(id); + } + catch (VoteCountingNotFound e) { + return null; + } + } + + protected VoteCountingTypeBean idToVoteCountingType(int id) throws VoteCountingNotFound { + VoteCountingFactory factory = serviceContext.getVoteCountingFactory(); + Locale l = serviceContext.getLocale(); + + VoteCountingTypeBean newVoteCountingType = new VoteCountingTypeBean(); + + VoteCounting voteCounting = factory.getVoteCounting(id); + + newVoteCountingType.setId(voteCounting.getId()); + newVoteCountingType.setName(voteCounting.getName(l)); + newVoteCountingType.setHelper(voteCounting.getHelp(l)); + newVoteCountingType.setShortHelper(voteCounting.getShortHelp(l)); + newVoteCountingType.setRenderType(voteCounting.getVoteValueEditorType()); + + return newVoteCountingType; + } +} -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

05/05: Merge branch 'develop' of https://git.chorem.org/pollen into develop
by chorem.org scm 02 Jul '14

02 Jul '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 980786db24be7e84d83daefbf735aab1c45e212b Merge: a4d70d7 4e9d45d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 18:52:34 2014 +0200 Merge branch 'develop' of https://git.chorem.org/pollen into develop -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/05: List User for admin
by chorem.org scm 02 Jul '14

02 Jul '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 a4d70d7750993dc86ac5260727e7dd5e10c0fa34 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 18:51:57 2014 +0200 List User for admin --- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 56 ++++++++++++++++++---- .../src/main/webapp/partials/poll-link.html | 1 + .../src/main/webapp/partials/user-edit.html | 22 ++++----- .../src/main/webapp/partials/user-list.html | 11 +++++ 5 files changed, 71 insertions(+), 20 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index a8bf214..8c3d08f 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', ['pollenDirective', 'pollenServices', 'ngRoute', 'pollC .when('/poll/result/:pollId/:token?', {templateUrl: './partials/poll.html', controller :"PollResultCtrl"}) .when('/poll/comment/:pollId/:commentToken?', {templateUrl: './partials/poll.html', controller :"PollCommentCtrl"}) .when('/poll/list/:cmd?', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) + .when('/user/list', {templateUrl: './partials/user-list.html', controller:"UserListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .when('/user/lostpassword', {templateUrl: './partials/user-lostPassword.html', controller:"UserLostPasswordCtrl"}) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 20b38da..4935fad 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -73,19 +73,24 @@ -.controller('UserEditCtrl', ['$scope', '$rootScope', '$location', 'User', 'SessionStorage', function ($scope, $rootScope, $location, User, SessionStorage) { - $scope.currentUser = SessionStorage.get().user; +.controller('UserEditCtrl', ['$scope', '$rootScope', '$routeParams', '$route', '$location', 'User', 'SessionStorage', function ($scope, $rootScope, $routeParams, $route, $location, User, SessionStorage) { + if (angular.isUndefined($scope.data)) { + $scope.data = {user:{}}; + } + + $scope.data.user = angular.copy(SessionStorage.get().user); - if (angular.isUndefined($scope.currentUser)) { + if (angular.isUndefined($scope.data.user)) { $rootScope.$broadcast('newError', 'user.error.login.mandatory' ); $location.url('/'); } - $scope.currentUser.password = ''; + $scope.data.user.password = ''; $scope.editUser = function () { - User.update($scope.currentUser, function (data) { + User.update($scope.data.user, function (data) { SessionStorage.save({user:data}); + $rootScope.$broadcast('editUser'); $rootScope.$broadcast('newSuccess', 'user.edit.success'); }, function (error) { $scope.restError = error.data; @@ -93,9 +98,8 @@ } $scope.editPassword = function () { - if ($scope.currentUser.newPassword == $scope.currentUser.newPassword2) { - User.editPassword($scope.currentUser, function (data) { - SessionStorage.save({user:data}); + if ($scope.data.user.newPassword == $scope.data.user.newPassword2) { + User.editPassword($scope.data.user, function (data) { $rootScope.$broadcast('newSuccess', 'user.edit.success'); }, function (error) { $scope.restError = error.data; @@ -104,6 +108,36 @@ } }]) +.controller('UserListCtrl', ['$scope', '$routeParams', 'User', + function ($scope, $routeParams, User) { + if (angular.isUndefined($scope.data)) { + $scope.data = {user:{}}; + } + + if (angular.isDefined(conf.pollDefaultPageSize)) { + $scope.pageSize = conf.pollDefaultPageSize; + } + else { + $scope.pageSize = -1; + } + + var paginationParameter = {pageSize:$scope.pageSize}; + if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; + } + + paginationParameter.pageNumber = $routeParams.page; + } + + User.get({paginationParameter:paginationParameter}, function (data) { + console.log(data); + $scope.data.users = data.elements; + $scope.data.usersPagination = data.pagination + }); +}]) + .controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', '$translate', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location, $translate) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; @@ -111,7 +145,11 @@ $scope.$on('sessionExpired', function() { $scope.logout(); - }) + }); + + $scope.$on('editUser', function() { + $scope.currentUser = SessionStorage.get().user; + }); $scope.currentUser = SessionStorage.get().user; 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 73822bc..21fd606 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> + <ul> <li class="toMini" ng-click="toggleMinify()"> <a class="fakeLink" ng-show="globalVariables.minify"><span class="glyphicon glyphicon-chevron-right"></span></a> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index c995f7d..765d96e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -26,7 +26,7 @@ {{ 'user.name' | translate }} </label> <div class="col-sm-6"> - <input type="text" id="formName" class="form-control" ng-model="currentUser.name" auto-save="editUser()" /> + <input type="text" id="formName" class="form-control" ng-model="data.user.name" auto-save="editUser()" /> </div> <div class="col-sm-1"> </div> @@ -39,10 +39,10 @@ </label> <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email" auto-save="editUser()" /> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email" auto-save="editUser()" /> </div> <div class="col-sm-1"> - <info-error error="restError.email[0]" data="currentUser.email"></info-error> + <info-error error="restError.email[0]" data="data.user.email"></info-error> </div> </div> @@ -51,10 +51,10 @@ {{ 'user.passwordCurrent' | translate }} </label> <div class="col-sm-6"> - <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password" auto-save="editUser()" /> + <input type="password" id="formPassword" class="form-control" ng-model="data.user.password" auto-save="editUser()" /> </div> <div class="col-sm-1"> - <info-error error="restError.password[0]" data="currentUser.password"></info-error> + <info-error error="restError.password[0]" data="data.user.password"></info-error> </div> </div> @@ -73,10 +73,10 @@ {{ 'user.passwordCurrent' | translate }} </label> <div class="col-sm-6"> - <input type="password" id="formCurrentPassword" class="form-control" ng-model="currentUser.password" /> + <input type="password" id="formCurrentPassword" class="form-control" ng-model="data.user.password" /> </div> <div class="col-sm-1"> - <info-error error="restError.password[0]" data="currentUser.password"></info-error> + <info-error error="restError.password[0]" data="data.user.password"></info-error> </div> </div> @@ -85,10 +85,10 @@ {{ 'user.passwordNew' | translate }} </label> <div class="col-sm-6"> - <input type="password" id="formNewPassword" class="form-control" ng-model="currentUser.newPassword" auto-save="editPassword()"/> + <input type="password" id="formNewPassword" class="form-control" ng-model="data.user.newPassword" auto-save="editPassword()"/> </div> <div class="col-sm-1"> - <info-error error="restError.newPassword[0]" data="currentUser.newPassword"></info-error> + <info-error error="restError.newPassword[0]" data="data.user.newPassword"></info-error> </div> </div> @@ -97,10 +97,10 @@ {{ 'user.password2' | translate }} </label> <div class="col-sm-6"> - <input type="password" id="formNewPassword2" class="form-control" ng-model="currentUser.newPassword2" auto-save="editPassword()"/> + <input type="password" id="formNewPassword2" class="form-control" ng-model="data.user.newPassword2" auto-save="editPassword()"/> </div> <div class="col-sm-1"> - <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="{{ 'user.error.password.diff' | translate }}" ng-if="currentUser.newPassword != currentUser.newPassword2"></span> + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="{{ 'user.error.password.diff' | translate }}" ng-if="data.user.newPassword != data.user.newPassword2"></span> </div> </div> </form> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-list.html b/pollen-ui-angular/src/main/webapp/partials/user-list.html new file mode 100644 index 0000000..02867b7 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-list.html @@ -0,0 +1,11 @@ + +<div ng-if="!data.users[0]"><h1>{{ 'user.error.listEmpty' | translate }}</h1></div> + +<div ng-repeat="user in data.users"> + <h2><a href="#/user/edit/{{user.id}}">{{user.name || user.email}}</a></h2> + <hr/> +</div> + +<make-pagination current-page="data.usersPagination.currentPage" + last-page="data.usersPagination.lastPage" + page-size="data.usersPagination.pageSize"></make-pagination> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/05: translate poll.link
by chorem.org scm 02 Jul '14

02 Jul '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 ecd6fa0d70e52756980d8cc31d07a53eb3c87e5f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 16:37:08 2014 +0200 translate poll.link --- pollen-ui-angular/src/main/webapp/i18n/en.js | 10 ++++++++-- pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-list.html | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index beffd49..e4643f8 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -44,12 +44,18 @@ var translateEN = { 'poll.tab.conf' : 'Configuration', 'poll.tab.participant' : 'Participants', -'poll.link.edit' : 'Edit Url', -'poll.link.vote' : 'Vote Url', +'poll.link.edit' : 'Edit poll', +'poll.link.vote' : 'Vote', +'poll.link.result' : 'Result of poll', +'poll.link.clone' : 'Clone this poll', +'poll.link.export' : 'Export this poll', +'poll.link.close' : 'Close this poll', +'poll.link.delete' : 'Delete this poll', 'poll.edit' : 'Click to edit', 'poll.desc' : 'Description is optional. This message will not visible in vote page.', 'poll.saved' : 'Poll saved.', +'poll.cloned' : 'Poll cloned', 'poll.closed' : 'Poll closed', 'poll.deleted' : 'Poll deleted', 'poll.restricted.name' : 'Name', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 7a3c2a0..d6c1c7c 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -51,11 +51,11 @@ var translateFR = { 'poll.link.export' : 'Exporter le sondage', 'poll.link.close' : 'Fermer les votes du sondage', 'poll.link.delete' : 'Supprimer le sondage', -'poll.link.hide' : 'Minifier le cadre', 'poll.edit' : 'Clique pour éditer', 'poll.desc' : 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise', 'poll.saved' : 'Sondage sauvegardé', +'poll.cloned' : 'Sondage cloné', 'poll.closed' : 'Sondage fermé', 'poll.deleted' : 'Sondage supprimé', 'poll.restricted.name' : 'Nom du votant', diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index 5e8d310..1d61471 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -2,7 +2,7 @@ <div ng-if="!data.polls[0]"><h1>{{ 'poll.error.listEmpty' | translate }}</h1></div> <div ng-repeat="poll in data.polls"> - <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> + <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a></h2> <p ng-bind-html="toHTML(poll.description)"></p> <hr/> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/05: clone voterList
by chorem.org scm 02 Jul '14

02 Jul '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 0cbc2651d9f12e9d7192f8184c6379343f0962f6 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 16:08:53 2014 +0200 clone voterList --- .../pollen/services/service/PollService.java | 26 +++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index ffdbf77..e35d911 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -26,11 +26,7 @@ package org.chorem.pollen.services.service; import com.google.common.base.Function; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.*; -import org.chorem.pollen.services.bean.ChoiceBean; -import org.chorem.pollen.services.bean.PaginationParameterBean; -import org.chorem.pollen.services.bean.PaginationResultBean; -import org.chorem.pollen.services.bean.PollBean; -import org.chorem.pollen.services.bean.PollenEntityRef; +import org.chorem.pollen.services.bean.*; import org.chorem.pollen.services.service.security.PermissionVerb; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -219,7 +215,10 @@ public class PollService extends PollenServiceSupport { checkNotNull(pollId); checkPermission(PermissionVerb.clonePoll, pollId); - PollBean clonedPoll = toBean(PollBean.class, getPoll0(pollId)); + Poll poll = getPoll0(pollId); + + // Clone Poll + PollBean clonedPoll = toBean(PollBean.class, poll); clonedPoll.setEntityId(null); clonedPoll.setPermission(null); @@ -231,6 +230,7 @@ public class PollService extends PollenServiceSupport { clonedPoll.setTitle(clonedPoll.getTitle() + " (clone)"); + // Clone Choice List<ChoiceBean> clonedChoices = getChoiceService().getChoices(pollId); for (ChoiceBean choice : clonedChoices) { choice.setEntityId(null); @@ -238,6 +238,20 @@ public class PollService extends PollenServiceSupport { } Poll savedPoll = savePoll(clonedPoll, clonedChoices); + + //clone VoterList + List<VoterListBean> clonedVoterList = toBeanList(VoterListBean.class, getVoterListService().getVoterLists0(poll)); + for (VoterListBean voterList : clonedVoterList) { + List<VoterListMemberBean> clonedVoterListMember = toBeanList(VoterListMemberBean.class , getVoterListService().getVoterListMembers0(voterList.toEntity())); + + voterList.setEntityId(null); + VoterList savedVoterList = getVoterListService().saveVoterList(savedPoll, voterList); + + for (VoterListMemberBean member : clonedVoterListMember) { + member.setEntityId(null); + getVoterListService().saveVoterListMember(savedVoterList, member); + } + } commit(); getNotificationService().onPollCreated(savedPoll); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/05: improve UI (print message when no poll in list, fix color vote)
by chorem.org scm 02 Jul '14

02 Jul '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 c804cdcd2f0dc6d3f027f22ad99b8a8508f3d3a2 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 14:43:26 2014 +0200 improve UI (print message when no poll in list,fix color vote) --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/less/style.less | 20 +++++++++----------- .../src/main/webapp/partials/big-poll.html | 18 ++++++++++++------ .../src/main/webapp/partials/inline-poll.html | 4 ++-- .../src/main/webapp/partials/poll-list.html | 2 ++ pollen-ui-angular/src/main/webapp/partials/poll.html | 2 -- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index d6cb8e7..beffd49 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -64,6 +64,7 @@ var translateEN = { 'poll.result.title.zero' : 'No result', 'poll.result.title.one' : 'Result : One voter', 'poll.result.title.other' : 'Result : {{nbVoter}} Voters', +'poll.error.listEmpty' : 'No poll find', 'vote.added' : 'Vote added.', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 94e7ad3..7a3c2a0 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -70,6 +70,7 @@ var translateFR = { 'poll.result.title.zero' : 'Aucun Résultat', 'poll.result.title.one' : 'Résultat : Un votant', 'poll.result.title.other' : 'Résultat : {{nbVoter}} Votants', +'poll.error.listEmpty' : 'Aucun sondage trouvé', 'vote.added' : 'Vote effectué', diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 6939672..13d64d0 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -205,11 +205,13 @@ margin:auto; margin-bottom:8px; } -} -.btn-large { - height:60px; - width:80px; + #poll-inline { + .btn-large { + height:60px; + width:80px; + } + } } @@ -232,10 +234,11 @@ height:25px; } - .voteTrue { + &.voteTrue { background-color:@brand-success; } - .voteFalse { + + &.voteFalse { background-color:@brand-danger; } } @@ -285,11 +288,6 @@ } } -.pollBigVote { - float:right; - margin-top:5px; -} - .pool-alert { position: fixed; top:65px; diff --git a/pollen-ui-angular/src/main/webapp/partials/big-poll.html b/pollen-ui-angular/src/main/webapp/partials/big-poll.html index 99be716..9dc5c09 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -60,18 +60,24 @@ <input type="checkbox" ng-model="data.vote.choice[$index].voteValue" name="{{data.vote.choice[$index].choiceId}}"/> </div> </div> + <div class="row pollBigChoice"> <div class="col-sm-10"> - <button class="btn btn-info btn-large" ng-click="addChoice()" ng-if="globalVariables.editMode" ><span class="glyphicon glyphicon-plus"></span> Ajouter un choix</button> + <button class="btn btn-info" ng-click="addChoice()" ng-if="globalVariables.editMode" ><span class="glyphicon glyphicon-plus"></span> Ajouter un choix</button> </div> <div class="col-sm-2"> <button ng-click="inlineVersion()" class="btn btn-default">inline version</button> </div> </div> -<div class="pollBigVote"> - <input-error error="data.vote.restError.voterName[0]" data="data.vote.voterName"> - <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" /> - </input-error> - <button class="btn btn-primary" ng-click="voter()">{{ 'action.vote' | translate }}</button> +<div class="row" ng-show="!globalVariables.editMode" ng-if="!data.poll.isClosed"> + <div class="col-sm-6"> </div> + <div class="col-sm-4"> + <input-error error="data.vote.restError.voterName[0]" data="data.vote.voterName"> + <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" /> + </input-error> + </div> + <div class="col-sm-2"> + <button class="btn btn-primary" ng-click="voter()">{{ 'action.vote' | translate }}</button> + </div> </div> \ No newline at end of file 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 87d801c..d5f4474 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -21,7 +21,7 @@ ~ --> - <table> + <table id="poll-inline">  <tr> <td><button ng-click="bigVersion()" class="btn btn-default" >Big version</button></td> @@ -56,7 +56,7 @@ <tr ng-show="!globalVariables.editMode" ng-if="! data.poll.isClosed"> <td class="pollChoice"> <input-error error="data.vote.restError.voterName[0]" data="data.vote.voterName"> - <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" /> + <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" focus-me="true" /> </input-error> </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}" ng-click="toggleValue(choice, $event);"> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index e036126..5e8d310 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -1,4 +1,6 @@ +<div ng-if="!data.polls[0]"><h1>{{ 'poll.error.listEmpty' | translate }}</h1></div> + <div ng-repeat="poll in data.polls"> <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 234c6fd..ac7d5c1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -30,8 +30,6 @@ <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkParticipant || '#/poll/create/participant'}}" ng-click="tab = 'participant'">{{ 'poll.tab.participant' | translate }}</a></li> </ul> - <div ng-include="'./partials/poll-link.html'" ng-if="tab == 'home'"></div> - <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'edit' || tab == 'vote'"></div> <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: improve UI (print message when no poll in list, fix color vote)
by chorem.org scm 02 Jul '14

02 Jul '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 4e9d45d3a262196b2b5c9d9608aafe9467edd69d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 2 14:43:26 2014 +0200 improve UI (print message when no poll in list,fix color vote) --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/less/style.less | 5 +++-- pollen-ui-angular/src/main/webapp/partials/poll-list.html | 2 ++ pollen-ui-angular/src/main/webapp/partials/poll.html | 2 -- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index d6cb8e7..beffd49 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -64,6 +64,7 @@ var translateEN = { 'poll.result.title.zero' : 'No result', 'poll.result.title.one' : 'Result : One voter', 'poll.result.title.other' : 'Result : {{nbVoter}} Voters', +'poll.error.listEmpty' : 'No poll find', 'vote.added' : 'Vote added.', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 94e7ad3..7a3c2a0 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -70,6 +70,7 @@ var translateFR = { 'poll.result.title.zero' : 'Aucun Résultat', 'poll.result.title.one' : 'Résultat : Un votant', 'poll.result.title.other' : 'Résultat : {{nbVoter}} Votants', +'poll.error.listEmpty' : 'Aucun sondage trouvé', 'vote.added' : 'Vote effectué', diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 6939672..5c98406 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -232,10 +232,11 @@ height:25px; } - .voteTrue { + &.voteTrue { background-color:@brand-success; } - .voteFalse { + + &.voteFalse { background-color:@brand-danger; } } diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index e036126..5e8d310 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -1,4 +1,6 @@ +<div ng-if="!data.polls[0]"><h1>{{ 'poll.error.listEmpty' | translate }}</h1></div> + <div ng-repeat="poll in data.polls"> <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 234c6fd..ac7d5c1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -30,8 +30,6 @@ <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkParticipant || '#/poll/create/participant'}}" ng-click="tab = 'participant'">{{ 'poll.tab.participant' | translate }}</a></li> </ul> - <div ng-include="'./partials/poll-link.html'" ng-if="tab == 'home'"></div> - <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'edit' || tab == 'vote'"></div> <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0