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

01/01: use controller for alert
by chorem.org scm June 24, 2014

June 24, 2014

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 56ceaf71cb0a7c0ded15ce9a98c3a205ad16134e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 24 12:00:16 2014 +0200 use controller for alert --- pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 + pollen-ui-angular/src/main/webapp/index.html | 5 ++ pollen-ui-angular/src/main/webapp/js/app.js | 20 ++++---- .../src/main/webapp/js/controllers/alertCtrl.js | 56 ++++++++++++++++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 56 +++++++++++----------- .../src/main/webapp/js/controllers/userCtrl.js | 32 ++++++++++--- pollen-ui-angular/src/main/webapp/js/services.js | 18 +++++++ .../src/main/webapp/partials/poll.html | 4 -- .../src/main/webapp/partials/user-edit.html | 2 - .../main/webapp/partials/user-lostPassword.html | 2 - .../src/main/webapp/partials/user-register.html | 4 +- 11 files changed, 146 insertions(+), 55 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 9466e8e..e624020 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -33,6 +33,8 @@ var translateFR = { 'user.error.mail.notFound' : 'Courriel n\'a pas été trouvé', 'user.error.mail.empty' : 'Courriel ne peux pas être vide', 'user.error.login' : 'Erreur sur le nom d\'utilisateur ou le mot de passe', +'user.error.login.mandatory' : 'Accès refusé, vous devez êtes connecté(e)', +'user.error.logout.mandatory' : 'Accès refusé, vous êtes connecté(e)', 'poll.tab.vote' : 'Voter', 'poll.tab.comment' : 'Commenter', diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index a4589d9..894c59e 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -51,6 +51,7 @@ <script src="js/controllers/userCtrl.js"></script> <script src="js/controllers/favoriteListCtrl.js"></script> <script src="js/controllers/localeCtrl.js"></script> + <script src="js/controllers/alertCtrl.js"></script> <script src="i18n/fr.js"></script> <script src="i18n/en.js"></script> @@ -148,6 +149,10 @@ </div> </nav> +<div class="pool-alert alert-float" ng-controller="printAlertCtrl" > + <alert ng-repeat="alert in data.alerts track by $index" type="{{alert.type}}" class="fakeLink" close="hideAlert(alert)" ng-click="hideAlert(alert)"> {{ alert.msg | translate }} </alert> +</div> + <div ng-view class='container' id="content"></div> </body> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 0465c9e..5d87bae 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'alertControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); @@ -237,14 +237,16 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC scope.oldVal = {}; scope.change = false; scope.timeout; - scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel); - scope.$watch(attrs.ngModel, function (newVal, oldVal) { - if (newVal != scope.oldVal[attrs.ngModel]) { - scope.change = true; - } else { - scope.change = false; - } - }, true); + $timeout(function () { + scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel); + scope.$watch(attrs.ngModel, function (newVal, oldVal) { + if (angular.isDefined(oldVal) && newVal != scope.oldVal[attrs.ngModel]) { + scope.change = true; + } else { + scope.change = false; + } + }, true); + }, 500); var save = function () { if (scope.change) { diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js new file mode 100644 index 0000000..7d798c0 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js @@ -0,0 +1,56 @@ +/* + * #%L + * Pollen :: UI (Angular) + * %% + * 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% + */ + +angular.module('alertControllers', []) +.controller('printAlertCtrl', ['$scope', '$timeout', + function ($scope, $timeout) { + + if (angular.isUndefined($scope.data)) { + $scope.data = {} + } + $scope.data.alerts = []; + + $scope.$on('newError', function (event, error, timeout) { + var alert = {msg:error, type:'danger'}; + addAlert(alert, timeout); + }); + + $scope.$on('newSuccess', function (event, success, timeout) { + var alert = {msg:success, type:'success'}; + addAlert(alert, timeout); + }); + + var addAlert = function (alert, timeout) { + $scope.data.alerts.push(alert); + if (angular.isDefined(timeout)) { + $timeout(function () { + $scope.hideAlert(alert) + }, timeout); + } + } + + $scope.hideAlert = function (alert) { + var index = $scope.data.alerts.indexOf(alert); + if (index >= 0) { + $scope.data.alerts.splice(index, 1); + } + } +}]) \ No newline at end of file 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 316add0..ba0865e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -54,14 +54,7 @@ angular.module('pollControllers', []) if (angular.isUndefined($scope.globalVariables)) { - $scope.globalVariables = {saved : SessionStorage.get().saved}; - SessionStorage.remove('saved'); - - $scope.$watch('globalVariables.saved', function() { - $timeout(function () { - $scope.globalVariables.saved = false; - }, 5000); - }); + $scope.globalVariables = {}; /** * Sauvegarde du token si non connecté @@ -327,8 +320,8 @@ angular.module('pollControllers', []) } }]) -.controller('PollCreateCtrl', ['$scope', '$controller', '$location', 'Poll', 'SessionStorage', 'PollVoterList', - function ( $scope, $controller, $location, Poll, SessionStorage, PollVoterList) { +.controller('PollCreateCtrl', ['$scope', '$rootScope', '$controller', '$location', 'Poll', 'SessionStorage', 'PollVoterList', + function ( $scope, $rootScope, $controller, $location, Poll, SessionStorage, PollVoterList) { $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.create = true; @@ -356,7 +349,7 @@ angular.module('pollControllers', []) } Poll.add(poll, function (data) { - SessionStorage.save({saved: true}); + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); if ($scope.data.poll.pollType != 'FREE') { SessionStorage.save({'voterList':$scope.data.voterList}) $location.url('/poll/edit/'+data.id+'?token='+data.permission); @@ -371,7 +364,11 @@ angular.module('pollControllers', []) if (angular.isDefined(error.data['choice['+index+'].name'])) { choice.restError = {name:error.data['choice['+index+'].name']}; } - }) + }); + + if (angular.isDefined(error.data.choice)) { + $rootScope.$broadcast('newError', error.data.choice[0]); + } }); } @@ -381,8 +378,8 @@ angular.module('pollControllers', []) }]) -.controller('PollEditCtrl', ['$scope', '$controller', '$routeParams', '$location', '$timeout', '$translate', 'Poll', 'PollChoice', 'PollVote', 'PollVoterList', 'PollVoterListMember', 'FavoriteList', 'SessionStorage', - function ( $scope, $controller, $routeParams, $location, $timeout, $translate, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember, FavoriteList, SessionStorage) { +.controller('PollEditCtrl', ['$scope', '$rootScope', '$controller', '$routeParams', '$location', '$timeout', '$translate', 'Poll', 'PollChoice', 'PollVote', 'PollVoterList', 'PollVoterListMember', 'FavoriteList', 'SessionStorage', + function ( $scope, $rootScope, $controller, $routeParams, $location, $timeout, $translate, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember, FavoriteList, SessionStorage) { $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.edit = true; @@ -395,7 +392,7 @@ angular.module('pollControllers', []) PollChoice.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, choice, function (data) { delete choice.restError; choice.id = data.id; - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); }, function (error) { choice.restError = error.data; }); @@ -404,7 +401,7 @@ angular.module('pollControllers', []) $scope.callBackEditChoice = function (choice) { PollChoice.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, choice, function() { delete choice.restError; - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); }, function (error) { choice.restError = error.data; }); @@ -412,13 +409,16 @@ angular.module('pollControllers', []) $scope.deleteChoice = function (choice) { PollChoice.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, choiceId: choice.id}, function () { - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); var index = $scope.data.choices.indexOf(choice); if (index > -1) { $scope.data.choices.splice(index,1); } }, function (error) { angular.extend($scope.restError, error.data); + if (angular.isDefined(error.data.choice)) { + $rootScope.$broadcast('newError', error.data.choice[0]); + } }); }; @@ -500,7 +500,7 @@ angular.module('pollControllers', []) $scope.saveVoterList = function (voterList) { if (angular.isDefined(voterList.group.id)) { PollVoterList.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, voterList.group, function (data) { - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); delete voterList.group.restError; }, function (error) { voterList.group.restError = error.data; @@ -519,7 +519,7 @@ angular.module('pollControllers', []) }); if (vl.members.length > 0) { PollVoterList.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, vl, function (data) { - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); voterList.group.id = data.id; delete voterList.group.restError; @@ -577,7 +577,7 @@ angular.module('pollControllers', []) } vlMemberPromise.then(function (data) { - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); member.id = data.id; delete member.restError; }, function (error) { @@ -694,7 +694,7 @@ angular.module('pollControllers', []) } $scope.data.poll.$update({permission:$scope.globalVariables.permission}, function (data) { - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'poll.saved', conf.defaultTimeSuccessSave); }, function (error) { angular.extend($scope.restError, error.data); }); @@ -715,8 +715,8 @@ angular.module('pollControllers', []) }; }]) -.controller('PollVoteCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', - function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate) { +.controller('PollVoteCtrl', ['$scope', '$rootScope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', '$translate', + function ($scope, $rootScope, $q, $controller, $routeParams, Poll, PollChoice, PollVote, $translate) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('vote'); @@ -778,7 +778,7 @@ angular.module('pollControllers', []) if (angular.isDefined($scope.data.vote.id)) { // edit vote PollVote.update({pollId:$routeParams.pollId}, sendVote, function (data) { - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'vote.added', conf.defaultTimeSuccessSave); }, function (error) { $scope.data.vote.restError = { voterName : error.data["voter.name"]}; }) @@ -790,7 +790,7 @@ angular.module('pollControllers', []) $scope.data.vote.permission = returnRequest.permission; $scope.data.votants.push(angular.copy($scope.data.vote)); - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'vote.added', conf.defaultTimeSuccessSave); initVote(); }, function (error) { $scope.data.vote.restError = { voterName : error.data["voter.name"]}; @@ -826,8 +826,8 @@ angular.module('pollControllers', []) }]) .controller('PollCommentCtrl', - ['$scope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', - function ( $scope, $controller, $routeParams, Poll, PollComment, $translate) { + ['$scope', '$rootScope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', + function ( $scope, $rootScope, $controller, $routeParams, Poll, PollComment, $translate) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('comment'); @@ -912,7 +912,7 @@ angular.module('pollControllers', []) } commentPromise.then(function () { - $scope.globalVariables.saved = true; + $rootScope.$broadcast('newSuccess', 'comment.added', conf.defaultTimeSuccessSave); //clean form $scope.comment.text = ''; delete $scope.comment.postDate; 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 8a3c40d..cb4104e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -19,7 +19,13 @@ * #L% */ angular.module('userControllers', []) - .controller('UserRegisterCtrl', ['$scope', 'User', function ($scope, User) { + .controller('UserRegisterCtrl', ['$scope', '$rootScope', '$location', 'User', 'SessionStorage', + function ($scope, $rootScope, $location, User, SessionStorage) { + + if (angular.isDefined(SessionStorage.get().user)) { + $rootScope.$broadcast('newError', 'user.error.logout.mandatory'); + $location.url('/'); + } if (!angular.isDefined($scope.data)) { $scope.data = {}; @@ -29,7 +35,7 @@ $scope.submit = function () { if ($scope.data.user.password == $scope.data.user.password2) { User.add({}, $scope.data.user, function (data) { - $scope.saved = true; + $rootScope.$broadcast('newSuccess', 'user.register.success', conf.defaultTimeSuccessSave); $scope.data.user = {email:'', password:'', password2:''}; }, function (error) { $scope.restError = error.data; @@ -38,12 +44,18 @@ } }]) -.controller('UserLostPasswordCtrl', ['$scope', '$translate', 'UserLostPassword', function ($scope, $translate, UserLostPassword) { +.controller('UserLostPasswordCtrl', ['$scope', '$rootScope', '$translate', '$location', 'SessionStorage', 'UserLostPassword', + function ($scope, $rootScope, $translate, $location, SessionStorage, UserLostPassword) { + if (angular.isDefined(SessionStorage.get().user)) { + $rootScope.$broadcast('newError', 'user.error.logout.mandatory'); + $location.url('/'); + } + $scope.email = ''; $scope.submit = function () { if ($scope.email != '') { UserLostPassword.send({login:$scope.email}, function (data) { - $scope.saved = true; + $rootScope.$broadcast('newSuccess', 'user.forgotPassword.success', conf.defaultTimeSuccessSave); $scope.email = ''; }, function (error) { $translate('user.error.mail.notFound').then(function (error) { @@ -61,14 +73,20 @@ -.controller('UserEditCtrl', ['$scope', 'User', 'SessionStorage', function ($scope, User, SessionStorage) { +.controller('UserEditCtrl', ['$scope', '$rootScope', '$location', 'User', 'SessionStorage', function ($scope, $rootScope, $location, User, SessionStorage) { $scope.currentUser = SessionStorage.get().user; + + if (angular.isUndefined($scope.currentUser)) { + $rootScope.$broadcast('newError', 'user.error.login.mandatory' ); + $location.url('/'); + } + $scope.currentUser.password = ''; $scope.editUser = function () { User.update($scope.currentUser, function (data) { SessionStorage.save({user:data}); - $scope.saved = true; + $rootScope.$broadcast('newSuccess', 'user.edit.success', conf.defaultTimeSuccessSave); }, function (error) { $scope.restError = error.data; }); @@ -78,7 +96,7 @@ if ($scope.currentUser.newPassword == $scope.currentUser.newPassword2) { User.editPassword($scope.currentUser, function (data) { SessionStorage.save({user:data}); - $scope.saved = true; + $rootScope.$broadcast('newSuccess', 'user.edit.success', conf.defaultTimeSuccessSave); }, function (error) { $scope.restError = error.data; }); diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 74b248b..e819aa8 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -317,6 +317,24 @@ angular.module('pollenServices', ['ngResource']) }) localStorage.setItem(storageId, JSON.stringify(session)); }, + append: function (data) { + angular.forEach(data, function (value, key) { + var field = session[key]; + if (angular.isDefined(field)) { + if (angular.isArray(field)) { + field.push(value); + } + else { + field = [field, value]; + } + } + else { + field = value; + } + session[key] = field; + }); + localStorage.setItem(storageId, JSON.stringify(session)); + }, remove: function (key) { if (angular.isString(key)) { delete session[key]; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 87315b2..58bc694 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -19,10 +19,6 @@ #L% --> <div> - <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> {{restError.choice[0]}} </alert> - <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false">{{ 'poll.saved' | translate }}</alert> - <alert type="success" class="alert-float" ng-if="globalVariables.voteMode && globalVariables.saved" close="globalVariables.saved = false">{{ 'vote.added' | translate }}</alert> - <alert type="success" class="alert-float" ng-if="globalVariables.commentMode && globalVariables.saved" close="globalVariables.saved = false">{{ 'comment.added' | translate }}</alert> <ul class="nav nav-tabs"> <li ng-class="{active: tab == 'home'}"><a href="{{urlTab}}tab=home" ng-click="tab = 'home'"> <span class="glyphicon glyphicon-home"></span> </a></li> 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 ccb0ae2..c995f7d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> {{ 'user.edit.success' | translate }} </alert> - <h2> {{ 'title.editUser' | translate }} </h2> <form class="horizontal-form" ng-submit="editUser()"> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html index fbf6890..dd28daa 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> {{ 'user.forgotPassword.success' | translate }} </alert> - <h2>{{ 'title.forgotPassword' | translate }}</h2> <form ng-submit="submit()" class="form-horizontal"> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index a604231..ea75471 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> {{ 'user.register.success' | translate }}</alert> - <h2>{{ 'title.register' | translate }}</h2> <form ng-submit="submit()" class="form-horizontal"> @@ -42,7 +40,7 @@ {{ 'user.name' | translate }} </label> <div class="col-sm-6"> - <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> + <input type="text" id="formName" name="email" class="form-control" ng-model="data.user.name"/> </div> <div class="col-sm-1"> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: improve UI
by chorem.org scm June 23, 2014

June 23, 2014

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 fec8d1244e78d3c31b8f69c684a612a28d06bf24 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 23 15:39:23 2014 +0200 improve UI --- pollen-ui-angular/src/main/webapp/css/style.css | 44 ++++++++++++++++++++- .../src/main/webapp/img/chart-icon.png | Bin 0 -> 610 bytes pollen-ui-angular/src/main/webapp/img/pie-icon.png | Bin 0 -> 1292 bytes pollen-ui-angular/src/main/webapp/index.html | 4 +- pollen-ui-angular/src/main/webapp/js/app.js | 41 ++++++++++--------- .../main/webapp/js/controllers/favoriteListCtrl.js | 17 ++++++-- .../src/main/webapp/js/controllers/pollCtrl.js | 29 ++++++++------ .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/poll-comment.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 13 ++++-- .../src/main/webapp/partials/poll-result.html | 34 ++++++++++++---- 11 files changed, 138 insertions(+), 50 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index ab77b85..7047243 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -276,4 +276,46 @@ i.icon-collapse { hr { border-top:1px solid #CCCCCC; -} \ No newline at end of file +} + +.table-result { + margin-left: auto; + margin-right: auto; + margin-top:5px; + margin-bottom:15px; +} +.table-result tr, .table-result tr td, .table-result tr th { + padding:8px; + border: 1px solid #AAA; + transition-duration: 0.5s; +} + +.table-result tr:hover { + background:#DDDDDD; + transition-duration: 0.5s; +} + +.plot { + height:300px; + margin-top:5px; + margin-bottom:15px; +} + +.ng-enter, .ng-leave { + -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.25s; + transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.25s; +} + +.ng-leave { + height:0px; +} + +.ng-enter, +.ng-leave.ng-leave-active { + opacity:0; +} + +.ng-leave, +.ng-enter.ng-enter-active { + opacity:1; +} diff --git a/pollen-ui-angular/src/main/webapp/img/chart-icon.png b/pollen-ui-angular/src/main/webapp/img/chart-icon.png new file mode 100644 index 0000000..152442c Binary files /dev/null and b/pollen-ui-angular/src/main/webapp/img/chart-icon.png differ diff --git a/pollen-ui-angular/src/main/webapp/img/pie-icon.png b/pollen-ui-angular/src/main/webapp/img/pie-icon.png new file mode 100644 index 0000000..fba9dd7 Binary files /dev/null and b/pollen-ui-angular/src/main/webapp/img/pie-icon.png differ diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 4423296..a4589d9 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -35,15 +35,15 @@ <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.pieRende…"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.category…"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.pointLab…"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/jqPlot/1.0.8/plugins/jqplot.highligh…"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.4.1/ckeditor.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-resource.min…"></script> + <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-animate.min.…"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/bower-angular-translate/2.0.1/angula…"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.0/ui-boots…"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.4.1/ckeditor.js"></script> <script src="js/app.js"></script> <script src="js/services.js"></script> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 037841d..0465c9e 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate', 'ngAnimate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); @@ -320,6 +320,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC restrict : 'E', scope : { data:'=', + max:'=' }, template:'<div class="jqplot-target"></div>', link: function(scope, element, attrs) { @@ -332,7 +333,6 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC //animate: !$.jqplot.use_excanvas, seriesDefaults:{ renderer:$.jqplot.BarRenderer, - pointLabels: { show: true }, rendererOptions : { varyBarColor: true } @@ -340,6 +340,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC axesDefaults: { showTicks: true, showTickMarks: true, + max: scope.max, tickOptions: { showGridline: false, show:true, @@ -349,25 +350,28 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC axes: { xaxis: { renderer: $.jqplot.CategoryAxisRenderer, + }, + yaxis: { + label:'Vote', } - }, - highlighter: { - showMaker:false, - tooltipLocation: 'ne', - formatString:'<div style="display:none">%s</div>%s Vote(s)' } }); + + var imgData = $(element).find('div').jqplotToImageStr({}); + $(element).html('<img src="' + imgData + '" />') } }; - scope.$watch('data', function () { - if (angular.isDefined(scope.plot)) { - scope.plot.html(''); - initChart() - } else { - initChart(); - } - }, true); + $timeout( function() { + scope.$watch('data', function () { + if (angular.isDefined(scope.plot)) { + scope.plot.html(''); + initChart() + } else { + initChart(); + } + }); + }); } } }) @@ -398,11 +402,12 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }, legend:{ show:true - }, - highlighter:{ - show:false } }); + + var imgData = $(element).find('div').jqplotToImageStr({}); + $(element).html('<img src="' + imgData + '" />') + } }; diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js index 6bd03aa..655996f 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -70,6 +70,10 @@ angular.module('favoriteListControllers', []) } }); + var getEmptyFavoriteList = function () { + return {name:'', members: []}; + } + var initFavoriteList = function () { if ($routeParams.favoriteListId) { FavoriteList.get({favoriteListId:$routeParams.favoriteListId}, function (favList) { @@ -78,7 +82,7 @@ angular.module('favoriteListControllers', []) }); } else { - $scope.data.favoriteList = {name:'', members: []}; + $scope.data.favoriteList = getEmptyFavoriteList(); } }; initFavoriteList(); @@ -170,10 +174,13 @@ angular.module('favoriteListControllers', []) } }); } + else { + $location.url('/favoriteList'); + } }; $scope.deleteMember = function (member) { - if (angular.isDefined($scope.data.favoriteList.id)) { + if (angular.isDefined($scope.data.favoriteList.id) && angular.isDefined(member.id)) { var confirmMessage; $translate('action.message.confirmDelete').then(function (msg) { confirmMessage = msg; @@ -187,10 +194,14 @@ angular.module('favoriteListControllers', []) } }); } + else { + var index = $scope.data.favoriteList.members.indexOf(member); + $scope.data.favoriteList.members.splice(index, 1); + } }; $scope.newFavoriteList = function () { - initFavoriteList(); + $scope.data.favoriteList = getEmptyFavoriteList(); $location.url('/favoriteList/new'); } 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 3714ed5..316add0 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -475,10 +475,12 @@ angular.module('pollControllers', []) } var initFavoriteList = function () { - FavoriteList.get({paginationParameter:{pageSize:-1}}, function (data) { - $scope.data.favoriteList = data.elements; - $scope.data.favoriteListImport = null; - }); + if (angular.isDefined(SessionStorage.get().user)) { + FavoriteList.get({paginationParameter:{pageSize:-1}}, function (data) { + $scope.data.favoriteList = data.elements; + $scope.data.favoriteListImport = null; + }); + } }; initFavoriteList(); $scope.importFavoriteList = function (voterListId) { @@ -602,6 +604,9 @@ angular.module('pollControllers', []) PollVoterList.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, function (data) { var index = $scope.data.voterList.indexOf(voterList); $scope.data.voterList.splice(index, 1); + if ($scope.data.voterList.length == 0 && $scope.data.poll.pollType == 'RESTRICTED') { + $scope.addGroup(); + } }); } }); @@ -609,6 +614,9 @@ angular.module('pollControllers', []) else { var index = $scope.data.voterList.indexOf(voterList); $scope.data.voterList.splice(index, 1); + if ($scope.data.voterList.length == 0 && $scope.data.poll.pollType == 'RESTRICTED') { + $scope.addGroup(); + } } }; @@ -956,6 +964,7 @@ angular.module('pollControllers', []) $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('result'); + $scope.plot = 'chart'; var choicesDeferred = $q.defer(); PollChoice.query({pollId:$routeParams.pollId}, function (choices) { @@ -992,16 +1001,14 @@ angular.module('pollControllers', []) } } }) - $scope.data.result.scoresChart = scores; resultDeferred.resolve('result load'); - }); - }); - votesDeferred.promise.then(function () { - angular.forEach($scope.data.result.scoresChart, function (value, key) { - value.push( Math.round(value[1] * 100 / $scope.data.result.scoreTotal) + '%'); + votesDeferred.promise.then(function () { + $scope.data.result.scoresChart = scores; + }); + }); - }) + }); }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 3ceb95d..47f66fa 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -32,7 +32,7 @@ <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" /> </input-error> </td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-trash"></span></button></div></td> + <td class="action"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-trash"></span></button></td> </tr> <tr> @@ -46,7 +46,7 @@ <tr> <th colspan="3"> <button class="btn btn-info" ng-click="addMember();"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.addMember' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteFavoriteList();" ng-show="data.favoriteList.id"><span class="glyphicon glyphicon-trash"></span> {{ 'action.favoriteList.delete' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteFavoriteList();"><span class="glyphicon glyphicon-trash"></span> {{ 'action.favoriteList.delete' | translate }} </button> </th> </tr> </table> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index a738c9c..cfd2042 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -38,7 +38,7 @@ <label class="col-sm-2"> {{ 'comment' | translate }} </label> <div class="col-sm-1"><info-error error="restError.text[0]" data="comment.text"></info-error></div> <div class="col-sm-9"> - <textarea data-ck-editor ng-model="comment.text" focus-me="comment.id != null"></textarea> + <textarea ck-editor ng-model="comment.text" focus-me="comment.id != null"></textarea> </div> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index dc0ef80..a60cb46 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -34,11 +34,14 @@ {{ 'poll.restricted.group' | translate }} </label> - <hr/> - <div class="container-fluid"> + + + <div class="container-fluid" ng-hide="data.poll.pollType == 'FREE'"> + <hr/> + <div class="row"> <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()"><span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addGroup' | translate }}</button> - <button class="btn btn-warning" ng-hide="data.poll.pollType == 'FREE'" disabled><span class="glyphicon glyphicon-envelope"></span> {{ 'action.restricted.notify' | translate }}</button> + <button class="btn btn-warning" disabled><span class="glyphicon glyphicon-envelope"></span> {{ 'action.restricted.notify' | translate }}</button> </div> <div class="row" ng-if="data.favoriteList"> @@ -56,9 +59,11 @@ </select> </div> </div> + + <hr/> </div> - <hr/> + <table ng-repeat="voterList in data.voterList" class="voterList" ng-hide="data.poll.pollType == 'FREE'"> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html index 8ff8bb9..fb492d4 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -2,12 +2,30 @@ <h2> Résultats : {{data.result.nbVotant}} Votants</h2> -<chart data="data.result.scoresChart"></chart> -<pie data="data.result.scoresChart"></pie> -<div ng-repeat="score in data.result.scores"> - <h4> {{score.choice.name}} </h4> - <p> - nb vote : {{score.scoreValue}} - </p> -</div> \ No newline at end of file +<hr/> +<div> + <button class="btn btn-default" ng-click="plot = 'chart'"><img src="img/chart-icon.png" /></button> + <button class="btn btn-default" ng-click="plot = 'pie'"><img src="img/pie-icon.png" </button> +</div> +<div class="plot"> + <div ng-if="plot == 'chart'"> + <chart data="data.result.scoresChart" max="data.result.nbVotant"></chart> + </div> + <div ng-if="plot == 'pie'"> + <pie data="data.result.scoresChart"></pie> + </div> +</div> +<hr/> +<table class="table-result"> + <tr> + <th>Choix</th> + <th>Score</th> + </tr> + <tr ng-repeat="score in data.result.scores"> + <th> {{score.choice.name}} </th> + <td> + {{score.scoreValue}} + </td> + </tr> +</table> \ 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/01: auto focus on edit comment and poll description
by chorem.org scm June 23, 2014

June 23, 2014

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 046a10e5942e5e346f51b3981e4b08850557d897 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 23 10:59:54 2014 +0200 auto focus on edit comment and poll description --- pollen-ui-angular/src/main/webapp/js/app.js | 10 +++++++++- pollen-ui-angular/src/main/webapp/partials/poll-comment.html | 6 +++--- pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 6c57603..037841d 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -119,7 +119,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) -.directive('ckEditor', function () { +.directive('ckEditor', function ($timeout) { return { require: '?ngModel', link: function ($scope, element, attrs, ngModel) { @@ -138,6 +138,14 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC ngModel.$render = function(value) { ck.setData(ngModel.$modelValue); }; + + if (attrs.focusMe) { + $scope.$watch(attrs.focusMe, function (value) { + if (value === true) { + $timeout(function () { ck.focus(); }); + } + }) + } } }; }) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 978c2b7..a738c9c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -25,12 +25,12 @@  <form class="form-horizontal" ng-submit="postComment()" novalidate> <div class="form-group"> - <label class="col-sm-2"> {{ 'user.name' | translate }} </label> + <label class="col-sm-2"> {{ 'user.name' | translate }} </label> <div class="col-sm-1"> <info-error error="restError['author.name'][0]" data="comment.authorName"></info-error> </div> <div class="col-sm-9"> - <input type="text" ng-model="comment.authorName" class="form-control"/> + <input type="text" ng-model="comment.authorName" class="form-control" focus-me="comment.id != null" /> </div> </div> @@ -38,7 +38,7 @@ <label class="col-sm-2"> {{ 'comment' | translate }} </label> <div class="col-sm-1"><info-error error="restError.text[0]" data="comment.text"></info-error></div> <div class="col-sm-9"> - <textarea data-ck-editor ng-model="comment.text"></textarea> + <textarea data-ck-editor ng-model="comment.text" focus-me="comment.id != null"></textarea> </div> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html index b5e6620..ede3062 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -34,7 +34,7 @@ <div ng-hide="data.poll.description ">{{ 'poll.desc' | translate }}</div> </div> <div ng-show="showEditDesc" class="pollDesc"> - <textarea id="descEditor" data-ck-editor ng-model="data.poll.description"></textarea> + <textarea id="descEditor" data-ck-editor ng-model="data.poll.description" focus-me="showEditDesc"></textarea>  <button type="button" class="btn btn-primary" ng-click="showEditDesc = false;" ng-show="globalVariables.create">{{ 'action.return' | translate }}</button> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: fix url lib ckeditor
by chorem.org scm June 23, 2014

June 23, 2014

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 f7646a0e2f902e496d99e9f5f15da463bb0f992e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jun 23 10:25:15 2014 +0200 fix url lib ckeditor --- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 8dd1a9c..6c57603 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -123,7 +123,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC return { require: '?ngModel', link: function ($scope, element, attrs, ngModel) { - var ck = CKEDITOR.replace(element[0], {customConfig: '//' + location.host + '/js/libs/ckeditor/config.js'}); + var ck = CKEDITOR.replace(element[0], {customConfig: window.location.origin + window.location.pathname + 'js/libs/ckeditor/config.js'}); ck.on('pasteState', function () { $scope.$apply(function () { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: setup spinner in voterList form
by chorem.org scm June 23, 2014

June 23, 2014

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 586df05664df9644ab7514246746560fe69f3789 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 20 18:08:45 2014 +0200 setup spinner in voterList form --- pollen-ui-angular/src/main/webapp/js/app.js | 19 +++++++------------ .../main/webapp/partials/poll-listParticipant.html | 4 ++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index a186282..8dd1a9c 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -240,15 +240,11 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC var save = function () { if (scope.change) { - // other change - scope.timeout = $timeout(function () { - scope.change = false; - scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel);; - scope.$apply(function () { - scope.$eval(attrs.autoSave); - }); - $timeout.cancel(scope.timeout); - }, 200); + scope.change = false; + scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel);; + scope.$apply(function () { + scope.$eval(attrs.autoSave); + }); } }; @@ -256,15 +252,14 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC if (scope.timeout) { $timeout.cancel(scope.timeout) } - save(); + scope.timeout = $timeout(save,1000); }); element.bind('blur', function () { if (scope.timeout) { $timeout.cancel(scope.timeout) } - // timeout for conflit with event change - $timeout(save, 50); + scope.timeout = $timeout(save, 100); }); } } diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index 5273ec0..dc0ef80 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -64,7 +64,7 @@ <tr ng-show="data.poll.pollType == 'GROUP'" ng-class="{'has-success':voterList.group.id && !voterList.group.restError}"> <th colspan="2" ng-class="{'has-error':voterList.group.restError.name}"> <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" auto-save="saveVoterList(voterList)" focus-me="!voterList.group.id"/></th> - <th class="weight" ng-class="{'has-error':voterList.group.restError.weight}"> <input type="number" ng-model="voterList.group.weight" select-on-click class="form-control" auto-save="saveVoterList(voterList)" /> </th> + <th class="weight" ng-class="{'has-error':voterList.group.restError.weight}"> <input type="number" step="0.1" min="0" ng-model="voterList.group.weight" select-on-click class="form-control" auto-save="saveVoterList(voterList)" /> </th> <th class="action"> </th> </tr> @@ -78,7 +78,7 @@ <tr ng-repeat="member in voterList.members" ng-class="{'has-success':member.id && !member.restError}"> <td> <input-error error="member.restError.name[0]"><input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterListMember(member, voterList)"/></input-error></td> <td> <input-error error="member.restError.email[0]"><input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterListMember(member, voterList)" /></input-error></td> - <td class="weight"> <input-error error="member.restError.weight[0]"><input type="number" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/></input-error></td> + <td class="weight"> <input-error error="member.restError.weight[0]"><input type="number" step="0.1" min="0" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/></input-error></td> <td class="action"> <button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);" tooltip="{{ 'action.restricted.deleteVoter' | translate }}"><span class="glyphicon glyphicon-trash"></span></button></td> </tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: improve voterList
by chorem.org scm June 20, 2014

June 20, 2014

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 59c9f386b3ad11950dea6aa18c9095a6313dfd1d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 20 17:14:57 2014 +0200 improve voterList --- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 106 +++++++++++++-------- .../main/webapp/partials/favoriteList-edit.html | 12 ++- .../src/main/webapp/partials/inline-poll.html | 5 +- .../main/webapp/partials/poll-listParticipant.html | 37 +++---- 5 files changed, 99 insertions(+), 63 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index feaad42..a186282 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -248,7 +248,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC scope.$eval(attrs.autoSave); }); $timeout.cancel(scope.timeout); - }, 500); + }, 200); } }; 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 d9df9cd..3714ed5 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -224,9 +224,6 @@ angular.module('pollControllers', []) $scope.data.voterList[0].members = listMember; } } - else if (newVal != oldVal && newVal == 'GROUP') { - $scope.addGroup(); - } }); $scope.addVoter = function (index) { @@ -457,7 +454,6 @@ angular.module('pollControllers', []) PollVoterListMember.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId: list.id}, function (voterListMember) { var newVoterList = {group:list, members:voterListMember}; $scope.data.voterList.push(newVoterList); - $scope.addVoter($scope.data.voterList.indexOf(newVoterList)); }) }) } @@ -466,6 +462,18 @@ angular.module('pollControllers', []) } }; + var memberIsEmpty = function (member) { + var isEmpty = true; + try { + if (member.name != '' && member.email != '') { + isEmpty = false; + } + } + catch (e) { } + + return isEmpty; + } + var initFavoriteList = function () { FavoriteList.get({paginationParameter:{pageSize:-1}}, function (data) { $scope.data.favoriteList = data.elements; @@ -503,7 +511,7 @@ angular.module('pollControllers', []) var vl = {group: voterList.group, members:[]}; angular.forEach(voterList.members, function(member, key) { - if (member.name != '' || member.email != '') { + if (!memberIsEmpty(member)) { vl.members.push(member); } }); @@ -514,28 +522,40 @@ angular.module('pollControllers', []) delete voterList.group.restError; // Get member Id - PollVoterListMember.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId: data.id}, function (voterListMember) { - voterList.members = voterListMember; - $scope.addVoter($scope.data.voterList.indexOf(voterList)); + PollVoterListMember.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId: data.id}, + function (voterListMember) { + angular.forEach(voterListMember, function(member, key) { + for (var i = 0; i < voterList.members.length; i++) { + if (member.email == voterList.members[i].email) { + voterList.members[i] = member; + i = voterList.members.length; + } + } + }); }); }, function (error) { voterList.group.restError = error.data; - - angular.forEach(voterList.members, function (member, index) { - member.restError = {}; - if (angular.isDefined(error.data['member['+index+'].name'])) { - member.restError.name = error.data['member['+index+'].name']; - } - if (angular.isDefined(error.data['member['+index+'].email'])) { - member.restError.email = error.data['member['+index+'].email']; - } - if (angular.isDefined(error.data['member['+index+'].weight'])) { - member.restError.weight = error.data['member['+index+'].weight']; - } - - if (angular.equals(member.restError, {})) { - // no error on this member - delete member.restError; + var deltaError = 0; + angular.forEach(voterList.members, function (member, key) { + if (!memberIsEmpty(member)) { + var index = key - deltaError; + member.restError = {}; + if (angular.isDefined(error.data['member['+index+'].name'])) { + member.restError.name = error.data['member['+index+'].name']; + } + if (angular.isDefined(error.data['member['+index+'].email'])) { + member.restError.email = error.data['member['+index+'].email']; + } + if (angular.isDefined(error.data['member['+index+'].weight'])) { + member.restError.weight = error.data['member['+index+'].weight']; + } + + if (angular.equals(member.restError, {})) { + // no error on this member + delete member.restError; + } + } else { + deltaError++; } }); }); @@ -544,7 +564,7 @@ angular.module('pollControllers', []) }; $scope.saveVoterListMember = function (member, voterList) { - if (member.name != '' && member.email != '') { + if (!memberIsEmpty(member)) { var vlId = voterList.group.id; // Id Voter list var vlMemberPromise; if (angular.isDefined(vlId)) { @@ -564,7 +584,7 @@ angular.module('pollControllers', []) } else { // create voter list - if (angular.isUndefined(voterList.group.restError)) { + if (angular.isUndefined(voterList.group.restError) || angular.isUndefined(voterList.group.restError.name)) { $scope.saveVoterList(voterList); } } @@ -586,22 +606,30 @@ angular.module('pollControllers', []) } }); } + else { + var index = $scope.data.voterList.indexOf(voterList); + $scope.data.voterList.splice(index, 1); + } }; $scope.deleteVoterListMember = function (member, voterList) { - if (angular.isDefined(voterList) && angular.isDefined(voterList.group.id)) { + if (angular.isDefined(voterList) && angular.isDefined(voterList.group.id) && angular.isDefined(member.id)) { var confirmMessage; - $translate('action.message.confirmDelete').then(function (msg) { - confirmMessage = msg; - }).then( function () { - var confirmDelete = confirm(confirmMessage); - if (confirmDelete == true) { - member.$remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, function (data) { - var index = voterList.members.indexOf(member); - voterList.members.splice(index, 1); - }); - } - }); + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + member.$remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, function (data) { + var index = voterList.members.indexOf(member); + voterList.members.splice(index, 1); + }); + } + }); + } + else { + var index = voterList.members.indexOf(member); + voterList.members.splice(index, 1); } }; @@ -971,7 +999,7 @@ angular.module('pollControllers', []) votesDeferred.promise.then(function () { angular.forEach($scope.data.result.scoresChart, function (value, key) { - value.push( Math.floor(value[1] * 100 / $scope.data.result.scoreTotal) + '%'); + value.push( Math.round(value[1] * 100 / $scope.data.result.scoreTotal) + '%'); }); }) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 9592724..3ceb95d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -22,11 +22,15 @@ </tr> <tr ng-repeat="member in data.favoriteList.members" ng-class="{'has-success':member.id && !member.restError}"> - <td ng-class="{'has-error':member.restError.name}"> - <input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.name[0]}}"/> + <td> + <input-error error="member.restError.name[0]"> + <input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)" /> + </input-error> </td> - <td ng-class="{'has-error':member.restError.email}"> - <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.email[0]}}" /> + <td> + <input-error error="member.restError.email[0]"> + <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" /> + </input-error> </td> <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-trash"></span></button></div></td> </tr> 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 9e908f9..8544d89 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -54,10 +54,9 @@ <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> -  </td> - <td ng-repeat="choice in data.vote.choice" class="pollChoice"> - <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" /> + <td ng-repeat="choice in data.vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}" ng-click="choice.voteValue = !choice.voteValue"> + <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" ng-click="choice.voteValue = !choice.voteValue;$event.stopPropagation()" /> </td> <td> <input class="btn btn-primary btn-large" type="button" value="{{ 'action.vote' | translate }}" ng-click="voter()" /> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index 3984cc4..5273ec0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -35,26 +35,35 @@ </label> <hr/> - <div ng-if="data.favoriteList" class="container-fluid"> - <h3>{{ 'user.favoriteList' | translate }}</h3> - <div class="row text-right"> + <div class="container-fluid"> + <div class="row"> + <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()"><span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addGroup' | translate }}</button> + <button class="btn btn-warning" ng-hide="data.poll.pollType == 'FREE'" disabled><span class="glyphicon glyphicon-envelope"></span> {{ 'action.restricted.notify' | translate }}</button> + </div> + + <div class="row" ng-if="data.favoriteList"> + <hr/> + </div> + + <div class="row text-right" ng-if="data.favoriteList"> <div class="col-sm-6"> - <button class="btn btn-info" ng-click="importFavoriteList()" ng-if="data.poll.pollType == 'GROUP'"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.import.addGroup' | translate }}</button> + <h4>{{ 'user.favoriteList' | translate }}</h4> </div> <div class="col-sm-6"> <select class="form-control" ng-model="data.favoriteListImport" ng-options="favList.id as favList.name for favList in data.favoriteList"> </select> - </div> </div> </div> + <hr/> + <table ng-repeat="voterList in data.voterList" class="voterList" ng-hide="data.poll.pollType == 'FREE'"> <tr ng-show="data.poll.pollType == 'GROUP'" ng-class="{'has-success':voterList.group.id && !voterList.group.restError}"> - <th colspan="2" ng-class="{'has-error':voterList.group.restError.name}"> <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" auto-save="saveVoterList(voterList)"/></th> + <th colspan="2" ng-class="{'has-error':voterList.group.restError.name}"> <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" auto-save="saveVoterList(voterList)" focus-me="!voterList.group.id"/></th> <th class="weight" ng-class="{'has-error':voterList.group.restError.weight}"> <input type="number" ng-model="voterList.group.weight" select-on-click class="form-control" auto-save="saveVoterList(voterList)" /> </th> <th class="action"> </th> </tr> @@ -67,22 +76,18 @@ </tr> <tr ng-repeat="member in voterList.members" ng-class="{'has-success':member.id && !member.restError}"> - <td> <div ng-class="{'has-error':member.restError.name}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterListMember(member, voterList)"/></div></td> - <td> <div ng-class="{'has-error':member.restError.email}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterListMember(member, voterList)" /></div></td> - <td class="weight"> <div ng-class="{'has-error':member.restError.weight}"><input type="number" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/></div></td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);"><span class="glyphicon glyphicon-trash"></span></button></div></td> + <td> <input-error error="member.restError.name[0]"><input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterListMember(member, voterList)"/></input-error></td> + <td> <input-error error="member.restError.email[0]"><input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterListMember(member, voterList)" /></input-error></td> + <td class="weight"> <input-error error="member.restError.weight[0]"><input type="number" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/></input-error></td> + <td class="action"> <button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);" tooltip="{{ 'action.restricted.deleteVoter' | translate }}"><span class="glyphicon glyphicon-trash"></span></button></td> </tr> <tr> <th colspan="4"> <button class="btn btn-info" ng-click="addVoter($index);"> <span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addVoter' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteVoterList(voterList);" ng-show="voterList.group.id"> <span class="glyphicon glyphicon-trash"></span> {{ 'action.restricted.deleteGroup' | translate }} </button> - <button class="btn btn-info" ng-click="importFavoriteList(voterList.group.id)"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.import.inGroup' | translate }}</button> + <button class="btn btn-danger" ng-click="deleteVoterList(voterList);"> <span class="glyphicon glyphicon-trash"></span> {{ 'action.restricted.deleteGroup' | translate }} </button> + <button class="btn btn-info" ng-click="importFavoriteList(voterList.group.id)" ng-if="data.favoriteList"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.import.inGroup' | translate }}</button> </th> - </tr> </table> - - <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()"><span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addGroup' | translate }}</button> - <button class="btn btn-warning" ng-hide="data.poll.pollType == 'FREE'" disabled><span class="glyphicon glyphicon-envelope"></span> {{ 'action.restricted.notify' | translate }}</button> </div> -- 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 import
by chorem.org scm June 19, 2014

June 19, 2014

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 077bd8068d207fa5c5f8df15fdcf0f0b95d007a9 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 20 01:15:11 2014 +0200 fix test import --- .../java/org/chorem/pollen/services/service/VoterListService.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 9f2b529..4fc2f9c 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 @@ -26,6 +26,7 @@ package org.chorem.pollen.services.service; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.*; +import org.chorem.pollen.services.bean.PollenEntityId; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.bean.VoterListBean; import org.chorem.pollen.services.bean.VoterListMemberBean; @@ -61,6 +62,11 @@ public class VoterListService extends PollenServiceSupport { } public PollenEntityRef<VoterList> importFavoriteList(String pollId, + String favoriteListId) { + return importFavoriteList(pollId, null, favoriteListId); + } + + public PollenEntityRef<VoterList> importFavoriteList(String pollId, String voterListId, String favoriteListId) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: import favoriteList to voterList
by chorem.org scm June 19, 2014

June 19, 2014

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 c25e040439d6a5f1925ff1827fd855074fa8b68e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 19 18:17:08 2014 +0200 import favoriteList to voterList --- .../chorem/pollen/rest/api/v1/VoterListApi.java | 9 +++- pollen-rest-api/src/main/resources/mapping | 1 + .../pollen/services/service/VoterListService.java | 52 +++++++++++++++------- pollen-ui-angular/src/main/webapp/css/style.css | 1 + pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 +- .../main/webapp/js/controllers/favoriteListCtrl.js | 25 +++++++---- .../src/main/webapp/js/controllers/pollCtrl.js | 25 ++++++++++- pollen-ui-angular/src/main/webapp/js/services.js | 9 ++++ .../main/webapp/partials/favoriteList-edit.html | 3 ++ .../main/webapp/partials/poll-listParticipant.html | 16 +++++++ 11 files changed, 116 insertions(+), 30 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java index d3242a4..7ce915e 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java @@ -49,11 +49,18 @@ public class VoterListApi extends WebMotionController { public PollenEntityRef<VoterList> importFavoriteList(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<FavoriteList> favoriteListId) { - PollenEntityRef<VoterList> principalRef = voterListService.importFavoriteList(pollId.getEntityId(), favoriteListId.getEntityId()); + PollenEntityRef<VoterList> principalRef = voterListService.importFavoriteList(pollId.getEntityId(), null, favoriteListId.getEntityId()); return principalRef; } + public PollenEntityRef<VoterList> importFavoriteList(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<VoterList> voterListId, PollenEntityId<FavoriteList> favoriteListId) { + + PollenEntityRef<VoterList> principalRef = voterListService.importFavoriteList(pollId.getEntityId(), voterListId.getEntityId(),favoriteListId.getEntityId()); + return principalRef; + + } + public List<VoterListBean> getVoterLists(VoterListService voterListService, PollenEntityId<Poll> pollId) { List<VoterListBean> voterLists = voterListService.getVoterLists(pollId.getEntityId()); diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 3d8011e..22f2d98 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -137,6 +137,7 @@ GET /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.getVoter POST /v1/polls/{pollId}/voterLists VoterListApi.createVoterList PUT,POST /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.editVoterList DELETE /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.deleteVoterList +PUT /v1/polls/{pollId}/voterLists/{voterListId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteList GET /v1/polls/{pollId}/voterLists/{voterListId}/members VoterListApi.getMembers GET /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.getMember 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 8526432..9f2b529 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 @@ -25,14 +25,7 @@ package org.chorem.pollen.services.service; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; -import org.chorem.pollen.persistence.entity.FavoriteList; -import org.chorem.pollen.persistence.entity.FavoriteListMember; -import org.chorem.pollen.persistence.entity.Poll; -import org.chorem.pollen.persistence.entity.PollenUser; -import org.chorem.pollen.persistence.entity.VoterList; -import org.chorem.pollen.persistence.entity.VoterListMember; -import org.chorem.pollen.persistence.entity.VoterListMemberTopiaDao; -import org.chorem.pollen.persistence.entity.VoterListTopiaDao; +import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.bean.VoterListBean; import org.chorem.pollen.services.bean.VoterListMemberBean; @@ -68,6 +61,7 @@ public class VoterListService extends PollenServiceSupport { } public PollenEntityRef<VoterList> importFavoriteList(String pollId, + String voterListId, String favoriteListId) { checkIsConnected(); @@ -81,11 +75,28 @@ public class VoterListService extends PollenServiceSupport { FavoriteList favoriteList = getFavoriteListService().getFavoriteList0(user, favoriteListId); - VoterListTopiaDao dao = getVoterListDao(); - VoterList result = dao.create(); + VoterList result = null; + List<VoterListMember> existingVoterListMembers = null; + if (voterListId != null) { + result = getVoterList0(poll, voterListId); + } + else { + if (poll.getPollType() == PollType.RESTRICTED) { + List<VoterList> existingVoterList = getVoterLists0(poll); + if (existingVoterList.size() > 0) { + result = getVoterList0(poll, existingVoterList.get(0).getTopiaId()); + } + } + } - result.setName(favoriteList.getName()); - result.setWeight(1d); + if (result == null) { + VoterListTopiaDao dao = getVoterListDao(); + result = dao.create(); + result.setName(favoriteList.getName()); + result.setWeight(1d); + } else { + existingVoterListMembers = getVoterListMembers0(result); + } VoterListMemberTopiaDao voterListMemberDao = getVoterListMemberDao(); @@ -93,11 +104,18 @@ public class VoterListService extends PollenServiceSupport { List<FavoriteListMember> favoriteListMembers = getFavoriteListService().getFavoriteListMembers0(favoriteList); for (FavoriteListMember favoriteListMember : favoriteListMembers) { - - VoterListMember voterListMember = voterListMemberDao.create(); - voterListMember.setWeight(1d); - voterListMember.setEmail(favoriteListMember.getEmail()); - voterListMember.setVoterList(result); + VoterListMemberBean voterListMemberBean = new VoterListMemberBean(); + voterListMemberBean.setWeight(1d); + voterListMemberBean.setName(favoriteListMember.getName()); + voterListMemberBean.setEmail(favoriteListMember.getEmail()); + + ErrorMap errorMap = checkVoterListMember(existingVoterListMembers, voterListMemberBean); + if (errorMap.isEmpty()) { + // no error then create member + VoterListMember voterListMember = voterListMemberBean.toEntity(); + voterListMember.setVoterList(result); + voterListMemberDao.create(voterListMember); + } } diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index a71f43a..ab77b85 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -249,6 +249,7 @@ i.icon-collapse { .voterList { width:100%; + margin-top:25px; margin-bottom:15px; border:3px solid #DDD; } diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index e0338f4..164d011 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -78,6 +78,7 @@ var translateEN = { 'action.restricted.addGroup' : 'Add a Group', 'action.restricted.deleteGroup' : 'Delete the Group', 'action.restricted.notify' : 'Notify', +'action.favoriteList.import' : 'Import favorite list', 'action.favoriteList.add' : 'Add favorite list', 'action.favoriteList.delete' : 'Delete the favorite list', 'action.favoriteList.addMember' : 'Add a member', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 8ce94c4..9466e8e 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -78,7 +78,9 @@ var translateFR = { 'action.restricted.addGroup' : 'Ajouter un Groupe de Votant', 'action.restricted.deleteGroup' : 'Supprimer le Groupe de Votant', 'action.restricted.notify' : 'Envoyer un mail', -'action.favoriteList.add' : 'Ajouter une liste de diffusion', +'action.favoriteList.import.addGroup' : 'Importer dans un nouveau groupe', +'action.favoriteList.import.inGroup' : 'Importer dans ce groupe', +'action.favoriteList.add' : 'Créer une nouvelle liste de diffusion', 'action.favoriteList.delete' : 'Supprimer la liste de diffusion', 'action.favoriteList.addMember' : 'Ajouter un membre', 'action.favoriteList.deleteMember' : 'Supprimer le membre', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js index 0f364be..6bd03aa 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -70,15 +70,17 @@ angular.module('favoriteListControllers', []) } }); - if ($routeParams.favoriteListId) { - FavoriteList.get({favoriteListId:$routeParams.favoriteListId}, function (favList) { - $scope.data.favoriteList = favList; - initFavoriteListMember(); - }); - } - else { - $scope.data.favoriteList = {name:'', members: []}; - } + var initFavoriteList = function () { + if ($routeParams.favoriteListId) { + FavoriteList.get({favoriteListId:$routeParams.favoriteListId}, function (favList) { + $scope.data.favoriteList = favList; + initFavoriteListMember(); + }); + } + else { + $scope.data.favoriteList = {name:'', members: []}; + } + }; initFavoriteList(); var initFavoriteListMember = function () { var deferred = $q.defer(); @@ -187,6 +189,11 @@ angular.module('favoriteListControllers', []) } }; + $scope.newFavoriteList = function () { + initFavoriteList(); + $location.url('/favoriteList/new'); + } + var lastRoute = $route.current; $scope.$on('$locationChangeSuccess', function(event) { if (lastRoute.$$route.controller == $route.current.$$route.controller) { 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 a11de83..d9df9cd 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -384,8 +384,8 @@ angular.module('pollControllers', []) }]) -.controller('PollEditCtrl', ['$scope', '$controller', '$routeParams', '$location', '$timeout', '$translate', 'Poll', 'PollChoice', 'PollVote', 'PollVoterList', 'PollVoterListMember', 'SessionStorage', - function ( $scope, $controller, $routeParams, $location, $timeout, $translate, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember, SessionStorage) { +.controller('PollEditCtrl', ['$scope', '$controller', '$routeParams', '$location', '$timeout', '$translate', 'Poll', 'PollChoice', 'PollVote', 'PollVoterList', 'PollVoterListMember', 'FavoriteList', 'SessionStorage', + function ( $scope, $controller, $routeParams, $location, $timeout, $translate, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember, FavoriteList, SessionStorage) { $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.edit = true; @@ -466,6 +466,27 @@ angular.module('pollControllers', []) } }; + var initFavoriteList = function () { + FavoriteList.get({paginationParameter:{pageSize:-1}}, function (data) { + $scope.data.favoriteList = data.elements; + $scope.data.favoriteListImport = null; + }); + }; initFavoriteList(); + + $scope.importFavoriteList = function (voterListId) { + if (angular.isDefined(voterListId)) { + PollVoterList.importInGroup({pollId:$routeParams.pollId, voterListId:voterListId, favoriteListId:$scope.data.favoriteListImport}, null, function (data) { + $scope.data.favoriteListImport = null; + initVoterList(); + }); + } else { + PollVoterList.importAddGroup({pollId:$routeParams.pollId, favoriteListId:$scope.data.favoriteListImport}, null, function (data) { + $scope.data.favoriteListImport = null; + initVoterList(); + }) + } + }; + $scope.saveVoterList = function (voterList) { if (angular.isDefined(voterList.group.id)) { PollVoterList.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, voterList.group, function (data) { diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 03579b8..74b248b 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -139,7 +139,16 @@ angular.module('pollenServices', ['ngResource']) transformRequest: function (data, headersGetter) { return 'voterList='+encodeURIComponent(JSON.stringify(data)); } + }, + 'importAddGroup': { + method : 'PUT', + url: conf.restURL+'/polls/:pollId/favoriteLists/:favoriteListId' + }, + 'importInGroup': { + method : 'PUT', + url: conf.restURL+'/polls/:pollId/voterLists/:voterListId/favoriteLists/:favoriteListId' } + }) }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 130d492..9592724 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -47,4 +47,7 @@ </tr> </table> + <div class="text-right"> + <button class="btn btn-info" ng-click="newFavoriteList()"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.add' | translate }}</button> + </div> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index db05d20..3984cc4 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -35,6 +35,21 @@ </label> <hr/> + <div ng-if="data.favoriteList" class="container-fluid"> + <h3>{{ 'user.favoriteList' | translate }}</h3> + <div class="row text-right"> + <div class="col-sm-6"> + <button class="btn btn-info" ng-click="importFavoriteList()" ng-if="data.poll.pollType == 'GROUP'"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.import.addGroup' | translate }}</button> + </div> + <div class="col-sm-6"> + <select class="form-control" + ng-model="data.favoriteListImport" + ng-options="favList.id as favList.name for favList in data.favoriteList"> + </select> + + </div> + </div> + </div> <table ng-repeat="voterList in data.voterList" class="voterList" ng-hide="data.poll.pollType == 'FREE'"> @@ -62,6 +77,7 @@ <th colspan="4"> <button class="btn btn-info" ng-click="addVoter($index);"> <span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addVoter' | translate }} </button> <button class="btn btn-danger" ng-click="deleteVoterList(voterList);" ng-show="voterList.group.id"> <span class="glyphicon glyphicon-trash"></span> {{ 'action.restricted.deleteGroup' | translate }} </button> + <button class="btn btn-info" ng-click="importFavoriteList(voterList.group.id)"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.import.inGroup' | translate }}</button> </th> </tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: view result order by scoreResult
by chorem.org scm June 19, 2014

June 19, 2014

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

1 0

13/13: change print error for vote
by chorem.org scm June 19, 2014

June 19, 2014

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 729158fbe6eed43d4332494d5c5ddb1f7f55b94d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 19 11:49:41 2014 +0200 change print error for vote --- pollen-ui-angular/src/main/webapp/js/app.js | 29 ++++++++++++++++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 4 ++- .../src/main/webapp/partials/big-poll.html | 4 ++- .../src/main/webapp/partials/inline-poll.html | 6 +++-- 4 files changed, 39 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 c367a04..5be379d 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -182,6 +182,35 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) +.directive('inputError', function() { + return { + restrict:'E', + scope: { + error: '=', + forData: '=data' + }, + transclude: true, + template: '<div tooltip={{error}} ng-transclude></div>', + link: function (scope, element, attrs) { + scope.$watch('forData', function (newVal, oldVal) { + if (newVal != oldVal) { + delete scope.error; + } + }); + scope.$watch('error', function (newVal, oldVal) { + attrs.tooltip = newVal; + if (angular.isDefined(newVal)) { + $(element[0]).addClass('has-error'); + + } + else { + $(element[0]).removeClass('has-error'); + } + }) + } + }; +}) + .directive('selectOnClick', function () { return { restrict: 'A', 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 9eecc06..92bc020 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -543,7 +543,9 @@ angular.module('pollControllers', []) } else { // create voter list - $scope.saveVoterList(voterList); + if (angular.isUndefined(voterList.group.restError)) { + $scope.saveVoterList(voterList); + } } } } 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 c78d3f2..99be716 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -70,6 +70,8 @@ </div> <div class="pollBigVote"> - <input type="text" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName"/> + <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> \ 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 43b92ee..9e908f9 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -51,8 +51,10 @@  <tr ng-show="!globalVariables.editMode"> <td class="pollChoice"> - <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" /> - <info-error error="data.vote.restError.voterName[0]" data="data.vote.voteName"></info-error> + <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> +  </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice"> <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" /> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

12/13: fix : change eugene version for build
by chorem.org scm June 19, 2014

June 19, 2014

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 a885c06373491322cc118fb65a1891133ad4065f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 19 11:48:37 2014 +0200 fix : change eugene version for build --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 793d363..b38a5f7 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ <webmotionVersion>2.4.1-SNAPSHOT</webmotionVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugenePluginVersion>2.10</eugenePluginVersion> + <eugenePluginVersion>2.11-SNAPSHOT</eugenePluginVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonWebVersion>1.17-SNAPSHOT</nuitonWebVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

11/13: fix convert Bean to Entity, and get voterListMember when edit voterList
by chorem.org scm June 19, 2014

June 19, 2014

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 372075ac86747870bdad5bd12a28056a291a18fb Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 19 11:46:27 2014 +0200 fix convert Bean to Entity, and get voterListMember when edit voterList --- .../main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java | 1 + .../main/java/org/chorem/pollen/services/service/VoterListService.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java index b778ce0..c9d630e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoterListMemberBean.java @@ -56,6 +56,7 @@ public class VoterListMemberBean extends PollenBean<VoterListMember> { public VoterListMember toEntity() { VoterListMember entity = new VoterListMemberImpl(); + entity.setTopiaId(getEntityId()); entity.setEmail(getEmail()); entity.setName(getName()); entity.setWeight(getWeight()); 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 868f2b0..8526432 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 @@ -181,8 +181,9 @@ public class VoterListService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); List<VoterList> existingVoterLists = getVoterLists0(poll); + List<VoterListMember> existingVoterListMembers = getVoterListMembers0(voterList.toEntity()); - ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, null); + ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, toBeanList(VoterListMemberBean.class, existingVoterListMembers)); errorMap.failIfNotEmpty(); VoterList result = saveVoterList(poll, voterList); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

10/13: some update in style and translate
by chorem.org scm June 19, 2014

June 19, 2014

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 4c238640108017eccdb1dc19020951b68beba0e6 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 17:35:15 2014 +0200 some update in style and translate --- 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/partials/inline-poll.html | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-comment.html | 11 ++++++----- .../src/main/webapp/partials/poll-listParticipant.html | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index f878922..e0338f4 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -69,6 +69,7 @@ var translateEN = { 'action.return' : 'Return', 'action.cancel' : 'Cancel', 'action.save' : 'Save', +'action.edit' : 'Edit', 'action.delete' : 'Delete', 'action.vote' : 'Vote', 'action.comment' : 'Comment', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index f710b33..8ce94c4 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -69,6 +69,7 @@ var translateFR = { 'action.return' : 'Retour', 'action.cancel' : 'Annuler', 'action.save' : 'Sauvegarder', +'action.edit' : 'Modifier', 'action.delete' : 'Supprimer', 'action.vote' : 'Voter', 'action.comment' : 'Commenter', 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 5062f76..43b92ee 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -71,7 +71,7 @@ </td> <td> <button class="btn btn-info" ng-if="vote.permission && !globalVariables.editMode" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> - <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-remove"></span></button> + <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-trash"></span></button> </td> </tr>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 2186408..978c2b7 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -45,7 +45,8 @@ <div class="form-group"> <div class="col-sm-3"> </div> <div class="col-sm-9"> - <input type="submit" class="btn btn-primary" value="{{ 'action.comment' | translate }}" /> + <button type="submit" class="btn btn-primary" ng-hide="comment.id"><span class="glyphicon glyphicon-save"></span> {{ 'action.comment' | translate }}</button> + <button type="submit" class="btn btn-primary" ng-show="comment.id"><span class="glyphicon glyphicon-save"></span> {{ 'action.edit' | translate }}</button> </div> </div> </form> @@ -55,10 +56,10 @@ <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:globalVariables.dateFormat}}<br/> - <i class="glyphicon glyphicon-pencil fakeLink" ng-show="comment.id" ng-click="editPost(comment)"></i> - <i class="glyphicon glyphicon-remove danger fakeLink" ng-show="comment.id" ng-click="deletePost(comment)"></i> + <span class="glyphicon glyphicon-user"></span>{{comment.authorName}}<br/> + <span class="glyphicon glyphicon-calendar"></span>{{comment.postDate | date:globalVariables.dateFormat}}<br/> + <a class="fakeLink" ng-click="editPost(comment)"><span class="glyphicon glyphicon-pencil" ng-show="comment.id"></span></a> + <a class="fakeLink" ng-click="deletePost(comment)"><span class="glyphicon glyphicon-trash danger" ng-show="comment.id"></span></a> </td> <td> <div ng-bind-html="toHTML(comment.text)"></div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index a34bdba..db05d20 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -55,7 +55,7 @@ <td> <div ng-class="{'has-error':member.restError.name}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterListMember(member, voterList)"/></div></td> <td> <div ng-class="{'has-error':member.restError.email}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterListMember(member, voterList)" /></div></td> <td class="weight"> <div ng-class="{'has-error':member.restError.weight}"><input type="number" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/></div></td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);"><i class="glyphicon glyphicon-remove"></i></button></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);"><span class="glyphicon glyphicon-trash"></span></button></div></td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

09/13: Merge branch 'feature/favoriteVoterList' into develop
by chorem.org scm June 19, 2014

June 19, 2014

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 42a27fc4c8b131bb1111039454fb29c350d4820a Merge: 418a032 50e4ba1 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 17:08:09 2014 +0200 Merge branch 'feature/favoriteVoterList' into develop .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 12 +- .../services/service/FavoriteListService.java | 16 +- .../i18n/pollen-services_en_GB.properties | 7 + .../i18n/pollen-services_fr_FR.properties | 13 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 15 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 9 +- pollen-ui-angular/src/main/webapp/index.html | 7 + pollen-ui-angular/src/main/webapp/js/app.js | 5 +- .../src/main/webapp/js/conf.js.exemple | 3 + .../main/webapp/js/controllers/favoriteListCtrl.js | 197 +++++++++++++++++++++ pollen-ui-angular/src/main/webapp/js/services.js | 61 +++++++ .../main/webapp/partials/favoriteList-edit.html | 50 ++++++ .../main/webapp/partials/favoriteList-list.html | 13 ++ 13 files changed, 383 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

08/13: save all member when create the favoriteList and no force request post for create favoriteList
by chorem.org scm June 19, 2014

June 19, 2014

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 50e4ba115dfa8b7d2f98eaa8a8cbf9f920a3fab0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 17:00:53 2014 +0200 save all member when create the favoriteList and no force request post for create favoriteList --- .../src/main/webapp/js/controllers/favoriteListCtrl.js | 11 ++++++++--- .../src/main/webapp/partials/favoriteList-edit.html | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js index e1a0f3e..0f364be 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -114,6 +114,9 @@ angular.module('favoriteListControllers', []) FavoriteListPromise = FavoriteList.add({name:$scope.data.favoriteList.name}, function (data) { $scope.data.favoriteList.id = data.id; delete $scope.data.favoriteList.restError; + angular.forEach($scope.data.favoriteList.members, function (member, key) { + $scope.saveMember(member); + }) $location.url('/favoriteList/'+data.id); }, function (error) { $scope.data.favoriteList.restError = error.data; @@ -142,9 +145,11 @@ angular.module('favoriteListControllers', []) } else { // create favoriteList - $scope.saveFavoriteList().then(function () { - $scope.saveMember(member); - }); + if (angular.isUndefined($scope.data.favoriteList.restError)) { + $scope.saveFavoriteList().then(function () { + $scope.saveMember(member); + }); + } } } } diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 734ccdc..130d492 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -28,7 +28,7 @@ <td ng-class="{'has-error':member.restError.email}"> <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.email[0]}}" /> </td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-remove"></span></button></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-trash"></span></button></div></td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

07/13: translate favoriteList
by chorem.org scm June 19, 2014

June 19, 2014

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 81c9b1aee1425fc334217cdda53b4abebf6bdb48 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 16:20:18 2014 +0200 translate favoriteList --- .../pollen/services/service/FavoriteListService.java | 16 +++++++++------- .../main/resources/i18n/pollen-services_en_GB.properties | 7 +++++++ .../main/resources/i18n/pollen-services_fr_FR.properties | 13 ++++++++++--- pollen-ui-angular/src/main/webapp/i18n/en.js | 15 +++++++++------ pollen-ui-angular/src/main/webapp/i18n/fr.js | 9 +++++++-- .../src/main/webapp/partials/favoriteList-edit.html | 2 +- 6 files changed, 43 insertions(+), 19 deletions(-) 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 82bc433..0e3e8a6 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 @@ -44,6 +44,8 @@ import java.io.File; import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -381,7 +383,7 @@ public class FavoriteListService extends PollenServiceSupport { String favoriteListName = favoriteList.getName(); - boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListName, "name can not be empty"); + boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListName, l(getLocale(), "pollen.error.favoriteList.name.empty")); boolean favoriteListExists = favoriteList.isPersisted(); @@ -409,7 +411,7 @@ public class FavoriteListService extends PollenServiceSupport { } boolean nameAdded = favoriteListNames.add(favoriteListName); - check(errors, "name", nameAdded, "name already used by another favorite list"); + check(errors, "name", nameAdded, l(getLocale(), "pollen.error.favoriteList.name.already.used")); } return errors; @@ -443,26 +445,26 @@ public class FavoriteListService extends PollenServiceSupport { } - boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListMember.getName(), "member name can not be empty"); + boolean nameNotBlank = checkNotBlank(errors, "name", favoriteListMember.getName(), l(getLocale(), "pollen.error.favoriteListMember.name.empty")); if (nameNotBlank) { boolean added = memberNames.add(favoriteListMember.getName()); - check(errors, "name", added, "member name already used"); + check(errors, "name", added, l(getLocale(), "pollen.error.favoriteListMember.name.already.used")); } String memberEmail = getCleanMail(favoriteListMember.getEmail()); - boolean emailNotBlank = checkNotBlank(errors, "email", memberEmail, "member email can not be empty"); + boolean emailNotBlank = checkNotBlank(errors, "email", memberEmail, l(getLocale(), "pollen.error.favoriteListMember.email.empty")); if (emailNotBlank) { - boolean emailValid = checkValidEmail(errors, "email", memberEmail, "member email is not valid"); + boolean emailValid = checkValidEmail(errors, "email", memberEmail, l(getLocale(), "pollen.error.favoriteListMember.email.invalid")); if (emailValid) { boolean emailAdded = memberEmails.add(memberEmail); - check(errors, "email", emailAdded, "member email already used in this list"); + check(errors, "email", emailAdded, l(getLocale(), "pollen.error.favoriteListMember.email.already.used")); } diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index 3eab430..24b79ec 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -20,6 +20,13 @@ pollen.error.favoriteList.import.csv.invalid.email= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.favoriteList.name.already.used=name already used by another favorite list +pollen.error.favoriteList.name.empty=name can not be empty +pollen.error.favoriteListMember.email.already.used=member email already used in this list +pollen.error.favoriteListMember.email.empty=member email can not be empty +pollen.error.favoriteListMember.email.invalid=member email is not valid +pollen.error.favoriteListMember.name.already.used=member name already used +pollen.error.favoriteListMember.name.empty=member name can not be empty pollen.error.poll.choice.mandatory=At least a choice is mandatory pollen.error.poll.commentVisibility.mandatory=comment visiblity is mandatory pollen.error.poll.mismatch.freePoll=cant' have a voter list for a free poll diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index 1faec5d..c7df00c 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -11,15 +11,22 @@ pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut pollen.configuration.defaultPollenUserPageSize= pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes) -pollen.error.choice.choiceNameEmpty=le nom du choix ne peut pas être vide -pollen.error.choice.choiceNameExist=le nom du choix est déjà utilisé sur ce sondage -pollen.error.choice.choiceTypeEmpty=le type du choix doit être défini +pollen.error.choice.choiceNameEmpty=Le nom du choix ne peut pas être vide +pollen.error.choice.choiceNameExist=Le nom du choix est déjà utilisé sur ce sondage +pollen.error.choice.choiceTypeEmpty=Le type du choix doit être défini pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.favoriteList.name.already.used=Le nom est déjà utilisé par une autre liste +pollen.error.favoriteList.name.empty=Le nom de la liste est obligatoire +pollen.error.favoriteListMember.email.already.used=Le courriel du membre est déjà utilisé dans cette liste +pollen.error.favoriteListMember.email.empty=Le courriel est obligatoire +pollen.error.favoriteListMember.email.invalid=Le courriel du membre est invalide +pollen.error.favoriteListMember.name.already.used=Le nom du membre est déjà utilisé dans cette liste +pollen.error.favoriteListMember.name.empty=Le nom du membre est obligatoire pollen.error.poll.choice.mandatory=Au moins un choix est nécessaire pollen.error.poll.commentVisibility.mandatory=la visibilité des commentaires est obligatoire pollen.error.poll.pollType.mandatory=le type de sondage est obligatoire diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 00ee69b..f878922 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -28,6 +28,7 @@ var translateEN = { 'user.register.success' : 'Register with success', 'user.edit.success' : 'Save with success', 'user.forgotPassword.success' : 'Password send by email', +'user.favoriteList' : 'Favorite list', 'user.error.password.diff' : 'Passwords not equal', 'user.error.mail.notFound' : 'E-mail not found', 'user.error.mail.empty' : 'E-mail can not be empty', @@ -60,7 +61,6 @@ var translateEN = { 'comment' : 'Comment', 'comment.added' : 'Comment added.', - 'action.logout' : 'Logout', 'action.login' : 'Login', 'action.register' : 'Register', @@ -72,15 +72,18 @@ var translateEN = { 'action.delete' : 'Delete', 'action.vote' : 'Vote', 'action.comment' : 'Comment', -'action.restricted.addVoter' : 'Add Voter', -'action.restricted.deleteVoter' : 'Delete Voter', -'action.restricted.addGroup' : 'Add Group', -'action.restricted.deleteGroup' : 'Delete Group', +'action.restricted.addVoter' : 'Add a Voter', +'action.restricted.deleteVoter' : 'Delete the Voter', +'action.restricted.addGroup' : 'Add a Group', +'action.restricted.deleteGroup' : 'Delete the Group', 'action.restricted.notify' : 'Notify', +'action.favoriteList.add' : 'Add favorite list', +'action.favoriteList.delete' : 'Delete the favorite list', +'action.favoriteList.addMember' : 'Add a member', +'action.favoriteList.deleteMember' : 'Delete the member', 'action.message.confirmDelete' : 'Are you sure to delete it?', - 'dateFormat' : 'MM-dd-yy', } diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 78f9297..f710b33 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -28,6 +28,7 @@ var translateFR = { 'user.register.success' : 'Compte enregisté, un mail de validation vient d\'être envoyé..', 'user.edit.success' : 'Modification effectuée..', 'user.forgotPassword.success' : 'Un mail de changement de mot de passe vient d\'être envoyé..', +'user.favoriteList' : 'Liste de Diffusion Favorite', 'user.error.password.diff' : 'Mot de passe différent', 'user.error.mail.notFound' : 'Courriel n\'a pas été trouvé', 'user.error.mail.empty' : 'Courriel ne peux pas être vide', @@ -72,10 +73,14 @@ var translateFR = { 'action.vote' : 'Voter', 'action.comment' : 'Commenter', 'action.restricted.addVoter' : 'Ajouter un Votant', -'action.restricted.deleteVoter' : 'Supprimer un Votant', +'action.restricted.deleteVoter' : 'Supprimer le Votant', 'action.restricted.addGroup' : 'Ajouter un Groupe de Votant', -'action.restricted.deleteGroup' : 'Supprimer un Groupe de Votant', +'action.restricted.deleteGroup' : 'Supprimer le Groupe de Votant', 'action.restricted.notify' : 'Envoyer un mail', +'action.favoriteList.add' : 'Ajouter une liste de diffusion', +'action.favoriteList.delete' : 'Supprimer la liste de diffusion', +'action.favoriteList.addMember' : 'Ajouter un membre', +'action.favoriteList.deleteMember' : 'Supprimer le membre', 'action.message.confirmDelete' : 'Êtes vous sûr de vouloir le supprimer?', diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 02aa7d0..734ccdc 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -28,7 +28,7 @@ <td ng-class="{'has-error':member.restError.email}"> <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.email[0]}}" /> </td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><span class="glyphicon glyphicon-remove"></span></button></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="glyphicon glyphicon-remove"></span></button></div></td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

06/13: add glyphicon in button
by chorem.org scm June 19, 2014

June 19, 2014

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 418a0322683328fafef4c44c048c83a8dbc83262 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 16:00:39 2014 +0200 add glyphicon in button --- pollen-ui-angular/src/main/webapp/partials/big-poll.html | 2 +- pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-listParticipant.html | 8 ++++---- pollen-ui-angular/src/main/webapp/partials/poll-poll.html | 4 ++-- pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html | 6 +++--- pollen-ui-angular/src/main/webapp/partials/user-login.html | 2 +- pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html | 2 +- pollen-ui-angular/src/main/webapp/partials/user-register.html | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) 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 c26b877..c78d3f2 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -62,7 +62,7 @@ </div> <div class="row pollBigChoice"> <div class="col-sm-10"> - <button class="btn btn-info btn-large" ng-click="addChoice()" ng-if="globalVariables.editMode" >Ajouter un choix</button> + <button class="btn btn-info btn-large" 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> 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 b7ba9d6..5062f76 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -44,7 +44,7 @@ </div> </div> </td> - <td ng-if="!globalVariables.voted && globalVariables.editMode"><input type="button" class="btn btn-default btn-large" value="+" ng-click="addChoice()"/></td> + <td ng-if="!globalVariables.voted && globalVariables.editMode"><button class="btn btn-default btn-large" ng-click="addChoice()"> <span class="glyphicon glyphicon-plus"></span> </button></td> </tr>  diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index dcf7068..a34bdba 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -60,13 +60,13 @@ <tr> <th colspan="4"> - <button class="btn btn-info" ng-click="addVoter($index);"> {{ 'action.restricted.addVoter' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteVoterList(voterList);" ng-show="voterList.group.id"> {{ 'action.restricted.deleteGroup' | translate }} </button> + <button class="btn btn-info" ng-click="addVoter($index);"> <span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addVoter' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteVoterList(voterList);" ng-show="voterList.group.id"> <span class="glyphicon glyphicon-trash"></span> {{ 'action.restricted.deleteGroup' | translate }} </button> </th> </tr> </table> - <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()">{{ 'action.restricted.addGroup' | translate }}</button> - <button class="btn btn-warning" ng-hide="data.poll.pollType == 'FREE'" disabled>{{ 'action.restricted.notify' | translate }}</button> + <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()"><span class="glyphicon glyphicon-plus"></span> {{ 'action.restricted.addGroup' | translate }}</button> + <button class="btn btn-warning" ng-hide="data.poll.pollType == 'FREE'" disabled><span class="glyphicon glyphicon-envelope"></span> {{ 'action.restricted.notify' | translate }}</button> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html index a88d3e6..b5e6620 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -49,10 +49,10 @@ <div ng-if="globalVariables.create"> <hr/> - <button class="btn btn-primary" ng-click="savePoll()">{{ 'action.save' | translate }}</button> + <button class="btn btn-primary" ng-click="savePoll()"><span class="glyphicon glyphicon-save"></span> {{ 'action.save' | translate }}</button> </div> <div ng-if="globalVariables.edit"> <hr/> - <button class="btn btn-danger" ng-click="deletePoll();">{{ 'action.delete' | translate }}</button> + <button class="btn btn-danger" ng-click="deletePoll();"><span class="glyphicon glyphicon-trash"></span> {{ 'action.delete' | translate }}</button> </div> \ No newline at end of file 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 cc659b7..402cf6a 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -62,8 +62,8 @@ </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-danger" ng-click="deleteChoice(choice)">Supprimer</button> - <button type="button" class="btn btn-default" ng-click="cancelChoice()">Annuler</button> - <button type="button" class="btn btn-primary" ng-click="saveChoice()">Sauvegarder</button> + <button type="button" class="btn btn-danger" ng-click="deleteChoice(choice)"><span class="glyphicon glyphicon-trash"></span> Supprimer</button> + <button type="button" class="btn btn-default" ng-click="cancelChoice()"><span class="glyphicon glyphicon-remove"></span> Annuler</button> + <button type="button" class="btn btn-primary" ng-click="saveChoice()"><span class="glyphicon glyphicon-save"></span> Sauvegarder</button> </div> </form> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index 3363889..e3c18fa 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -23,7 +23,7 @@ </div> <div class="form-actions"> - <button type="submit" class="btn btn-primary">{{ 'action.login' | translate }}</button> + <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-log-in"></span>   {{ 'action.login' | translate }}</button> <hr/> <a href="#/user/lostpassword"> {{ 'user.forgotPassword' | translate }}</a> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html index 386f833..fbf6890 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html @@ -40,7 +40,7 @@ <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">{{ 'action.recovered' | translate }}</button> + <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-envelope"></span> {{ 'action.recovered' | translate }}</button> </div> <div class="col-sm-1"></div> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index de3c261..a604231 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -82,7 +82,7 @@ <div class="control-group"> <div class="col-sm-5"></div> <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">{{ 'action.register' | translate }}</button> + <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-log-in"></span>   {{ 'action.register' | translate }}</button> </div> <div class="col-sm-1"></div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

05/13: print form error, delete favoriteListMember, delete and edit favoriteList
by chorem.org scm June 19, 2014

June 19, 2014

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 a85b55808d7d9d5f4518b3eaadf8695e6ec4a718 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 15:27:30 2014 +0200 print form error, delete favoriteListMember, delete and edit favoriteList --- .../main/webapp/js/controllers/favoriteListCtrl.js | 22 +++++++++++++++------- .../main/webapp/partials/favoriteList-edit.html | 18 +++++++++++------- .../main/webapp/partials/favoriteList-list.html | 1 + 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js index 246d29a..e1a0f3e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -49,8 +49,8 @@ angular.module('favoriteListControllers', []) }]) -.controller('FavoriteListEditCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', '$timeout', '$q', - function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams, $timeout, $q) { +.controller('FavoriteListEditCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', '$timeout', '$q', '$location', '$route', + function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams, $timeout, $q, $location, $route) { $scope.data = {}; var paginationParameter = {pageSize: conf.favoriteListDefaultPageSize}; @@ -114,6 +114,7 @@ angular.module('favoriteListControllers', []) FavoriteListPromise = FavoriteList.add({name:$scope.data.favoriteList.name}, function (data) { $scope.data.favoriteList.id = data.id; delete $scope.data.favoriteList.restError; + $location.url('/favoriteList/'+data.id); }, function (error) { $scope.data.favoriteList.restError = error.data; }).$promise; @@ -148,17 +149,16 @@ angular.module('favoriteListControllers', []) } } - $scope.deleteVoterList = function (voterList) { - if (angular.isDefined(voterList) && angular.isDefined(voterList.group.id)) { + $scope.deleteFavoriteList = function () { + if (angular.isDefined($scope.data.favoriteList.id)) { var confirmMessage; $translate('action.message.confirmDelete').then(function (msg) { confirmMessage = msg; }).then( function () { var confirmDelete = confirm(confirmMessage); if (confirmDelete == true) { - PollVoterList.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, function (data) { - var index = $scope.data.voterList.indexOf(voterList); - $scope.data.voterList.splice(index, 1); + FavoriteList.remove({favoriteListId:$scope.data.favoriteList.id}, function (data) { + $location.url('/favoriteList'); }); } }); @@ -181,4 +181,12 @@ angular.module('favoriteListControllers', []) }); } }; + + var lastRoute = $route.current; + $scope.$on('$locationChangeSuccess', function(event) { + if (lastRoute.$$route.controller == $route.current.$$route.controller) { + $route.current = lastRoute; + } + }); + }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 257b333..02aa7d0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -3,13 +3,13 @@ <div> <table class="voterList"> <tr> - <th colspan="2" ng-class="{'has-success':data.favoriteList.id && !data.favoriteList.restError}"> + <th colspan="2" ng-class="{'has-success':data.favoriteList.id && !data.favoriteList.restError, 'has-error':data.favoriteList.restError.name}"> <input type="text" name="group" ng-model="data.favoriteList.name" placeholder="name group" class="form-control" - ng-class="{'has-error':data.favoriteList.restError.name}" + tooltip="{{data.favoriteList.restError.name[0]}}" auto-save="saveFavoriteList()" /> </th> <th class="action"> </th> @@ -22,9 +22,13 @@ </tr> <tr ng-repeat="member in data.favoriteList.members" ng-class="{'has-success':member.id && !member.restError}"> - <td> <div ng-class="{'has-error':member.restError.name}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)"/></div></td> - <td> <div ng-class="{'has-error':member.restError.email}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" /></div></td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><i class="glyphicon glyphicon-remove"></i></button></div></td> + <td ng-class="{'has-error':member.restError.name}"> + <input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.name[0]}}"/> + </td> + <td ng-class="{'has-error':member.restError.email}"> + <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" tooltip="{{member.restError.email[0]}}" /> + </td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><span class="glyphicon glyphicon-remove"></span></button></div></td> </tr> <tr> @@ -37,8 +41,8 @@ <tr> <th colspan="3"> - <button class="btn btn-info" ng-click="addMember();"> {{ 'action.favoriteList.addMember' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteFavoriteList();" ng-show="favoriteList.id"> {{ 'action.favoriteList.delete' | translate }} </button> + <button class="btn btn-info" ng-click="addMember();"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.addMember' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteFavoriteList();" ng-show="data.favoriteList.id"><span class="glyphicon glyphicon-trash"></span> {{ 'action.favoriteList.delete' | translate }} </button> </th> </tr> </table> diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html index 840685a..8d87f3d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html @@ -1,6 +1,7 @@ <h1> {{ 'user.favoriteList' | translate }} </h1> <div> + <a href="#/favoriteList/new"><button class="btn btn-info"><span class="glyphicon glyphicon-plus"></span> {{ 'action.favoriteList.add' | translate }}</button></a> <div ng-repeat="favList in data.favoriteList"> <h2> <a href="#/favoriteList/{{favList.id}}">{{ favList.name }}</a></h2> <hr/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/13: fix edit and delete favoriteListMember
by chorem.org scm June 19, 2014

June 19, 2014

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 beae1ab7ab267b55740fb380b31910d148766725 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 15:24:57 2014 +0200 fix edit and delete favoriteListMember --- .../main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java index 71f2150..8adb776 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java @@ -113,16 +113,16 @@ public class FavoriteListApi extends WebMotionController { } - public FavoriteListMemberBean editMember(FavoriteListService favoriteListService, String favoriteListId, FavoriteListMemberBean member) throws InvalidFormException { + public FavoriteListMemberBean editMember(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, FavoriteListMemberBean member) throws InvalidFormException { - FavoriteListMemberBean editedFavoriteListMember = favoriteListService.editFavoriteListMember(favoriteListId, member); + FavoriteListMemberBean editedFavoriteListMember = favoriteListService.editFavoriteListMember(favoriteListId.getEntityId(), member); return editedFavoriteListMember; } - public void removeMember(FavoriteListService favoriteListService, String favoriteListId, String memberId) { + public void removeMember(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, PollenEntityId<FavoriteListMember> memberId) { - favoriteListService.deleteFavoriteListMember(favoriteListId, memberId); + favoriteListService.deleteFavoriteListMember(favoriteListId.getEntityId(), memberId.getEntityId()); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/13: List favoriteList and create/edit favoriteListMember
by chorem.org scm June 19, 2014

June 19, 2014

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 bbc9778b5cf58d1053336f1384f0809bee2097fa Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 17:54:36 2014 +0200 List favoriteList and create/edit favoriteListMember --- pollen-ui-angular/src/main/webapp/index.html | 7 + pollen-ui-angular/src/main/webapp/js/app.js | 5 +- .../src/main/webapp/js/conf.js.exemple | 3 + .../main/webapp/js/controllers/favoriteListCtrl.js | 184 +++++++++++++++++++++ pollen-ui-angular/src/main/webapp/js/services.js | 14 +- .../main/webapp/partials/favoriteList-edit.html | 46 ++++++ .../main/webapp/partials/favoriteList-list.html | 12 ++ 7 files changed, 269 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index f53360b..a40155a 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -48,6 +48,7 @@ <script src="js/services.js"></script> <script src="js/controllers/pollCtrl.js"></script> <script src="js/controllers/userCtrl.js"></script> + <script src="js/controllers/favoriteListCtrl.js"></script> <script src="js/controllers/localeCtrl.js"></script> <script src="i18n/fr.js"></script> @@ -116,6 +117,12 @@ <li class="divider"></li> <li> + <a href="#/favoriteList">{{ 'user.favoriteList' | translate }}</a> + </li> + + <li class="divider"></li> + + <li> <a href="#/poll/list/created"> {{ 'user.listPollCreated' | translate }} </a> </li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 726c14a..c367a04 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'favoriteListControllers', 'localeControllers', 'ui.bootstrap', 'pascalprecht.translate']) .config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpInterceptor'); @@ -67,6 +67,9 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .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"}) + .when('/favoriteList', {templateUrl: './partials/favoriteList-list.html', controller:"FavoriteListCtrl"}) + .when('/favoriteList/new', {templateUrl: './partials/favoriteList-edit.html', controller:"FavoriteListEditCtrl"}) + .when('/favoriteList/:favoriteListId', {templateUrl: './partials/favoriteList-edit.html', controller:"FavoriteListEditCtrl"}) .otherwise({redirectTo: '/'}); }]) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index 06021c7..4602e9a 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -11,6 +11,9 @@ var conf = { // Favorite list number per page favoriteListDefaultPageSize : 15, + // Member in Favorite list number per page + favoriteListMemberDefaultPageSize : 30, + // Default Language for i18n : 'en' or 'fr' defaultLanguage: 'en', } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js new file mode 100644 index 0000000..246d29a --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/js/controllers/favoriteListCtrl.js @@ -0,0 +1,184 @@ +/* + * #%L + * Pollen :: UI (Angular) + * %% + * 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% + */ +angular.module('favoriteListControllers', []) +.controller('FavoriteListCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', + function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams) { + $scope.data = {}; + + var paginationParameter = {pageSize: conf.favoriteListDefaultPageSize}; + if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; + } + paginationParameter.pageNumber = $routeParams.page; + } + + $scope.$watch('data.favoriteListPagination.currentPage', function (newVal, oldVal) { + // check if the current page has changed + if (angular.isDefined(oldVal) && newVal != oldVal) { + paginationParameter.pageNumber = $scope.data.favoriteListPagination.currentPage; + initFavoriteList(); + } + }); + + var initFavoriteList = function () { + FavoriteList.get({paginationParameter:paginationParameter}, function (data) { + $scope.data.favoriteList = data.elements; + $scope.data.favoriteListPagination = data.pagination; + }); + }; initFavoriteList(); + +}]) + +.controller('FavoriteListEditCtrl', ['$scope', 'FavoriteList', 'FavoriteListMember', '$translate', '$routeParams', '$timeout', '$q', + function ($scope, FavoriteList, FavoriteListMember, $translate, $routeParams, $timeout, $q) { + $scope.data = {}; + + var paginationParameter = {pageSize: conf.favoriteListDefaultPageSize}; + if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; + } + paginationParameter.pageNumber = $routeParams.page; + } + + $scope.$watch('data.favoriteListMemberPagination.currentPage', function (newVal, oldVal) { + // check if the current page has changed + if (angular.isDefined(oldVal) && newVal != paginationParameter.pageNumber) { + paginationParameter.pageNumber = newVal; + initFavoriteListMember(); + } + }); + + if ($routeParams.favoriteListId) { + FavoriteList.get({favoriteListId:$routeParams.favoriteListId}, function (favList) { + $scope.data.favoriteList = favList; + initFavoriteListMember(); + }); + } + else { + $scope.data.favoriteList = {name:'', members: []}; + } + + var initFavoriteListMember = function () { + var deferred = $q.defer(); + FavoriteListMember.get({favoriteListId:$routeParams.favoriteListId, paginationParameter:paginationParameter}, function (members) { + $timeout(function () { + $scope.data.favoriteList.members = members.elements; + $scope.data.favoriteListMemberPagination = members.pagination; + deferred.resolve(); + }, 100); + }); + + return deferred.promise; + } + + $scope.addMember = function () { + if (angular.isDefined($scope.data.favoriteListMemberPagination) && $scope.data.favoriteListMemberPagination.currentPage < $scope.data.favoriteListMemberPagination.lastPage) { + paginationParameter.pageNumber = $scope.data.favoriteListMemberPagination.lastPage; + initFavoriteListMember().then($scope.addMember); + } else { + $scope.data.favoriteList.members.push({name:'', email:''}); + } + }; + + $scope.saveFavoriteList = function () { + var FavoriteListPromise; + if (angular.isDefined($scope.data.favoriteList.id)) { // edit + FavoriteListPromise = FavoriteList.update({id:$scope.data.favoriteList.id, name:$scope.data.favoriteList.name}, function (data) { + delete $scope.data.favoriteList.restError; + }, function (error) { + $scope.data.favoriteList.restError = error.data; + }).$promise; + } else { // Create + FavoriteListPromise = FavoriteList.add({name:$scope.data.favoriteList.name}, function (data) { + $scope.data.favoriteList.id = data.id; + delete $scope.data.favoriteList.restError; + }, function (error) { + $scope.data.favoriteList.restError = error.data; + }).$promise; + } + + return FavoriteListPromise; + }; + + $scope.saveMember = function (member) { + if (member.name != '' && member.email != '') { + if (angular.isDefined($scope.data.favoriteList.id)) { + var memberPromise; + if (angular.isDefined(member.id)) { + memberPromise = FavoriteListMember.update({favoriteListId:$scope.data.favoriteList.id}, member).$promise; + } else { + memberPromise = FavoriteListMember.add({favoriteListId:$scope.data.favoriteList.id}, member).$promise; + } + + memberPromise.then(function (data) { + member.id = data.id; + delete member.restError; + }, function (error) { + member.restError = error.data; + }) + } + else { + // create favoriteList + $scope.saveFavoriteList().then(function () { + $scope.saveMember(member); + }); + } + } + } + + $scope.deleteVoterList = function (voterList) { + if (angular.isDefined(voterList) && angular.isDefined(voterList.group.id)) { + var confirmMessage; + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + PollVoterList.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, function (data) { + var index = $scope.data.voterList.indexOf(voterList); + $scope.data.voterList.splice(index, 1); + }); + } + }); + } + }; + + $scope.deleteMember = function (member) { + if (angular.isDefined($scope.data.favoriteList.id)) { + var confirmMessage; + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + FavoriteListMember.remove({favoriteListId:$scope.data.favoriteList.id, memberId:member.id}, function (data) { + var index = $scope.data.favoriteList.members.indexOf(member); + $scope.data.favoriteList.members.splice(index, 1); + }); + } + }); + } + }; +}]) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 332f70e..03579b8 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -259,6 +259,12 @@ angular.module('pollenServices', ['ngResource']) transformRequest: function (data, headersGetter) { return transformParam(data); } + }, + 'update' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } } }) }]) @@ -268,13 +274,19 @@ angular.module('pollenServices', ['ngResource']) return 'member='+encodeURIComponent(JSON.stringify(data)); } - return $resource(conf.restURL+'/favoriteLists/:favoriteListId/members/:memberId', {favoriteListId:'@id'}, + return $resource(conf.restURL+'/favoriteLists/:favoriteListId/members/:memberId', {memberId:'@id'}, { 'add' : { method:'POST', transformRequest: function (data, headersGetter) { return transformParam(data); } + }, + 'update' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } } }) }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html new file mode 100644 index 0000000..257b333 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -0,0 +1,46 @@ +<h1> {{ 'user.favoriteList' | translate }} </h1> + +<div> + <table class="voterList"> + <tr> + <th colspan="2" ng-class="{'has-success':data.favoriteList.id && !data.favoriteList.restError}"> + <input type="text" + name="group" + ng-model="data.favoriteList.name" + placeholder="name group" + class="form-control" + ng-class="{'has-error':data.favoriteList.restError.name}" + auto-save="saveFavoriteList()" /> + </th> + <th class="action"> </th> + </tr> + + <tr> + <th> {{ 'poll.restricted.name' | translate }} </th> + <th> {{ 'poll.restricted.mail' | translate }} </th> + <th class="action"> </th> + </tr> + + <tr ng-repeat="member in data.favoriteList.members" ng-class="{'has-success':member.id && !member.restError}"> + <td> <div ng-class="{'has-error':member.restError.name}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveMember(member)"/></div></td> + <td> <div ng-class="{'has-error':member.restError.email}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" /></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteMember(member);"><i class="glyphicon glyphicon-remove"></i></button></div></td> + </tr> + + <tr> + <th colspan="3" ng-show="data.favoriteListMemberPagination.lastPage > 0"> + <make-pagination current-page="data.favoriteListMemberPagination.currentPage" + last-page="data.favoriteListMemberPagination.lastPage" + page-size="data.favoriteListMemberPagination.pageSize"></make-pagination> + </th> + </tr> + + <tr> + <th colspan="3"> + <button class="btn btn-info" ng-click="addMember();"> {{ 'action.favoriteList.addMember' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteFavoriteList();" ng-show="favoriteList.id"> {{ 'action.favoriteList.delete' | translate }} </button> + </th> + </tr> + </table> + +</div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html new file mode 100644 index 0000000..840685a --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-list.html @@ -0,0 +1,12 @@ +<h1> {{ 'user.favoriteList' | translate }} </h1> + +<div> + <div ng-repeat="favList in data.favoriteList"> + <h2> <a href="#/favoriteList/{{favList.id}}">{{ favList.name }}</a></h2> + <hr/> + </div> + + <make-pagination current-page="data.favoriteListPagination.currentPage" + last-page="data.favoriteListPagination.lastPage" + page-size="data.favoriteListPagination.pageSize"></make-pagination> +</div> \ 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

02/13: fix paginationParameter for FavoriteListApi.getMembers
by chorem.org scm June 19, 2014

June 19, 2014

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 5afd6b88d302a31e29f02873cbff3dc1afcff106 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 17:52:34 2014 +0200 fix paginationParameter for FavoriteListApi.getMembers --- .../src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java index 8295bd1..71f2150 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java @@ -92,9 +92,9 @@ public class FavoriteListApi extends WebMotionController { } - public PaginationResultBean<FavoriteListMemberBean> getMembers(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId) { + public PaginationResultBean<FavoriteListMemberBean> getMembers(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, PaginationParameterBean paginationParameter) { - PaginationResultBean<FavoriteListMemberBean> members = favoriteListService.getFavoriteListMembers(favoriteListId.getEntityId(), null); + PaginationResultBean<FavoriteListMemberBean> members = favoriteListService.getFavoriteListMembers(favoriteListId.getEntityId(), paginationParameter); return members; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/13: add FavoriteList and FavoriteListMember in service
by chorem.org scm June 19, 2014

June 19, 2014

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 3114d11fdbb7f3849cb85aaf9c581962a9075e44 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 17 11:19:49 2014 +0200 add FavoriteList and FavoriteListMember in service --- pollen-ui-angular/src/main/webapp/js/services.js | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index c4dd105..332f70e 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -20,6 +20,10 @@ */ angular.module('pollenServices', ['ngResource']) +////////////////////////////////////// +///// POLL RESOURCE ///// +////////////////////////////////////// + .factory('Poll', ['$resource', function ($resource) { return $resource(conf.restURL+'/polls/:pollId', {pollId:'@id'}, { 'skeletonNew' : { @@ -161,6 +165,10 @@ angular.module('pollenServices', ['ngResource']) }]) +////////////////////////////////////// +///// USER RESOURCE ///// +////////////////////////////////////// + .factory('User', ['$resource', function ($resource) { var transformParam = function (data) { return 'user='+encodeURIComponent(JSON.stringify(data))+'&generatePassword=false'; @@ -234,6 +242,47 @@ angular.module('pollenServices', ['ngResource']) }) }]) + +////////////////////////////////////// +///// FAVORITE LIST RESOURCE ///// +////////////////////////////////////// + +.factory('FavoriteList', ['$resource', function ($resource) { + var transformParam = function (data) { + return 'favoriteList='+encodeURIComponent(JSON.stringify(data)); + } + + return $resource(conf.restURL+'/favoriteLists/:favoriteListId', {favoriteListId:'@id'}, + { + 'add' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } + } + }) +}]) + +.factory('FavoriteListMember', ['$resource', function ($resource) { + var transformParam = function (data) { + return 'member='+encodeURIComponent(JSON.stringify(data)); + } + + return $resource(conf.restURL+'/favoriteLists/:favoriteListId/members/:memberId', {favoriteListId:'@id'}, + { + 'add' : { + method:'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } + } + }) +}]) + +////////////////////////////////////// +///// SESSION STORAGE RESOURCE ///// +////////////////////////////////////// + .factory('SessionStorage', [function () { var storageId='sessionStorage'; var session = JSON.parse(localStorage.getItem(storageId) || '{}'); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: improve load poll
by chorem.org scm June 18, 2014

June 18, 2014

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 d629debf1d12698a98f52cd2411e80c188a3f259 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 12:01:27 2014 +0200 improve load poll --- pollen-ui-angular/src/main/webapp/js/app.js | 6 +- .../src/main/webapp/js/controllers/pollCtrl.js | 137 +++++++++++---------- 2 files changed, 79 insertions(+), 64 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 1d31b79..726c14a 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -128,7 +128,11 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }); }); - ngModel.$render = function (value) { + ck.on('instanceReady', function() { + ck.setData(ngModel.$modelValue); + }); + + ngModel.$render = function(value) { ck.setData(ngModel.$modelValue); }; } 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 0f20f1c..9eecc06 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -24,8 +24,8 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', - ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', - function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route) { + ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', '$q', 'Poll', + function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -94,26 +94,47 @@ angular.module('pollControllers', []) $scope.data.poll = {}; if (angular.isDefined($routeParams.pollId)) { - var baseUrl = window.location.origin+window.location.pathname; - $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; - $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; - } - else { - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; - } + var pollDeferred = $q.defer(); + $scope.pollDeferred = pollDeferred; + Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { + $scope.data.poll = poll; + $scope.globalVariables.permission = poll.permission; + pollDeferred.resolve('read-write poll'); + }, function (error) { + Poll.get({pollId:$routeParams.pollId}, function (poll) { + $scope.data.poll = poll; + // clean permission + SessionStorage.remove('permission'); + delete $scope.globalVariables.permission; + + pollDeferred.resolve('read-only poll') + }, function (error) { + pollDeferred.reject(error); + }); + }); + + pollDeferred.promise.then(function () { + var baseUrl = window.location.origin+window.location.pathname; + $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; + $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; + } + else { + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; + } + }); } $scope.toHTML = function (data) { @@ -142,8 +163,7 @@ angular.module('pollControllers', []) else { $scope.inlineVersion(); } - } - initTemplateURL(); + }; initTemplateURL(); var lastRoute = $route.current; $scope.$on('$locationChangeSuccess', function(event) { @@ -567,13 +587,7 @@ angular.module('pollControllers', []) //////////////////////////////// var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - if (angular.isUndefined(poll.permission)) { - $location.path('/'); - } - $scope.data.poll = poll; - initVoterList(); - }); + initVoterList(); PollChoice.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}).$promise.then(function (choices) { $scope.data.choices = choices; @@ -594,8 +608,19 @@ angular.module('pollControllers', []) }) }) }); - } - initPoll(); + }; + $scope.pollDeferred.promise.then(function () { + if (angular.isDefined($scope.data.poll.permission)) { + initPoll(); + delete $scope.pollDeferred; + } else { + $location.path('/'); + } + }, function (error) { + $location.path('/'); + }); + + $scope.autoSavePoll = function () { $scope.savePoll(); @@ -638,10 +663,6 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('vote'); var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - $scope.data.poll = poll; - }); - PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; initVote(); @@ -754,10 +775,6 @@ angular.module('pollControllers', []) $scope.globalVariables.commentMode = true; - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { - $scope.data.poll = data; - }) - $scope.comment = {text:''}; var initAuthor = function () { if (angular.isDefined($scope.session.user)) { @@ -889,25 +906,26 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('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) { + var choicesDeferred = $q.defer(); + PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; - }).$promise; + choicesDeferred.resolve('choices load'); + }); - var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { + var votesDeferred = $q.defer(); + PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; - resultPromise.then(function () { + resultDeferred.promise.then(function () { $scope.data.result.nbVotant = $scope.data.votants.length; + votesDeferred.resolve('votes load'); }); - }).$promise; + }); - var resultPromise = Poll.result({pollId:$routeParams.pollId}, function (result) { + var resultDeferred = $q.defer(); + Poll.result({pollId:$routeParams.pollId}, function (result) { $scope.data.result = result; - choicesPromise.then(function () { + choicesDeferred.promise.then(function () { var scoresSorted = []; $scope.data.result.scoreTotal = 0; angular.forEach(result.scores, function(value, key) { @@ -924,10 +942,11 @@ angular.module('pollControllers', []) } }) $scope.data.result.scoresChart = scoresSorted; + resultDeferred.resolve('result load'); }); - }).$promise; + }); - votesPromise.then(function () { + votesDeferred.promise.then(function () { angular.forEach($scope.data.result.scoresChart, function (value, key) { value.push( Math.floor(value[1] * 100 / $scope.data.result.scoreTotal) + '% - '+value[1]+' Vote(s)'); }); @@ -954,15 +973,7 @@ angular.module('pollControllers', []) } var initPolls = function () { - var pollPromise; - if (angular.isDefined($routeParams.cmd)) { - pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; - } - else { - pollPromise = Poll.get({paginationParameter:paginationParameter}).$promise; - } - - pollPromise.then(function (data) { + Poll.get({paginationParameter:paginationParameter}, function (data) { $scope.data.polls = data.elements $scope.data.pollsPagination = data.pagination; }, function (error) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: improve load poll
by chorem.org scm June 18, 2014

June 18, 2014

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 914b05a691a008381d9e9220c6483df3333a19ee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 12:01:27 2014 +0200 improve load poll --- pollen-ui-angular/src/main/webapp/js/app.js | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 137 +++++++++++---------- 2 files changed, 76 insertions(+), 65 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 1d31b79..aea01ff 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -128,9 +128,9 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }); }); - ngModel.$render = function (value) { + ck.on('instanceReady', function() { ck.setData(ngModel.$modelValue); - }; + }); } }; }) 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 0f20f1c..9eecc06 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -24,8 +24,8 @@ angular.module('pollControllers', []) }]) .controller('PollCtrl', - ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', - function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route) { + ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', '$q', 'Poll', + function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route, $q, Poll) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -94,26 +94,47 @@ angular.module('pollControllers', []) $scope.data.poll = {}; if (angular.isDefined($routeParams.pollId)) { - var baseUrl = window.location.origin+window.location.pathname; - $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; - $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; - } - else { - $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; - $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; - } + var pollDeferred = $q.defer(); + $scope.pollDeferred = pollDeferred; + Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { + $scope.data.poll = poll; + $scope.globalVariables.permission = poll.permission; + pollDeferred.resolve('read-write poll'); + }, function (error) { + Poll.get({pollId:$routeParams.pollId}, function (poll) { + $scope.data.poll = poll; + // clean permission + SessionStorage.remove('permission'); + delete $scope.globalVariables.permission; + + pollDeferred.resolve('read-only poll') + }, function (error) { + pollDeferred.reject(error); + }); + }); + + pollDeferred.promise.then(function () { + var baseUrl = window.location.origin+window.location.pathname; + $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; + $scope.globalVariables.linkResult += '?token='+$scope.globalVariables.permission; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'&tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'&tab=participant'; + } + else { + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; + } + }); } $scope.toHTML = function (data) { @@ -142,8 +163,7 @@ angular.module('pollControllers', []) else { $scope.inlineVersion(); } - } - initTemplateURL(); + }; initTemplateURL(); var lastRoute = $route.current; $scope.$on('$locationChangeSuccess', function(event) { @@ -567,13 +587,7 @@ angular.module('pollControllers', []) //////////////////////////////// var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - if (angular.isUndefined(poll.permission)) { - $location.path('/'); - } - $scope.data.poll = poll; - initVoterList(); - }); + initVoterList(); PollChoice.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}).$promise.then(function (choices) { $scope.data.choices = choices; @@ -594,8 +608,19 @@ angular.module('pollControllers', []) }) }) }); - } - initPoll(); + }; + $scope.pollDeferred.promise.then(function () { + if (angular.isDefined($scope.data.poll.permission)) { + initPoll(); + delete $scope.pollDeferred; + } else { + $location.path('/'); + } + }, function (error) { + $location.path('/'); + }); + + $scope.autoSavePoll = function () { $scope.savePoll(); @@ -638,10 +663,6 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('vote'); var initPoll = function () { - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { - $scope.data.poll = poll; - }); - PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; initVote(); @@ -754,10 +775,6 @@ angular.module('pollControllers', []) $scope.globalVariables.commentMode = true; - Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { - $scope.data.poll = data; - }) - $scope.comment = {text:''}; var initAuthor = function () { if (angular.isDefined($scope.session.user)) { @@ -889,25 +906,26 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('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) { + var choicesDeferred = $q.defer(); + PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; - }).$promise; + choicesDeferred.resolve('choices load'); + }); - var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { + var votesDeferred = $q.defer(); + PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; - resultPromise.then(function () { + resultDeferred.promise.then(function () { $scope.data.result.nbVotant = $scope.data.votants.length; + votesDeferred.resolve('votes load'); }); - }).$promise; + }); - var resultPromise = Poll.result({pollId:$routeParams.pollId}, function (result) { + var resultDeferred = $q.defer(); + Poll.result({pollId:$routeParams.pollId}, function (result) { $scope.data.result = result; - choicesPromise.then(function () { + choicesDeferred.promise.then(function () { var scoresSorted = []; $scope.data.result.scoreTotal = 0; angular.forEach(result.scores, function(value, key) { @@ -924,10 +942,11 @@ angular.module('pollControllers', []) } }) $scope.data.result.scoresChart = scoresSorted; + resultDeferred.resolve('result load'); }); - }).$promise; + }); - votesPromise.then(function () { + votesDeferred.promise.then(function () { angular.forEach($scope.data.result.scoresChart, function (value, key) { value.push( Math.floor(value[1] * 100 / $scope.data.result.scoreTotal) + '% - '+value[1]+' Vote(s)'); }); @@ -954,15 +973,7 @@ angular.module('pollControllers', []) } var initPolls = function () { - var pollPromise; - if (angular.isDefined($routeParams.cmd)) { - pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; - } - else { - pollPromise = Poll.get({paginationParameter:paginationParameter}).$promise; - } - - pollPromise.then(function (data) { + Poll.get({paginationParameter:paginationParameter}, function (data) { $scope.data.polls = data.elements $scope.data.pollsPagination = data.pagination; }, function (error) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: fix : delete error value for Access-Control-Allow-Origin: *, *
by chorem.org scm June 18, 2014

June 18, 2014

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 c015c621f9ad511e5307dfd000d30aac3dc8c163 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 18 10:22:25 2014 +0200 fix : delete error value for Access-Control-Allow-Origin: *, * --- .../src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java index f95df3a..84ec254 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java @@ -55,8 +55,8 @@ public class PollenRestApiUtil { public static void prepareResponse(HttpContext context) { HttpServletResponse response = context.getResponse(); - response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*"); - response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); + response.setHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*"); + response.setHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0