-
{aStat.text}
+
+ {aStat.text} ({aStat.unit})
+
+
+
+ Peak Threshold Preset. Use input fields to change to higher values.
+
{
aStat.from = detail[0];
aStat.to = detail[1];
- if (aStat.from == 0 && aStat.to == aStat.peak) {
+ if (aStat.from == 1 && aStat.to == aStat.peak) {
aStat.enabled = false;
} else {
aStat.enabled = true;
}
}}
- sliderMin={0.0}
+ sliderMin={1}
sliderMax={aStat.peak}
fromPreset={aStat.from}
toPreset={aStat.to}
@@ -69,6 +85,7 @@
color="primary"
onclick={() => {
isOpen = false;
+ setRanges();
setFilter({ stats: [...availableStats.filter((as) => as.enabled)] });
}}>Close & Apply
diff --git a/web/frontend/src/generic/select/DoubleRangeSlider.svelte b/web/frontend/src/generic/select/DoubleRangeSlider.svelte
index c655087f..958db598 100644
--- a/web/frontend/src/generic/select/DoubleRangeSlider.svelte
+++ b/web/frontend/src/generic/select/DoubleRangeSlider.svelte
@@ -165,11 +165,11 @@
}}
/>
- {#if inputFieldFrom != "1" && inputFieldTo != sliderMax?.toString() }
+ {#if inputFieldFrom != sliderMin?.toString() && inputFieldTo != sliderMax?.toString() }
Selected: Range {inputFieldFrom} - {inputFieldTo}
- {:else if inputFieldFrom != "1" && inputFieldTo == sliderMax?.toString() }
+ {:else if inputFieldFrom != sliderMin?.toString() && inputFieldTo == sliderMax?.toString() }
Selected: More than {inputFieldFrom}
- {:else if inputFieldFrom == "1" && inputFieldTo != sliderMax?.toString() }
+ {:else if inputFieldFrom == sliderMin?.toString() && inputFieldTo != sliderMax?.toString() }
Selected: Less than {inputFieldTo}
{:else}
No Selection
diff --git a/web/frontend/src/generic/utils.js b/web/frontend/src/generic/utils.js
index 09239ec8..82da21b8 100644
--- a/web/frontend/src/generic/utils.js
+++ b/web/frontend/src/generic/utils.js
@@ -341,26 +341,28 @@ export function getStatsItems(presetStats = []) {
if (gm?.footprint) {
const mc = getMetricConfigDeep(gm.name, null, null)
if (mc) {
- const presetEntry = presetStats.find((s) => s?.field === (gm.name + '_' + gm.footprint))
+ const presetEntry = presetStats.find((s) => s.field == `${gm.name}_${gm.footprint}`)
if (presetEntry) {
return {
- field: gm.name + '_' + gm.footprint,
- text: gm.name + ' (' + gm.footprint + ')',
+ field: presetEntry.field,
+ text: `${gm.name} (${gm.footprint})`,
metric: gm.name,
from: presetEntry.from,
- to: presetEntry.to,
+ to: (presetEntry.to == 0) ? mc.peak : presetEntry.to,
peak: mc.peak,
- enabled: true
+ enabled: true,
+ unit: `${gm?.unit?.prefix ? gm.unit.prefix : ''}${gm.unit.base}`
}
} else {
return {
- field: gm.name + '_' + gm.footprint,
- text: gm.name + ' (' + gm.footprint + ')',
+ field: `${gm.name}_${gm.footprint}`,
+ text: `${gm.name} (${gm.footprint})`,
metric: gm.name,
- from: 0,
+ from: 1,
to: mc.peak,
peak: mc.peak,
- enabled: false
+ enabled: false,
+ unit: `${gm?.unit?.prefix ? gm.unit.prefix : ''}${gm.unit.base}`
}
}
}