konevsa/proxmox-widget-toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format/render size: allow one to specifiy if base 2 or 10 is desired

Browse Source 
Storage capacity and usage seems to prefer the base ten (SI unit) use
(makes the capacity a bigger number) while memory (RAM) is normally
preferred to use base 2.

So allow both, mostly to allow consistent displaying of metrics.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-05-04 10:33:28 +02:00
parent ce8289fc58
commit b46ad78c2d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Utils.js
View File

@ -608,14 +608,22 @@ utilities: {
return text; return text;
}, },
format_size: function(size) { format_size: function(size, useSI) {
let units = ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi']; let units = ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
let num = 0; let order = 0;
while (size >= 1024 && num++ <= units.length) { const baseValue = useSI ? 1000 : 1024;
size = size / 1024; while (size >= baseValue && order < units.length) {
size = size / baseValue;
order++;
} }
return size.toFixed(num > 0?2:0) + " " + units[num] + "B"; let unit = units[order], commaDigits = 2;
if (order === 0) {
commaDigits = 0;
} else if (!useSI) {
unit += 'i';
}
return `${size.toFixed(commaDigits)} ${unit}B`;
}, },
render_upid: function(value, metaData, record) { render_upid: function(value, metaData, record) {
@ -865,11 +873,11 @@ utilities: {
); );
}, },
render_size_usage: function(val, max) { render_size_usage: function(val, max, useSI) {
if (max === 0) { if (max === 0) {
return gettext('N/A'); return gettext('N/A');
} }
let fmt = v => Proxmox.Utils.format_size(v); let fmt = v => Proxmox.Utils.format_size(v, useSI);
let ratio = (val * 100 / max).toFixed(2); let ratio = (val * 100 / max).toFixed(2);
return ratio + '% (' + Ext.String.format(gettext('{0} of {1}'), fmt(val), fmt(max)) + ')'; return ratio + '% (' + Ext.String.format(gettext('{0} of {1}'), fmt(val), fmt(max)) + ')';
}, },