MALIO-DEV/SIRH
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 67 Wiki Activity

feat : exposer accruingDaysTotal (brut généré) sur le récap congés

Browse Source 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Autin
2026-05-26 15:52:39 +02:00
parent 2b699b333b
commit 355d5d1975
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ApiResource/EmployeeLeaveSummary.php
+14 -11
View File
@@ -20,17 +20,20 @@ use App\State\EmployeeLeaveSummaryProvider;
)] )]
final class EmployeeLeaveSummary final class EmployeeLeaveSummary
{ {
public int $year = 0; public int $year = 0;
public bool $isSupported = false; public bool $isSupported = false;
public string $ruleCode = ''; public string $ruleCode = '';
public float $acquiredDays = 0.0; public float $acquiredDays = 0.0;
public float $remainingDays = 0.0; public float $remainingDays = 0.0;
public float $takenDays = 0.0; public float $takenDays = 0.0;
public float $acquiredSaturdays = 0.0; public float $acquiredSaturdays = 0.0;
public float $remainingSaturdays = 0.0; public float $remainingSaturdays = 0.0;
public float $takenSaturdays = 0.0; public float $takenSaturdays = 0.0;
public float $fractionedDays = 0.0; public float $fractionedDays = 0.0;
public float $accruingDays = 0.0; public float $accruingDays = 0.0;
/** Brut généré sur l'exercice à ce jour (= accruingDays + congés pris en anticipé). Dénominateur de l'affichage « net / brut ». */
public float $accruingDaysTotal = 0.0;
public float $previousYearAcquiredDays = 0.0; public float $previousYearAcquiredDays = 0.0;
public float $previousYearTakenDays = 0.0; public float $previousYearTakenDays = 0.0;
public float $previousYearRemainingDays = 0.0; public float $previousYearRemainingDays = 0.0;
src/State/EmployeeLeaveSummaryProvider.php
+9 -2
View File
@@ -123,6 +123,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
$summary->acquiredSaturdays = $yearSummary['acquiredSaturdays']; $summary->acquiredSaturdays = $yearSummary['acquiredSaturdays'];
$summary->fractionedDays = $fractionedDays; $summary->fractionedDays = $fractionedDays;
$summary->accruingDays = $yearSummary['accruingDays']; $summary->accruingDays = $yearSummary['accruingDays'];
$summary->accruingDaysTotal = $yearSummary['accruingDaysTotal'];
$summary->takenDays = $yearSummary['takenDays']; $summary->takenDays = $yearSummary['takenDays'];
$summary->takenSaturdays = $yearSummary['takenSaturdays']; $summary->takenSaturdays = $yearSummary['takenSaturdays'];
$summary->remainingDays = $yearSummary['remainingDays'] + $fractionedDays; $summary->remainingDays = $yearSummary['remainingDays'] + $fractionedDays;
@@ -186,6 +187,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
* acquiredDays: float, * acquiredDays: float,
* acquiredSaturdays: float, * acquiredSaturdays: float,
* accruingDays: float, * accruingDays: float,
* accruingDaysTotal: float,
* takenDays: float, * takenDays: float,
* takenSaturdays: float, * takenSaturdays: float,
* remainingDays: float, * remainingDays: float,
@@ -336,8 +338,11 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
$remainingSaturdaysToImpute = max(0.0, $takenSaturdays - $takenFromAcquiredSaturdays); $remainingSaturdaysToImpute = max(0.0, $takenSaturdays - $takenFromAcquiredSaturdays);
$remainingGeneratedSaturdays = $generatedSaturdays - $remainingSaturdaysToImpute; $remainingGeneratedSaturdays = $generatedSaturdays - $remainingSaturdaysToImpute;
$acquiredDays = $carryDays; $acquiredDays = $carryDays;
$accruingDays = $remainingGenerated + $remainingGeneratedSaturdays; $accruingDays = $remainingGenerated + $remainingGeneratedSaturdays;
// Brut généré à ce jour, AVANT imputation des congés pris en anticipé
// (dénominateur de l'affichage « net / brut » sur l'onglet Congés).
$accruingDaysTotal = $generatedDays + $generatedSaturdays;
$remainingDays = $remainingAcquired; $remainingDays = $remainingAcquired;
$acquiredSaturdays = $carrySaturdays; $acquiredSaturdays = $carrySaturdays;
$remainingSaturdays = max(0.0, $remainingAcquiredSaturdays); $remainingSaturdays = max(0.0, $remainingAcquiredSaturdays);
@@ -359,6 +364,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
$acquiredDays = $leavePolicy['acquiredDays']; $acquiredDays = $leavePolicy['acquiredDays'];
$accruingDays = 0.0; $accruingDays = 0.0;
$accruingDaysTotal = 0.0;
$remainingDays = max(0.0, $acquiredDays - $takenFromCurrent); $remainingDays = max(0.0, $acquiredDays - $takenFromCurrent);
$acquiredSaturdays = 0.0; $acquiredSaturdays = 0.0;
$remainingSaturdays = 0.0; $remainingSaturdays = 0.0;
@@ -373,6 +379,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
'acquiredDays' => $acquiredDays, 'acquiredDays' => $acquiredDays,
'acquiredSaturdays' => $acquiredSaturdays, 'acquiredSaturdays' => $acquiredSaturdays,
'accruingDays' => $accruingDays, 'accruingDays' => $accruingDays,
'accruingDaysTotal' => $accruingDaysTotal,
'takenDays' => $takenDays, 'takenDays' => $takenDays,
'takenSaturdays' => $takenSaturdays, 'takenSaturdays' => $takenSaturdays,
'remainingDays' => $remainingDays, 'remainingDays' => $remainingDays,