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

feat(heures) : affichage des jours travaillés (CUSTOM) sur la vue Jour
Auto Tag Develop / tag (push) Successful in 12s
Details

Browse Source 
Le libellé sous le nom de l'employé affiche en suffixe les jours du planning
workDaysHours au format court (ex. BUREAU — CDI — LU,JE) pour les contrats CUSTOM.
Résolu à la date filtrée et exposé via WorkHourDayContext.workDaysHours ; formaté
front par formatWorkedDaysShort. Limité aux CUSTOM (35h/39h/forfait/intérim sans
planning → rien affiché) et à l'écran Heures (pas Heures Conducteurs).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Autin
2026-06-12 14:33:46 +02:00
parent 4b22270c60
commit 7187989003
12 changed files with 106 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/State/WorkHourDayContextProviderTest.php
+63 -2
View File
@@ -23,6 +23,7 @@ use App\Service\WorkHours\HolidayVirtualHoursResolver;
use App\Service\WorkHours\WorkedHoursCreditPolicy;
use App\State\WorkHourDayContextProvider;
use DateTime;
use DateTimeImmutable;
use PHPUnit\Framework\TestCase;
use ReflectionObject;
use Symfony\Bundle\SecurityBundle\Security;
@@ -150,8 +151,7 @@ final class WorkHourDayContextProviderTest extends TestCase
// Resolver renvoie le contrat 39h avant 2026-03-01, le forfait à partir de cette date.
$resolver = $this->createStub(EmployeeContractResolver::class);
$resolver->method('resolveForEmployeeAndDate')->willReturnCallback(
static fn (Employee $e, \DateTimeImmutable $d): ?Contract =>
$d < new \DateTimeImmutable('2026-03-01') ? $timeContract : $forfaitContract
static fn (Employee $e, DateTimeImmutable $d): ?Contract => $d < new DateTimeImmutable('2026-03-01') ? $timeContract : $forfaitContract
);
$resolver->method('resolveNatureForEmployeeAndDate')->willReturn(ContractNature::CDI);
@@ -180,6 +180,67 @@ final class WorkHourDayContextProviderTest extends TestCase
self::assertSame('Contrat', $row['contractName']);
}
public function testRowCarriesWorkDaysHoursForCustomContract(): void
{
$user = new User();
$employee = $this->buildEmployee(1, Contract::TRACKING_TIME, 4);
$resolver = $this->createStub(EmployeeContractResolver::class);
$resolver->method('resolveForEmployeeAndDate')->willReturn($employee->getContract());
$resolver->method('resolveNatureForEmployeeAndDate')->willReturn(ContractNature::CDI);
// Contrat 4h travaillé le lundi et le vendredi (120 min chacun).
$resolver->method('resolveWorkDaysMinutesForEmployeeAndDate')->willReturn([1 => 120, 5 => 120]);
$this->requestStack->push(new Request(query: ['workDate' => '2026-02-16']));
$this->security->method('getUser')->willReturn($user);
$this->employeeRepository->method('findScoped')->with($user)->willReturn([$employee]);
$this->absenceRepository->method('findByDateAndEmployees')->willReturn([]);
$provider = new WorkHourDayContextProvider(
$this->security,
$this->requestStack,
$this->employeeRepository,
$this->absenceRepository,
$this->formationRepository,
$resolver,
new AbsenceSegmentsResolver(),
new WorkedHoursCreditPolicy($this->buildResolverStub(), new DailyReferenceMinutesResolver()),
$this->buildHolidayResolver(),
);
$row = $provider->provide(new Get())->rows[0];
self::assertSame([1 => 120, 5 => 120], $row['workDaysHours']);
}
public function testRowHasNullWorkDaysHoursForStandardContract(): void
{
$user = new User();
$employee = $this->buildEmployee(1, Contract::TRACKING_TIME, 35);
// buildResolverStub ne stube pas resolveWorkDaysMinutesForEmployeeAndDate → null (35h n'a pas de planning).
$this->requestStack->push(new Request(query: ['workDate' => '2026-02-16']));
$this->security->method('getUser')->willReturn($user);
$this->employeeRepository->method('findScoped')->with($user)->willReturn([$employee]);
$this->absenceRepository->method('findByDateAndEmployees')->willReturn([]);
$provider = new WorkHourDayContextProvider(
$this->security,
$this->requestStack,
$this->employeeRepository,
$this->absenceRepository,
$this->formationRepository,
$this->buildResolverStub(),
new AbsenceSegmentsResolver(),
new WorkedHoursCreditPolicy($this->buildResolverStub(), new DailyReferenceMinutesResolver()),
$this->buildHolidayResolver(),
);
$row = $provider->provide(new Get())->rows[0];
self::assertNull($row['workDaysHours']);
}
private function buildEmployee(int $id, string $trackingMode, ?int $weeklyHours): Employee
{
$contract = new Contract()