From 41dd4d89f7e3535a2f4fa817b278eb0e932163fd Mon Sep 17 00:00:00 2001 From: nobohan Date: Tue, 2 Jul 2024 16:24:45 +0200 Subject: [PATCH] Revert "#271 Account for acp closing date inn action filters (export)" This reverts commit 3a7ed7ef8fd95909ffc3a2539b19c45e08007e46. --- .changes/unreleased/Fixed-20240613-135945.yaml | 5 ----- .../AccompanyingPeriodWorkEndDateBetweenDateFilter.php | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 .changes/unreleased/Fixed-20240613-135945.yaml diff --git a/.changes/unreleased/Fixed-20240613-135945.yaml b/.changes/unreleased/Fixed-20240613-135945.yaml deleted file mode 100644 index 38028a735..000000000 --- a/.changes/unreleased/Fixed-20240613-135945.yaml +++ /dev/null @@ -1,5 +0,0 @@ -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" diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php index 38ca39320..92258ccf9 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/AccompanyingPeriodWorkEndDateBetweenDateFilter.php @@ -86,11 +86,11 @@ final readonly class AccompanyingPeriodWorkEndDateBetweenDateFilter implements F }; $end = match ($data['keep_null']) { true => $qb->expr()->orX( - $qb->expr()->gt('COALESCE(acp.closingDate, acpw.endDate)', ':'.$as), + $qb->expr()->gt('acpw.endDate', ':'.$as), $qb->expr()->isNull('acpw.endDate') ), false => $qb->expr()->andX( - $qb->expr()->gt('COALESCE(acp.closingDate, acpw.endDate)', ':'.$as), + $qb->expr()->gt('acpw.endDate', ':'.$as), $qb->expr()->isNotNull('acpw.endDate') ), default => throw new \LogicException('This value is not supported'),