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

feat(heures) : calcul des lignes jour pour export PDF

Browse Source 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Autin
2026-06-08 17:21:41 +02:00
parent edbb1f7b29
commit b917fd2e41
2 changed files with 239 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Service/WorkHours/YearlyHoursExportBuilder.php
+127 -4
View File
@@ -11,8 +11,8 @@ use App\Entity\WorkHour;
use App\Enum\ContractNature;
use App\Enum\ContractType;
use App\Enum\TrackingMode;
use App\Repository\AbsenceRepository;
use App\Repository\WorkHourRepository;
use App\Repository\Contract\AbsenceReadRepositoryInterface;
use App\Repository\Contract\WorkHourReadRepositoryInterface;
use App\Service\Contracts\EmployeeContractResolver;
use App\Service\PublicHolidayServiceInterface;
use DateInterval;
@@ -22,8 +22,8 @@ use Throwable;
class YearlyHoursExportBuilder
{
public function __construct(
private WorkHourRepository $workHourRepository,
private AbsenceRepository $absenceRepository,
private WorkHourReadRepositoryInterface $workHourRepository,
private AbsenceReadRepositoryInterface $absenceRepository,
private EmployeeContractResolver $contractResolver,
private AbsenceSegmentsResolver $absenceSegmentsResolver,
private WorkedHoursCreditPolicy $workedHoursCreditPolicy,
@@ -103,6 +103,129 @@ class YearlyHoursExportBuilder
return $this->buildForEmployees([$employee], $from, $to);
}
/**
* Construit une ligne par employé pour une seule journée (vue Jour de l'écran Heures).
* Réutilise les helpers de calcul de cellule pour rester l'unique source de vérité.
* Les employés sans contrat ce jour sont exclus (comme l'écran).
*
* @param list<Employee> $employees
*
* @return list<array{employeeId:int, employeeName:string, statut:?string,
* morningFrom:string, morningTo:string, afternoonFrom:string, afternoonTo:string,
* eveningFrom:string, eveningTo:string, dayHours:string, nightHours:string,
* total:string, isWeekend:bool, isHoliday:bool}>
*/
public function buildDayRowsForEmployees(array $employees, DateTimeImmutable $date): array
{
$ymd = $date->format('Y-m-d');
$days = [$ymd];
$workHours = $this->workHourRepository->findByDateRangeAndEmployees($date, $date, $employees);
$absences = $this->absenceRepository->findForPrint($date, $date, $employees);
$contractMap = $this->contractResolver->resolveForEmployeesAndDays($employees, $days);
$driverMap = $this->contractResolver->resolveIsDriverForEmployeesAndDays($employees, $days);
$workDaysMap = $this->contractResolver->resolveWorkDaysMinutesForEmployeesAndDays($employees, $days);
$holidayMap = $this->buildHolidayMap($date, $date);
$workHourMap = $this->buildWorkHourMap($workHours);
$absenceMap = $this->buildAbsenceMap($absences, $days);
$isoDay = (int) $date->format('N');
$isWeekend = $isoDay >= 6;
$holidayLabel = $holidayMap[$ymd] ?? null;
$rows = [];
foreach ($employees as $employee) {
$employeeId = $employee->getId();
$contract = $contractMap[$employeeId][$ymd] ?? null;
// Hors contrat ce jour → exclu (avant embauche / après départ / suspension).
if (null === $contract) {
continue;
}
$wh = $workHourMap[$employeeId][$ymd] ?? null;
$absenceData = $this->resolveAbsenceDataForEmployee($absenceMap[$employeeId] ?? [], $days, $employee);
$hasAbsence = $absenceData['hasDayAbsence'][$ymd] ?? false;
$isDriver = $driverMap[$employeeId][$ymd] ?? false;
$mode = $this->resolveSegmentMode($contract->getTrackingMode(), $isDriver);
$creditedMinutes = $absenceData['credited'][$ymd] ?? 0;
$virtualMinutes = $this->holidayVirtualHoursResolver->resolveVirtualCredit(
$contract,
$date,
$hasAbsence,
$workDaysMap[$employeeId][$ymd] ?? null,
);
$statut = $absenceData['labels'][$ymd] ?? null;
if (null === $statut && null !== $holidayLabel) {
$statut = $holidayLabel;
}
$row = [
'employeeId' => $employeeId,
'employeeName' => trim(($employee->getLastName() ?? '').' '.($employee->getFirstName() ?? '')),
'statut' => $statut,
'morningFrom' => '',
'morningTo' => '',
'afternoonFrom' => '',
'afternoonTo' => '',
'eveningFrom' => '',
'eveningTo' => '',
'dayHours' => '',
'nightHours' => '',
'total' => '',
'isWeekend' => $isWeekend,
'isHoliday' => null !== $holidayLabel,
];
if ('presence' === $mode) {
$absentMorning = $absenceData['absentMorning'][$ymd] ?? false;
$absentAfternoon = $absenceData['absentAfternoon'][$ymd] ?? false;
$morning = (($wh?->getIsPresentMorning() ?? false) && !$absentMorning) ? 0.5 : 0.0;
$afternoon = (($wh?->getIsPresentAfternoon() ?? false) && !$absentAfternoon) ? 0.5 : 0.0;
$total = $morning + $afternoon;
$row['total'] = $total > 0 ? (string) $total : '';
} elseif ('driver' === $mode) {
$dayMin = $wh?->getDayHoursMinutes() ?? 0;
$nightMin = $wh?->getNightHoursMinutes() ?? 0;
$workshop = $wh?->getWorkshopHoursMinutes() ?? 0;
$totalMin = $dayMin + $nightMin + $workshop + $creditedMinutes;
if ($virtualMinutes > $totalMin) {
$totalMin = $virtualMinutes;
}
$row['dayHours'] = $dayMin > 0 ? $this->formatMinutes($dayMin) : '';
$row['nightHours'] = $nightMin > 0 ? $this->formatMinutes($nightMin) : '';
$row['total'] = $totalMin > 0 ? $this->formatMinutes($totalMin) : '';
} else {
$metrics = null !== $wh ? $this->computeMetrics($wh) : new WorkMetrics();
$metrics->addCreditedMinutes($creditedMinutes);
$dayMin = $metrics->dayMinutes;
$nightMin = $metrics->nightMinutes;
$totalMin = $metrics->totalMinutes;
if ($virtualMinutes > $totalMin) {
$dayMin += $virtualMinutes - $totalMin;
$totalMin = $virtualMinutes;
}
$row['morningFrom'] = $wh?->getMorningFrom() ?? '';
$row['morningTo'] = $wh?->getMorningTo() ?? '';
$row['afternoonFrom'] = $wh?->getAfternoonFrom() ?? '';
$row['afternoonTo'] = $wh?->getAfternoonTo() ?? '';
$row['eveningFrom'] = $wh?->getEveningFrom() ?? '';
$row['eveningTo'] = $wh?->getEveningTo() ?? '';
$row['dayHours'] = $dayMin > 0 ? $this->formatMinutes($dayMin) : '';
$row['nightHours'] = $nightMin > 0 ? $this->formatMinutes($nightMin) : '';
$row['total'] = $totalMin > 0 ? $this->formatMinutes($totalMin) : '';
}
$rows[] = $row;
}
return $rows;
}
public function buildContractLabel(Employee $employee): ?string
{
$contract = $employee->getContract();