diff --git a/apps/steward-app/src/main/js/src/app/dashboard/history/history-table/history-table.tpl.html b/apps/steward-app/src/main/js/src/app/dashboard/history/history-table/history-table.tpl.html
index c9cbe7aba..b33790f7b 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/history/history-table/history-table.tpl.html
+++ b/apps/steward-app/src/main/js/src/app/dashboard/history/history-table/history-table.tpl.html
@@ -1,87 +1,87 @@
<div>
<table class="table table-striped thin-col">
<thead>
<tr>
<td class="thin-col">
- <a ng-click="sort.currentColumn = 'stewardId'; sort.descending = !sort.descending; refreshHistory()">
+ <a ng-click=" setSort('stewardId'); refreshHistory();">
ID
<i ng-show="sort.currentColumn == 'stewardId' && sort.descending" class="fa fa-caret-down"></i>
<i ng-show="sort.currentColumn == 'stewardId' && !sort.descending" class="fa fa-caret-up"></i>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'topicName'; sort.descending = !sort.descending; refreshHistory()">
+ <a ng-click="setSort('topicName'); refreshHistory();">
Query Topic
<i ng-show="sort.currentColumn == 'topicName' && sort.descending" class="fa fa-caret-down"></i>
<i ng-show="sort.currentColumn == 'topicName' && !sort.descending" class="fa fa-caret-up"></i>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'researcherId'; sort.descending = !sort.descending; refreshHistory()">
+ <a ng-click="setSort('researcherId'); refreshHistory();">
Username
<i ng-show="sort.currentColumn == 'researcherId' && sort.descending" class="fa fa-caret-down"></i>
<i ng-show="sort.currentColumn == 'researcherId' && !sort.descending" class="fa fa-caret-up"></i>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'name'; sort.descending = !sort.descending; refreshHistory()">
+ <a ng-click="setSort('name'); refreshHistory();">
Query Text
<i ng-show="sort.currentColumn == 'name' && sort.descending" class="fa fa-caret-down"></i>
<i ng-show="sort.currentColumn == 'name' && !sort.descending" class="fa fa-caret-up"></i>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'stewardResponse'; sort.descending = !sort.descending; refreshHistory()">
+ <a ng-click="setSort('stewardResponse'); refreshHistory();">
Status
<i ng-show="sort.currentColumn == 'stewardResponse' && sort.descending" class="fa fa-caret-down"></i>
<i ng-show="sort.currentColumn == 'stewardResponse' && !sort.descending" class="fa fa-caret-up"></i>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'date'; sort.descending= !sort.descending; refreshHistory()">
+ <a ng-click="setSort('date'); refreshHistory();">
Date
<i ng-show="sort.currentColumn == 'date' && sort.descending"
class="fa fa-caret-down"></i>
<i ng-show="sort.currentColumn == 'date' && !sort.descending"
class="fa fa-caret-up"></i>
</a>
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="query in queries">
<td class="thin-col">{{query.stewardId}}</td>
<td class="big-data">{{query.topic.name}}</td>
<td>{{query.user.userName}}</td>
<td class="big-data">
<a href ng-click="showQuery(query)">{{query.name}}</a>
</td>
<td>{{query.stewardResponse}}</td>
<td>{{formatDate(query.date)}}</td>
</tr>
</tbody>
</table>
<!--
https://angular-ui.github.io/bootstrap/
http://getbootstrap.com/components/
-->
<div class="form-group text-center" ng-show="length > limit">
<pagination boundary-links="true"
ng-change="onPageSelected()"
total-items="length"
ng-model="pageIndex"
class="pagination-sm"
items-per-page="limit"
previous-text="‹"
next-text="›"
first-text="«"
last-text="»">
</pagination>
</div>
</div>
\ No newline at end of file
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/history/history.js b/apps/steward-app/src/main/js/src/app/dashboard/history/history.js
index aea311503..40f3ac57f 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/history/history.js
+++ b/apps/steward-app/src/main/js/src/app/dashboard/history/history.js
@@ -1,170 +1,187 @@
/**
* Query History
* @author Ben Carmen
* @date 04/04/2015
* Edit Log:
* @todo: bdc -- 04-04-15 -- consider making steward role default a utils. method.
* @todo: bdc -- 04-06-15 -- change $scope.data.queries to $scope.queries.
*/
angular.module('stewardApp')
.directive('queryHistory', function (HistoryMdl, $app, $modal) {
return {
restrict: 'E',
scope: {
topic: "="
},
templateUrl: 'src/app/dashboard/history/history.tpl.html',
controller: function ($scope) {
//private
var roles = $app.globals.UserRoles,
user = $app.globals.currentUser,
utils = $app.utils,
model, role;
//steward by default.
role = (utils.hasAccess(user, [roles.ROLE2])) ? roles.ROLE2 : roles.ROLE1;
model = HistoryMdl.getInstance(role);
$scope.queries = [];
$scope.formatDate = $app.utils.utcToMMDDYYYY;
$scope.sort = {
currentColumn: 'date',
descending: false
}
$scope.getTopicTitle = function (topic) {
return (topic !== undefined)? topic.name + ' Query History' : 'Query History';
};
$scope.getQueryTitle = function (queryXml) {
var queryAsJson = utils.xmlToJson(queryXml);
return queryAsJson.queryDefinition.name;
};
/**
* Modal Configuration for creating a new topic.
* @type {{templateUrl: string, controller: Function}}
*/
$scope.modalConfig = {
templateUrl: 'src/app/history/query-detail/query-detail.tpl.html',
controller: function ($scope, $modalInstance, modalData) {
$scope.query = modalData;
$scope.prettify = function (queryData) {
var array = queryData.split('<'),
tab = '\t',
enter = '\n';
//traverse array
var ret = array.join(enter + tab + '<');
return ret;
};
$scope.ok = function () {
$modalInstance.dismiss('cancel');
};
$scope.queryContents = $scope.prettify($scope.query.queryContents);
}
};
//set pagination values.
$scope.range = $app.globals.ViewConfig.RANGE;//range of paging numbers at bottom
$scope.length = 0; //total number of results
$scope.pageIndex = $app.globals.ViewConfig.INDEX;//current page
$scope.limit = $app.globals.ViewConfig.LIMIT;//number of results to show in table at per page.
$scope.skip = 0; //number of results to skip.
/*
* Refresh Query History - get a range of query history results.
* @param: skip - number of result to skip
* @param: limit - number of results.
*/
$scope.refreshHistory = function () {
var topicId = ($scope.topic !== undefined) ? $scope.topic.id : undefined,
sortBy, sortDirection;
if ($scope.sort && $scope.sort.currentColumn !== "") {
sortBy = $scope.sort.currentColumn;
sortDirection = ($scope.sort.descending) ? "descending" : "ascending";
}
$scope.queryRecords = model.getHistory($scope.skip, $scope.limit, sortBy, sortDirection, topicId)
.then(function (result) {
$scope.queries = result.queryRecords;
$scope.length = result.totalCount;
});
};
/*
* Handler for when pagination page is changed.
*/
$scope.onPageSelected = function () {
var mult;
mult = ($scope.pageIndex > 0) ? $scope.pageIndex - 1 : 0;
$scope.skip = $scope.limit * mult;
$scope.refreshHistory($scope.skip, $scope.limit);
};
+ /**
+ *
+ * @param columnId
+ */
+ $scope.setSort = function (columnId) {
+
+ //change direction if same column is clicked.
+ if($scope.sort.currentColumn == columnId) {
+ $scope.sort.descending = !$scope.sort.descending;
+ return;
+ }
+
+ //start out the sorting as ascending.
+ $scope.sort.descending = false;
+ $scope.sort.currentColumn = columnId;
+ }
+
/**
*
*/
$scope.showQuery = function (query) {
var model = $scope.model;
var modalInstance = $modal.open({
animation: true,
templateUrl: 'src/app/dashboard/history/history-table/query-detail.tpl.html',
controller: function ($scope, $modalInstance, query) {
$scope.query = query;
$scope.prettify = function (queryData) {
var array = queryData.split('<'),
tab = '\t',
enter = '\n';
var ret = array.join(enter + tab + '<');
return ret;
};
$scope.ok = function () {
$modalInstance.dismiss('cancel');
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
$scope.queryContents = $scope.prettify($scope.query.queryContents);
},
//size: undefined,
resolve: {
query: function () {
return query;
}
}
});
};
$scope.refreshHistory();
}
};
})
.directive("historyTable", function () {
return {
restrict: "E",
templateUrl: "src/app/dashboard/history/history-table/history-table.tpl.html",
replace: true
};
});
\ No newline at end of file
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-table.tpl.html b/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-table.tpl.html
index c30086bb7..8d4cb19fc 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-table.tpl.html
+++ b/apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-table.tpl.html
@@ -1,114 +1,109 @@
<div>
<table class="table table-striped thin-col">
<thead>
<tr>
<td restrict="{{app.globals.UserRoles.ROLE2}}" class="thin-col">
- <a href="#"
- ng-click="sort.currentColumn = 'id'; sort.descending = !sort.descending; refreshTopics()">
+ <a ng-click="setSort('id'); refreshTopics();">
ID
<span ng-show="sort.currentColumn == 'id' && sort.descending" class="fa fa-caret-down"></span>
<span ng-show="sort.currentColumn == 'id' && !sort.descending" class="fa fa-caret-up"></span>
</a>
</td>
<td>
- <a href="#"
- ng-click="sort.currentColumn = 'name'; sort.descending = !sort.descending; refreshTopics()">
+ <a ng-click="setSort('name'); refreshTopics();">
Topic Name
<span ng-show="sort.currentColumn == 'name' && sort.descending" class="fa fa-caret-down"></span>
<span ng-show="sort.currentColumn == 'name' && !sort.descending" class="fa fa-caret-up"></span>
</a>
</td>
<td restrict="{{app.globals.UserRoles.ROLE2}}">
- <a href="#"
-
- ng-click="sort.currentColumn = 'createdBy'; sort.descending = !sort.descending; refreshTopics()">
+ <a ng-click="setSort('createdBy'); refreshTopics();">
Username
<span ng-show="sort.currentColumn == 'createdBy' && sort.descending" class="fa fa-caret-down"></span>
<span ng-show="sort.currentColumn == 'createdBy' && !sort.descending" class="fa fa-caret-up"></span>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'createDate'; sort.descending = !sort.descending; refreshTopics()">
+ <a ng-click="setSort('createDate'); refreshTopics()">
Date Created
<span ng-show="sort.currentColumn == 'createDate' && sort.descending" class="fa fa-caret-down"></span>
<span ng-show="sort.currentColumn == 'createDate' && !sort.descending" class="fa fa-caret-up"></span>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'changeDate'; sort.descending = !sort.descending; refreshTopics()">
+ <a ng-click="setSort('changeDate'); refreshTopics();">
Last Updated
<span ng-show="sort.currentColumn == 'changeDate' && sort.descending" class="fa fa-caret-down"></span>
<span ng-show="sort.currentColumn == 'changeDate' && !sort.descending" class="fa fa-caret-up"></span>
</a>
</td>
<td>
- <a ng-click="sort.currentColumn = 'state'; sort.descending= !sort.descending; refreshTopics()">
+ <a ng-click="setSort('state'); refreshTopics();">
State
<span ng-show="sort.currentColumn == 'state' && sort.descending" class="fa fa-caret-down"></span>
<span ng-show="sort.currentColumn == 'state' && !sort.descending" class="fa fa-caret-up"></span>
</a>
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="topic in topics">
<td class="thin-col" restrict="{{app.globals.UserRoles.ROLE2}}">{{topic.id}}</td>
<td class="big-data">{{topic.name}}</td>
<td restrict="{{app.globals.UserRoles.ROLE2}}">{{topic.createdBy.userName}}</td>
<td>{{formatDate(topic.createDate)}}</td>
<td>{{formatDate(topic.changeDate)}}</td>
<td>{{topic.state}}</td>
<td><a ng-click="open(topic)">view</a></td>
</tr>
</tbody>
<tfoot restrict="{{app.globals.UserRoles.ROLE1}}">
<tr>
<td colspan="7">
<fieldset>
<button type=button"
class="shrine-button pull-right"
ng-click="createTopic()">
<span>NEW</span>
<i class="fa fa-chevron-right fa-2x"></i>
</button>
</fieldset>
</td>
</tr>
</tfoot>
</table>
<!--
https://angular-ui.github.io/bootstrap/
http://getbootstrap.com/components/
-->
<div class="form-group text-center" ng-show="length > limit">
<pagination boundary-links="true"
ng-change="onPageSelected()"
total-items="length"
ng-model="pageIndex"
class="pagination-sm"
items-per-page="limit"
previous-text="‹"
next-text="›"
first-text="«"
last-text="»">
-
</pagination>
</div>
<script type="text/ng-template" id="myModalContent.html">
<div class="modal-header">
<h3 class="modal-title"></h3>
</div>
<div class="modal-body">
topic Name: <b>{{ topic.name }}</b>
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()">OK</button>
<button class="btn btn-warning" ng-click="cancel()">Cancel</button>
</div>
</script>
</div>
diff --git a/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.js b/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.js
index a283f05c8..662a695b5 100644
--- a/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.js
+++ b/apps/steward-app/src/main/js/src/app/dashboard/topics/topics.js
@@ -1,266 +1,283 @@
'use strict';
/**
* @ngdoc function
* @name sbAdminApp.controller:MainCtrl
* @description
* # MainCtrl
* Controller of the sbAdminApp
* https://scotch.io/tutorials/sort-and-filter-a-table-using-angular
*/
angular.module('stewardApp')
.controller("NewTopicCtrl", function ($scope, $modalInstance, model, refreshTopics) {
$scope.newTopic = {name: "", description: ""};
$scope.ok = function () {
var name = $scope.newTopic.name,
description = $scope.newTopic.description;
model.requestNewTopic({"name": name, "description": description})
.then(function () {
refreshTopics();
$modalInstance.close();
});
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
})
.controller('TopicsCtrl', function ($scope, $position, $app, TopicsModelFactory, $modal) {
//private vars
var roles = $app.globals.UserRoles,
user = $app.globals.currentUser,
utils = $app.utils,
scope = $scope,
ModelFactory = TopicsModelFactory,
role, model, initState;
//determine role of user.
role = (utils.hasAccess(user, [roles.ROLE2])) ? roles.ROLE2 : roles.ROLE1;
initState = (role === roles.ROLE2) ? $app.globals.States.STATE1 : "ALL";
model = ModelFactory.getInstance(role);
$scope.model = model;
$scope.roles = roles;
$scope.userRole = role;
$scope.formatDate = $app.utils.utcToMMDDYYYY;
$scope.states = $app.globals.States;
$scope.topics = [];
$scope.filterBy = 'topicName';
$scope.sort = {
currentColumn: 'changeDate',
descending: false
};
$scope.selectedTab = initState;
/**
* Parent scope data referenced by children.
* @type {{topics: Array, name: string, description: string, sort: {column: string, descending: boolean}}}
*/
$scope.data = {
name: 'name',
description: 'description'
};
//set pagination values.
$scope.range = $app.globals.ViewConfig.RANGE;//range of paging numbers at bottom
$scope.length = 0; //total number of results
$scope.pageIndex = $app.globals.ViewConfig.INDEX;//current page
$scope.limit = $app.globals.ViewConfig.LIMIT;//number of results to show in table at per page.
$scope.skip = 0; //number of results to skip.
/*
* Handler for when pagination page is changed.
*/
$scope.onPageSelected = function () {
var mult;
mult = ($scope.pageIndex > 0) ? $scope.pageIndex - 1 : 0;
$scope.skip = $scope.limit * mult;
$scope.refreshTopics($scope.skip, $scope.limit);
};
$scope.setStateAndRefresh = function (state) {
$scope.state = state;
$scope.refreshTopics();
};
+ /**
+ *
+ * @param columnId
+ */
+ $scope.setSort = function (columnId) {
+
+ //change direction if same column is clicked.
+ if($scope.sort.currentColumn == columnId) {
+ $scope.sort.descending = !$scope.sort.descending;
+ return;
+ }
+
+ //start out the sorting as ascending.
+ $scope.sort.descending = false;
+ $scope.sort.currentColumn = columnId;
+ }
+
$scope.refreshTopics = function () {
var state, sortBy, sortDirection;
if ($scope.state !== "ALL") {
state = $scope.state;
}
if ($scope.sort && $scope.sort.currentColumn !== "") {
sortBy = $scope.sort.currentColumn;
sortDirection = ($scope.sort.descending) ? "descending" : "ascending";
}
$scope.model.getTopics($scope.skip, $scope.limit, state, sortBy, sortDirection)
.then(function (result) {
scope.topics = result.topics;
$scope.length = result.totalCount;
});
};
$scope.getTitle = function (state) {
var title = " Query Topics";
return (role === roles.ROLE2) ?
($scope.state + title) : title;
};
//method wrapper for scope resolution in modal context.
function requestNewTopic(topic) {
if (model.requestNewTopic !== undefined) {
return model.requestNewTopic(topic);
}
}
//method wrapper for scope resolution in modal context.
function refreshTopics() {
return $scope.refreshTopics();
}
$scope.createTopic = function () {
var model = $scope.model;
var modalInstance = $modal.open({
animation: true,
templateUrl: 'src/app/dashboard/topics/new-topic/new-topic.tpl.html',
controller: function ($scope, $modalInstance) {
$scope.newTopic = {name: "", description: ""};
$scope.ok = function () {
var name = $scope.newTopic.name,
description = $scope.newTopic.description;
requestNewTopic({"name": name, "description": description})
.then(function () {
refreshTopics();
$modalInstance.close();
});
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
},
//size: undefined,
resolve: {
model: model,
refreshTopics: $scope.refreshTopics
}
});
};
$scope.open = function (topic) {
var modalInstance = $modal.open({
animation: true,
templateUrl: 'src/app/dashboard/topics/topic-table/topic-detail.tpl.html',
controller: function ($scope, $modalInstance, topic, $app, Role2TopicDetailMdl, Role1TopicDetailMdl){
$scope.roles = $app.globals.UserRoles;
$scope.userRole = $app.globals.currentUser.roles[0];
$scope.topic = topic;
$scope.tabState = 'description';
$scope.formatDate = $app.utils.utcToMMDDYYYY;
$scope.loadedState = $scope.topic.state;
$scope.topicName = topic.name;
$scope.topicDescription = topic.description;
$scope.data = {topicState: topic.state};
$scope.ok = function (id) {
$scope.topic.state = $scope.data.topicState;
if ($scope.topic.state === "Pending") {
$modalInstance.close($scope.topic);
return;
}
(($scope.topic.state == "Approved") ?
Role2TopicDetailMdl.approveTopic(id) :
Role2TopicDetailMdl.rejectTopic(id))
.then(function (result) {
refreshTopics();
$modalInstance.close(result);
});
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
$scope.isEditable = function () {
return ($app.globals.currentUser.roles[0] === $scope.roles.ROLE2) || ($scope.topic.state === "Pending");
};
$scope.setState = function (state) {
if ($scope.isEditable() === true) {
$scope.tabState = state;
}
};
$scope.update = function (id, name, description) {
Role1TopicDetailMdl.updateTopic(id, name, description)
.then( function (result) {
refreshTopics();
$modalInstance.close(result);
});
};
$scope.canViewHistory = function () {
var canView = (($app.globals.currentUser.roles[0] === $scope.roles.ROLE2 && $scope.loadedState !== "Pending") || ($scope.loadedState === "Approved")) && $scope.tabState != 'edit';
return canView;
};
},
//size: undefined,
resolve: {
topic: function () {
return topic;
}
}
});
};
$scope.setStateAndRefresh(initState);
})
.directive("topicTable", function () {
return {
restrict: "E",
templateUrl: "src/app/dashboard/topics/topic-table/topic-table.tpl.html",
replace: true
};
})
.directive("role1Description", function () {
return {
restrict: "E",
templateUrl: "src/app/dashboard/topics/topic-table/topic-detail/role1-description.tpl.html",
replace: true
};
})
.directive("role2Description", function () {
return {
restrict: "E",
templateUrl: "src/app/dashboard/topics/topic-table/topic-detail/role2-description.tpl.html",
replace: true
};
})
.directive("role1Edit", function () {
return {
restrict: "E",
templateUrl: "src/app/dashboard/topics/topic-table/topic-detail/role1-edit.tpl.html",
replace: true
};
})
.directive("role2Edit", function () {
return {
restrict: "E",
templateUrl: "src/app/dashboard/topics/topic-table/topic-detail/role2-edit.tpl.html",
replace: true
};
});