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

01/01: add form for edit user
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 895a0d687a282fc4ae1cef4f00389f7d7e89ad0b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 16:58:57 2014 +0200 add form for edit user --- pollen-rest-api/src/main/resources/mapping | 12 ++-- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 14 +++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 +- .../src/main/webapp/partials/user-edit.html | 70 ++++++++++++++++++++++ .../src/main/webapp/partials/user-register.html | 9 ++- 7 files changed, 100 insertions(+), 12 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index da2368c..fe48ec3 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -115,12 +115,12 @@ PUT /v1/polls/{pollId}/close PollApi.closePoll # PollenUserApi -GET /v1/users PollenUserApi.getUsers -GET /v1/users/{userId} PollenUserApi.getUser -POST /v1/users PollenUserApi.createUser -PUT /v1/users/{userId} PollenUserApi.editUser -DELETE /v1/users/{userId} PollenUserApi.deleteUser -PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail +GET /v1/users PollenUserApi.getUsers +GET /v1/users/{userId} PollenUserApi.getUser +POST /v1/users PollenUserApi.createUser +PUT,POST /v1/users/{userId} PollenUserApi.editUser +DELETE /v1/users/{userId} PollenUserApi.deleteUser +PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail # VoteCountingApi diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index ce64f62..6778c75 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -88,7 +88,7 @@ <ul class="dropdown-menu" role="menu"> <li> - <a href="#/user/edit/{{currentUser.id}}">Profile</a> + <a href="#/user/edit">Profile</a> </li> <li class="divider"></li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index da816a1..1a252fa 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -68,6 +68,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) + .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .otherwise({redirectTo: '/'}); }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 8f4a71f..2340bcf 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,6 +36,20 @@ } }]) +.controller('UserEditCtrl', ['$scope', 'User', 'SessionStorage', function ($scope, User, SessionStorage) { + $scope.currentUser = SessionStorage.get().user; + $scope.currentUser.password = ''; + + $scope.editUser = function () { + User.update($scope.currentUser, function (data) { + SessionStorage.save({user:data}); + $scope.saved = true; + }, function (error) { + $scope.restError = error.data; + }); + } +}]) + .controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 785de6f..8171f52 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -79,7 +79,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } @@ -126,7 +126,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html new file mode 100644 index 0000000..5c29acf --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -0,0 +1,70 @@ + +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Modification effectuée..</alert> + +<h2> Modification du Profile </h2> + +<form class="horizontal-form" ng-submit="editUser()"> + <div class="control-group"> + <label for="formName" class="col-sm-3 text-right control-label"> + Nom + </label> + <div class="col-sm-8"> + <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/> + </div> + <div class="col-sm-1"> + </div> + </div> + + <div class="control-group"> + + <label for="formEmail" class="col-sm-3 text-right control-label"> + Adresse E-Mail + </label> + + <div class="col-sm-8"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="currentUser.email"></info-error> + </div> + </div> + + <div class="control-group"> + <label for="formPassword" class="col-sm-3 text-right control-label"> + Mot de passe Actuel + </label> + <div class="col-sm-8"> + <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.password[0]" data="currentUser.password"></info-error> + </div> + </div> + + <div class="control-group"> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> + </div> +</form> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 81cf1c3..eb37772 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -19,7 +19,6 @@ #L% --> <h2> Inscription sur Pollen</h2> - <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> <label for="formName" class="col-sm-3 text-right control-label"> @@ -68,7 +67,11 @@ </div> - <div class="form-group"> - <button class="btn btn-primary" type="submit">Envoyer</button> + <div class="control-group"> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> </div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add form for edit user
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 968ff64a7febc268a5c8fbdfeb2aef18b1d07d7b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 16:58:57 2014 +0200 add form for edit user --- pollen-rest-api/src/main/resources/mapping | 12 ++-- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 14 +++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 +- .../src/main/webapp/partials/user-edit.html | 70 ++++++++++++++++++++++ .../src/main/webapp/partials/user-register.html | 7 ++- 7 files changed, 99 insertions(+), 11 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index da2368c..fe48ec3 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -115,12 +115,12 @@ PUT /v1/polls/{pollId}/close PollApi.closePoll # PollenUserApi -GET /v1/users PollenUserApi.getUsers -GET /v1/users/{userId} PollenUserApi.getUser -POST /v1/users PollenUserApi.createUser -PUT /v1/users/{userId} PollenUserApi.editUser -DELETE /v1/users/{userId} PollenUserApi.deleteUser -PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail +GET /v1/users PollenUserApi.getUsers +GET /v1/users/{userId} PollenUserApi.getUser +POST /v1/users PollenUserApi.createUser +PUT,POST /v1/users/{userId} PollenUserApi.editUser +DELETE /v1/users/{userId} PollenUserApi.deleteUser +PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail # VoteCountingApi diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index ce64f62..6778c75 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -88,7 +88,7 @@ <ul class="dropdown-menu" role="menu"> <li> - <a href="#/user/edit/{{currentUser.id}}">Profile</a> + <a href="#/user/edit">Profile</a> </li> <li class="divider"></li> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index da816a1..1a252fa 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -68,6 +68,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) + .when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"}) .otherwise({redirectTo: '/'}); }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 8f4a71f..2340bcf 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,6 +36,20 @@ } }]) +.controller('UserEditCtrl', ['$scope', 'User', 'SessionStorage', function ($scope, User, SessionStorage) { + $scope.currentUser = SessionStorage.get().user; + $scope.currentUser.password = ''; + + $scope.editUser = function () { + User.update($scope.currentUser, function (data) { + SessionStorage.save({user:data}); + $scope.saved = true; + }, function (error) { + $scope.restError = error.data; + }); + } +}]) + .controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', '$route', '$location', function ($scope, UserLogin, UserLogout, User, SessionStorage, $route, $location) { if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 785de6f..8171f52 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -79,7 +79,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } @@ -126,7 +126,7 @@ angular.module('pollenServices', ['ngResource']) }, 'update' : { - method:'PUT', + method:'POST', transformRequest : function (data, headersGetter) { return transformParam(data); } diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html new file mode 100644 index 0000000..5c29acf --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -0,0 +1,70 @@ + +<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Modification effectuée..</alert> + +<h2> Modification du Profile </h2> + +<form class="horizontal-form" ng-submit="editUser()"> + <div class="control-group"> + <label for="formName" class="col-sm-3 text-right control-label"> + Nom + </label> + <div class="col-sm-8"> + <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/> + </div> + <div class="col-sm-1"> + </div> + </div> + + <div class="control-group"> + + <label for="formEmail" class="col-sm-3 text-right control-label"> + Adresse E-Mail + </label> + + <div class="col-sm-8"> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="currentUser.email"></info-error> + </div> + </div> + + <div class="control-group"> + <label for="formPassword" class="col-sm-3 text-right control-label"> + Mot de passe Actuel + </label> + <div class="col-sm-8"> + <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.password[0]" data="currentUser.password"></info-error> + </div> + </div> + + <div class="control-group"> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> + </div> +</form> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 81cf1c3..501edfd 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -19,7 +19,6 @@ #L% --> <h2> Inscription sur Pollen</h2> - <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> <label for="formName" class="col-sm-3 text-right control-label"> @@ -69,6 +68,10 @@ <div class="form-group"> - <button class="btn btn-primary" type="submit">Envoyer</button> + <div class="col-sm-3"></div> + <div class="col-sm-8"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + <div class="col-sm-1"></div> </div> </form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: check password is not blank
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 4086dc6e7c158344bb9e542d82a658ed04fec268 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 28 16:29:39 2014 +0200 check password is not blank --- .../java/org/chorem/pollen/services/service/PollenUserService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index f61fe51..1df2fa3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -217,6 +217,8 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } + checkNotBlank(errors, "password", userLogin, "password can not be empty"); + boolean emailNotblank = checkNotBlank(errors, "email", userEmail, "email can not be empty"); if (emailNotblank) { @@ -228,8 +230,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer // check if email is available only if has changed - boolean emailChanged = ObjectUtils.notEqual(persisted.getEmail(), - userEmail); + boolean emailChanged = ObjectUtils.notEqual(persisted.getEmail(), userEmail); if (emailChanged) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: change favoriteDefaultPageSize to favoriteListDefaultPageSize
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit a3c9015b438fa9d1bd258096100639fe88c89fb4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 15:51:36 2014 +0200 change favoriteDefaultPageSize to favoriteListDefaultPageSize --- pollen-ui-angular/src/main/webapp/js/conf.js.exemple | 4 ++-- .../src/main/webapp/partials/user-register.html | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index 1291f2c..adcbae6 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -8,6 +8,6 @@ var conf = { // Comment number per page commentDefaultPageSize : 10, - // Favorite poll number per page - favoriteDefaultPageSize : 15, + // Favorite list number per page + favoriteListDefaultPageSize : 15, } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 5d0d583..81cf1c3 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,8 +21,8 @@ <h2> Inscription sur Pollen</h2> <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> - <div class="form-group"> - <label for="formName" class="col-sm-3 text-right"> + <div class="control-group"> + <label for="formName" class="col-sm-3 text-right control-label"> Nom d'utilisateur </label> <div class="col-sm-8"> @@ -33,9 +33,9 @@ </div> </div> - <div class="form-group"> + <div class="control-group"> - <label for="formEmail" class="col-sm-3 text-right"> + <label for="formEmail" class="col-sm-3 text-right control-label"> Adresse E-Mail </label> @@ -47,7 +47,7 @@ </div> </div> - <div class="form-group"> + <div class="control-group"> <label for="formPassword" class="col-sm-3 text-right"> Mot de passe </label> @@ -55,7 +55,7 @@ <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> </div> - <div class="form-group"> + <div class="control-group"> <label for="formPassword2" class="col-sm-3 text-right"> Confirmation </label> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: Add default page size in conf
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 50bb88a50e77a7c36dc9d35425ebf466c933297f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 15:41:10 2014 +0200 Add default page size in conf --- pollen-ui-angular/src/main/webapp/js/conf.js.exemple | 11 ++++++++++- pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index f3f7975..1291f2c 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -1,4 +1,13 @@ var conf = { // Rest-API Base Url - restURL : "http://exemple.com/pollen-rest-api/v1" + restURL : "http://exemple.com/pollen-rest-api/v1", + + // Poll number per page + pollDefaultPageSize : 10, + + // Comment number per page + commentDefaultPageSize : 10, + + // Favorite poll number per page + favoriteDefaultPageSize : 15, } \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 0a9165d..58d2b38 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -470,7 +470,7 @@ angular.module('pollControllers', []) } } - $scope.pageSize = 3; + $scope.pageSize = conf.commentDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); var paginationParameter = {pageSize:$scope.pageSize}; @@ -559,7 +559,7 @@ angular.module('pollControllers', []) function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.pageSize = 3; + $scope.pageSize = conf.pollDefaultPageSize; $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); var paginationParameter = {pageSize:$scope.pageSize}; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/03: update pagination and add pagination in comments
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit a5da89832b2299fb38e30e933d56f6f5188b3b8a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 15:30:47 2014 +0200 update pagination and add pagination in comments --- pollen-ui-angular/src/main/webapp/js/app.js | 12 ++++++-- .../src/main/webapp/js/controllers/pollCtrl.js | 36 +++++++++++++--------- .../src/main/webapp/partials/poll-comment.html | 5 ++- .../src/main/webapp/partials/poll-list.html | 3 +- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 957151b..da816a1 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -199,13 +199,21 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC return { restrict: 'E', scope: { - pageList: '=', currentPage: '=', lastPage: '=', pageSize: '=', url: '=' }, - templateUrl: 'partials/pagination.html' + templateUrl: 'partials/pagination.html', + link: function (scope, element, attrs) { + //set pageList + scope.pageList = []; + scope.$watch('lastPage', function (newVal) { + for (var i = 0; i <= newVal; i++) { + scope.pageList.push(i); + } + }); + } } }) 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 ffa175d..0a9165d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -458,6 +458,7 @@ angular.module('pollControllers', []) }) $scope.tab = $scope.setTab('comment'); + $scope.comment = {text:''}; if (angular.isDefined($scope.session.user)) { @@ -469,8 +470,22 @@ angular.module('pollControllers', []) } } - PollComment.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { + $scope.pageSize = 3; + $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); + + var paginationParameter = {pageSize:$scope.pageSize}; + if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; + } + + paginationParameter.pageNumber = $routeParams.page; + } + + PollComment.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission, paginationParameter:paginationParameter}, function (data) { $scope.data.comments = data.elements; + $scope.data.commentsPagination = data.pagination; }); $scope.postComment = function () { @@ -486,6 +501,8 @@ angular.module('pollControllers', []) //clean form $scope.comment.text = ''; delete $scope.comment.postDate; + delete $scope.comment.id; + delete $scope.comment.permission; }, function (error) { $scope.restError = error.data; }); @@ -542,23 +559,20 @@ angular.module('pollControllers', []) function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); - $scope.pageSize = 10; + $scope.pageSize = 3; + $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); - var pollPromise; - var paginationParameter; + var paginationParameter = {pageSize:$scope.pageSize}; if (angular.isDefined($routeParams.page)) { if (angular.isDefined($routeParams.pageSize)) { paginationParameter = {pageSize:$routeParams.pageSize}; $scope.pageSize = $routeParams.pageSize; } - else { - paginationParameter = {pageSize:$scope.pageSize}; - } paginationParameter.pageNumber = $routeParams.page; } - + var pollPromise; if (angular.isDefined($routeParams.cmd)) { pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; } @@ -569,16 +583,10 @@ angular.module('pollControllers', []) pollPromise.then(function (data) { $scope.data.polls = data.elements $scope.data.pollsPagination = data.pagination; - $scope.pageList = []; - for (var i = 0; i <= $scope.data.pollsPagination.lastPage; i++) { - $scope.pageList.push(i); - } }, function (error) { $scope.restError = {forbidden:true}; }); - $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); - }]) ; \ No newline at end of file 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 90d24ec..2dd295d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -61,9 +61,8 @@ </table>  - <make-pagination page-list="pageList" - current-page="data.pollsPagination.currentPage" - last-page="data.pollsPagination.lastPage" + <make-pagination current-page="data.commentsPagination.currentPage" + last-page="data.commentsPagination.lastPage" page-size="pageSize" url="urlPagination"></make-pagination> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index b648f14..e1f74d8 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -7,8 +7,7 @@ <hr/> </div> -<make-pagination page-list="pageList" - current-page="data.pollsPagination.currentPage" +<make-pagination current-page="data.pollsPagination.currentPage" last-page="data.pollsPagination.lastPage" page-size="pageSize" url="urlPagination"></make-pagination> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/03: create directive for pagination
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 6c2b973e499af62ff4a6dba02ee4395aa5366ce1 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 14:32:30 2014 +0200 create directive for pagination --- pollen-ui-angular/src/main/webapp/js/app.js | 14 ++++++++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 5 ++++- .../src/main/webapp/partials/pagination.html | 11 +++++++++++ .../src/main/webapp/partials/poll-comment.html | 6 ++++++ .../src/main/webapp/partials/poll-list.html | 16 +++++----------- 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index ee998d0..957151b 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -195,3 +195,17 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC } }) +.directive('makePagination', function () { + return { + restrict: 'E', + scope: { + pageList: '=', + currentPage: '=', + lastPage: '=', + pageSize: '=', + url: '=' + }, + templateUrl: 'partials/pagination.html' + } +}) + 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 cebc55e..ffa175d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -542,14 +542,17 @@ angular.module('pollControllers', []) function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); + $scope.pageSize = 10; + var pollPromise; var paginationParameter; if (angular.isDefined($routeParams.page)) { if (angular.isDefined($routeParams.pageSize)) { paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; } else { - paginationParameter = {pageSize:10}; + paginationParameter = {pageSize:$scope.pageSize}; } paginationParameter.pageNumber = $routeParams.page; diff --git a/pollen-ui-angular/src/main/webapp/partials/pagination.html b/pollen-ui-angular/src/main/webapp/partials/pagination.html new file mode 100644 index 0000000..d82635f --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/pagination.html @@ -0,0 +1,11 @@ +<ul class="pagination" ng-show="pageList.length > 1"> + <li ng-class="{disabled:currentPage == 0}"> + <a ng-if="currentPage != 0" href="{{url}}page={{currentPage-1}}&pageSize={{pageSize}}">«</a> + <a ng-if="currentPage == 0">«</a> + </li> + <li ng-repeat="page in pageList" ng-class="{active:currentPage == page}"><a href="{{url}}page={{page}}&pageSize={{pageSize}}">{{page+1}}</a></li> + <li ng-class="{disabled:currentPage == lastPage}"> + <a ng-if="currentPage != lastPage" href="{{url}}page={{currentPage+1}}&pageSize={{pageSize}}">»</a> + <a ng-if="currentPage == lastPage">»</a> + </li> +</ul> 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 83ae6d2..90d24ec 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -60,4 +60,10 @@ </tr> </table>  + + <make-pagination page-list="pageList" + current-page="data.pollsPagination.currentPage" + last-page="data.pollsPagination.lastPage" + page-size="pageSize" + url="urlPagination"></make-pagination> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index 75c7b87..b648f14 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -7,14 +7,8 @@ <hr/> </div> -<ul class="pagination" ng-show="pageList.length > 1"> - <li ng-class="{disabled:data.pollsPagination.currentPage == 0}"> - <a ng-if="data.pollsPagination.currentPage != 0" href="{{urlPagination}}page={{data.pollsPagination.currentPage-1}}&pageSize={{data.pollsPagination.pageSize}}">«</a> - <a ng-if="data.pollsPagination.currentPage == 0">«</a> - </li> - <li ng-repeat="page in pageList" ng-class="{active:data.pollsPagination.currentPage == page}"><a href="{{urlPagination}}page={{page}}&pageSize={{data.pollsPagination.pageSize}}">{{page+1}}</a></li> - <li ng-class="{disabled:data.pollsPagination.currentPage == data.pollsPagination.lastPage}"> - <a ng-if="data.pollsPagination.currentPage != data.pollsPagination.lastPage" href="{{urlPagination}}page={{data.pollsPagination.currentPage+1}}&pageSize={{data.pollsPagination.pageSize}}">»</a> - <a ng-if="data.pollsPagination.currentPage == data.pollsPagination.lastPage">»</a> - </li> -</ul> \ No newline at end of file +<make-pagination page-list="pageList" + current-page="data.pollsPagination.currentPage" + last-page="data.pollsPagination.lastPage" + page-size="pageSize" + url="urlPagination"></make-pagination> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/03: fix url tab, no get result in vote controllers set pageNumber and pageSize
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 23830920e3546045fb379b781a0f0628a9ab2e27 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 14:00:00 2014 +0200 fix url tab, no get result in vote controllers set pageNumber and pageSize --- .../src/main/webapp/js/controllers/pollCtrl.js | 39 +++++++++------------- .../src/main/webapp/partials/poll.html | 4 +-- 2 files changed, 17 insertions(+), 26 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 ee5b00f..cebc55e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -388,17 +388,17 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('vote'); var initPoll = function () { - var pollPromise = Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { + Poll.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (poll) { $scope.data.poll = poll; - }).$promise; + }); - var choicesPromise = PollChoice.query({pollId:$routeParams.pollId}, function (choices) { + PollChoice.query({pollId:$routeParams.pollId}, function (choices) { $scope.data.choices = choices; initVote(); - }).$promise; + }); - var votesPromise = PollVote.query({pollId:$routeParams.pollId}, function (votes) { + PollVote.query({pollId:$routeParams.pollId}, function (votes) { $scope.data.votants = votes; angular.forEach($scope.data.votants, function (vote) { angular.forEach(vote.choice, function (choice) { @@ -410,21 +410,6 @@ angular.module('pollControllers', []) } }) }) - }).$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; - }); }); } initPoll(); @@ -500,6 +485,7 @@ angular.module('pollControllers', []) //clean form $scope.comment.text = ''; + delete $scope.comment.postDate; }, function (error) { $scope.restError = error.data; }); @@ -557,14 +543,19 @@ angular.module('pollControllers', []) $controller('PollCtrl', {$scope:$scope}); var pollPromise; - var paginationParameter = {pageSize:5}; - if (angular.isDefined($routeParams.pageSize)) { - paginationParameter.pageSize= $routeParams.pageSize; - } + var paginationParameter; if (angular.isDefined($routeParams.page)) { + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter = {pageSize:$routeParams.pageSize}; + } + else { + paginationParameter = {pageSize:10}; + } + paginationParameter.pageNumber = $routeParams.page; } + if (angular.isDefined($routeParams.cmd)) { pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; } diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 6d35af1..f2fe86d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -25,13 +25,13 @@ <alert type="success" class="alert-float" ng-if="globalVariables.commentMode && globalVariables.saved" close="globalVariables.saved = false"> Commentaire effectué..</alert> <ul class="nav nav-tabs"> - <li ng-class="{active: tab == 'home'}"><a href="{{url}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> + <li ng-class="{active: tab == 'home'}"><a href="{{urlTab}}tab=home"> <span class="glyphicon glyphicon-home"></span> </a></li> <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}">Voter</a></li> <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.id"><a href="{{globalVariables.linkComment}}">Commenter</a></li> <li ng-class="{active: tab == 'result'}" ng-show="!globalVariables.create"><a href="{{globalVariables.linkResult}}">Résultat</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="globalVariables.create"><a href="#/poll/create">Créer</a></li> <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}">Editer</a></li> - <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{url}}tab=conf">Configuration</a></li> + <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{urlTab}}tab=conf">Configuration</a></li> </ul> <div ng-include="'partials/poll-link.html'" ng-if="tab == 'home'"></div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: get poll with pagination
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit e022b11a34860aea3db0dfc25bb770e68deb50e4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 28 10:38:39 2014 +0200 get poll with pagination --- .../src/main/webapp/js/controllers/pollCtrl.js | 99 +++++++++++++++------- .../src/main/webapp/partials/poll-list.html | 14 ++- 2 files changed, 80 insertions(+), 33 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 683986e..ee5b00f 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -22,7 +22,9 @@ angular.module('pollControllers', []) .controller('HomeCtrl', ['$scope', function ($scope) { }]) -.controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', function ($scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage) { +.controller('PollCtrl', + ['$scope', '$controller', '$sce', '$timeout', '$routeParams', '$location', 'SessionStorage', + function ( $scope, $controller, $sce, $timeout, $routeParams, $location, SessionStorage) { $scope.setTab = function (defaultValue) { if (angular.isDefined($routeParams.tab)) { return $routeParams.tab; @@ -32,17 +34,23 @@ angular.module('pollControllers', []) } }; - $scope.url = window.location.origin+window.location.pathname+'#'+$location.path(); - if ($location.search().length != 0) { - $scope.url += '?'; + $scope.setUrl = function (exclude) { + var url = window.location.origin+window.location.pathname+'#'+$location.path(); + if ($location.search().length != 0) { + url += '?'; angular.forEach($location.search(), function(value, key) { - if (key != 'tab') - $scope.url += key+'='+value+'&'; + if (exclude.indexOf(key) == -1) + url += key+'='+value+'&'; }) - } - else { - $scope.url += '?'; - } + } + else { + url += '?'; + } + return url; + }; + + $scope.urlTab = $scope.setUrl(['tab']); + if (angular.isUndefined($scope.globalVariables)) { $scope.globalVariables = {saved : SessionStorage.get().saved}; @@ -57,17 +65,17 @@ angular.module('pollControllers', []) /** * Sauvegarde du token si non connecté */ - var session = SessionStorage.get(); - if (angular.isUndefined($routeParams.token) && angular.isUndefined(session.id)) { // pas de paramètre url et non connecté - if (angular.isDefined(session.permission) && session.permission != '') { // existe une permission - $scope.globalVariables.permission = session.permission; + $scope.session = SessionStorage.get(); + if (angular.isUndefined($routeParams.token) && angular.isUndefined($scope.session.id)) { // pas de paramètre url et non connecté + if (angular.isDefined($scope.session.permission) && $scope.session.permission != '') { // existe une permission + $scope.globalVariables.permission = $scope.session.permission; } - else if (session.permission == '') { + else if ($scope.session.permission == '') { SessionStorage.remove('permission'); } } - else if (angular.isDefined(session.id)) { // connecté - if (angular.isDefined(session.permission)) { // connecté => pas besoin de permission + else if (angular.isDefined($scope.session.id)) { // connecté + if (angular.isDefined($scope.session.permission)) { // connecté => pas besoin de permission SessionStorage.remove('permission'); } } @@ -453,7 +461,9 @@ angular.module('pollControllers', []) } }]) -.controller('PollCommentCtrl', ['$scope', '$controller', '$routeParams', 'Poll', 'PollComment', function ($scope, $controller, $routeParams, Poll, PollComment) { +.controller('PollCommentCtrl', + ['$scope', '$controller', '$routeParams', 'Poll', 'PollComment', + function ( $scope, $controller, $routeParams, Poll, PollComment ) { $controller('PollCtrl', {$scope:$scope}); $scope.globalVariables.commentMode = true; @@ -465,8 +475,17 @@ angular.module('pollControllers', []) $scope.tab = $scope.setTab('comment'); $scope.comment = {text:''}; - PollComment.query({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { - $scope.data.comments = data; + if (angular.isDefined($scope.session.user)) { + if (angular.isDefined($scope.session.user.name)) { + $scope.comment.authorName = $scope.session.user.name; + } + else { + $scope.comment.authorName = $scope.session.user.login; + } + } + + PollComment.get({pollId:$routeParams.pollId, permission:$scope.globalVariables.permission}, function (data) { + $scope.data.comments = data.elements; }); $scope.postComment = function () { @@ -480,7 +499,7 @@ angular.module('pollControllers', []) $scope.data.comments.push(angular.copy($scope.comment)); //clean form - $scope.comment = {text:''}; + $scope.comment.text = ''; }, function (error) { $scope.restError = error.data; }); @@ -532,24 +551,40 @@ angular.module('pollControllers', []) }]) -.controller('PollListCtrl', ['$scope', '$controller', '$routeParams', 'Poll', function ($scope, $controller, $routeParams, Poll) { +.controller('PollListCtrl', + ['$scope', '$controller', '$routeParams', 'Poll', + function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); + var pollPromise; + var paginationParameter = {pageSize:5}; + if (angular.isDefined($routeParams.pageSize)) { + paginationParameter.pageSize= $routeParams.pageSize; + } + if (angular.isDefined($routeParams.page)) { + paginationParameter.pageNumber = $routeParams.page; + } + if (angular.isDefined($routeParams.cmd)) { - Poll.query({cmd:$routeParams.cmd}, function (data) { - $scope.data.polls = data; - }, function (error) { - $scope.restError = {forbidden:true}; - }); + pollPromise = Poll.get({cmd:$routeParams.cmd, paginationParameter:paginationParameter}).$promise; } else { - Poll.query(function (data) { - $scope.data.polls = data; - }, function (error) { - $scope.restError = {forbidden:true}; - }); + pollPromise = Poll.get({paginationParameter:paginationParameter}).$promise; } + pollPromise.then(function (data) { + $scope.data.polls = data.elements + $scope.data.pollsPagination = data.pagination; + $scope.pageList = []; + for (var i = 0; i <= $scope.data.pollsPagination.lastPage; i++) { + $scope.pageList.push(i); + } + }, function (error) { + $scope.restError = {forbidden:true}; + }); + + $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); + }]) ; \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index 1648b0b..75c7b87 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -5,4 +5,16 @@ <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> <hr/> -</div> \ No newline at end of file +</div> + +<ul class="pagination" ng-show="pageList.length > 1"> + <li ng-class="{disabled:data.pollsPagination.currentPage == 0}"> + <a ng-if="data.pollsPagination.currentPage != 0" href="{{urlPagination}}page={{data.pollsPagination.currentPage-1}}&pageSize={{data.pollsPagination.pageSize}}">«</a> + <a ng-if="data.pollsPagination.currentPage == 0">«</a> + </li> + <li ng-repeat="page in pageList" ng-class="{active:data.pollsPagination.currentPage == page}"><a href="{{urlPagination}}page={{page}}&pageSize={{data.pollsPagination.pageSize}}">{{page+1}}</a></li> + <li ng-class="{disabled:data.pollsPagination.currentPage == data.pollsPagination.lastPage}"> + <a ng-if="data.pollsPagination.currentPage != data.pollsPagination.lastPage" href="{{urlPagination}}page={{data.pollsPagination.currentPage+1}}&pageSize={{data.pollsPagination.pageSize}}">»</a> + <a ng-if="data.pollsPagination.currentPage == data.pollsPagination.lastPage">»</a> + </li> +</ul> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: Improve pagination API
by Chorem.org scm May 28, 2014

