From a46e987f81ea4cb4fa1a18e17521da8389c0f41a Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 25 Jul 2024 16:56:43 +0200 Subject: [PATCH 1/4] Upgrade version of chill-bundles to v2.23.1 --- .changes/v2.23.1.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changes/v2.23.1.md diff --git a/.changes/v2.23.1.md b/.changes/v2.23.1.md new file mode 100644 index 000000000..75e03cf61 --- /dev/null +++ b/.changes/v2.23.1.md @@ -0,0 +1,3 @@ +## v2.23.1 - 2024-07-25 +### Fixed +* Fix export activities linked to accompanying period between two dates From 5dfd8daf3ab741048b1e760d51242f6129a3ae74 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 30 Jul 2024 14:58:48 +0200 Subject: [PATCH 2/4] Remove dump causing export to fail --- .../ACPFilters/PeriodHavingActivityBetweenDatesFilter.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php index 2b30a075c..03cb00be1 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php @@ -80,8 +80,6 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt $qb ->setParameter($from, $this->rollingDateConverter->convert($data['start_date'])) ->setParameter($to, $this->rollingDateConverter->convert($data['end_date'])); - - dump($qb->getQuery()->getResult()); } public function applyOn() From 288a02f5b796a226f3949cdb84d3c751d867c647 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Mon, 5 Aug 2024 15:56:40 +0200 Subject: [PATCH 3/4] Undo wrong fix in export filter parcours having activity between dates Problem reported by users, wrong analysis and fix made. Behavior was in fact correct. --- .../ACPFilters/PeriodHavingActivityBetweenDatesFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php index 03cb00be1..1a006ba97 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php @@ -73,7 +73,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt $qb->andWhere( $qb->expr()->exists( - 'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = activity.accompanyingPeriod AND {$alias}.id = activity.id" + 'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = activity.accompanyingPeriod" ) ); From 547a9d1369795e9983aac1065ef55a93c18868d0 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 8 Aug 2024 10:57:58 +0200 Subject: [PATCH 4/4] Downgrade bundles to v2.23.0 fix in v2.23.1 undone --- .changes/v2.23.1.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .changes/v2.23.1.md diff --git a/.changes/v2.23.1.md b/.changes/v2.23.1.md deleted file mode 100644 index 75e03cf61..000000000 --- a/.changes/v2.23.1.md +++ /dev/null @@ -1,3 +0,0 @@ -## v2.23.1 - 2024-07-25 -### Fixed -* Fix export activities linked to accompanying period between two dates