Skip to content

Sprint5 b03528 reorder tabs by role #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Sprint5 b03528 reorder tabs by role #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ce8b8e
Item b03526: Present tabs based on roles, using ng-show
kaladay Jun 25, 2018
ec7e507
minor cleanup, update routing to management
tamu-sad-iii Jun 25, 2018
d81474e
Use traditional for loop instead of for-of loop for compatibility
kaladay Jun 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/config/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
app.config(function ($routeProvider) {
$routeProvider.
when('/management', {
redirectTo: '/management/services',
access: ["ROLE_ADMIN", "ROLE_WEB_MANAGER", "ROLE_SERVICE_MANAGER"]
}).
when('/management/:tab', {
templateUrl: 'views/management.html',
access: ["ROLE_ADMIN", "ROLE_WEB_MANAGER", "ROLE_SERVICE_MANAGER"]
Expand Down
100 changes: 98 additions & 2 deletions app/controllers/managementController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,103 @@
app.controller('ManagementController', function ($controller, $scope) {
app.controller('ManagementController', function ($controller, $scope, UserService) {

angular.extend(this, $controller('AbstractController', {
$scope: $scope
}));

});
$scope.columns = [];

$scope.getDefaultManagementTab = function () {
var columns = getColumns();
return "management/" + columns[0].path;
};

var columns = {
"services": {
path: "services",
view: "services",
label: "Services"
},
"notes": {
path: "notes",
view: "notes",
label: "Notes"
},
"ideas": {
path: "ideas",
view: "ideas",
label: "Ideas"
},
"featureProposals": {
path: "feature-proposals",
view: "featureProposals",
label: "Feature Proposals"
},
"notifications": {
path: "notifications",
view: "notifications",
label: "Notifications"
},
"users": {
path: "users",
view: "users",
label: "Users"
}
};

var getColumns = function () {
var columnDefinitions;
switch (sessionStorage.role) {
case "ROLE_ADMIN":
columnDefinitions = [
columns.services,
columns.notes,
columns.ideas,
columns.featureProposals,
columns.notifications,
columns.users
];
break;
case "ROLE_SERVICE_ADMIN":
columnDefinitions = [
columns.services,
columns.notes,
columns.ideas,
columns.featureProposals,
columns.notifications
];
break;
case "ROLE_SERVICE_MANAGER":
columnDefinitions = [
columns.services,
columns.notes,
columns.ideas,
columns.featureProposals
];
break;
case "ROLE_WEB_MANAGER":
columnDefinitions = [
columns.notes,
columns.notifications
];
break;
case "ROLE_NOTICE_MANAGER":
columnDefinitions = [
columns.notifications
];
break;
default:
columnDefinitions = [];
break;
}
$scope.columns.length = 0;
for (var index = 0 ; index < columnDefinitions.length; index++) {
$scope.columns.push(columnDefinitions[index]);
}
return $scope.columns;
};

UserService.userReady().then(function () {
getColumns();
});

});
4 changes: 2 additions & 2 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ <h2 class="hidden">Libraries Web Services Status</h2>

<ul class="dropdown-menu" role="menu">
<li ng-if="isAdmin() || isAssuming() == 'true'" role="presentation" class="dropdown-header">Manager Actions</li>
<li ng-if="isAdmin() || isManager()">
<a href="management">Management Dashboard</a>
<li ng-if="isAdmin() || isManager()" ng-controller="ManagementController">
<a href="{{getDefaultManagementTab()}}">Management Dashboard</a>
</li>
<li ng-if="isAdmin() || isAssuming() == 'true'" role="presentation" class="divider"></li>
<li ng-if="isAdmin() || isAssuming() == 'true'" role="presentation" class="dropdown-header">Admin Actions</li>
Expand Down
20 changes: 11 additions & 9 deletions app/views/management.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<div class="row">
<div class="row" ng-controller="ManagementController">

<div class="row" ng-controller="ManagementController">
<div class="row" ng-if="columns.length > 0">

<wvr-tabs target="managementView">
<wvr-tab path="services" view="views/management/services.html" label="Services">Services</wvr-tab>
<wvr-tab path="ideas" view="views/management/ideas.html" label="Notes">Ideas</wvr-tab>
<wvr-tab path="feature-proposals" view="views/management/featureProposals.html" label="Notes">Feature Proposals</wvr-tab>
<wvr-tab path="notes" view="views/management/notes.html" label="Notes">Notes</wvr-tab>
<wvr-tab path="notifications" view="views/management/notifications.html" label="notifications">Notifications</wvr-tab>
<wvr-tab path="users" view="views/management/users.html" label="users">Users</wvr-tab>
<!-- TODO: fix wvr-tabs -->
<!-- <wvr-tab ng-repeat="col in columns" path="{{col.path}}" view="views/management/{{col.view}}.html" label="{{col.label}}">{{col.label}}</wvr-tab> -->
<wvr-tab ng-show="columns[0]" path="{{columns[0].path}}" view="views/management/{{columns[0].view}}.html" label="{{columns[0].label}}">{{columns[0].label}}</wvr-tab>
<wvr-tab ng-show="columns[1]" path="{{columns[1].path}}" view="views/management/{{columns[1].view}}.html" label="{{columns[1].label}}">{{columns[1].label}}</wvr-tab>
<wvr-tab ng-show="columns[2]" path="{{columns[2].path}}" view="views/management/{{columns[2].view}}.html" label="{{columns[2].label}}">{{columns[2].label}}</wvr-tab>
<wvr-tab ng-show="columns[3]" path="{{columns[3].path}}" view="views/management/{{columns[3].view}}.html" label="{{columns[3].label}}">{{columns[3].label}}</wvr-tab>
<wvr-tab ng-show="columns[4]" path="{{columns[4].path}}" view="views/management/{{columns[4].view}}.html" label="{{columns[4].label}}">{{columns[4].label}}</wvr-tab>
<wvr-tab ng-show="columns[5]" path="{{columns[5].path}}" view="views/management/{{columns[5].view}}.html" label="{{columns[5].label}}">{{columns[5].label}}</wvr-tab>
</wvr-tabs>

<wvr-tabview class="management-vew" for="managementView"></wvr-tabview>
<wvr-tabview class="management-view" for="managementView"></wvr-tabview>

</div>

Expand Down