From 4bd2b5230b57fbc85d4871948152817ed8819ad5 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Fri, 15 Mar 2024 18:26:13 +0100 Subject: [PATCH] Updated unit scaling --- lib/SvelteUi/app/src/lib/Helpers.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/SvelteUi/app/src/lib/Helpers.js b/lib/SvelteUi/app/src/lib/Helpers.js index 611bf901..43f138be 100644 --- a/lib/SvelteUi/app/src/lib/Helpers.js +++ b/lib/SvelteUi/app/src/lib/Helpers.js @@ -224,11 +224,11 @@ export function formatUnit(val, unit) { if(typeof val === 'undefined') { ret[0] = "-"; ret[1] = unit; - } else if(val >= 2000000) { - ret[0] = (val / 1000000).toFixed(val > 100000000 ? 1 : 2); + } else if(val >= 1_000_000_000) { // Over 1000 M + ret[0] = (val / 1_000_000).toFixed(val > 10_000_000_000 ? 0 : 1); ret[1] = "M"+unit; - } else if(val > 5000) { - ret[0] = (val / 1000).toFixed(val > 100000 ? 1 : 2); + } else if(val > 100_000) { // Over 100 k + ret[0] = (val / 1000).toFixed(val > 1_000_000 ? 0 : val > 100_000 ? 1 : 2); ret[1] = "k"+unit; } else { ret[0] = val.toFixed(0);