|
@@ -350,13 +350,13 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
|
|
|
|
|
refreshRunning = function () {
|
|
refreshRunning = function () {
|
|
|
$.getJSON(window.location.pathname + "?format=json&type=running", function (data) {
|
|
$.getJSON(window.location.pathname + "?format=json&type=running", function (data) {
|
|
|
- if (data) {
|
|
|
|
|
|
|
+ if (data.jobs) {
|
|
|
var nNodes = runningTable.fnGetNodes();
|
|
var nNodes = runningTable.fnGetNodes();
|
|
|
|
|
|
|
|
// check for zombie nodes
|
|
// check for zombie nodes
|
|
|
$(nNodes).each(function (iNode, node) {
|
|
$(nNodes).each(function (iNode, node) {
|
|
|
var nodeFound = false;
|
|
var nodeFound = false;
|
|
|
- $(data).each(function (iCoord, currentItem) {
|
|
|
|
|
|
|
+ $(data.jobs).each(function (iCoord, currentItem) {
|
|
|
% if enable_cron_scheduling:
|
|
% if enable_cron_scheduling:
|
|
|
if ($(node).children("td").eq(8).text() == currentItem.id) {
|
|
if ($(node).children("td").eq(8).text() == currentItem.id) {
|
|
|
nodeFound = true;
|
|
nodeFound = true;
|
|
@@ -374,7 +374,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- $(data).each(function (iCoord, item) {
|
|
|
|
|
|
|
+ $(data.jobs).each(function (iCoord, item) {
|
|
|
var coord = new Coordinator(item);
|
|
var coord = new Coordinator(item);
|
|
|
var foundRow = null;
|
|
var foundRow = null;
|
|
|
$(nNodes).each(function (iNode, node) {
|
|
$(nNodes).each(function (iNode, node) {
|
|
@@ -418,11 +418,11 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- if (data.length == 0) {
|
|
|
|
|
|
|
+ if (data.jobs.length == 0) {
|
|
|
runningTable.fnClearTable();
|
|
runningTable.fnClearTable();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (data.length != numRunning) {
|
|
|
|
|
|
|
+ if (data.jobs.length != numRunning) {
|
|
|
refreshCompleted();
|
|
refreshCompleted();
|
|
|
}
|
|
}
|
|
|
numRunning = data.length;
|
|
numRunning = data.length;
|
|
@@ -433,7 +433,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
function refreshCompleted() {
|
|
function refreshCompleted() {
|
|
|
$.getJSON(window.location.pathname + "?format=json&type=completed", function (data) {
|
|
$.getJSON(window.location.pathname + "?format=json&type=completed", function (data) {
|
|
|
completedTable.fnClearTable();
|
|
completedTable.fnClearTable();
|
|
|
- $(data).each(function (iWf, item) {
|
|
|
|
|
|
|
+ $(data.jobs).each(function (iWf, item) {
|
|
|
var coord = new Coordinator(item);
|
|
var coord = new Coordinator(item);
|
|
|
try {
|
|
try {
|
|
|
completedTable.fnAddData([
|
|
completedTable.fnAddData([
|
|
@@ -463,7 +463,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
function refreshProgress() {
|
|
function refreshProgress() {
|
|
|
$.getJSON(window.location.pathname + "?format=json&type=progress", function (data) {
|
|
$.getJSON(window.location.pathname + "?format=json&type=progress", function (data) {
|
|
|
var nNodes = runningTable.fnGetNodes();
|
|
var nNodes = runningTable.fnGetNodes();
|
|
|
- $(data).each(function (iCoord, item) {
|
|
|
|
|
|
|
+ $(data.jobs).each(function (iCoord, item) {
|
|
|
var coord = new Coordinator(item);
|
|
var coord = new Coordinator(item);
|
|
|
var foundRow = null;
|
|
var foundRow = null;
|
|
|
$(nNodes).each(function (iNode, node) {
|
|
$(nNodes).each(function (iNode, node) {
|