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

05/05: delete vote
by chorem.org scm June 12, 2014

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

1 0

04/05: edit Vote
by chorem.org scm June 12, 2014

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

1 0

03/05: improvement delete comment
by chorem.org scm June 12, 2014

June 12, 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 0b552d95f3d8904f28d6bb376ccd059e7023ca47 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 12 17:27:17 2014 +0200 improvement delete comment --- pollen-ui-angular/src/main/webapp/css/style.css | 4 ++++ pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 11 +++++++++++ pollen-ui-angular/src/main/webapp/partials/poll-comment.html | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 6b8a543..11ae47b 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -210,6 +210,10 @@ i.icon-collapse { color: #a94442; } +.fakeLink { + cursor:pointer; +} + #comments { margin-top:30px; width:100%; 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 b6c1273..0388b6d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -803,8 +803,19 @@ angular.module('pollControllers', []) }).then( function () { var confirmDelete = confirm(confirmMessage); if (confirmDelete == true) { + // check if not on edit + if (comment.id == $scope.comment.id) { + //clean form + $scope.comment.text = ''; + delete $scope.comment.postDate; + delete $scope.comment.id; + delete $scope.comment.permission; + } + PollComment.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, commentId:comment.id}, function (data) { + // reload comments initComments().then(function () { + // if no comment then change page if it's possible if ($scope.data.comments.length == 0 && paginationParameter.pageNumber > 0) { // no comment and not the first page $scope.data.commentsPagination.currentPage = paginationParameter.pageNumber - 1; 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 cb1504a..381b03b 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -56,7 +56,8 @@ <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" ng-show="comment.id" ng-click="editPost(comment)"></i> <i class="glyphicon glyphicon-remove danger" ng-show="comment.id" ng-click="deletePost(comment)"></i> + <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> </td> <td> <div ng-bind-html="toHTML(comment.text)"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/05: delete member in voterList
by chorem.org scm June 12, 2014

June 12, 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 786d6c2840673c81abdc8715d13644748a4dcf7c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 12 16:51:35 2014 +0200 delete member in voterList --- pollen-ui-angular/src/main/webapp/css/style.css | 10 +++++++++- .../src/main/webapp/js/controllers/pollCtrl.js | 17 +++++++++++++++++ .../src/main/webapp/partials/poll-listParticipant.html | 10 +++++----- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 144f707..6b8a543 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -249,10 +249,18 @@ i.icon-collapse { border:1px solid #DDD; } -input[type=number] { +.voterList tr th.weight, .voterList tr td.weight { + width:92px; +} + +.voterList tr th.weight input, .voterList tr td.weight input { width:80px; } +.voterList tr td.action { + width:53px; +} + hr { border-top:1px solid #CCCCCC; } \ 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 26bea08..b6c1273 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -547,6 +547,23 @@ angular.module('pollControllers', []) } }; + $scope.deleteVoterListMember = function (member, 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) { + 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); + }); + } + }); + } + }; + //////////////////////////////// //// POLL ///// //////////////////////////////// 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 3a6cdf9..e36d9ee 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -39,22 +39,22 @@ <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 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> </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> <tr> <th> {{ 'poll.restricted.name' | translate }} </th> <th> {{ 'poll.restricted.mail' | translate }} </th> <th> {{ 'poll.restricted.weight' | translate }} </th> - <th> </th> + <th class="action"> </th> </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> <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> - <th> <div ng-show="member.id"><button class="btn btn-danger" disabled>X</button> </div></th> + <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> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/05: improvement auto-save, and add auto-save in poll-settings
by chorem.org scm June 12, 2014

June 12, 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 5230e07ed7ebcad55b26036e7dd5087595c6123a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 12 16:27:55 2014 +0200 improvement auto-save, and add auto-save in poll-settings --- pollen-ui-angular/src/main/webapp/js/app.js | 56 ++++++++++++------- .../src/main/webapp/js/controllers/pollCtrl.js | 18 ++++++- .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-settings.html | 63 +++++++++++----------- 4 files changed, 89 insertions(+), 50 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 102da70..e2e148f 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -175,19 +175,6 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC }; }) -.directive('inputError', function() { - return { - restrict:'A', - require: '?ngModel', - link: function (scope, element, attrs) { - element.bind('change', function () { - - }) - } - }; -}) - - .directive('selectOnClick', function () { return { restrict: 'A', @@ -203,12 +190,45 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC return { restrict : 'A', link : function (scope, element, attrs) { + 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); + + 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); + }, 500); + } + }; + element.bind('change', function () { - scope.$apply(function () { - $timeout(function() { - scope.$eval(attrs.autoSave); - }, 100); - }); + if (scope.timeout) { + $timeout.cancel(scope.timeout) + } + save(); + }); + + element.bind('blur', function () { + if (scope.timeout) { + $timeout.cancel(scope.timeout) + } + // timeout for conflit with event change + $timeout(save, 50); }); } } 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 4c4e66b..26bea08 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -330,6 +330,14 @@ angular.module('pollControllers', []) $scope.savePoll = function () { var poll = angular.copy($scope.data.poll); poll.choice = angular.copy($scope.data.choices); + + if (angular.isDate(poll.beginDate)) { + poll.beginDate = poll.beginDate.getTime(); + } + if (angular.isDate(poll.endDate)) { + poll.endDate = poll.endDate.getTime(); + } + Poll.add(poll, function (data) { SessionStorage.save({saved: true}); if ($scope.data.poll.pollType != 'FREE') { @@ -377,6 +385,7 @@ angular.module('pollControllers', []) } $scope.callBackEditChoice = function (choice) { + console.log('save choice'); PollChoice.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, choice, function() { delete choice.restError; $scope.globalVariables.saved = true; @@ -539,7 +548,7 @@ angular.module('pollControllers', []) }; //////////////////////////////// - //// INIT POLL ///// + //// POLL ///// //////////////////////////////// var initPoll = function () { @@ -578,6 +587,13 @@ angular.module('pollControllers', []) }; $scope.savePoll = function () { + if (angular.isDate($scope.data.poll.beginDate)) { + $scope.data.poll.beginDate = $scope.data.poll.beginDate.getTime(); + } + if (angular.isDate($scope.data.poll.endDate)) { + $scope.data.poll.endDate = $scope.data.poll.endDate.getTime(); + } + $scope.data.poll.$update({permission:$scope.globalVariables.permission}, function (data) { $scope.globalVariables.saved = true; }, function (error) { 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 90e2ca2..cb1504a 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -22,7 +22,7 @@ <h2>{{ 'title.comment' | translate }}</h2>  - <form class="form-horizontal" ng-submit="postComment()"> + <form class="form-horizontal" ng-submit="postComment()" novalidate> <div class="form-group"> <label class="col-sm-2"> {{ 'user.name' | translate }} </label> <div class="col-sm-1"> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html index ed890b0..0f277d5 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -19,7 +19,7 @@ #L% --> -<form class="form-horizontal"> +<form class="form-horizontal" novalidate> <h4>Confiuration global</h4> <div class="form-group"> @@ -31,8 +31,9 @@ max-date="data.poll.endDate" ng-model="data.poll.beginDate" is-open="beginDateOpened" - ng-click="beginDateOpened = true" /> - </div> + ng-click="beginDateOpened = true" + auto-save="autoSavePoll()" /> + </div> </div> <div class="form-group"> @@ -43,16 +44,17 @@ min-date="data.poll.beginDate" ng-model="data.poll.endDate" is-open="endDateOpened" - ng-click="endDateOpened = true" /> + ng-click="endDateOpened = true" + auto-save="autoSavePoll()" /> </div> </div> <div class="form-group"> <label class="col-sm-4 control-label">Résultat : </label> <div class="col-sm-8"> - <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="EVERYBODY" /> Public</label> - <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="VOTER" /> Participants</label> - <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="CREATOR" /> Créateur</label> + <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="EVERYBODY" auto-save="autoSavePoll()" /> Public</label> + <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="VOTER" auto-save="autoSavePoll()" /> Participants</label> + <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="CREATOR" auto-save="autoSavePoll()" /> Créateur</label> </div> <!-- <div class="col-sm-8 btn-group"> @@ -66,8 +68,8 @@ <div class="form-group"> <label class="col-sm-4 control-label">Résultat continue : </label> <div class="col-sm-8 btn-group"> - <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="true">Oui</button> - <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="false">Non</button> + <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="true" auto-save="autoSavePoll()" >Oui</button> + <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="false" auto-save="autoSavePoll()" >Non</button> </div> </div> @@ -76,8 +78,8 @@ <div class="form-group"> <label class="col-sm-4 control-label">Ajout de choix par les votants :</label> <div class="col-sm-8 btn-group"> - <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="true">Oui</button> - <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="false">Non</button> + <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="true" auto-save="autoSavePoll()" >Oui</button> + <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="false" auto-save="autoSavePoll()" >Non</button> </div> </div> @@ -90,7 +92,8 @@ max-date="data.poll.endChoiceDate" ng-model="data.poll.beginChoiceDate" is-open="beginChoiceDateOpened" - ng-click="beginChoiceDateOpened = true" /> + ng-click="beginChoiceDateOpened = true" + auto-save="autoSavePoll()" /> </div> </div> <div class="form-group" ng-if="data.poll.choiceAddAllowed" for="endChoiceDate"> @@ -100,24 +103,24 @@ datepicker-popup="dd/MM/yyyy" min-date="data.poll.beginChoiceDate" max-date="data.poll.endDate" - ng-model="data.poll.endChoiceDate" is-open="endChoiceDateOpened" - ng-click="endChoiceDateOpened = true" /> + ng-click="endChoiceDateOpened = true" + auto-save="autoSavePoll()" /> </div> </div> <div class="form-group"> <label class="col-sm-4 control-label">Limiter les votes :</label> <div class="col-sm-8 btn-group"> - <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="true">Oui</button> - <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="false">Non</button> + <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="true" auto-save="autoSavePoll()">Oui</button> + <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="false" auto-save="autoSavePoll()">Non</button> </div> </div> <div class="form-group" ng-show="data.poll.limitedVote"> <label class="col-sm-4 control-label" for="popMaxChoiceNumber">Nombre de vote :</label> <div class="col-sm-6"> - <input type="text" class="form-control" id="popMaxChoiceNumber" ng-model="data.poll.maxChoiceNumber"/> + <input type="text" class="form-control" id="popMaxChoiceNumber" ng-model="data.poll.maxChoiceNumber" auto-save="autoSavePoll()" /> </div> </div> @@ -127,13 +130,13 @@ <label class="col-sm-4 control-label">Type : </label> <div class="col-sm-8"> <div class="btn-group"> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="1">Normal</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="2">Pourcentage</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="3">Condorcet</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="4">Nombre</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="5">Borda</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="6">Vote alternatif</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="7">Coombs</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="1" auto-save="autoSavePoll()">Normal</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="2" auto-save="autoSavePoll()">Pourcentage</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="3" auto-save="autoSavePoll()">Condorcet</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="4" auto-save="autoSavePoll()">Nombre</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="5" auto-save="autoSavePoll()">Borda</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="6" auto-save="autoSavePoll()">Vote alternatif</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="7" auto-save="autoSavePoll()">Coombs</button> </div> <p>Description du types de vote</p> </div> @@ -142,18 +145,18 @@ <div class="form-group"> <label class="col-sm-4 control-label">Visibilité : </label> <div class="col-sm-8 btn-group"> - <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'EVERYBODY'">Public</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'VOTER'">Participants</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'CREATOR'">Créateur</button> - <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'ANONYMOUS'">Anonyme</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" auto-save="autoSavePoll()" btn-radio="'EVERYBODY'">Public</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" auto-save="autoSavePoll()" btn-radio="'VOTER'">Participants</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" auto-save="autoSavePoll()" btn-radio="'CREATOR'">Créateur</button> + <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" auto-save="autoSavePoll()" btn-radio="'ANONYMOUS'">Anonyme</button> </div> </div> <div class="form-group"> <label class="col-sm-4 control-label">Autoriser les votes anonymes :</label> <div class="col-sm-8 btn-group"> - <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="true">Oui</button> - <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="false">Non</button> + <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="true" auto-save="autoSavePoll()">Oui</button> + <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="false" auto-save="autoSavePoll()">Non</button> </div> </div> </form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: Change version ToPIA to 3.0-beta-5
by chorem.org scm June 12, 2014

June 12, 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 8a70503693798450f94598957538c34f011a38d7 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jun 12 10:14:15 2014 +0200 Change version ToPIA to 3.0-beta-5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 793d363..f12ea9f 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ <nuitonI18nVersion>3.1</nuitonI18nVersion> <eugenePluginVersion>2.10</eugenePluginVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-beta-5</topiaVersion> <nuitonWebVersion>1.17-SNAPSHOT</nuitonWebVersion> <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: delete comment
by chorem.org scm June 11, 2014

June 11, 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 5dc6870de2da8ef7b26973d06fb7bd0f3fae6dab Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 11 15:53:17 2014 +0200 delete comment --- .../src/main/webapp/js/controllers/pollCtrl.js | 24 ++++++++++++++++++++-- .../src/main/webapp/partials/poll-settings.html | 3 ++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 0ba25a4..4c4e66b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -657,8 +657,8 @@ angular.module('pollControllers', []) }]) .controller('PollCommentCtrl', - ['$scope', '$controller', '$routeParams', 'Poll', 'PollComment', - function ( $scope, $controller, $routeParams, Poll, PollComment ) { + ['$scope', '$controller', '$routeParams', 'Poll', 'PollComment', '$translate', + function ( $scope, $controller, $routeParams, Poll, PollComment, $translate) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('comment'); @@ -762,6 +762,26 @@ angular.module('pollControllers', []) $scope.comment = angular.copy(comment); $scope.comment.page = paginationParameter.pageNumber; } + + $scope.deletePost = function (comment) { + var confirmMessage; + $translate('action.message.confirmDelete').then(function (msg) { + confirmMessage = msg; + }).then( function () { + var confirmDelete = confirm(confirmMessage); + if (confirmDelete == true) { + PollComment.remove({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, commentId:comment.id}, function (data) { + initComments().then(function () { + if ($scope.data.comments.length == 0 && paginationParameter.pageNumber > 0) { + // no comment and not the first page + $scope.data.commentsPagination.currentPage = paginationParameter.pageNumber - 1; + } + }); + }); + } + }); + } + }]) .controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html index 590a527..ed890b0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -19,7 +19,7 @@ #L% --> - +<form class="form-horizontal"> <h4>Confiuration global</h4> <div class="form-group"> @@ -156,3 +156,4 @@ <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="false">Non</button> </div> </div> +</form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: edit comment
by chorem.org scm June 11, 2014

June 11, 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 3bf4a58ddf9791d3212e3751b7f9076379a6d516 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 11 15:21:43 2014 +0200 edit comment --- .../src/main/webapp/js/controllers/pollCtrl.js | 82 +++++++++++++--------- .../src/main/webapp/partials/poll-comment.html | 12 ++-- .../src/main/webapp/partials/poll.html | 4 +- 3 files changed, 60 insertions(+), 38 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 72bc2ae..0ba25a4 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -661,24 +661,25 @@ angular.module('pollControllers', []) function ( $scope, $controller, $routeParams, Poll, PollComment ) { $controller('PollCtrl', {$scope:$scope}); + $scope.tab = $scope.setTab('comment'); + $scope.globalVariables.commentMode = true; Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { $scope.data.poll = data; }) - $scope.tab = $scope.setTab('comment'); - $scope.comment = {text:''}; - - if (angular.isDefined($scope.session.user)) { - if (angular.isDefined($scope.session.user.name)) { - $scope.comment.authorName = $scope.session.user.name; - } - else { - $scope.comment.authorName = $scope.session.user.login; + var initAuthor = function () { + if (angular.isDefined($scope.session.user)) { + if (angular.isDefined($scope.session.user.name)) { + $scope.comment.authorName = $scope.session.user.name; + } + else { + $scope.comment.authorName = $scope.session.user.login; + } } - } + }; initAuthor(); $scope.pageSize = conf.commentDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); @@ -712,29 +713,41 @@ angular.module('pollControllers', []) }); $scope.postComment = function () { - PollComment.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, $scope.comment, function (data) { - $scope.globalVariables.saved = true; - - // add ID and Permission and push in list of comments - $scope.comment.id = data.id; - $scope.comment.permission = data.permission; - $scope.comment.postDate = new Date(); - - // reload comments - if ($scope.data.commentsPagination.desc) { - // change pageNumber without reload - paginationParameter.pageNumber = 0; - // reload + var commentPromise + if (angular.isDefined($scope.comment.id)) { + // edit + commentPromise = PollComment.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, $scope.comment, function (data) { + paginationParameter.pageNumber = $scope.comment.page; initComments(); - } else { - // change pageNumber without reload - paginationParameter.pageNumber = $scope.data.commentsPagination.lastPage; - // reload and check the last page. - initComments().then( function () { - $scope.data.commentsPagination.currentPage = $scope.data.commentsPagination.lastPage; - }); - } + initAuthor(); + }).$promise; + } else { + //Add + commentPromise = PollComment.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, $scope.comment, function (data) { + // add ID and Permission and push in list of comments + $scope.comment.id = data.id; + $scope.comment.permission = data.permission; + $scope.comment.postDate = new Date(); + + // reload comments + if ($scope.data.commentsPagination.desc) { + // change pageNumber without reload + paginationParameter.pageNumber = 0; + // reload + initComments(); + } else { + // change pageNumber without reload + paginationParameter.pageNumber = $scope.data.commentsPagination.lastPage; + // reload and check the last page. + initComments().then( function () { + $scope.data.commentsPagination.currentPage = $scope.data.commentsPagination.lastPage; + }); + } + }).$promise; + } + commentPromise.then(function () { + $scope.globalVariables.saved = true; //clean form $scope.comment.text = ''; delete $scope.comment.postDate; @@ -742,8 +755,13 @@ angular.module('pollControllers', []) delete $scope.comment.permission; }, function (error) { $scope.restError = error.data; - }); + }) }; + + $scope.editPost = function (comment) { + $scope.comment = angular.copy(comment); + $scope.comment.page = paginationParameter.pageNumber; + } }]) .controller('PollResultCtrl', ['$scope', '$q', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $controller, $routeParams, Poll, PollChoice, PollVote) { 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 d10bf4f..90e2ca2 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<div ng-controller="PollCommentCtrl"> +<div> <h2>{{ 'title.comment' | translate }}</h2>  - <form ng-submit="postComment()"> + <form class="form-horizontal" ng-submit="postComment()"> <div class="form-group"> <label class="col-sm-2"> {{ 'user.name' | translate }} </label> <div class="col-sm-1"> @@ -42,7 +42,10 @@ </div> <div class="form-group"> - <button type="submit" class="btn btn-primary" ng-click="postComment()">{{ 'action.comment' | translate }}</button> + <div class="col-sm-3"> </div> + <div class="col-sm-9"> + <input type="submit" class="btn btn-primary" value="{{ 'action.comment' | translate }}" /> + </div> </div> </form>  @@ -52,7 +55,8 @@ <tr ng-repeat="comment in data.comments"> <td> <i class="glyphicon glyphicon-user"></i>{{comment.authorName}}<br/> - <i class="glyphicon glyphicon-calendar"></i>{{comment.postDate | date:'dd/MM/yyyy HH:mm'}} + <i class="glyphicon glyphicon-calendar"></i>{{comment.postDate | date:globalVariables.dateFormat}}<br/> + <i class="glyphicon glyphicon-pencil" ng-show="comment.id" ng-click="editPost(comment)"></i> <i class="glyphicon glyphicon-remove danger" ng-show="comment.id" ng-click="deletePost(comment)"></i> </td> <td> <div ng-bind-html="toHTML(comment.text)"></div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 888b3f1..87315b2 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<form class="form-horizontal" novalidate> +<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> @@ -47,4 +47,4 @@ <div ng-include="'./partials/poll-listParticipant.html'" ng-if="tab == 'participant'"></div> -</form> \ No newline at end of file +</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/03: clean template
by chorem.org scm June 11, 2014

June 11, 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 7e785f1216d433c1f9a465b5d0b4ee8bda807edc Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 11 12:24:20 2014 +0200 clean template --- .../src/main/webapp/partials/poll-poll.html | 58 ++++++++++++++++++++++ .../src/main/webapp/partials/poll.html | 47 ++---------------- 2 files changed, 62 insertions(+), 43 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-poll.html b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html new file mode 100644 index 0000000..d9eec6d --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/poll-poll.html @@ -0,0 +1,58 @@ + +<div class="pollTitle" edit-me="showEditTitle"> + <h1 ng-hide="showEditTitle"> + {{data.poll.title || 'poll.edit' | translate }} + <info-error error="restError.title[0]" data="data.poll.title"></info-error> + </h1> + + <h1 ng-show="showEditTitle"> + <input type="text" class="form-control" focus-me="showEditTitle" ng-model="data.poll.title" ng-exit="showEditTitle = false" auto-save="autoSavePoll()" required/> + </h1> +</div> + +<div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc"> + <div ng-bind-html="toHTML(data.poll.description)"></div> + <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> + +  + <button type="button" class="btn btn-primary" ng-click="showEditDesc = false;" ng-show="globalVariables.create">{{ 'action.return' | translate }}</button> + <button type="button" class="btn btn-primary" ng-click="showEditDesc = false; savePoll()" ng-show="globalVariables.edit">{{ 'action.return' | translate }}</button> +</div> + +<div id="poll"> + + <div ng-include="templateURL"></div> + +</div> + +<div ng-if="globalVariables.create"> + <hr/> + <button class="btn btn-primary" ng-click="savePoll()">{{ 'action.save' | translate }}</button> +</div> + +<div ng-if="globalVariables.edit"> + <hr/> + <button class="btn btn-danger" ng-click="deletePoll();">{{ 'action.delete' | translate }}</button> +</div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 4f4517c..888b3f1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -35,52 +35,13 @@ <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkParticipant || '#/poll/create?tab=participant'}}" ng-click="tab = 'participant'">{{ 'poll.tab.participant' | translate }}</a></li> </ul> -<div ng-include="'partials/poll-link.html'" ng-if="tab == 'home'"></div> + <div ng-include="'./partials/poll-link.html'" ng-if="tab == 'home'"></div> -<div ng-if="tab == 'edit' || tab == 'vote'"> - <div class="pollTitle" edit-me="showEditTitle"> - <h1 ng-hide="showEditTitle"> - {{data.poll.title || 'poll.edit' | translate }} - <info-error error="restError.title[0]" data="data.poll.title"></info-error> - </h1> + <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'edit' || tab == 'vote'"></div> - <h1 ng-show="showEditTitle"> - <input type="text" class="form-control" focus-me="showEditTitle" ng-model="data.poll.title" ng-exit="showEditTitle = false" auto-save="autoSavePoll()" required/> - </h1> - </div> + <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'"></div> - <div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc"> - <div ng-bind-html="toHTML(data.poll.description)"></div> - <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> - -  - <button type="button" class="btn btn-primary" ng-click="showEditDesc = false;" ng-show="globalVariables.create">{{ 'action.return' | translate }}</button> - <button type="button" class="btn btn-primary" ng-click="showEditDesc = false; savePoll()" ng-show="globalVariables.edit">{{ 'action.return' | translate }}</button> - </div> - - <div id="poll"> - - <div ng-include="templateURL"></div> - - </div> - - <div ng-if="globalVariables.create"> - <hr/> - <button class="btn btn-primary" ng-click="savePoll()">{{ 'action.save' | translate }}</button> - </div> - - <div ng-if="globalVariables.edit"> - <hr/> - <button class="btn btn-danger" ng-click="deletePoll();">{{ 'action.delete' | translate }}</button> - </div> -</div> - - <div ng-include="'partials/poll-settings.html'" ng-if="tab == 'conf'"></div> - - <div ng-include="'partials/poll-comment.html'" ng-if="tab == 'comment'"></div> + <div ng-include="'./partials/poll-comment.html'" ng-if="tab == 'comment'"></div> <div ng-include="'./partials/poll-result.html'" ng-if="tab == 'result'"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: edit user password, change Auto-save,
by chorem.org scm June 11, 2014

June 11, 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 d37923e815a35900fa7c3f63d24ce503b63db0c5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jun 11 11:47:42 2014 +0200 edit user password, change Auto-save, --- pollen-rest-api/src/main/resources/mapping | 2 + pollen-ui-angular/src/main/webapp/css/style.css | 4 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 2 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 + pollen-ui-angular/src/main/webapp/js/app.js | 12 ++--- .../src/main/webapp/js/controllers/pollCtrl.js | 26 +++++----- .../src/main/webapp/js/controllers/userCtrl.js | 11 ++++ pollen-ui-angular/src/main/webapp/js/services.js | 8 +++ .../main/webapp/partials/poll-listParticipant.html | 6 +-- .../src/main/webapp/partials/poll.html | 10 ++-- .../src/main/webapp/partials/user-edit.html | 58 ++++++++++++++++++---- 11 files changed, 104 insertions(+), 37 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 7276722..661740f 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -40,6 +40,7 @@ org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException org.chorem.pollen.services.service.security.PollenUnauthorizedException ErrorAction.on403 org.chorem.pollen.services.service.security.PollenInvalidPermissionException ErrorAction.on403 org.chorem.pollen.services.service.security.PollenInvalidEmailActivationTokenException ErrorAction.on403 +org.chorem.pollen.services.service.security.PollenInvalidPasswordException ErrorAction.on400Form org.chorem.pollen.services.service.InvalidFormException ErrorAction.on400Form org.nuiton.topia.persistence.TopiaNoResultException ErrorAction.on404 org.chorem.pollen.services.service.InvalidEntityLinkException ErrorAction.on404 @@ -119,6 +120,7 @@ GET /v1/users PollenUserApi.getUsers GET /v1/users/{userId} PollenUserApi.getUser POST /v1/users PollenUserApi.createUser PUT,POST /v1/users/{userId} PollenUserApi.editUser +PUT,POST /v1/users/{userId}/password PollenUserApi.changePassword DELETE /v1/users/{userId} PollenUserApi.deleteUser PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 36a52f2..144f707 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -251,4 +251,8 @@ i.icon-collapse { input[type=number] { width:80px; +} + +hr { + border-top:1px solid #CCCCCC; } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 17ac768..00ee69b 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -21,6 +21,8 @@ var translateEN = { 'user.mail' : 'e-mail', 'user.password' : 'Password', 'user.password2' : 'Confirm', +'user.passwordNew' : 'New password', +'user.passwordCurrent' : 'Current password', 'user.rememberMe' : 'Remember Me', 'user.forgotPassword' : 'Forgot Password', 'user.register.success' : 'Register with success', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 4978334..78f9297 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -21,6 +21,8 @@ var translateFR = { 'user.mail' : 'Courriel', 'user.password' : 'Mot de passe', 'user.password2' : 'Confirmation', +'user.passwordNew' : 'Nouveau Mot de passe', +'user.passwordCurrent' : 'Mot de passe Actuel', 'user.rememberMe' : 'Connexion automatique', 'user.forgotPassword' : 'Mot de passe oublié', 'user.register.success' : 'Compte enregisté, un mail de validation vient d\'être envoyé..', diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 11774ca..102da70 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -204,13 +204,11 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC restrict : 'A', link : function (scope, element, attrs) { element.bind('change', function () { - if (scope.globalVariables.edit) { - scope.$apply(function () { - $timeout(function() { - scope.$eval(attrs.autoSave); - },100); - }); - } + scope.$apply(function () { + $timeout(function() { + scope.$eval(attrs.autoSave); + }, 100); + }); }); } } 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 8ce5be8..72bc2ae 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', - function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate) { + ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', '$translate', '$route', + function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage, $translate, $route) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -145,10 +145,16 @@ angular.module('pollControllers', []) } initTemplateURL(); -}]) + var lastRoute = $route.current; + $scope.$on('$locationChangeSuccess', function(event) { + if (lastRoute.$$route.controller == $route.current.$$route.controller) { + $route.current = lastRoute; + } + }); +}]) -.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', '$route', function ($scope, $controller, $modal, $timeout, $routeParams, $route) { +.controller('PollAdminCtrl', ['$scope', '$controller', '$modal', '$timeout', '$routeParams', function ($scope, $controller, $modal, $timeout, $routeParams) { $controller('PollCtrl', {$scope:$scope}); $scope.tab = $scope.setTab('edit'); @@ -159,14 +165,6 @@ angular.module('pollControllers', []) $scope.globalVariables.lastDate = new Date(); $scope.restError = {}; - - var lastRoute = $route.current; - $scope.$on('$locationChangeSuccess', function(event) { - if (lastRoute.$$route.controller == $route.current.$$route.controller) { - $route.current = lastRoute; - } - }); - //////////////////////////////// //// VOTER LIST ///// //////////////////////////////// @@ -575,6 +573,10 @@ angular.module('pollControllers', []) } initPoll(); + $scope.autoSavePoll = function () { + $scope.savePoll(); + }; + $scope.savePoll = function () { $scope.data.poll.$update({permission:$scope.globalVariables.permission}, function (data) { $scope.globalVariables.saved = true; 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 d9afb8b..8a3c40d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -73,6 +73,17 @@ $scope.restError = error.data; }); } + + $scope.editPassword = function () { + if ($scope.currentUser.newPassword == $scope.currentUser.newPassword2) { + User.editPassword($scope.currentUser, function (data) { + SessionStorage.save({user:data}); + $scope.saved = true; + }, function (error) { + $scope.restError = error.data; + }); + } + } }]) .controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', '$translate', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location, $translate) { diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 1252fad..3a82d25 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -179,6 +179,14 @@ angular.module('pollenServices', ['ngResource']) transformRequest : function (data, headersGetter) { return transformParam(data); } + }, + 'editPassword' : { + method:'POST', + url: conf.restURL+'/users/:userId/password', + transformRequest : function (data, headersGetter) { + return 'oldPassword='+encodeURIComponent(data.password)+ + '&newPassword='+encodeURIComponent(data.newPassword); + } } } ); 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 b0ae0db..3a6cdf9 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -21,15 +21,15 @@ <h2>{{ 'poll.restricted.pollType' | translate }}</h2> <div> <label for="formFree"> - <input type="radio" ng-model="data.poll.pollType" name="type" value="FREE" id="formFree" auto-save="savePoll()"/> + <input type="radio" ng-model="data.poll.pollType" name="type" value="FREE" id="formFree" auto-save="autoSavePoll()"/> {{ 'poll.restricted.free' | translate }} </label> <label for="formRestricted"> - <input type="radio" ng-model="data.poll.pollType" name="type" value="RESTRICTED" id="formRestricted" auto-save="savePoll()"/> + <input type="radio" ng-model="data.poll.pollType" name="type" value="RESTRICTED" id="formRestricted" auto-save="autoSavePoll()"/> {{ 'poll.restricted.restricted' | translate }} </label> <label for="formGroup"> - <input type="radio" ng-model="data.poll.pollType" name="type" value="GROUP" id="formGroup" auto-save="savePoll()"/> + <input type="radio" ng-model="data.poll.pollType" name="type" value="GROUP" id="formGroup" auto-save="autoSavePoll()"/> {{ 'poll.restricted.group' | translate }} </label> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 047c09b..4f4517c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -25,10 +25,10 @@ <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"> <span class="glyphicon glyphicon-home"></span> </a></li> - <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}">{{ 'poll.tab.vote' | translate }}</a></li> - <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}">{{ 'poll.tab.comment' | translate }}</a></li> - <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}">{{ 'poll.tab.result' | translate }}</a></li> + <li ng-class="{active: tab == 'home'}"><a href="{{urlTab}}tab=home" ng-click="tab = 'home'"> <span class="glyphicon glyphicon-home"></span> </a></li> + <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}" ng-click="tab = 'vote'">{{ 'poll.tab.vote' | translate }}</a></li> + <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}" ng-click="tab = 'comment'">{{ 'poll.tab.comment' | translate }}</a></li> + <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}" ng-click="tab = 'result'">{{ 'poll.tab.result' | translate }}</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create" ng-click="tab = 'edit'">{{ 'poll.tab.create' | translate }}</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}" ng-click="tab = 'edit'">{{ 'poll.tab.edit' | translate }}</a></li> <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkConf || '#/poll/create?tab=conf'}}" ng-click="tab = 'conf'">{{ 'poll.tab.conf' | translate }}</a></li> @@ -45,7 +45,7 @@ </h1> <h1 ng-show="showEditTitle"> - <input type="text" class="form-control" focus-me="showEditTitle" ng-model="data.poll.title" ng-exit="showEditTitle = false" auto-save="savePoll()" required/> + <input type="text" class="form-control" focus-me="showEditTitle" ng-model="data.poll.title" ng-exit="showEditTitle = false" auto-save="autoSavePoll()" required/> </h1> </div> 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 a0d1b68..ccb0ae2 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -28,7 +28,7 @@ {{ 'user.name' | translate }} </label> <div class="col-sm-6"> - <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/> + <input type="text" id="formName" class="form-control" ng-model="currentUser.name" auto-save="editUser()" /> </div> <div class="col-sm-1"> </div> @@ -41,7 +41,7 @@ </label> <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email"/> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email" auto-save="editUser()" /> </div> <div class="col-sm-1"> <info-error error="restError.email[0]" data="currentUser.email"></info-error> @@ -50,21 +50,59 @@ <div class="control-group"> <label for="formPassword" class="col-sm-5 text-right control-label"> - {{ 'user.password' | translate }} + {{ 'user.passwordCurrent' | translate }} </label> <div class="col-sm-6"> - <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/> + <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password" auto-save="editUser()" /> </div> <div class="col-sm-1"> <info-error error="restError.password[0]" data="currentUser.password"></info-error> </div> </div> +</form> + + +<div> + <div class="col-sm-2"></div> + <div class="col-sm-9"><hr/></div> + <div class="col-sm-1"></div> +</div> + +<form class="horizontal-form" ng-submit="editPassword()"> <div class="control-group"> - <div class="col-sm-5"></div> - <div class="col-sm-6"> - <button class="btn btn-primary" type="submit">{{ 'action.send' | translate }} </button> - </div> - <div class="col-sm-1"></div> + <label for="formCurrentPassword" class="col-sm-5 text-right control-label"> + {{ 'user.passwordCurrent' | translate }} + </label> + <div class="col-sm-6"> + <input type="password" id="formCurrentPassword" class="form-control" ng-model="currentUser.password" /> + </div> + <div class="col-sm-1"> + <info-error error="restError.password[0]" data="currentUser.password"></info-error> + </div> + </div> + + <div class="control-group"> + <label for="formNewPassword" class="col-sm-5 text-right control-label"> + {{ 'user.passwordNew' | translate }} + </label> + <div class="col-sm-6"> + <input type="password" id="formNewPassword" class="form-control" ng-model="currentUser.newPassword" auto-save="editPassword()"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.newPassword[0]" data="currentUser.newPassword"></info-error> + </div> + </div> + + <div class="control-group"> + <label for="formNewPassword2" class="col-sm-5 text-right control-label"> + {{ 'user.password2' | translate }} + </label> + <div class="col-sm-6"> + <input type="password" id="formNewPassword2" class="form-control" ng-model="currentUser.newPassword2" auto-save="editPassword()"/> + </div> + <div class="col-sm-1"> + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="{{ 'user.error.password.diff' | translate }}" ng-if="currentUser.newPassword != currentUser.newPassword2"></span> + </div> </div> -</form> \ No newline at end of file +</form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0