Commit 8a37c90a authored by Romain Reuillon's avatar Romain Reuillon
Browse files

Merge branch 'executiontime' into 'master'

[GUI] enh: use execution time instead of elapsed time

See merge request openmole/openmole!16
parents 424ce663 3f3cd950
......@@ -216,7 +216,7 @@ class ExecutionPanel {
VarCell(tags.span(tags.span(Utils.longToDate(staticInf(execID).startDate)).tooltip("Starting time")), 1),
VarCell(tags.span(glyphAndText(glyph_flash, details.running.toString).tooltip("Running jobs")), 2),
VarCell(tags.span(glyphAndText(glyph_flag, details.ratio.toString).tooltip("Finished/Total jobs")), 3),
VarCell(tags.span(tags.span(durationString).tooltip("Elapsed time")), 4),
VarCell(tags.span(tags.span(durationString).tooltip("Execution time")), 4),
VarCell(tags.span(subLink(SubCompile, execID, execStatus, defaultModifier = executionState(info)).tooltip("Execution state")), 5),
VarCell(tags.span(subLink(SubEnvironment, execID, "Executions").tooltip("Computation environment details")), 6),
VarCell(tags.span(subLink(SubOutput, execID, glyphicon = glyph_list).tooltip("Standard output")), 7),
......
......@@ -150,7 +150,7 @@ class JobTable(executionId: ExecutionId) {
}
}, errOpen.map { _.getOrElse(EnvironmentId(i), false) })),
bsTableStyle = BSTableStyle(tableStyle = `class` := "table executionTable")
).addHeaders("Name", "Elapsed time", "Uploads", "Downloads", "Submitted", "Running", "Finished", "Failed", "Errors")
).addHeaders("Name", "Execution time", "Uploads", "Downloads", "Submitted", "Running", "Finished", "Failed", "Errors")
.render(minWidth := 1000)
}
......
......@@ -211,13 +211,13 @@ class FileToolBar(treeNodePanel: TreeNodePanel) {
def resetFilterThresold = {
thresholdInput.value = "1000"
thresholdChanged() = true
thresholdChanged() = true
}
def resetFilterTools: Unit = {
Try {
val th = thresholdInput.value.toInt
if ( th > 1000 || thresholdInput.value == "") resetFilterThresold
if (th > 1000 || thresholdInput.value == "") resetFilterThresold
else thresholdChanged() = false
} match {
case Failure(exception)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment