branch develop updated (3862881 -> dcd3eff)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 3862881 Refs-30 #6547 : Change display of question page new 20137fa fix default example values for advance search on user new cfe61da review advanced search part on users new d69ec96 fix user advanced search display as admin new 7896917 Fixes #6553 Merge branch 'feature/6553-fix-advanced-search-users' into develop new dcd3eff Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dcd3eff5130f5fa82b2ae33c2a00f8a863aba806 Merge: 7896917 3862881 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 10:18:02 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit 7896917a4ebf23b56f61b1b36ce97f558135b9bd Merge: ba33c15 d69ec96 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 10:17:47 2015 +0100 Fixes #6553 Merge branch 'feature/6553-fix-advanced-search-users' into develop commit d69ec96ec4daa7c8576ff24bfba5f44afd680610 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 10:17:38 2015 +0100 fix user advanced search display as admin commit cfe61da0d121cb4c5e5dfcb533f6ac55e6f3bc62 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 18:19:18 2015 +0100 review advanced search part on users commit 20137fa3acb692993c6be70e18f5a5dfb42fdfd0 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 17:23:07 2015 +0100 fix default example values for advance search on user Summary of changes: .../persistence/entity/CoselmarUserTopiaDao.java | 11 +-- .../src/main/webapp/js/coselmar-controllers.js | 17 ++-- .../src/main/webapp/views/users/adminUsers.html | 27 +----- .../src/main/webapp/views/users/searchPart.html | 97 ++++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 62 +------------- 5 files changed, 115 insertions(+), 99 deletions(-) create mode 100644 coselmar-ui/src/main/webapp/views/users/searchPart.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 20137fa3acb692993c6be70e18f5a5dfb42fdfd0 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 17:23:07 2015 +0100 fix default example values for advance search on user --- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index ca3aff5..3e8033e 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -315,7 +315,7 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', //manage keywords if given $scope.search = { searchKeywords : []}; - $scope.example = {}; + $scope.example = { active : "true", role : 'ALL'}; var keywords = $routeParams.keywords; if (Array.isArray(keywords)) { @@ -329,7 +329,6 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', } else { $scope.search.showDisable = false; } - console.log($scope.search.showDisable); userService.getUsers($scope.search.searchKeywords, $scope.search.showDisable, function(users) { $scope.users = users; @@ -364,24 +363,24 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', }; $scope.searchUsers = function(){ + console.log("launch search"); $location.search('keywords', $scope.search.searchKeyword); $location.search('showDisable', $scope.search.showDisable); }; $scope.advancedSearchUsers = function() { if ($scope.example.role && $scope.example.role == "ALL") { + // Because "ALL" role is just a hack to select no role, remove it from example delete $scope.example.role; }; - if ($scope.example.active) { - if($scope.example.active == "true") { - $scope.example.active = true; - } else { - $scope.example.active = false; - }; - }; console.log($scope.example); + userService.getAdvancedUsers($scope.example, function(users){ $scope.users = users; + if (!$scope.example.role) { + // replace "ALL" as role if there is no specified role + $scope.example.role = "ALL"; + }; }); }; }]); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit cfe61da0d121cb4c5e5dfcb533f6ac55e6f3bc62 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 27 18:19:18 2015 +0100 review advanced search part on users --- .../persistence/entity/CoselmarUserTopiaDao.java | 11 +-- .../src/main/webapp/views/users/adminUsers.html | 27 +----- .../src/main/webapp/views/users/searchPart.html | 97 ++++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 62 +------------- 4 files changed, 107 insertions(+), 90 deletions(-) diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java index 458da7d..45e81e1 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java @@ -30,6 +30,7 @@ import java.util.Map; import fr.ifremer.coselmar.persistence.DaoUtils; import fr.ifremer.coselmar.persistence.SearchRequestBean; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.pagination.PaginationParameter; public class CoselmarUserTopiaDao extends AbstractCoselmarUserTopiaDao<CoselmarUser> { @@ -134,35 +135,35 @@ public class CoselmarUserTopiaDao extends AbstractCoselmarUserTopiaDao<CoselmarU } // Search on FirstName ? - if (example.getFirstname() != null) { + if (StringUtils.isNotBlank(example.getFirstname())) { String firstNameCondition = DaoUtils.andAttributeLike("CU", CoselmarUser.PROPERTY_FIRSTNAME, args, example.getFirstname()); hqlBuilder.append(firstNameCondition); } // Search on Name ? - if (example.getName() != null) { + if (StringUtils.isNotBlank(example.getName())) { String nameCondition = DaoUtils.andAttributeLike("CU", CoselmarUser.PROPERTY_NAME, args, example.getName()); hqlBuilder.append(nameCondition); } // Search on Mail ? - if (example.getMail() != null) { + if (StringUtils.isNotBlank(example.getMail())) { String mailCondition = DaoUtils.andAttributeLike("CU", CoselmarUser.PROPERTY_MAIL, args, example.getMail()); hqlBuilder.append(mailCondition); } // Search on Organization ? - if (example.getOrganization() != null) { + if (StringUtils.isNotBlank(example.getOrganization())) { String organizationCondition = DaoUtils.andAttributeLike("CU", CoselmarUser.PROPERTY_ORGANIZATION, args, example.getOrganization()); hqlBuilder.append(organizationCondition); } // Search on Qualification ? - if (example.getQualification() != null) { + if (StringUtils.isNotBlank(example.getQualification())) { String qualificationCondition = DaoUtils.andAttributeLike("CU", CoselmarUser.PROPERTY_QUALIFICATION, args, example.getQualification()); hqlBuilder.append(qualificationCondition); diff --git a/coselmar-ui/src/main/webapp/views/users/adminUsers.html b/coselmar-ui/src/main/webapp/views/users/adminUsers.html index 26dd36c..e336b3a 100644 --- a/coselmar-ui/src/main/webapp/views/users/adminUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/adminUsers.html @@ -23,31 +23,8 @@ --> <div class="table-responsive" ng-if="currentUser.role == 'ADMIN'"> - <div class="row"> - <div class="form-group col-md-5"> - <a href="#/users/new" class="form-inline navbar-left btn btn-primary">{{ 'user.button.add' | translate }}</a> - </div> - <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> - <div class="form-group"> - <input type="checkbox" class="form-control" ng-model="search.showDisable" /> - <span>{{ 'user.button.showDisable' | translate }}</span> - </div> - <div class="form-group"> - <input type="search" class="form-control" placeholder="Search an user" ng-model="search.searchKeyword" /> - </div> - <div class="form-group"> - <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> - </div> - </form> - </div> - <div class="row"> - <div class="form-group col-md-5" ng-show="!advanced"> - <a ng-click="advanced=true" class="fa fa-sort-down">{{ 'common.button.advanceSearch' | translate }}</a> - </div> - <div class="form-group col-md-5" ng-show="advanced"> - <a ng-click="advanced=false" class="fa fa-sort-up">{{ 'common.button.simpleSearch' | translate }}</a> - </div> - </div> + + <div class="row" ng-include="src='views/users/searchPart.html'" /> <br/> <table class="table"> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html new file mode 100644 index 0000000..56e6592 --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -0,0 +1,97 @@ + +<!-- Simple search part --> +<div class="row"> + <div class="form-group col-md-5"> + <a href="#/users/new" class="form-inline navbar-left btn btn-primary" ng-if="currentUser.role == 'ADMIN'"> + {{ 'user.button.add' | translate }} + </a> + + <a href="#/users/new" class="form-inline navbar-left btn btn-primary" ng-if="currentUser.role == 'SUPERVISOR'"> + {{ 'user.button.add.client' | translate }} + </a> + </div> + + <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> + <div class="form-group"> + <input type="checkbox" class="form-control" ng-model="search.showDisable" /> + <span>{{ 'user.button.showDisable' | translate }}</span> + </div> + <div class="form-group"> + <input type="search" class="form-control" placeholder="Search an user" ng-model="search.searchKeyword" /> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> + </div> + </form> +</div> + +<div class="row"> + <div class="form-group col-md-5" ng-show="!advanced"> + <a ng-click="advanced=true" class="fa fa-sort-down">{{ 'common.button.advanceSearch' | translate }}</a> + </div> + <div class="form-group col-md-5" ng-show="advanced"> + <a ng-click="advanced=false" class="fa fa-sort-up">{{ 'common.button.simpleSearch' | translate }}</a> + </div> +</div> + +<!-- Advanced Search part --> + +<div ng-if="advanced" > + <form class="form-horizontal" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchUsers()"> + + <div class="form-group row"> + + <label class="col-md-1 control-label">{{ 'user.metadata.name' | translate }}</label> + <div class="col-md-2"> + <input class="form-control" type="search" class="form-control" placeholder="Bond" ng-model="example.name" /> + </div> + + <label class="col-md-1 control-label">{{ 'user.metadata.firstName' | translate }}</label> + <div class="col-md-2"> + <input class="form-control" type="search" class="form-control" placeholder="James" ng-model="example.firstName" /> + </div> + + <label class="col-md-1 control-label">{{ 'user.metadata.mail' | translate }}</label> + <div class="col-md-2"> + <input class="form-control" type="search" class="form-control" placeholder="james.bond@mi6.org" ng-model="example.mail" /> + </div> + + <label class="col-md-1 control-label">{{ 'user.metadata.role' | translate }}</label> + <div class="col-md-2"> + <select class="form-control" name="role" ng-model="example.role" title="role" > + <option value="ALL">{{ 'user.metadata.role.all' | translate }}</option> + <option value="ADMIN">{{ 'user.metadata.role.admin' | translate }}</option> + <option value="SUPERVISOR">{{ 'user.metadata.role.supervisor' | translate }}</option> + <option value="EXPERT">{{ 'user.metadata.role.expert' | translate }}</option> + <option value="MEMBER">{{ 'user.metadata.role.member' | translate }}</option> + <option value="CLIENT">{{ 'user.metadata.role.client' | translate }}</option> + </select> + </div> + + </div> + + <div class="form-group row"> + + <label class="col-md-1 control-label">{{ 'user.metadata.organization' | translate }}</label> + <div class="col-md-2"> + <input class="form-control" type="search" class="form-control" placeholder="MI-6" ng-model="example.organization" /> + </div> + + <label class="col-md-1 control-label">{{ 'user.metadata.qualification' | translate }}</label> + <div class="col-md-2"> + <input class="form-control" type="search" class="form-control" placeholder="007" ng-model="example.qualification" /> + </div> + + <label class="col-md-1 control-label">{{ 'user.metadata.status' | translate }}</label> + <div class="col-md-2"> + <select class="form-control" name="active" ng-model="example.active" title="active" > + <option value="true">{{ 'user.metadata.status.enable' | translate }}</option> + <option value="false">{{ 'user.metadata.status.disable' | translate }}</option> + </select> + </div> + + <button type="submit" class="btn btn-default fa fa-search" ng-click="advancedSearchUsers()">Search</button> + + </div> + </form> +</div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html index 69834a3..3542ea7 100644 --- a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html @@ -23,69 +23,11 @@ --> <div class="table-responsive" ng-if="currentUser.role == 'SUPERVISOR'"> - <div class="row"> - <div class="form-group col-md-5"> - <a href="#/users/new" class="form-inline navbar-left btn btn-primary">{{ 'user.button.add.client' | translate }}</a> - </div> - <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> - <div class="form-group"> - <input type="checkbox" class="form-control" ng-model="search.showDisable" /> - <span>{{ 'user.button.showDisable' | translate }}</span> - </div> - <div class="form-group"> - <input type="search" class="form-control" placeholder="Search an user" ng-model="search.searchKeyword" /> - </div> - <div class="form-group"> - <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> - </div> - </form> - </div> - <div class="row"> - <div class="form-group col-md-5" ng-show="!advanced"> - <a ng-click="advanced=true" class="fa fa-sort-down">{{ 'common.button.advanceSearch' | translate }}</a> - </div> - <div class="form-group col-md-5" ng-show="advanced"> - <a ng-click="advanced=false" class="fa fa-sort-up">{{ 'common.button.simpleSearch' | translate }}</a> - </div> - </div> + + <div ng-include="src='views/users/searchPart.html'" /> <br/> <table class="table"> - <tr ng-if="advanced"> - <form class="form-inline" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchUsers()"> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Name" ng-model="example.name" /> - </td> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Mail" ng-model="example.mail" /> - </td> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Qualification" ng-model="example.qualification" /> - </td> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Organization" ng-model="example.organization" /> - </td> - <td class="form-group"> - <select class="form-control" name="role" ng-model="example.role" title="role" > - <option value="ALL">{{ 'user.metadata.role.all' | translate }}</option> - <option value="ADMIN">{{ 'user.metadata.role.admin' | translate }}</option> - <option value="SUPERVISOR">{{ 'user.metadata.role.supervisor' | translate }}</option> - <option value="EXPERT">{{ 'user.metadata.role.expert' | translate }}</option> - <option value="MEMBER">{{ 'user.metadata.role.member' | translate }}</option> - <option value="CLIENT">{{ 'user.metadata.role.client' | translate }}</option> - </select> - </td> - <td class="form-group"> - <select class="form-control" name="active" ng-model="example.active" title="active" > - <option value="true">{{ 'user.metadata.status.enable' | translate }}</option> - <option value="false">{{ 'user.metadata.status.disable' | translate }}</option> - </select> - </td> - <td class="form-group text-center"> - <button type="submit" class="btn btn-default fa fa-search" ng-click="advancedSearchUsers()">Search</button> - </td> - </form> - </tr> <tr> <th class="col-md-2">{{ 'user.metadata.name' | translate }}</th> <th class="col-md-2">{{ 'user.metadata.mail' | translate }}</th> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit d69ec96ec4daa7c8576ff24bfba5f44afd680610 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 10:17:38 2015 +0100 fix user advanced search display as admin --- coselmar-ui/src/main/webapp/views/users/adminUsers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coselmar-ui/src/main/webapp/views/users/adminUsers.html b/coselmar-ui/src/main/webapp/views/users/adminUsers.html index e336b3a..fd03b84 100644 --- a/coselmar-ui/src/main/webapp/views/users/adminUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/adminUsers.html @@ -24,7 +24,7 @@ <div class="table-responsive" ng-if="currentUser.role == 'ADMIN'"> - <div class="row" ng-include="src='views/users/searchPart.html'" /> + <div ng-include="src='views/users/searchPart.html'" /> <br/> <table class="table"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 7896917a4ebf23b56f61b1b36ce97f558135b9bd Merge: ba33c15 d69ec96 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 10:17:47 2015 +0100 Fixes #6553 Merge branch 'feature/6553-fix-advanced-search-users' into develop .../persistence/entity/CoselmarUserTopiaDao.java | 11 +-- .../src/main/webapp/js/coselmar-controllers.js | 17 ++-- .../src/main/webapp/views/users/adminUsers.html | 27 +----- .../src/main/webapp/views/users/searchPart.html | 97 ++++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 62 +------------- 5 files changed, 115 insertions(+), 99 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit dcd3eff5130f5fa82b2ae33c2a00f8a863aba806 Merge: 7896917 3862881 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 10:18:02 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop coselmar-ui/src/main/webapp/css/coselmar.css | 143 ++++++++++++- coselmar-ui/src/main/webapp/i18n/en.js | 3 +- coselmar-ui/src/main/webapp/i18n/fr.js | 7 +- coselmar-ui/src/main/webapp/img/logo.gif | Bin 0 -> 4274 bytes coselmar-ui/src/main/webapp/index.html | 19 +- .../src/main/webapp/views/questions/question.html | 13 +- .../main/webapp/views/questions/viewquestion.html | 232 ++++++++------------- 7 files changed, 256 insertions(+), 161 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm