fix: Display the correct count of employee in the dashboard
This commit is contained in:
parent
de4b49495a
commit
c07ff0dd57
1 changed files with 15 additions and 5 deletions
|
|
@ -24,10 +24,13 @@ final class StatsHelper
|
||||||
{
|
{
|
||||||
$stats = [];
|
$stats = [];
|
||||||
foreach ($statsType as $type) {
|
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] = [
|
$stats[$type->value] = [
|
||||||
'previous' => self::getPrevious(sprintf('get%s', ucfirst($type->getDefinition())), $start, $end),
|
'previous' => $previous,
|
||||||
'current' => self::{sprintf('get%s', ucfirst($type->getDefinition()))}($start, $end),
|
'current' => $current,
|
||||||
'diff' => self::getDiff(sprintf('get%s', ucfirst($type->getDefinition())), $start, $end),
|
'diff' => $current - $previous,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
return $stats;
|
return $stats;
|
||||||
|
|
@ -69,7 +72,10 @@ final class StatsHelper
|
||||||
*/
|
*/
|
||||||
private function getNbSalarie(Carbon $start, Carbon $end)
|
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
|
public static function getMembershipRate(Carbon $start, Carbon $end): int
|
||||||
{
|
{
|
||||||
$registered = self::getNumberSalaries($start, $end);
|
$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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue