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

01/01: improve voterList
by chorem.org scm 20 Jun '14

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

1 0

01/01: fix test import
by chorem.org scm 19 Jun '14

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

1 0

01/01: import favoriteList to voterList
by chorem.org scm 19 Jun '14

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

1 0

01/01: view result order by scoreResult
by chorem.org scm 19 Jun '14

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

1 0

13/13: change print error for vote
by chorem.org scm 19 Jun '14

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

1 0

12/13: fix : change eugene version for build
by chorem.org scm 19 Jun '14

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

1 0

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

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

1 0

10/13: some update in style and translate
by chorem.org scm 19 Jun '14

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

1 0

09/13: Merge branch 'feature/favoriteVoterList' into develop
by chorem.org scm 19 Jun '14

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

1 0

08/13: save all member when create the favoriteList and no force request post for create favoriteList
by chorem.org scm 19 Jun '14

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

1 0