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

01/01: update directive autoSave
by chorem.org scm 10 Jun '14

10 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit f3a179e84eb61dde5c6f7963b86a38929dc5b1f4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 10 18:10:34 2014 +0200 update directive autoSave --- pollen-ui-angular/src/main/webapp/js/app.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 3763db6..11774ca 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -203,16 +203,12 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC return { restrict : 'A', link : function (scope, element, attrs) { - var oldValue = null; - element.bind('focus', function () { - scope.$apply(function () { - oldValue = element.val(); - }); - }); - element.bind('blur', function () { - if (element.val() != oldValue && scope.globalVariables.edit) { + element.bind('change', function () { + if (scope.globalVariables.edit) { scope.$apply(function () { - scope.$eval(attrs.autoSave); + $timeout(function() { + scope.$eval(attrs.autoSave); + },100); }); } }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: Add and Delete voterList
by chorem.org scm 10 Jun '14

10 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit c9320592ddb5509e503937f8aa4baa8d1df690ab Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 10 17:49:34 2014 +0200 Add and Delete voterList --- pollen-ui-angular/src/main/webapp/css/style.css | 4 + pollen-ui-angular/src/main/webapp/i18n/en.js | 8 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 17 +++- .../src/main/webapp/js/controllers/pollCtrl.js | 113 +++++++++++++++------ pollen-ui-angular/src/main/webapp/js/services.js | 3 +- .../main/webapp/partials/poll-listParticipant.html | 25 +++-- 6 files changed, 123 insertions(+), 47 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index ce7e00d..36a52f2 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -247,4 +247,8 @@ i.icon-collapse { padding-left:5px; padding-right:5px; border:1px solid #DDD; +} + +input[type=number] { + width:80px; } \ 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 39d30a4..17ac768 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -70,6 +70,14 @@ 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.notify' : 'Notify', + +'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 7dc335c..4978334 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -47,7 +47,7 @@ var translateFR = { 'poll.saved' : 'Sondage sauvegardé', 'poll.restricted.name' : 'Nom du votant', 'poll.restricted.mail' : 'Courriel du votant', -'poll.restricted.weight' : 'Poids du votant', +'poll.restricted.weight' : 'Poids', 'poll.restricted.free' : 'Libre', 'poll.restricted.restricted' : 'Restreint', 'poll.restricted.group' : 'Groupe', @@ -58,17 +58,24 @@ var translateFR = { 'comment' : 'Commentaire', 'comment.added' : 'Commentaire effectué', -'action.logout' : 'Deconnexion', -'action.login' : 'Connexion', +'action.logout' : 'Se Deconnecter', +'action.login' : 'Se Connecter', 'action.register' : 'S\'enregistrer', -'action.recovered' : 'Récupéré', -'action.send' : 'Envoyé', +'action.recovered' : 'Récupérer', +'action.send' : 'Envoyer', 'action.return' : 'Retour', 'action.cancel' : 'Annuler', 'action.save' : 'Sauvegarder', 'action.delete' : 'Supprimer', 'action.vote' : 'Voter', 'action.comment' : 'Commenter', +'action.restricted.addVoter' : 'Ajouter un Votant', +'action.restricted.deleteVoter' : 'Supprimer un Votant', +'action.restricted.addGroup' : 'Ajouter un Groupe de Votant', +'action.restricted.deleteGroup' : 'Supprimer un Groupe de Votant', +'action.restricted.notify' : 'Envoyer un mail', + +'action.message.confirmDelete' : 'Êtes vous sûr de vouloir le supprimer?', 'dateFormat' : 'dd/MM/yyyy', 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 e13a381..8ce5be8 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -19,7 +19,8 @@ * #L% */ angular.module('pollControllers', []) -.controller('HomeCtrl', ['$scope', function ($scope) { +.controller('HomeCtrl', ['$scope', 'Poll', function ($scope, Poll) { + Poll.skeletonNew(); }]) .controller('PollCtrl', @@ -357,8 +358,8 @@ angular.module('pollControllers', []) }]) -.controller('PollEditCtrl', ['$scope', '$controller', '$routeParams', '$location', '$timeout', 'Poll', 'PollChoice', 'PollVote', 'PollVoterList', 'PollVoterListMember', 'SessionStorage', - function ( $scope, $controller, $routeParams, $location, $timeout, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember, SessionStorage) { +.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('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.edit = true; @@ -428,7 +429,9 @@ angular.module('pollControllers', []) $scope.data.voterList = []; angular.forEach(voterList, function (list) { PollVoterListMember.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId: list.id}, function (voterListMember) { - $scope.data.voterList.push({group:list, members:voterListMember}); + var newVoterList = {group:list, members:voterListMember}; + $scope.data.voterList.push(newVoterList); + $scope.addVoter($scope.data.voterList.indexOf(newVoterList)); }) }) } @@ -440,56 +443,102 @@ angular.module('pollControllers', []) $scope.saveVoterList = function (voterList) { if (angular.isDefined(voterList.group.id)) { console.log(voterList); - PollVoterList.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, voterList.group, function (data) { + PollVoterList.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:voterList.group.id}, voterList.group, function (data) { $scope.globalVariables.saved = true; delete voterList.group.restError; }, function (error) { voterList.group.restError = error.data; }); - } else { + } else { // new group // set default name for restricted poll type if ($scope.data.poll.pollType == 'RESTRICTED') { voterList.group.name = 'restricted'; } var vl = {group: voterList.group, members:[]}; - angular.forEach(value.members, function(member, key) { + angular.forEach(voterList.members, function(member, key) { if (member.name != '' || member.email != '') { vl.members.push(member); } }); - PollVoterList.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, vl, function (data) { - $scope.globalVariables.saved = true; - voterList.group.id = data.id; - delete voterList.group.restError; - }, function (error) { - voterList.group.restError = error.data.group; - }); + if (vl.members.length > 0) { + PollVoterList.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, vl, function (data) { + $scope.globalVariables.saved = true; + voterList.group.id = data.id; + 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)); + }); + }, 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; + } + }); + }); + } } }; - $scope.saveVoterListMember = function (member, vlId) { - var vlMemberPromise; - if (angular.isDefined(vlId)) { - if (angular.isDefined(member.id)) { - console.log({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}); - vlMemberPromise = PollVoterListMember.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}, member).$promise; - } else { - vlMemberPromise = PollVoterListMember.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}, member).$promise; - } + $scope.saveVoterListMember = function (member, voterList) { + if (member.name != '' && member.email != '') { + var vlId = voterList.group.id; // Id Voter list + var vlMemberPromise; + if (angular.isDefined(vlId)) { + if (angular.isDefined(member.id)) { + vlMemberPromise = PollVoterListMember.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}, member).$promise; + } else { + vlMemberPromise = PollVoterListMember.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}, member).$promise; + } - vlMemberPromise.then(function (data) { - $scope.globalVariables.saved = true; - member.id = data.id; - delete member.restError; - }, function (error) { - member.restError = error.data; - }) + vlMemberPromise.then(function (data) { + $scope.globalVariables.saved = true; + member.id = data.id; + delete member.restError; + }, function (error) { + member.restError = error.data; + }) + } + else { + // create voter list + $scope.saveVoterList(voterList); + } } - else { + } + $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); + }); + } + }); } - } + }; //////////////////////////////// //// INIT POLL ///// diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index ab3f2be..1252fad 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -122,7 +122,7 @@ angular.module('pollenServices', ['ngResource']) .factory('PollVoterList', ['$resource', function ($resource) { - return $resource(conf.restURL+'/polls/:pollId/voterLists/:voterListId', {voterListId:'@id'}, + return $resource(conf.restURL+'/polls/:pollId/voterLists/:voterListId', null, { 'add' : { method : 'POST', @@ -136,7 +136,6 @@ angular.module('pollenServices', ['ngResource']) return 'voterList='+encodeURIComponent(JSON.stringify(data)); } } - }) }]) 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 8462a0a..b0ae0db 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -36,27 +36,36 @@ <hr/> <table ng-repeat="voterList in data.voterList" class="voterList" ng-hide="data.poll.pollType == 'FREE'"> - <tr ng-show="data.poll.pollType == 'GROUP'"> - <th colspan="2"> <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" auto-save="saveVoterList(voterList)"/></th> - <th> <input type="number" ng-model="voterList.group.weight" select-on-click class="form-control" auto-save="saveVoterList(voterList)" /> </th> + + <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> </tr> <tr> <th> {{ 'poll.restricted.name' | translate }} </th> <th> {{ 'poll.restricted.mail' | translate }} </th> <th> {{ 'poll.restricted.weight' | translate }} </th> + <th> </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.group.id)"/></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.group.id)" /></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.group.id)"/></div></td> + <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> </tr> <tr> - <th colspan="3"> <a ng-click="addVoter($index);"> Add Voter </a> </th> + <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> + </th> + </tr> </table> - <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()">Add group</button> + <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> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: fix create voterList
by chorem.org scm 10 Jun '14

10 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit c944497477d1d8caeeb26d88e27664efe9433e56 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jun 10 15:46:07 2014 +0200 fix create voterList --- .../java/org/chorem/pollen/services/service/VoterListService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 99af926..868f2b0 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 @@ -415,14 +415,14 @@ public class VoterListService extends PollenServiceSupport { // get all used names - for (VoterList voterList1 : existingVoterLists) { + for (VoterList oneVoterList : existingVoterLists) { if (voterListExists && - voterList1.getTopiaId().equals(voterList.getEntityId())) { + oneVoterList.getTopiaId().equals(voterList.getEntityId())) { continue; } - voterListNames.add(voterList.getName()); + voterListNames.add(oneVoterList.getName()); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: edit and add participant in existing group
by chorem.org scm 06 Jun '14

06 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 405ee1cb5304e3d9a3c12f08f2988ceb0288d067 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 6 18:00:14 2014 +0200 edit and add participant in existing group --- pollen-rest-api/src/main/resources/mapping | 48 +++++------ pollen-ui-angular/src/main/webapp/js/app.js | 13 +++ .../src/main/webapp/js/controllers/pollCtrl.js | 94 ++++++++++++++++++---- pollen-ui-angular/src/main/webapp/js/services.js | 32 ++++++-- .../main/webapp/partials/poll-listParticipant.html | 12 +-- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- 6 files changed, 146 insertions(+), 55 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index e3fb135..7276722 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -77,18 +77,18 @@ DELETE /v1/polls/{pollId}/comments/{commentId} CommentApi.deleteComment # FavoriteListApi -GET /v1/favoriteLists FavoriteListApi.getFavoriteLists -GET /v1/favoriteLists/{favoriteListId} FavoriteListApi.getFavoriteList -POST /v1/favoriteLists/{favoriteListId}/importCsv FavoriteListApi.importFavoriteListMembersFromCsv -POST /v1/favoriteLists/{favoriteListId}/importLdap FavoriteListApi.importFavoriteListMembersFromLdap -POST /v1/favoriteLists FavoriteListApi.createFavoriteList -PUT /v1/favoriteLists/{favoriteListId} FavoriteListApi.editFavoriteList -DELETE /v1/favoriteLists/{favoriteListId} FavoriteListApi.deleteFavoriteList -GET /v1/favoriteLists/{favoriteListId}/members FavoriteListApi.getMembers -GET /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.getMember -POST /v1/favoriteLists/{favoriteListId}/members FavoriteListApi.addMember -PUT /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.editMember -DELETE /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.removeMember +GET /v1/favoriteLists FavoriteListApi.getFavoriteLists +GET /v1/favoriteLists/{favoriteListId} FavoriteListApi.getFavoriteList +POST /v1/favoriteLists/{favoriteListId}/importCsv FavoriteListApi.importFavoriteListMembersFromCsv +POST /v1/favoriteLists/{favoriteListId}/importLdap FavoriteListApi.importFavoriteListMembersFromLdap +POST /v1/favoriteLists FavoriteListApi.createFavoriteList +PUT,POST /v1/favoriteLists/{favoriteListId} FavoriteListApi.editFavoriteList +DELETE /v1/favoriteLists/{favoriteListId} FavoriteListApi.deleteFavoriteList +GET /v1/favoriteLists/{favoriteListId}/members FavoriteListApi.getMembers +GET /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.getMember +POST /v1/favoriteLists/{favoriteListId}/members FavoriteListApi.addMember +PUT,POST /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.editMember +DELETE /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.removeMember # PollApi @@ -129,18 +129,18 @@ GET /v1/polls/{pollId}/groupResults VoteCountingApi.getGroupResult # VoterListApi -PUT /v1/polls/{pollId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteList -GET /v1/polls/{pollId}/voterLists VoterListApi.getVoterLists -GET /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.getVoterList -POST /v1/polls/{pollId}/voterLists VoterListApi.createVoterList -PUT /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.editVoterList -DELETE /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.deleteVoterList - -GET /v1/polls/{pollId}/voterLists/{voterListId}/members VoterListApi.getMembers -GET /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.getMember -POST /v1/polls/{pollId}/voterLists/{voterListId}/members VoterListApi.addMember -PUT /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.editMember -DELETE /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.deleteMember +PUT /v1/polls/{pollId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteList +GET /v1/polls/{pollId}/voterLists VoterListApi.getVoterLists +GET /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.getVoterList +POST /v1/polls/{pollId}/voterLists VoterListApi.createVoterList +PUT,POST /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.editVoterList +DELETE /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.deleteVoterList + +GET /v1/polls/{pollId}/voterLists/{voterListId}/members VoterListApi.getMembers +GET /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.getMember +POST /v1/polls/{pollId}/voterLists/{voterListId}/members VoterListApi.addMember +PUT,POST /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.editMember +DELETE /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.deleteMember # VoteApi diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 34a0dbf..3763db6 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -175,6 +175,19 @@ 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', 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 0b2b942..e13a381 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -334,9 +334,8 @@ angular.module('pollControllers', []) Poll.add(poll, function (data) { SessionStorage.save({saved: true}); if ($scope.data.poll.pollType != 'FREE') { - PollVoterList.add({pollId:data.id, permission:data.permission}, $scope.data.voterList[0], function (dataVoterList) { - $location.url('/poll/edit/'+data.id+'?token='+data.permission); - }) + SessionStorage.save({'voterList':$scope.data.voterList}) + $location.url('/poll/edit/'+data.id+'?token='+data.permission); } else { $location.url('/poll/edit/'+data.id+'?token='+data.permission); @@ -358,8 +357,8 @@ angular.module('pollControllers', []) }]) -.controller('PollEditCtrl', ['$scope', '$controller', '$routeParams', '$location', '$timeout', 'Poll', 'PollChoice', 'PollVote', 'PollVoterList', 'PollVoterListMember', - function ( $scope, $controller, $routeParams, $location, $timeout, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember) { +.controller('PollEditCtrl', ['$scope', '$controller', '$routeParams', '$location', '$timeout', 'Poll', 'PollChoice', 'PollVote', 'PollVoterList', 'PollVoterListMember', 'SessionStorage', + function ( $scope, $controller, $routeParams, $location, $timeout, Poll, PollChoice, PollVote, PollVoterList, PollVoterListMember, SessionStorage) { $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.edit = true; @@ -415,20 +414,81 @@ angular.module('pollControllers', []) //////////////////////////////// var initVoterList = function () { - PollVoterList.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (voterList) { - if (voterList.length > 0) { - $scope.data.voterList = []; - angular.forEach(voterList, function (list) { - PollVoterListMember.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId: list.id}, function (voterListMember) { - $scope.data.voterList.push({group:list, members:voterListMember}); - }) - }) + if ($scope.data.poll.pollType != 'FREE') { + var session = SessionStorage.get(); + if (angular.isDefined(session.voterList)) { + $scope.data.voterList = session.voterList; + angular.forEach($scope.data.voterList, function (voterList) { + $scope.saveVoterList(voterList); + }); + SessionStorage.remove('voterList'); + } else { + PollVoterList.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (voterList) { + if (voterList.length > 0) { + $scope.data.voterList = []; + angular.forEach(voterList, function (list) { + PollVoterListMember.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId: list.id}, function (voterListMember) { + $scope.data.voterList.push({group:list, members:voterListMember}); + }) + }) + } + }); } - }) + } }; - $scope.saveVoterList = function (member) { - console.log(member); + $scope.saveVoterList = function (voterList) { + if (angular.isDefined(voterList.group.id)) { + console.log(voterList); + PollVoterList.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, voterList.group, function (data) { + $scope.globalVariables.saved = true; + delete voterList.group.restError; + }, function (error) { + voterList.group.restError = error.data; + }); + } else { + // set default name for restricted poll type + if ($scope.data.poll.pollType == 'RESTRICTED') { + voterList.group.name = 'restricted'; + } + + var vl = {group: voterList.group, members:[]}; + angular.forEach(value.members, function(member, key) { + if (member.name != '' || member.email != '') { + vl.members.push(member); + } + }); + PollVoterList.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, vl, function (data) { + $scope.globalVariables.saved = true; + voterList.group.id = data.id; + delete voterList.group.restError; + }, function (error) { + voterList.group.restError = error.data.group; + }); + } + }; + + $scope.saveVoterListMember = function (member, vlId) { + var vlMemberPromise; + if (angular.isDefined(vlId)) { + if (angular.isDefined(member.id)) { + console.log({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}); + vlMemberPromise = PollVoterListMember.update({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}, member).$promise; + } else { + vlMemberPromise = PollVoterListMember.add({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, voterListId:vlId}, member).$promise; + } + + vlMemberPromise.then(function (data) { + $scope.globalVariables.saved = true; + member.id = data.id; + delete member.restError; + }, function (error) { + member.restError = error.data; + }) + } + else { + + } } //////////////////////////////// @@ -441,6 +501,7 @@ angular.module('pollControllers', []) $location.path('/'); } $scope.data.poll = poll; + initVoterList(); }); PollChoice.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}).$promise.then(function (choices) { @@ -462,7 +523,6 @@ angular.module('pollControllers', []) }) }) }); - initVoterList(); } initPoll(); diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index be047a0..ab3f2be 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -121,25 +121,43 @@ angular.module('pollenServices', ['ngResource']) }]) .factory('PollVoterList', ['$resource', function ($resource) { - var transformParam = function (data) { - return 'voterList='+encodeURIComponent(JSON.stringify(data.group))+'&members='+encodeURIComponent(JSON.stringify(data.members)); - }; - return $resource(conf.restURL+'/polls/:pollId/voterLists/:voterListId', {voterListId: '@group.id'}, + return $resource(conf.restURL+'/polls/:pollId/voterLists/:voterListId', {voterListId:'@id'}, { 'add' : { method : 'POST', transformRequest: function (data, headersGetter) { - return transformParam(data); + return 'voterList='+encodeURIComponent(JSON.stringify(data.group))+'&members='+encodeURIComponent(JSON.stringify(data.members)); } }, + 'update' : { + method : 'POST', + transformRequest: function (data, headersGetter) { + return 'voterList='+encodeURIComponent(JSON.stringify(data)); + } + } + }) }]) .factory('PollVoterListMember', ['$resource', function ($resource) { - return $resource(conf.restURL+'/polls/:pollId/voterLists/:voterListId/members/:memberId', {voterListId: '@group.id'}, + var transformParam = function (data) { + return 'member='+encodeURIComponent(JSON.stringify(data)); + }; + return $resource(conf.restURL+'/polls/:pollId/voterLists/:voterListId/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/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index 014211f..8462a0a 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -37,8 +37,8 @@ <table ng-repeat="voterList in data.voterList" class="voterList" ng-hide="data.poll.pollType == 'FREE'"> <tr ng-show="data.poll.pollType == 'GROUP'"> - <th colspan="2"> <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" /></th> - <th> <input type="number" ng-model="voterList.group.weight" select-on-click class="form-control" /> </th> + <th colspan="2"> <input type="text" name="group" placeholder="name group" ng-model="voterList.group.name" class="form-control" auto-save="saveVoterList(voterList)"/></th> + <th> <input type="number" ng-model="voterList.group.weight" select-on-click class="form-control" auto-save="saveVoterList(voterList)" /> </th> </tr> <tr> @@ -47,10 +47,10 @@ <th> {{ 'poll.restricted.weight' | translate }} </th> </tr> - <tr ng-repeat="member in voterList.members"> - <td> <div ng-class="{'has-error':member.name == ''}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterList(member)"/></div></td> - <td> <div ng-class="{'has-error':member.email == ''}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterList(member)" /></div></td> - <td> <input type="number" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterList(member)"/></td> + <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.group.id)"/></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.group.id)" /></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.group.id)"/></div></td> </tr> <tr> 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 f7abff3..cc659b7 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -30,7 +30,7 @@ <div class="col-sm-8 btn-group"> <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'TEXT'">Text</button> - <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'DATE'">Date</button> + <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'DATE'" disabled>Date</button> <button type="button" class="btn btn-default" ng-model="choice.choiceType" btn-radio="'PICTURE'" disabled>Image</button> </div> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: fix résult
by chorem.org scm 06 Jun '14

06 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit de619c576837efa63deb9c3e27ccddbacb4f0399 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 6 14:41:29 2014 +0200 fix résult --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 4 ++-- pollen-ui-angular/src/main/webapp/js/services.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index eb3953b..0b2b942 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -572,7 +572,7 @@ angular.module('pollControllers', []) $scope.pageSize = conf.commentDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); - var paginationParameter = {pageSize:$scope.pageSize}; + var paginationParameter = {pageSize:$scope.pageSize, order:'postDate', desc:true}; if (angular.isDefined($routeParams.page)) { if (angular.isDefined($routeParams.pageSize)) { paginationParameter = {pageSize:$routeParams.pageSize}; @@ -664,7 +664,7 @@ angular.module('pollControllers', []) }).$promise; $q.all([choicesPromise, votesPromise]).then(function () { - Poll.get({pollId:$routeParams.pollId, cmd:'results'}, function (result) { + Poll.result({pollId:$routeParams.pollId}, function (result) { $scope.data.result = result; angular.forEach(result.scores, function(value, key) { for (var i = 0; i < $scope.data.choices.length; i++) { diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index e78438f..be047a0 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -26,6 +26,10 @@ angular.module('pollenServices', ['ngResource']) method : 'GET', url : conf.restURL+'/polls/new' }, + 'result' : { + method : 'GET', + url : conf.restURL+'/polls/:pollId/results' + }, 'add' : { method : 'POST', transformRequest : function (data, headersGetter) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

Build failed in Jenkins: pollen-rest-api-nightly #18
by admin+ci-chorem.org＠codelutin.com 06 Jun '14

06 Jun '14

See <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/18/changes> Changes: [Tony CHEMIT] aupdates mavenpom and eugene [a.garandel] translate error une register and login ------------------------------------------ [...truncated 1604 lines...] [INFO] No file generated. [INFO] Process phase [model] [INFO] Process phase [generator] [INFO] Apply generator JavaEnumerationTransformer [INFO] Apply generator TopiaMetaTransformer [INFO] No file generated. [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ pollen-persistence --- [INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ pollen-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ pollen-persistence --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ pollen-persistence --- [INFO] Loaded <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/target/collect-…> [INFO] Copying pollen-persistence-2.0-SNAPSHOT.jar to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/target/collect/…> [INFO] Copying THIRD-PARTY.properties to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/target/collect/…> [INFO] Copying pollen-persistence-2.0-SNAPSHOT-sources.jar to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/target/collect/…> [INFO] Copying pollen-persistence-2.0-SNAPSHOT-javadoc.jar to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/target/collect/…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ pollen-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ pollen-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ pollen-persistence --- [INFO] Used declared dependencies found: [INFO] com.google.guava:guava:jar:17.0:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ pollen-persistence --- [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT.jar [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT.pom [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT-third-party.properties [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT-sources.jar [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT.jar.asc [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT.pom.asc [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-persiste…> to /var/local/forge/data/chorem.org/maven/repository/org/chorem/pollen/pollen-persistence/2.0-SNAPSHOT/pollen-persistence-2.0-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Pollen :: Service 2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 43.6 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (2 KB at 1.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (3 KB at 73.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (3 KB at 121.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (7 KB at 292.8 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ pollen-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ pollen-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ pollen-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ pollen-services --- [INFO] Exporting server [redmine-forge.chorem.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ pollen-services --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ pollen-services --- [INFO] Load missing file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [WARNING] dependency [javax.servlet--servlet-api--2.5] does not exist in project, remove it from the missing file. [INFO] Missing file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> is up-to-date. [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] Regenerate missing license file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] Will attach third party file from <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (default) @ pollen-services --- [INFO] start entry basedir:<http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…,> includes:[**/*.java] [INFO] 82 file(s) to process (among 82 files) [INFO] Parsing is done. [treated file(s) : 24/82](total time:190.677ms) ( ~ 2.325ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (default) @ pollen-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ pollen-services --- [INFO] config - basedir : <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 181606ns [INFO] Copying pollen-services.properties to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] Copying pollen-services.properties to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (default) @ pollen-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (default) @ pollen-services --- [INFO] config - src basedir : <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] config - out basedir : <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [WARNING] bundle fr_FR contains 11/56 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 12/57 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ pollen-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 25 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ pollen-services --- [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] Scan 90 files header done in 101.015ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ pollen-services --- [INFO] Compiling 82 source files to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>: Recompile with -Xlint:unchecked for details. [INFO] 2 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>:[158,38] cannot find symbol symbol: method closeContext() location: variable openedTransaction of type org.chorem.pollen.persistence.PollenTopiaPersistenceContext [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>:[168,31] cannot find symbol symbol: method closeContext() location: variable applicationContext of type org.chorem.pollen.persistence.PollenTopiaApplicationContext [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>:[100,31] cannot find symbol symbol: method closeContext() location: variable persistenceContext of type org.chorem.pollen.persistence.PollenTopiaPersistenceContext [INFO] 3 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Pollen ............................................ SUCCESS [ 8.802 s] [INFO] Pollen :: VoteCounting (Api) ...................... SUCCESS [ 9.491 s] [INFO] Pollen :: VoteCounting :: Normal .................. SUCCESS [ 3.687 s] [INFO] Pollen :: VoteCounting :: Percentage .............. SUCCESS [ 3.415 s] [INFO] Pollen :: VoteCounting :: Condorcet ............... SUCCESS [ 3.434 s] [INFO] Pollen :: VoteCounting :: Number .................. SUCCESS [ 3.443 s] [INFO] Pollen :: VoteCounting :: Borda ................... SUCCESS [ 3.284 s] [INFO] Pollen :: VoteCounting :: Instant Runoff .......... SUCCESS [ 3.407 s] [INFO] Pollen :: VoteCounting :: Coombs .................. SUCCESS [ 3.344 s] [INFO] Pollen :: VoteCounting (Aggregator) ............... SUCCESS [ 1.320 s] [INFO] Pollen :: Persistence ............................. SUCCESS [ 11.279 s] [INFO] Pollen :: Service ................................. FAILURE [ 2.755 s] [INFO] Pollen :: Rest Api ................................ SKIPPED [INFO] Pollen :: UI (Angular) ............................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:01 min [INFO] Finished at: 2014-06-04T02:06:15+01:00 [INFO] Final Memory: 82M/631M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project pollen-services: Compilation failure: Compilation failure: [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>:[158,38] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable openedTransaction of type org.chorem.pollen.persistence.PollenTopiaPersistenceContext [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>:[168,31] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable applicationContext of type org.chorem.pollen.persistence.PollenTopiaApplicationContext [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/pollen-services…>:[100,31] cannot find symbol [ERROR] symbol: method closeContext() [ERROR] location: variable persistenceContext of type org.chorem.pollen.persistence.PollenTopiaPersistenceContext [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project pollen-services: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :pollen-services Sending e-mails to: pollen-commits(a)list.chorem.org channel stopped Skipping sonar analysis due to bad build status FAILURE

1 2

Build failed in Jenkins: pollen-rest-api-nightly » Pollen :: Service #18
by admin+ci-chorem.org＠codelutin.com 06 Jun '14

06 Jun '14

See <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Pollen :: Service 2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 43.6 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (2 KB at 1.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (3 KB at 73.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (3 KB at 121.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (7 KB at 292.8 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ pollen-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ pollen-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ pollen-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ pollen-services --- [INFO] Exporting server [redmine-forge.chorem.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ pollen-services --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ pollen-services --- [INFO] Load missing file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [WARNING] dependency [javax.servlet--servlet-api--2.5] does not exist in project, remove it from the missing file. [INFO] Missing file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> is up-to-date. [INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] Regenerate missing license file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] Will attach third party file from <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (default) @ pollen-services --- [INFO] start entry basedir:<http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…,> includes:[**/*.java] [INFO] 82 file(s) to process (among 82 files) [INFO] Parsing is done. [treated file(s) : 24/82](total time:190.677ms) ( ~ 2.325ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (default) @ pollen-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ pollen-services --- [INFO] config - basedir : <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 181606ns [INFO] Copying pollen-services.properties to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] Copying pollen-services.properties to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (default) @ pollen-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (default) @ pollen-services --- [INFO] config - src basedir : <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] config - out basedir : <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [WARNING] bundle fr_FR contains 11/56 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 12/57 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ pollen-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 25 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ pollen-services --- [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] Scan 90 files header done in 101.015ms. [INFO] All files are up-to-date. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ pollen-services --- [INFO] Compiling 82 source files to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>: Recompile with -Xlint:unchecked for details. [INFO] 2 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>:[158,38] cannot find symbol symbol: method closeContext() location: variable openedTransaction of type org.chorem.pollen.persistence.PollenTopiaPersistenceContext [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>:[168,31] cannot find symbol symbol: method closeContext() location: variable applicationContext of type org.chorem.pollen.persistence.PollenTopiaApplicationContext [ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>:[100,31] cannot find symbol symbol: method closeContext() location: variable persistenceContext of type org.chorem.pollen.persistence.PollenTopiaPersistenceContext [INFO] 3 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

01/01: fix type error
by chorem.org scm 06 Jun '14

06 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit a24ff9d86f804a5ee2862b07b45b618ca32afae8 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 6 12:22:16 2014 +0200 fix type error --- .../src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 7fd66cd..d3242a4 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 @@ -47,10 +47,10 @@ import java.util.Set; */ public class VoterListApi extends WebMotionController { - public VoterListBean importFavoriteList(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<FavoriteList> favoriteListId) { + public PollenEntityRef<VoterList> importFavoriteList(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<FavoriteList> favoriteListId) { - VoterListBean importVoterList = voterListService.importFavoriteList(pollId.getEntityId(), favoriteListId.getEntityId()); - return importVoterList; + PollenEntityRef<VoterList> principalRef = voterListService.importFavoriteList(pollId.getEntityId(), favoriteListId.getEntityId()); + return principalRef; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix url tab in poll form
by chorem.org scm 06 Jun '14

06 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 602c1be1d67e1a5f0c66265271aa86a72db48f3e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 6 12:16:48 2014 +0200 fix url tab in poll form --- .../src/main/webapp/js/controllers/pollCtrl.js | 12 +++++----- .../main/webapp/partials/poll-listParticipant.html | 27 ++++++++++++++++++---- 2 files changed, 28 insertions(+), 11 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 b6078c1..eb3953b 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -104,14 +104,14 @@ angular.module('pollControllers', []) $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 = '#/poll/edit/'+$routeParams.pollId+'&tab=conf'; - $scope.globalVariables.linkParticipant = '#/poll/edit/'+$routeParams.pollId+'&tab=participant'; + $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 = '#/poll/edit/'+$routeParams.pollId+'?tab=conf'; - $scope.globalVariables.linkParticipant = '#/poll/edit/'+$routeParams.pollId+'?tab=participant'; + $scope.globalVariables.linkConf = $scope.globalVariables.linkEdit+'?tab=conf'; + $scope.globalVariables.linkParticipant = $scope.globalVariables.linkEdit+'?tab=participant'; } } 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 81185c7..014211f 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -1,7 +1,25 @@ -{{ data.voterList }} - + <h2>{{ 'poll.restricted.pollType' | translate }}</h2> -<form> +<div> <label for="formFree"> <input type="radio" ng-model="data.poll.pollType" name="type" value="FREE" id="formFree" auto-save="savePoll()"/> {{ 'poll.restricted.free' | translate }} @@ -41,5 +59,4 @@ </table> <button class="btn btn-info" ng-show="data.poll.pollType == 'GROUP'" ng-click="addGroup()">Add group</button> - -</form> +</div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: get the order pagination
by chorem.org scm 06 Jun '14

06 Jun '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit cdb3dc99bd8c712f365810a75efac046e9d2fdff Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Jun 6 12:01:57 2014 +0200 get the order pagination --- .../org/chorem/pollen/services/bean/PaginationParameterBean.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java index e2ee793..1ef416a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java @@ -60,8 +60,15 @@ public class PaginationParameterBean { } public PaginationParameter toPaginationParameter() { + PaginationParameter paginationParameter; + + if (order != null) { + paginationParameter = PaginationParameter.of(pageNumber, pageSize, order, desc); + } + else { + paginationParameter = PaginationParameter.of(pageNumber, pageSize); + } - PaginationParameter paginationParameter = PaginationParameter.of(pageNumber, pageSize); return paginationParameter; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0