From c07ff0dd57932bbb55f230b99f051dcecc9c48f2 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Mon, 24 Feb 2025 15:22:14 +0100 Subject: [PATCH] fix: Display the correct count of employee in the dashboard --- app/Lib/Helpers/StatsHelper.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/Lib/Helpers/StatsHelper.php b/app/Lib/Helpers/StatsHelper.php index 03c5f9a7..80ab490c 100644 --- a/app/Lib/Helpers/StatsHelper.php +++ b/app/Lib/Helpers/StatsHelper.php @@ -24,10 +24,13 @@ final class StatsHelper { $stats = []; foreach ($statsType as $type) { + $previous = self::getPrevious(sprintf('get%s', ucfirst($type->getDefinition())), $start, $end); + $current = self::{sprintf('get%s', ucfirst($type->getDefinition()))}($start, $end); + $stats[$type->value] = [ - 'previous' => self::getPrevious(sprintf('get%s', ucfirst($type->getDefinition())), $start, $end), - 'current' => self::{sprintf('get%s', ucfirst($type->getDefinition()))}($start, $end), - 'diff' => self::getDiff(sprintf('get%s', ucfirst($type->getDefinition())), $start, $end), + 'previous' => $previous, + 'current' => $current, + 'diff' => $current - $previous, ]; } return $stats; @@ -69,7 +72,10 @@ final class StatsHelper */ private function getNbSalarie(Carbon $start, Carbon $end) { - return self::getNumberCustomers($start, $end); + return Salarie::query() + ->whereDate('created_at', '>=', $start) + ->whereDate('created_at', '<=', $end) + ->count(); } /** @@ -125,7 +131,11 @@ final class StatsHelper public static function getMembershipRate(Carbon $start, Carbon $end): int { $registered = self::getNumberSalaries($start, $end); - return round($registered / Salarie::count() * 100, 2); + $employee = Salarie::query() + ->whereDate('created_at', '>=', $start) + ->whereDate('created_at', '<=', $end) + ->count(); + return round($registered / $employee * 100, 2); } /**