You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/04/05 02:04:48 UTC
[02/50] [abbrv] git commit: Added task status.
Added task status.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/bedea902
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/bedea902
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/bedea902
Branch: refs/heads/mansu/job_page
Commit: bedea902a9b9ffa17cebd37a248637683c697e25
Parents: a55cb10
Author: Suman Karumuri <sk...@twitter.com>
Authored: Wed Mar 26 10:45:23 2014 -0700
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Wed Mar 26 10:45:23 2014 -0700
----------------------------------------------------------------------
.../aurora/scheduler/http/ServletModule.java | 1 +
.../apache/aurora/scheduler/http/ui/index.html | 18 ++++++++++++++----
.../aurora/scheduler/http/ui/js/controllers.js | 18 ++++--------------
.../aurora/scheduler/http/ui/js/directives.js | 7 +++++++
.../aurora/scheduler/http/ui/taskStatus.html | 1 +
5 files changed, 27 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/bedea902/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index 631768f..822f34e 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -201,6 +201,7 @@ public class ServletModule extends AbstractModule {
registerAsset("ui/error.html", "/error.html");
registerAsset("ui/job.html", "/job.html");
registerAsset("ui/taskSandbox.html", "/taskSandbox.html");
+ registerAsset("ui/taskStatus.html", "/taskStatus.html");
registerAsset("ui/css/app.css", "/css/app.css");
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/bedea902/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
index 54d3015..fa51c03 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/index.html
@@ -31,13 +31,23 @@
<script src='/js/bootstrap.min.js'></script>
<link href='/css/bootstrap.min.css' rel='stylesheet'>
-<!--smart table-->
-<script src='/js/smartTable.js'></script>::
+<!-- smart table -->
+<script src='/js/smartTable.js'></script>
-<!--underscore-->
+<!-- underscore -->
<script src='/js/underscore.js'></script>
-<!--moment.js-->
+<!-- moment.js -->
<script src='/js/moment.js'></script>
+
+<!-- Intitalize bootstrap tooltips -->
+<script>
+ var options = {
+ placement: 'right',
+ trigger: 'hover'
+ };
+
+ $('.task-status-tooltip').tooltip(options);
+</script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/bedea902/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
index 46b2bd1..b8419e1 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js
@@ -4,7 +4,6 @@
var auroraUIControllers = angular.module('auroraUI.controllers', []);
-
var globalTableConfig = {
isGlobalSearchActivated: true,
isPaginationEnabled: true,
@@ -307,7 +306,7 @@ auroraUIControllers.controller('JobController',
$scope.completedTasksTableColumns = [
{label: 'Instance', map: 'instanceId'},
- {label: 'Status', map: 'status'},
+ {label: 'Status', map: 'status', cellTemplateUrl: '/taskStatus.html'},
{label: 'Running duration', map: 'duration',
formatFunction: function (duration) {
return fromNow(moment().subtract(duration), true);
@@ -337,7 +336,6 @@ auroraUIControllers.controller('JobController',
var tasks = _.chain(response.tasks)
.map(function (task) {
- var taskStatus = getTaskStatus(task);
var isActive = isActiveTask(task);
// TODO: Clean this logic.
@@ -356,14 +354,15 @@ auroraUIControllers.controller('JobController',
return {
instanceId: task.assignedTask.instanceId,
- status: taskStatus.statusStr,
+ status: _.invert(ScheduleStatus)[task.status],
host: task.assignedTask.slaveHost || '',
latestActivity: lastTaskTimestamp,
duration: isActive || _.isUndefined(runningTaskEvent)
? 0
: lastTaskTimestamp - runningTaskEvent.timestamp,
isActive: isActive,
- taskId: task.assignedTask.taskId
+ taskId: task.assignedTask.taskId,
+ taskEvents: sortedTaskEvents
};
})
.value();
@@ -389,15 +388,6 @@ auroraUIControllers.controller('JobController',
.value();
}
- function getTaskStatus(task) {
- var status = task.status;
- return {
- status: status,
- statusStr: _.invert(ScheduleStatus)[status],
- isActive: _.contains(ACTIVE_STATES, status)
- };
- }
-
function isActiveTask(task) {
return _.contains(ACTIVE_STATES, task.status);
}
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/bedea902/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
index 9f0c56a..fb0324e 100644
--- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/directives.js
@@ -43,3 +43,10 @@ auroraUI.directive('taskSandboxLink', function () {
'<a ng-href="http://{{formatedValue}}:1338/task/{{dataRow.taskId}}">{{formatedValue}}</a>'
};
});
+
+auroraUI.directive('taskStatus', function () {
+ return {
+ restrict: 'C',
+ template: '<span title="TEST">{{formatedValue}}</span>'
+ };
+});
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/bedea902/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
new file mode 100644
index 0000000..0d925f0
--- /dev/null
+++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/taskStatus.html
@@ -0,0 +1 @@
+<div class="task-status task-status-tooltip"></div>
\ No newline at end of file