|
@@ -164,11 +164,14 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
return {
|
|
return {
|
|
|
id: c.id,
|
|
id: c.id,
|
|
|
endTime: c.endTime,
|
|
endTime: c.endTime,
|
|
|
|
|
+ endTimeInMillis: c.endTimeInMillis,
|
|
|
nextMaterializedTime: c.nextMaterializedTime,
|
|
nextMaterializedTime: c.nextMaterializedTime,
|
|
|
|
|
+ nextMaterializedTimeInMillis: c.nextMaterializedTimeInMillis,
|
|
|
status: c.status,
|
|
status: c.status,
|
|
|
statusClass: "label " + getStatusClass(c.status),
|
|
statusClass: "label " + getStatusClass(c.status),
|
|
|
isRunning: c.isRunning,
|
|
isRunning: c.isRunning,
|
|
|
duration: c.duration,
|
|
duration: c.duration,
|
|
|
|
|
+ durationInMillis: c.durationInMillis,
|
|
|
appName: decodeURIComponent(c.appName),
|
|
appName: decodeURIComponent(c.appName),
|
|
|
progress: c.progress,
|
|
progress: c.progress,
|
|
|
progressClass: "bar " + getStatusClass(c.status, "bar-"),
|
|
progressClass: "bar " + getStatusClass(c.status, "bar-"),
|
|
@@ -180,7 +183,8 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
resumeUrl: c.resumeUrl,
|
|
resumeUrl: c.resumeUrl,
|
|
|
frequency: c.frequency,
|
|
frequency: c.frequency,
|
|
|
timeUnit: c.timeUnit,
|
|
timeUnit: c.timeUnit,
|
|
|
- startTime: c.startTime
|
|
|
|
|
|
|
+ startTime: c.startTime,
|
|
|
|
|
+ startTimeInMillis: c.startTimeInMillis
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -194,7 +198,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
"sDom":"<'row'r>t<'row'<'span6'i><''p>>",
|
|
"sDom":"<'row'r>t<'row'<'span6'i><''p>>",
|
|
|
"aoColumns":[
|
|
"aoColumns":[
|
|
|
{ "bSortable":false },
|
|
{ "bSortable":false },
|
|
|
- { "sType":"date" },
|
|
|
|
|
|
|
+ { "sSortDataType":"dom-sort-value", "sType":"numeric" },
|
|
|
null,
|
|
null,
|
|
|
null,
|
|
null,
|
|
|
{ "sSortDataType":"dom-sort-value", "sType":"numeric" },
|
|
{ "sSortDataType":"dom-sort-value", "sType":"numeric" },
|
|
@@ -233,16 +237,16 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
"bLengthChange":false,
|
|
"bLengthChange":false,
|
|
|
"sDom":"<'row'r>t<'row'<'span6'i><''p>>",
|
|
"sDom":"<'row'r>t<'row'<'span6'i><''p>>",
|
|
|
"aoColumns":[
|
|
"aoColumns":[
|
|
|
- { "sType":"date" },
|
|
|
|
|
|
|
+ { "sSortDataType":"dom-sort-value", "sType":"numeric" },
|
|
|
null,
|
|
null,
|
|
|
null,
|
|
null,
|
|
|
{ "sSortDataType":"dom-sort-value", "sType":"numeric" },
|
|
{ "sSortDataType":"dom-sort-value", "sType":"numeric" },
|
|
|
null,
|
|
null,
|
|
|
null,
|
|
null,
|
|
|
- null,
|
|
|
|
|
% if not enable_cron_scheduling:
|
|
% if not enable_cron_scheduling:
|
|
|
- null,
|
|
|
|
|
|
|
+ null,
|
|
|
% endif
|
|
% endif
|
|
|
|
|
+ { "sSortDataType":"dom-sort-value", "sType":"numeric" },
|
|
|
null
|
|
null
|
|
|
],
|
|
],
|
|
|
"aaSorting":[
|
|
"aaSorting":[
|
|
@@ -412,7 +416,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
try {
|
|
try {
|
|
|
runningTable.fnAddData([
|
|
runningTable.fnAddData([
|
|
|
coord.canEdit ? '<div class="hueCheckbox fa" data-row-selector-exclude="true"></div>' : '',
|
|
coord.canEdit ? '<div class="hueCheckbox fa" data-row-selector-exclude="true"></div>' : '',
|
|
|
- emptyStringIfNull(coord.nextMaterializedTime),
|
|
|
|
|
|
|
+ '<span data-sort-value="'+ coord.nextMaterializedTimeInMillis +'">' + emptyStringIfNull(coord.nextMaterializedTime) + '</span>',
|
|
|
'<span class="' + coord.statusClass + '">' + coord.status + '</span>',
|
|
'<span class="' + coord.statusClass + '">' + coord.status + '</span>',
|
|
|
coord.appName,
|
|
coord.appName,
|
|
|
'<div class="progress"><div class="bar bar-warning" style="width: 1%"></div></div>',
|
|
'<div class="progress"><div class="bar bar-warning" style="width: 1%"></div></div>',
|
|
@@ -423,7 +427,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
emptyStringIfNull(coord.frequency),
|
|
emptyStringIfNull(coord.frequency),
|
|
|
emptyStringIfNull(coord.timeUnit),
|
|
emptyStringIfNull(coord.timeUnit),
|
|
|
% endif
|
|
% endif
|
|
|
- emptyStringIfNull(coord.startTime),
|
|
|
|
|
|
|
+ '<span data-sort-value="'+ coord.startTimeInMillis +'">' + emptyStringIfNull(coord.startTime) + '</span>',
|
|
|
'<a href="' + coord.absoluteUrl + '" data-row-selector="true">' + coord.id + '</a>'
|
|
'<a href="' + coord.absoluteUrl + '" data-row-selector="true">' + coord.id + '</a>'
|
|
|
]);
|
|
]);
|
|
|
}
|
|
}
|
|
@@ -456,10 +460,10 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
var coord = new Coordinator(item);
|
|
var coord = new Coordinator(item);
|
|
|
try {
|
|
try {
|
|
|
completedTable.fnAddData([
|
|
completedTable.fnAddData([
|
|
|
- emptyStringIfNull(coord.endTime),
|
|
|
|
|
|
|
+ '<span data-sort-value="'+ coord.endTimeInMillis +'">' + emptyStringIfNull(coord.endTime) + '</span>',
|
|
|
'<span class="' + coord.statusClass + '">' + coord.status + '</span>',
|
|
'<span class="' + coord.statusClass + '">' + coord.status + '</span>',
|
|
|
coord.appName,
|
|
coord.appName,
|
|
|
- emptyStringIfNull(coord.duration),
|
|
|
|
|
|
|
+ '<span data-sort-value="'+ coord.durationInMillis +'">' + emptyStringIfNull(coord.duration) + '</span>',
|
|
|
coord.user,
|
|
coord.user,
|
|
|
% if enable_cron_scheduling:
|
|
% if enable_cron_scheduling:
|
|
|
emptyStringIfNull(coord.frequency),
|
|
emptyStringIfNull(coord.frequency),
|
|
@@ -467,7 +471,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
|
|
|
emptyStringIfNull(coord.frequency),
|
|
emptyStringIfNull(coord.frequency),
|
|
|
emptyStringIfNull(coord.timeUnit),
|
|
emptyStringIfNull(coord.timeUnit),
|
|
|
% endif
|
|
% endif
|
|
|
- emptyStringIfNull(coord.startTime),
|
|
|
|
|
|
|
+ '<span data-sort-value="'+ coord.startTimeInMillis +'">' + emptyStringIfNull(coord.startTime) + '</span>',
|
|
|
'<a href="' + coord.absoluteUrl + '" data-row-selector="true">' + coord.id + '</a>'
|
|
'<a href="' + coord.absoluteUrl + '" data-row-selector="true">' + coord.id + '</a>'
|
|
|
], false);
|
|
], false);
|
|
|
}
|
|
}
|