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 f13b8d3bb43a404bd46189546de68a4f73160d0f Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 20 11:47:31 2015 +0100 allow supervisor to add client user from ui --- coselmar-ui/src/main/webapp/index.html | 12 +- .../src/main/webapp/js/coselmar-controllers.js | 1 - .../views/users/{users.html => adminUsers.html} | 14 +-- .../users/{users.html => supervisorUsers.html} | 51 +-------- coselmar-ui/src/main/webapp/views/users/users.html | 123 +-------------------- 5 files changed, 19 insertions(+), 182 deletions(-) diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index bd194a0..ca492a1 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -35,7 +35,6 @@ <script src="webjars/angularjs/1.3.6/angular-route.js"></script> <script src="webjars/angularjs/1.3.6/angular-resource.js"></script> <script src="webjars/angularjs/1.3.6/angular-messages.js"></script> - <!--<script src="nuiton-js/angular-ui-bootstrap.js"></script>--> <script src="webjars/bootstrap/3.3.1/js/bootstrap.js"></script> <!--TODO ymartel 20141203 : extract version, or use wro --> @@ -75,12 +74,18 @@ <nav class="hidden-xs"> <ul class="nav navbar-nav"> <a href="#" role="button" class="navbar-brand">Coselmar Traceability</a> - <li ng-if="currentUser.role == 'ADMIN'"> - <a href="#/users" class="dropdown-toggle">User</a> + <li class="dropdown" ng-if="currentUser.role == 'ADMIN' || currentUser.role == 'SUPERVISOR'"> + <a class="dropdown-toggle" data-toggle="dropdown">Users<span class="caret"></span></a> + <ul class="dropdown-menu" role="menu"> + <li><a href="#/users" role="menuitem">List</a></li> + <li><a href="#/users/new" role="menuitem" ng-if="currentUser.role == 'ADMIN'">Add an user</a></li> + <li><a href="#/users/new" role="menuitem" ng-if="currentUser.role == 'SUPERVISOR'">Add a client</a></li> + </ul> </li> <li ng-if="currentUser"> <a href="#/documents" role="button" class="dropdown-toggle">Documents</a> </li> + <li class="dropdown" ng-if="currentUser"> <a class="dropdown-toggle" data-toggle="dropdown">Questions<span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> @@ -88,6 +93,7 @@ <li><a href="#/questions/new" role="menuitem" ng-if="currentUser.role == 'SUPERVISOR'">Add a question</a></li> </ul> </li> + <li ng-if="currentUser"> <a href="#/referential" role="button" class="dropdown-toggle">Referential Search</a> </li> diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index d1ae64b..5d40401 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -286,7 +286,6 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', // Controller for new user View coselmarControllers.controller("NewUserCtrl", ['$scope', '$route', '$location', 'userService', function($scope, $route, $location, userService){ - console.log($scope.currentUser); if ($scope.currentUser.role == 'ADMIN') { $scope.user = {'role' : 'EXPERT'}; } else if ($scope.currentUser.role == 'SUPERVISOR') { diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/adminUsers.html similarity index 94% copy from coselmar-ui/src/main/webapp/views/users/users.html copy to coselmar-ui/src/main/webapp/views/users/adminUsers.html index adff98a..766faa2 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/adminUsers.html @@ -21,15 +21,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> - <div class="page-header" style="margin: 0"> - <h1> - <!-- Heading goes here --> - All Users - </h1> - </div> - <div class="table-responsive"> + <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">Add an user</a> @@ -103,7 +96,7 @@ <th class="col-md-1"></th> </tr> <tr ng-repeat="user in users"> - <td><a href="#/users/{{user.id}}">{{user.firstname}} {{user.name}}</a></td> + <td><a href="#/users/{{user.id}}">{{user.firstName}} {{user.name}}</a></td> <td>{{user.mail}}</td> <td>{{user.qualification}}</td> <td>{{user.organization}}</td> @@ -127,5 +120,4 @@ </td> </tr> </table> - </div> -</div> \ No newline at end of file + </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html similarity index 68% copy from coselmar-ui/src/main/webapp/views/users/users.html copy to coselmar-ui/src/main/webapp/views/users/supervisorUsers.html index adff98a..e28eb42 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html @@ -1,38 +1,8 @@ -<!-- - #%L - Coselmar :: UI - $Id:$ - $HeadURL:$ - %% - Copyright (C) 2014 Ifremer, Code Lutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<div style="padding: 0px 0px 0px 30px"> - <div class="page-header" style="margin: 0"> - <h1> - <!-- Heading goes here --> - All Users - </h1> - </div> - <div class="table-responsive"> + <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">Add an user</a> + <a href="#/users/new" class="form-inline navbar-left btn btn-primary">Add a client</a> </div> <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> <div class="form-group"> @@ -103,7 +73,7 @@ <th class="col-md-1"></th> </tr> <tr ng-repeat="user in users"> - <td><a href="#/users/{{user.id}}">{{user.firstname}} {{user.name}}</a></td> + <td>{{user.firstName}} {{user.name}}</td> <td>{{user.mail}}</td> <td>{{user.qualification}}</td> <td>{{user.organization}}</td> @@ -111,21 +81,10 @@ <td ng-if="user.active">Active</td> <td ng-if="!user.active">Disable</td> <td> - <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit"> + <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit" ng-if="user.role == 'CLIENT'"> <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>Modify </a> - <a class="btn btn-action btn-disable" ng-if="user.active" - ng-confirm-message="Do you really want to disable this user ?" - ng-confirm-click="disableUser(user)"> - <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Disable - </a> - <a class="btn btn-action" ng-if="!user.active" - ng-click="enableUser(user)"> - <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Enable - </a> - <!--<a class="btn btn-primary" ng-if="!user.active" ng-click="enableUser(user.id)">Enable</a>--> </td> </tr> </table> - </div> -</div> \ No newline at end of file + </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html index adff98a..3ca0c0e 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/users.html @@ -1,26 +1,3 @@ -<!-- - #%L - Coselmar :: UI - $Id:$ - $HeadURL:$ - %% - Copyright (C) 2014 Ifremer, Code Lutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> <div style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h1> @@ -29,103 +6,7 @@ </h1> </div> - <div class="table-responsive"> - <div class="row"> - <div class="form-group col-md-5"> - <a href="#/users/new" class="form-inline navbar-left btn btn-primary">Add an user</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>Show Disable</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">Advanced Search</a> - </div> - <div class="form-group col-md-5" ng-show="advanced"> - <a ng-click="advanced=false" class="fa fa-sort-up">Simple Search</a> - </div> - </div> + <div ng-include="src='views/users/adminUsers.html'" ng-if="currentUser.role == 'ADMIN'"></div> + <div ng-include="src='views/users/supervisorUsers.html'" ng-if="currentUser.role == 'SUPERVISOR'"></div> - <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">All</option> - <option value="ADMIN">Admin</option> - <option value="SUPERVISOR">Supervisor</option> - <option value="EXPERT">Expert</option> - <option value="MEMBER">Member</option> - <option value="CLIENT">Client</option> - </select> - </td> - <td class="form-group"> - <select class="form-control" name="active" ng-model="example.active" title="active" > - <option value="true">Active</option> - <option value="false">Inactive</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">Name</th> - <th class="col-md-2">Mail</th> - <th class="col-md-2">Qualification</th> - <th class="col-md-2">Organization</th> - <th class="col-md-2">Role</th> - <th class="col-md-1">Status</th> - <th class="col-md-1"></th> - </tr> - <tr ng-repeat="user in users"> - <td><a href="#/users/{{user.id}}">{{user.firstname}} {{user.name}}</a></td> - <td>{{user.mail}}</td> - <td>{{user.qualification}}</td> - <td>{{user.organization}}</td> - <td>{{user.role}}</td> - <td ng-if="user.active">Active</td> - <td ng-if="!user.active">Disable</td> - <td> - <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit"> - <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>Modify - </a> - <a class="btn btn-action btn-disable" ng-if="user.active" - ng-confirm-message="Do you really want to disable this user ?" - ng-confirm-click="disableUser(user)"> - <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Disable - </a> - <a class="btn btn-action" ng-if="!user.active" - ng-click="enableUser(user)"> - <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Enable - </a> - <!--<a class="btn btn-primary" ng-if="!user.active" ng-click="enableUser(user.id)">Enable</a>--> - </td> - </tr> - </table> - </div> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.