Share/Pool size calculation: show and allow percentage values

This commit is contained in:
bergware
2023-04-25 09:45:41 +02:00
parent d4b74590b1
commit 0f7b6fd8a2
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -36,7 +36,6 @@ function presetSpace($val) {
global $disk,$display;
if (!$val or strcasecmp($val,'NaN')==0) return;
sanitize($val);
[$dot,$comma] = str_split(_var($display,'number','.,'));
$size = _var($disk,'fsSize',0);
$size = $size>0 ? round(100*$val/$size,1) : 0;
$unit = '%';
@@ -46,6 +45,7 @@ function presetSpace($val) {
$size = round($val/pow(1000,$base),1);
$unit = _var($units,$base);
}
[$dot,$comma] = str_split(_var($display,'number','.,'));
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' '.$unit : '';
}
function fsSize() {
+1 -1
View File
@@ -59,7 +59,6 @@ function presetSpace($val) {
global $disks,$shares,$name,$pools,$display;
if (!$val or strcasecmp($val,'NaN')==0) return;
sanitize($val);
[$dot,$comma] = str_split(_var($display,'number','.,'));
$small = [];
foreach (data_filter($disks) as $disk) $small[] = _var($disk,'fsSize');
$fsSize[""] = min(array_filter($small));
@@ -74,6 +73,7 @@ function presetSpace($val) {
$size = round($val/pow(1000,$base),1);
$unit = _var($units,$base);
}
[$dot,$comma] = str_split(_var($display,'number','.,'));
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' '.$unit : '';
}
function fsSize() {