fix : on ne prend plus en compte les jour de congé du samedi et dimanche pour les forfaits dans le calcule des RTT
All checks were successful
Auto Tag Develop / tag (push) Successful in 5s
All checks were successful
Auto Tag Develop / tag (push) Successful in 5s
This commit is contained in:
@@ -349,14 +349,25 @@ final readonly class LeaveBalanceComputationService
|
||||
}
|
||||
|
||||
for ($cursor = $rangeStart; $cursor <= $rangeEnd; $cursor = $cursor->modify('+1 day')) {
|
||||
$dayOfWeek = (int) $cursor->format('N');
|
||||
|
||||
if ($splitSaturdays) {
|
||||
if (7 === $dayOfWeek) {
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
if ($dayOfWeek >= 6) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
[$am, $pm] = $this->resolveSegmentsForDate($absence, $cursor->format('Y-m-d'));
|
||||
$dayAmount = ($am ? 0.5 : 0.0) + ($pm ? 0.5 : 0.0);
|
||||
if ($dayAmount <= 0.0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$isSaturday = $splitSaturdays && '6' === $cursor->format('N');
|
||||
if ($isSaturday) {
|
||||
if ($splitSaturdays && 6 === $dayOfWeek) {
|
||||
$takenSaturdays += $dayAmount;
|
||||
} else {
|
||||
$takenDays += $dayAmount;
|
||||
|
||||
Reference in New Issue
Block a user