From 6d005f1b3848bcf7021c3417afcae45e7aaa7ff0 Mon Sep 17 00:00:00 2001 From: Luca Tacconi Date: Tue, 27 Feb 2024 23:11:33 +0100 Subject: [PATCH] Day left calc --- app/shareds/DiskUsage.vue | 27 +++++++++++++++++++++------ routes/api/task-stat.php | 17 ++++++++++++++++- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/app/shareds/DiskUsage.vue b/app/shareds/DiskUsage.vue index 3b605c9..e0ece64 100644 --- a/app/shareds/DiskUsage.vue +++ b/app/shareds/DiskUsage.vue @@ -6,13 +6,13 @@

- - lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum - lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum + The bar representing the percentage of disk occupancy will change color to identify an emergency situation. +
+ The daily log size data will allow you to calculate the time available to fill the disk
@@ -82,6 +87,16 @@ self.calcStatExecuted = true; self.diskUsageData = response.data; }); + }, + + progressBarColor(percentage) { + if (percentage > 90) { + return 'red'; + } else if (percentage > 80) { + return 'orange'; + } else { + return 'primary'; + } } }, diff --git a/routes/api/task-stat.php b/routes/api/task-stat.php index 891857a..4b0464a 100644 --- a/routes/api/task-stat.php +++ b/routes/api/task-stat.php @@ -860,6 +860,14 @@ static function (array $file) { $free_space = $free_space_disp = disk_free_space($LOGS_DIR); $used_space = $used_space_disp = $total_space - $free_space; + $date_focus = strtotime('yesterday'); + $aFILE = glob($LOGS_DIR .'/'. '*_'.date("Y-m-d", $date_focus).'*_'.date("Y-m-d", $date_focus).'_*.log'); + + $total_space_yesterday = 0; + foreach ($aFILE as $file) { + $total_space_yesterday += filesize($file); + } + $num_len = strlen($used_space); if($unit = 'AUTO'){ if($num_len < 4){ @@ -884,10 +892,17 @@ static function (array $file) { $total_space_disp = number_format(($total_space / pow(1024, $exponent)), 2, '.', ''); $free_space_disp = number_format(($free_space / pow(1024, $exponent)), 2, '.', ''); $used_space_disp = number_format(($used_space / pow(1024, $exponent)), 2, '.', ''); + $total_space_yesterday_disp = number_format(($total_space_yesterday / pow(1024, $exponent)), 2, '.', ''); } $data["total-partition-size"] = $total_space_disp; - $data["total-log-size-yesterday"] = 0; //need implementation + $data["total-log-space-yesterday"] = $total_space_yesterday_disp; + + $data["day-left"] = ""; + if($total_space_yesterday > 0){ + $data["day-left"] = ceil($free_space / $total_space_yesterday); + } + $data["partition-free-space"] = $free_space_disp; $data["partition-used-space"] = $used_space_disp; $data["unit"] = $unit;