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 '345-export-activity-bug' into 'master'

Browse Source 
Fix the filtering of users that have been associated to an activity between certain dates

Closes #345

See merge request Chill-Projet/chill-bundles!773
This commit is contained in:
LenaertsJ 2024-12-19 09:41:21 +00:00
commit 78c8e94765
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/unreleased/Fixed-20241211-151057.yaml Normal file
View File

@ -0,0 +1,5 @@
kind: Fixed
body: 'Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range"'
time: 2024-12-11T15:10:57.973144789+01:00
custom:
Issue: "345"

2
src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
View File

@ -55,6 +55,8 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
.' AND ' .' AND '
.'(person_person_having_activity.id = person.id OR person MEMBER OF activity_person_having_activity.persons)'); .'(person_person_having_activity.id = person.id OR person MEMBER OF activity_person_having_activity.persons)');
$sqb->andWhere('activity_person_having_activity.id = activity.id');
if (isset($data['reasons']) && [] !== $data['reasons']) { if (isset($data['reasons']) && [] !== $data['reasons']) {
// add clause activity reason // add clause activity reason
$sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity'); $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');