Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'issue271_account_acp_closing_date' into 'master'

Browse Source 
#271 Account for acp closing date inn action filters (export)

See merge request Chill-Projet/chill-bundles!707
This commit is contained in:
Julien Fastré 2024-07-05 13:42:06 +00:00
commit 643156f822
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/unreleased/Fixed-20240613-135945.yaml Normal file
View File

@ -0,0 +1,5 @@
kind: Fixed
body: Take into account the acp closing date in the acp works date filter
time: 2024-06-13T13:59:45.561891547+02:00
custom:
Issue: "271"

4
src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php
View File

@ -86,11 +86,11 @@ final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements F
}; };
$end = match ($data['keep_null']) { $end = match ($data['keep_null']) {
true => $qb->expr()->orX( true => $qb->expr()->orX(
$qb->expr()->gt('acpw.endDate', ':'.$as), $qb->expr()->gt('COALESCE(acp.closingDate, acpw.endDate)', ':'.$as),
$qb->expr()->isNull('acpw.endDate') $qb->expr()->isNull('acpw.endDate')
), ),
false => $qb->expr()->andX( false => $qb->expr()->andX(
$qb->expr()->gt('acpw.endDate', ':'.$as), $qb->expr()->gt('COALESCE(acp.closingDate, acpw.endDate)', ':'.$as),
$qb->expr()->isNotNull('acpw.endDate') $qb->expr()->isNotNull('acpw.endDate')
), ),
default => throw new \LogicException('This value is not supported'), default => throw new \LogicException('This value is not supported'),