diff --git a/web/frontend/src/User.root.svelte b/web/frontend/src/User.root.svelte
index 669ca8bb..bb83ef91 100644
--- a/web/frontend/src/User.root.svelte
+++ b/web/frontend/src/User.root.svelte
@@ -19,7 +19,8 @@
Spinner,
Input,
InputGroup,
- InputGroupText
+ InputGroupText,
+ Tooltip
} from "@sveltestrap/sveltestrap";
import {
queryStore,
@@ -32,6 +33,10 @@
scramble,
scrambleNames,
} from "./generic/utils.js";
+ import {
+ formatNumber,
+ formatDurationTime
+ } from "./generic/units.js";
import JobList from "./generic/JobList.svelte";
import JobCompare from "./generic/JobCompare.svelte";
import Filters from "./generic/Filters.svelte";
@@ -56,6 +61,7 @@
const durationBinOptions = ["1m","10m","1h","6h","12h"];
const metricBinOptions = [10, 20, 50, 100];
const matchedJobCompareLimit = 500;
+ const shortDuration = ccconfig.jobList_hideShortRunningJobs; // Always configured
/* State Init */
// List & Control Vars
@@ -108,6 +114,7 @@
shortJobs
totalWalltime
totalCoreHours
+ totalAccHours
histDuration {
count
value
@@ -133,6 +140,7 @@
variables: { jobFilters, selectedHistograms, numDurationBins, numMetricBins },
})
);
+ const hasAccHours = $derived($stats?.data?.jobsStatistics[0]?.totalAccHours != 0);
/* Functions */
function resetJobSelection() {
@@ -290,20 +298,54 @@
{/if}
| Total Jobs |
- {$stats.data.jobsStatistics[0].totalJobs} |
+
+
+ {formatNumber($stats.data.jobsStatistics[0].totalJobs)} Jobs
+
+ |
- | Short Jobs |
- {$stats.data.jobsStatistics[0].shortJobs} |
+
+
+ Short Jobs
+
+
+
+ Job duration less than {formatDurationTime(shortDuration)}
+
+ |
+
+
+ {formatNumber($stats.data.jobsStatistics[0].shortJobs)} Jobs
+
+ |
| Total Walltime |
- {$stats.data.jobsStatistics[0].totalWalltime} |
+
+
+ {formatNumber($stats.data.jobsStatistics[0].totalWalltime)} Hours
+
+ |
| Total Core Hours |
- {$stats.data.jobsStatistics[0].totalCoreHours} |
+
+
+ {formatNumber($stats.data.jobsStatistics[0].totalCoreHours)} Hours
+
+ |
+ {#if hasAccHours}
+
+ | Total Accelerator Hours |
+
+
+ {formatNumber($stats.data.jobsStatistics[0].totalAccHours)} Hours
+
+ |
+
+ {/if}
@@ -316,6 +358,7 @@
xunit="Runtime"
ylabel="Number of Jobs"
yunit="Jobs"
+ height={hasAccHours ? 290 : 250}
usesBins
xtime
/>
@@ -330,6 +373,7 @@
xunit="Nodes"
ylabel="Number of Jobs"
yunit="Jobs"
+ height={hasAccHours ? 290 : 250}
/>
{/key}
diff --git a/web/frontend/src/generic/joblist/JobListRow.svelte b/web/frontend/src/generic/joblist/JobListRow.svelte
index 9502a2f8..93fa496b 100644
--- a/web/frontend/src/generic/joblist/JobListRow.svelte
+++ b/web/frontend/src/generic/joblist/JobListRow.svelte
@@ -79,7 +79,6 @@
/* Derived */
const jobId = $derived(job?.id);
- const refinedData = $derived($metricsQuery?.data?.jobMetrics ? sortAndSelectScope($metricsQuery.data.jobMetrics) : []);
const scopes = $derived.by(() => {
if (job.numNodes == 1) {
if (job.numAcc >= 1) return ["core", "accelerator"];
@@ -95,6 +94,7 @@
variables: { id: jobId, metrics, scopes, selectedResolution },
})
);
+ const refinedData = $derived($metricsQuery?.data?.jobMetrics ? sortAndSelectScope($metricsQuery.data.jobMetrics) : []);
/* Effects */
$effect(() => {
diff --git a/web/frontend/src/generic/units.js b/web/frontend/src/generic/units.js
index 540a1a32..951ecbe8 100644
--- a/web/frontend/src/generic/units.js
+++ b/web/frontend/src/generic/units.js
@@ -32,10 +32,6 @@ export function scaleNumber(x, p = '') {
}
}
-export function roundTwoDigits(x) {
- return Math.round(x * 100) / 100
-}
-
export function scaleNumbers(x, y, p = '') {
const oldPower = power[prefix.indexOf(p)]
const rawXValue = x * oldPower
@@ -77,6 +73,10 @@ export function formatUnixTime(t, withDate = false) {
}
}
+export function roundTwoDigits(x) {
+ return Math.round(x * 100) / 100
+}
+
// const equalsCheck = (a, b) => {
// return JSON.stringify(a) === JSON.stringify(b);
// }