May 28, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 5feaa08cdaf5d27d9bb3b7cd5d64f43853f3c1e8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 28 11:58:17 2014 +0200 Improve pagination API --- .../pollen/persistence/entity/CommentTopiaDao.java | 1 - .../rest/api/PollenRestApiApplicationListener.java | 4 ++- .../services/bean/PaginationParameterBean.java | 27 +++++++++++++++ .../pollen/services/bean/PaginationResultBean.java | 39 +++++++++++++--------- .../chorem/pollen/services/bean/PollenBeans.java | 13 ++++++++ .../pollen/services/service/CommentService.java | 6 +++- 6 files changed, 72 insertions(+), 18 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java index c314ee3..feba455 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java @@ -29,7 +29,6 @@ public class CommentTopiaDao extends AbstractCommentTopiaDao<Comment> { public PaginationResult<Comment> find(Poll poll, PaginationParameter paginationParameter) { PaginationResult<Comment> comments = forPollEquals(poll) - .setOrderByArguments(Comment.PROPERTY_TOPIA_CREATE_DATE) .findPage(paginationParameter); return comments; diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java index 886ce14..aa9581e 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java @@ -34,6 +34,7 @@ import org.chorem.pollen.services.bean.ChoiceBean; import org.chorem.pollen.services.bean.CommentBean; import org.chorem.pollen.services.bean.FavoriteListBean; import org.chorem.pollen.services.bean.FavoriteListMemberBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PollBean; import org.chorem.pollen.services.bean.PollenUserBean; import org.chorem.pollen.services.bean.VoteBean; @@ -63,7 +64,8 @@ public class PollenRestApiApplicationListener implements WebMotionServerListener PollBean.class, PollenUserBean.class, FavoriteListBean.class, - FavoriteListMemberBean.class + FavoriteListMemberBean.class, + PaginationParameterBean.class ); @Override 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 a621328..e2ee793 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 @@ -41,10 +41,21 @@ public class PaginationParameterBean { */ protected int pageSize; + protected String order; + + protected boolean desc; + public static PaginationParameterBean of(int pageNumber, int pageSize) { + PaginationParameterBean result = of (pageNumber, pageSize, null, false); + return result; + } + + public static PaginationParameterBean of(int pageNumber, int pageSize, String order, boolean desc) { PaginationParameterBean result = new PaginationParameterBean(); result.setPageNumber(pageNumber); result.setPageSize(pageSize); + result.setOrder(order); + result.setDesc(desc); return result; } @@ -70,4 +81,20 @@ public class PaginationParameterBean { public void setPageSize(int pageSize) { this.pageSize = pageSize; } + + public String getOrder() { + return order; + } + + public void setOrder(String order) { + this.order = order; + } + + public boolean isDesc() { + return desc; + } + + public void setDesc(boolean desc) { + this.desc = desc; + } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java index 79b08c3..223a59e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java @@ -33,11 +33,21 @@ public class PaginationResultBean<O extends PollenBean> { protected List<O> elements; - protected int currentPage; + public static class PaginationResultContextBean { - protected int lastPage; + protected int currentPage; - protected int pageSize; + protected int lastPage; + + protected int pageSize; + + protected String order; + + protected boolean desc; + + } + + protected PaginationResultContextBean pagination = new PaginationResultContextBean(); public List<O> getElements() { return elements; @@ -47,28 +57,27 @@ public class PaginationResultBean<O extends PollenBean> { this.elements = elements; } - public int getCurrentPage() { - return currentPage; + public PaginationResultContextBean getPagination() { + return pagination; } public void setCurrentPage(int currentPage) { - this.currentPage = currentPage; - } - - public int getLastPage() { - return lastPage; + pagination.currentPage = currentPage; } public void setLastPage(int lastPage) { - this.lastPage = lastPage; + pagination.lastPage = lastPage; } - public int getPageSize() { - return pageSize; + public void setPageSize(int pageSize) { + pagination.pageSize = pageSize; } - public void setPageSize(int pageSize) { - this.pageSize = pageSize; + public void setOrder(String order) { + pagination.order = order; } + public void setDesc(boolean desc) { + pagination.desc = desc; + } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java index 7a2c2fc..fcfcd33 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java @@ -24,12 +24,15 @@ package org.chorem.pollen.services.bean; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.services.PollenTechnicalException; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.pagination.PaginationOrder; import org.nuiton.util.pagination.PaginationResult; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * Created on 5/27/14. @@ -69,6 +72,16 @@ public class PollenBeans { result.setPageSize(entities.getCurrentPage().getPageSize()); result.setCurrentPage(entities.getCurrentPage().getPageNumber()); result.setLastPage(entities.getLastPage().getPageNumber()); + List<PaginationOrder> orderClauses = entities.getCurrentPage().getOrderClauses(); + if (CollectionUtils.isNotEmpty(orderClauses)) { + + // take the first order clause + PaginationOrder paginationOrder = orderClauses.get(0); + result.setOrder(paginationOrder.getClause()); + result.setDesc(paginationOrder.isDesc()); + + } + return result; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java index 34ec81f..1141b41 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java @@ -210,7 +210,11 @@ public class CommentService extends PollenServiceSupport { if (paginationParameter == null) { int pageSize = getPollenServiceConfig().getDefaultCommentPaginationSize(); - paginationParameter = PaginationParameterBean.of(0, pageSize); + paginationParameter = PaginationParameterBean.of( + 0, + pageSize, + Comment.PROPERTY_TOPIA_CREATE_DATE, + true); } -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0