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

01/02: fix right : connected and permission
by Chorem.org scm May 23, 2014

May 23, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 948f247bffef3bfc20ad249214247dbdf304ef2a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri May 23 15:44:17 2014 +0200 fix right : connected and permission --- .../org/chorem/pollen/services/service/security/SecurityService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 26641c9..595b9cf 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -408,7 +408,7 @@ public class SecurityService extends PollenServiceSupport { } } - if (user != null && pollenPrincipal != null) { + if (user == null && pollenPrincipal == null) { // no user connected, nor main principal given // get all public objects -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: use promise for get result
by Chorem.org scm May 23, 2014

May 23, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 21a929c8fc99154b4caa34ed5531f53a949d088d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri May 23 15:02:39 2014 +0200 use promise for get result --- .../src/main/webapp/js/controllers/pollCtrl.js | 43 ++++++++++++---------- 1 file changed, 24 insertions(+), 19 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 43ebe0d..1601454 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -286,20 +286,23 @@ angular.module('pollControllers', []) } }]) -.controller('PollVoteCtrl', ['$scope', '$filter', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $filter, $controller, $routeParams, Poll, PollChoice, PollVote) { +.controller('PollVoteCtrl', ['$scope', '$q', '$filter', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $q, $filter, $controller, $routeParams, Poll, PollChoice, PollVote) { $controller('PollCtrl', {$scope:$scope}); $scope.globalVariables.results = true; var initPoll = function () { - Poll.get({pollId:$routeParams.pollId}, function (poll) { + var pollPromise = Poll.get({pollId:$routeParams.pollId}, function (poll) { $scope.data.poll = poll; - }); - PollChoice.query({pollId:$routeParams.pollId}, function (choices) { + }).$promise; + + var choicesPromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; initVote(); - }); - PollVote.query({pollId:$routeParams.pollId}, function (votes) { + }).$promise; + + + var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; angular.forEach($scope.data.votants, function (vote) { angular.forEach(vote.choice, function (choice) { @@ -311,19 +314,21 @@ angular.module('pollControllers', []) } }) }) - }); - - Poll.get({pollId:$routeParams.pollId, cmd:'results'}, function (result) { - $scope.data.result = result; - angular.forEach(result.scores, function(value, key) { - for (var i = 0; i < $scope.data.choices.length; i++) { - if ($scope.data.choices[i].id == value.choiceId) { - value.choice = $scope.data.choices[i]; - i = $scope.data.choices.length; + }).$promise; + + $q.all([choicesPromise, votesPromise]).then(function () { + Poll.get({pollId:$routeParams.pollId, cmd:'results'}, function (result) { + $scope.data.result = result; + angular.forEach(result.scores, function(value, key) { + for (var i = 0; i < $scope.data.choices.length; i++) { + if ($scope.data.choices[i].id == value.choiceId) { + value.choice = $scope.data.choices[i]; + i = $scope.data.choices.length; + } } - } - }) - $scope.data.result.nbVotant = $scope.data.votants.length; + }) + $scope.data.result.nbVotant = $scope.data.votants.length; + }); }); } initPoll(); @@ -349,7 +354,7 @@ angular.module('pollControllers', []) PollVote.add({pollId:$routeParams.pollId}, sendVote, function (returnRequest) { $scope.data.vote.id = returnRequest.id; $scope.data.vote.permission = returnRequest.permission; - + $scope.data.votants.push(angular.copy($scope.data.vote)); $scope.globalVariables.saved = true; initVote(); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: add link for edit vote
by Chorem.org scm May 23, 2014

May 23, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 53a5d768f8691d24aa12106c8373a4cd258fca8e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri May 23 13:19:31 2014 +0200 add link for edit vote --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 3 +++ pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 3 +++ 2 files changed, 6 insertions(+) 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 16cf767..43ebe0d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -347,6 +347,9 @@ angular.module('pollControllers', []) }); PollVote.add({pollId:$routeParams.pollId}, sendVote, function (returnRequest) { + $scope.data.vote.id = returnRequest.id; + $scope.data.vote.permission = returnRequest.permission; + $scope.data.votants.push(angular.copy($scope.data.vote)); $scope.globalVariables.saved = true; initVote(); 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 9decf83..9d18149 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -69,6 +69,9 @@ <td ng-repeat="choice in vote.choice" class="pollChoice"> <input type="checkbox" ng-model="choice.voteValue" disabled /> </td> + <td> + <a href="#/poll/vote/{{data.poll.id}}" ng-if="vote.permission"><span class="glyphicon glyphicon-pencil"></span></a> + </td> </tr>  </table> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: add link for edit poll and vote
by Chorem.org scm May 23, 2014

May 23, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 9a28b0a317a40876e16788f9c33ab5190a2eb72b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri May 23 10:34:17 2014 +0200 add link for edit poll and vote --- pollen-ui-angular/src/main/webapp/css/style.css | 6 +++--- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 7 +++++++ pollen-ui-angular/src/main/webapp/partials/poll.html | 8 +++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index de2d910..d6ef705 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -199,9 +199,9 @@ i.icon-collapse { } .alert-float { - position: absolute; - width: 80%; - left: 10%; + position: fixed; + left:20%; + width:60%; z-index: 100000; opacity: 0.9; } 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 da513f3..16cf767 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -208,6 +208,11 @@ angular.module('pollControllers', []) $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.edit = true; + $scope.globalVariables.hostName = $location.protocol()+'://'+$location.host(); + + if (angular.isDefined($routeParams.token)) { + $scope.globalVariables.linkEdit = $location.protocol()+'://'+$location.host()+'/#/poll/edit/'+$routeParams.pollId; + } $scope.callBackAddChoice = function (choice) { PollChoice.add({pollId:$routeParams.pollId, permission:$routeParams.token}, choice, function (data) { @@ -284,6 +289,8 @@ angular.module('pollControllers', []) .controller('PollVoteCtrl', ['$scope', '$filter', '$controller', '$routeParams', 'Poll', 'PollChoice', 'PollVote', function ($scope, $filter, $controller, $routeParams, Poll, PollChoice, PollVote) { $controller('PollCtrl', {$scope:$scope}); + $scope.globalVariables.results = true; + var initPoll = function () { Poll.get({pollId:$routeParams.pollId}, function (poll) { $scope.data.poll = poll; diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 54929d7..d8529fb 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -18,15 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> - <form class="form-horizontal" novalidate> - <alert type="warning" ng-if="globalVariables.voted"> Les votes ont commencé, certaine modification sont inaccessible.. </alert> - <alert type="success" ng-if="globalVariables.edit"> Lien de vote : <a href="#/poll/vote/{{data.poll.id}}"> http://pollen/#/poll/vote/{{data.poll.id}}</a> </alert> - <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> Vous devez avoir au moins 1 choix </alert> <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Sondage sauvegardé..</alert> <alert type="success" class="alert-float" ng-if="!globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> + <alert type="warning" ng-if="globalVariables.linkEdit"> Lien d'édition : <a href="{{globalVariables.linkEdit}}">{{globalVariables.linkEdit}}</a> </alert> + <alert type="success" ng-if="globalVariables.edit"> Lien de vote : <a href="#/poll/vote/{{data.poll.id}}"> {{globalVariables.hostName}}/#/poll/vote/{{data.poll.id}}</a> </alert> <tabset> <tab heading="Sondage"> @@ -64,7 +62,7 @@ </tab> </tabset> - <div ng-include="'./partials/poll-result.html'"></div> + <div ng-include="'./partials/poll-result.html'" ng-if="globalVariables.results"></div> <div ng-if="globalVariables.create"> <hr/> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: improve favorite list model
by Chorem.org scm May 23, 2014

May 23, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 76e2023b2da05c089905b8ace2b1c1036869ab6d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 23 09:05:52 2014 +0200 improve favorite list model --- .../persistence/entity/PollenUserTopiaDao.java | 18 ++++++++++++++++++ pollen-persistence/src/main/xmi/pollen.zargo | Bin 18495 -> 18501 bytes .../services/service/FavoriteListService.java | 19 +++++++++++-------- pom.xml | 2 +- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java index 580eb43..f1331fa 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java @@ -23,6 +23,8 @@ package org.chorem.pollen.persistence.entity; * #L% */ +import java.util.List; + /** * @author tchemit <chemit(a)codelutin.com> * @since 2.0 @@ -38,4 +40,20 @@ public class PollenUserTopiaDao extends AbstractPollenUserTopiaDao<PollenUser> { boolean exists = forEmailEquals(email).exists(); return exists; } + + @Override + public void delete(PollenUser entity) { + + { // --- remove favorite lists --- // + + FavoriteListTopiaDao dao = topiaDaoSupplier + .getDao(FavoriteList.class, FavoriteListTopiaDao.class); + List<FavoriteList> list = dao.forPollenUserEquals(entity).findAll(); + dao.deleteAll(list); + + } + + super.delete(entity); + + } } diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index c871d76..13a00d2 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 00a28fa..0f940c8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -70,7 +70,7 @@ public class FavoriteListService extends PollenServiceSupport { checkIsConnected(); PollenUser user = getConnectedUser(); - List<FavoriteList> favoriteLists = user.getFavoriteList(); + List<FavoriteList> favoriteLists = getFavoriteLists0(user); List<FavoriteListBean> favoriteListBeans = copyAsList(FavoriteListBean.class, favoriteLists); return favoriteListBeans; @@ -97,7 +97,7 @@ public class FavoriteListService extends PollenServiceSupport { PollenUser user = getConnectedUser(); - List<FavoriteList> existingFavoriteLists = new ArrayList<>(user.getFavoriteList()); + List<FavoriteList> existingFavoriteLists = getFavoriteLists0(user); ErrorMap errorMap = checkFavoriteList(existingFavoriteLists, favoriteList); errorMap.failIfNotEmpty(); @@ -120,7 +120,7 @@ public class FavoriteListService extends PollenServiceSupport { PollenUser user = getConnectedUser(); - List<FavoriteList> existingFavoriteLists = new ArrayList<>(user.getFavoriteList()); + List<FavoriteList> existingFavoriteLists = getFavoriteLists0(user); ErrorMap errorMap = checkFavoriteList(existingFavoriteLists, favoriteList); errorMap.failIfNotEmpty(); @@ -143,8 +143,8 @@ public class FavoriteListService extends PollenServiceSupport { PollenUser user = getConnectedUser(); FavoriteList favoriteList = getFavoriteList(user, favoriteListId); + getFavoriteListDao().delete(favoriteList); - user.removeFavoriteList(favoriteList); commit(); getNotificationService().onFavoriteListDeleted(user, favoriteList); @@ -436,13 +436,17 @@ public class FavoriteListService extends PollenServiceSupport { return result; } + protected List<FavoriteList> getFavoriteLists0(PollenUser user) { + return getFavoriteListDao().forPollenUserEquals(user).findAll(); + } + protected FavoriteList getFavoriteList(PollenUser user, String favoriteListId) { FavoriteList result = getFavoriteListDao().findByTopiaId(favoriteListId); - if (!user.containsFavoriteList(result)) { + if (!user.equals(result.getPollenUser())) { - throw new InvalidEntityLinkException(PollenUser.PROPERTY_FAVORITE_LIST, user, result); + throw new InvalidEntityLinkException(FavoriteList.PROPERTY_POLLEN_USER, result, user); } @@ -481,8 +485,7 @@ public class FavoriteListService extends PollenServiceSupport { // create a new favorite list toSave = favoriteListDao.create(); - - user.addFavoriteList(toSave); + toSave.setPollenUser(user); } diff --git a/pom.xml b/pom.xml index 25dc5d0..8d48b76 100644 --- a/pom.xml +++ b/pom.xml @@ -167,7 +167,7 @@ <topiaVersion>3.0-SNAPSHOT</topiaVersion> <nuitonWebVersion>1.16</nuitonWebVersion> - <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: print result
by Chorem.org scm May 22, 2014

May 22, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 82c729951a7feab4c6a17cec2c3698aaf8c28bf0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu May 22 18:27:41 2014 +0200 print result --- .../src/main/webapp/js/controllers/pollCtrl.js | 17 +++++++++++------ .../src/main/webapp/partials/poll-result.html | 7 +++++-- pollen-ui-angular/src/main/webapp/partials/poll.html | 7 ++++--- 3 files changed, 20 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 02a6b82..da513f3 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -304,15 +304,20 @@ angular.module('pollControllers', []) } }) }) - }) + }); - Poll.get({pollId:$routeParams.pollId, cmd:'result'}, function (result) { + Poll.get({pollId:$routeParams.pollId, cmd:'results'}, function (result) { $scope.data.result = result; - angular.forEach(result.scores, function (value, key) { - value.choice = JSON.search($scope.data.choices, value.choiceId); + angular.forEach(result.scores, function(value, key) { + for (var i = 0; i < $scope.data.choices.length; i++) { + if ($scope.data.choices[i].id == value.choiceId) { + value.choice = $scope.data.choices[i]; + i = $scope.data.choices.length; + } + } }) - console.log(result); - }) + $scope.data.result.nbVotant = $scope.data.votants.length; + }); } initPoll(); diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html index ec74732..d21b64c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -1,4 +1,7 @@ -<h2> Résultats :</h2> +<h2> Résultats : {{data.result.nbVotant}}</h2> <div ng-repeat="score in data.result.scores"> - <h3> </h3> + <h4> {{score.choice.name}} </h4> + <p> + nb vote : {{score.scoreValue}} + </p> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index cb1d550..54929d7 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -20,14 +20,13 @@ --> <form class="form-horizontal" novalidate> + <alert type="warning" ng-if="globalVariables.voted"> Les votes ont commencé, certaine modification sont inaccessible.. </alert> + <alert type="success" ng-if="globalVariables.edit"> Lien de vote : <a href="#/poll/vote/{{data.poll.id}}"> http://pollen/#/poll/vote/{{data.poll.id}}</a> </alert> <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> Vous devez avoir au moins 1 choix </alert> <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Sondage sauvegardé..</alert> <alert type="success" class="alert-float" ng-if="!globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> - <alert type="warning" ng-if="globalVariables.voted"> Les votes ont commencé, certaine modification sont inaccessible.. </alert> - <alert type="warning" ng-if="globalVariables.created"> <a href="#/poll/edit/{{pollId}}"> Edition du sondage </a>.. </alert> - <tabset> <tab heading="Sondage"> @@ -65,6 +64,8 @@ </tab> </tabset> + <div ng-include="'./partials/poll-result.html'"></div> + <div ng-if="globalVariables.create"> <hr/> <button type="button" class="btn btn-default" ng-model="globalVariables.editMode" btn-checkbox>Mode Edition</button> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: alert floatant
by Chorem.org scm May 22, 2014

May 22, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit db18b7c34e43b0a748860f1715904808c618942e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu May 22 17:48:12 2014 +0200 alert floatant --- pollen-ui-angular/src/main/webapp/css/style.css | 8 ++++++++ pollen-ui-angular/src/main/webapp/partials/poll.html | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 597a98b..de2d910 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -198,6 +198,14 @@ i.icon-collapse { margin-top:5px; } +.alert-float { + position: absolute; + width: 80%; + left: 10%; + z-index: 100000; + opacity: 0.9; +} + .danger { color: #a94442; } diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 0363f7a..cb1d550 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -21,10 +21,9 @@ <form class="form-horizontal" novalidate> - <alert type="danger" ng-if="globalVariables.errorForm"> Champ non remplie </alert> - <alert type="danger" ng-if="restError.choice"> Vous devez avoir au moins 1 choix </alert> - <alert type="success" ng-if="globalVariables.editMode && globalVariables.saved"> Sondage sauvegardé..</alert> - <alert type="success" ng-if="!globalVariables.editMode && globalVariables.saved"> Vote effectué..</alert> + <alert type="danger" class="alert-float" ng-if="restError.choice" close="restError.choice = false"> Vous devez avoir au moins 1 choix </alert> + <alert type="success" class="alert-float" ng-if="globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Sondage sauvegardé..</alert> + <alert type="success" class="alert-float" ng-if="!globalVariables.editMode && globalVariables.saved" close="globalVariables.saved = false"> Vote effectué..</alert> <alert type="warning" ng-if="globalVariables.voted"> Les votes ont commencé, certaine modification sont inaccessible.. </alert> <alert type="warning" ng-if="globalVariables.created"> <a href="#/poll/edit/{{pollId}}"> Edition du sondage </a>.. </alert> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: print result in vote page
by Chorem.org scm May 22, 2014

May 22, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 65f9744d94537d1db568cdf8d41cec8911d6355c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu May 22 17:16:28 2014 +0200 print result in vote page --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++++++ pollen-ui-angular/src/main/webapp/partials/poll-result.html | 4 ++++ 2 files changed, 12 insertions(+) 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 3bb1029..02a6b82 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -305,6 +305,14 @@ angular.module('pollControllers', []) }) }) }) + + Poll.get({pollId:$routeParams.pollId, cmd:'result'}, function (result) { + $scope.data.result = result; + angular.forEach(result.scores, function (value, key) { + value.choice = JSON.search($scope.data.choices, value.choiceId); + }) + console.log(result); + }) } initPoll(); diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html new file mode 100644 index 0000000..ec74732 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -0,0 +1,4 @@ +<h2> Résultats :</h2> +<div ng-repeat="score in data.result.scores"> + <h3> </h3> +</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: move to / when error 403
by Chorem.org scm May 22, 2014

May 22, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 4552378110b7168c87ef2a249db07c20cbde6846 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu May 22 16:29:33 2014 +0200 move to / when error 403 --- pollen-ui-angular/src/main/webapp/js/app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 6737d15..0794019 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -27,7 +27,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; }]) -.factory('httpInterceptor', ['$q', '$rootScope', 'SessionStorage', function ($q, $rootScope, SessionStorage) { +.factory('httpInterceptor', ['$q', '$rootScope', '$location', 'SessionStorage', function ($q, $rootScope, $location, SessionStorage) { return { request: function($config) { // set locale with browser preference @@ -49,6 +49,10 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC //error login or sessionToken $rootScope.$broadcast('sessionExpired'); } + if (response.status === 403) { + //access forbidden + $location.path('/'); + } return $q.reject(response); } }; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: send permission for getting poll and choices
by Chorem.org scm May 22, 2014

May 22, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit d2726c6dc728d9a2cc22920df530d3d99fea26f0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu May 22 16:20:51 2014 +0200 send permission for getting poll and choices --- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 41dd6fc..3bb1029 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -220,7 +220,7 @@ angular.module('pollControllers', []) } $scope.callBackEditChoice = function (choice) { - PollChoice.update({permission:$routeParams.token, pollId:$routeParams.pollId}, choice, function() { + PollChoice.update({pollId:$routeParams.pollId, permission:$routeParams.token}, choice, function() { delete choice.restError; $scope.globalVariables.saved = true; }, function (error) { @@ -241,13 +241,13 @@ angular.module('pollControllers', []) } var initPoll = function () { - Poll.get({pollId:$routeParams.pollId}).$promise.then(function (poll) { + Poll.get({pollId:$routeParams.pollId, permission:$routeParams.token}, function (poll) { if (angular.isUndefined(poll.permission)) { $location.path('/'); } $scope.data.poll = poll; }); - PollChoice.query({pollId:$routeParams.pollId}).$promise.then(function (choices) { + PollChoice.query({pollId:$routeParams.pollId, permission:$routeParams.token}).$promise.then(function (choices) { $scope.data.choices = choices; $scope.data.vote = {}; $scope.data.vote.choice = $scope.data.choices; @@ -285,7 +285,7 @@ angular.module('pollControllers', []) $controller('PollCtrl', {$scope:$scope}); var initPoll = function () { - Poll.get({pollId:$routeParams.pollId}).$promise.then(function (poll) { + Poll.get({pollId:$routeParams.pollId}, function (poll) { $scope.data.poll = poll; }); PollChoice.query({pollId:$routeParams.pollId}, function (choices) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0