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

Fix activity between dates filter: condition added for alias

Browse Source
This commit is contained in:
Julie Lenaerts 2025-01-16 15:19:38 +01:00
parent 573118e514
commit 1b831bc424
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/unreleased/Fixed-20250116-151459.yaml Normal file
View File

@ -0,0 +1,5 @@
kind: Fixed
body: 'Export: fix missing alias in activity between certain dates filter. Condition added for alias.'
time: 2025-01-16T15:14:59.323517319+01:00
custom:
Issue: ""

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

@ -55,7 +55,9 @@ 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 (\in_array('activity', $qb->getAllAliases(), true)) {
$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

4
src/Bundle/ChillPersonBundle/Controller/SocialWorkExportController.php
View File

@ -53,7 +53,7 @@ class SocialWorkExportController extends AbstractController
$socialIssues = $this->socialIssueRepository->findAll(); $socialIssues = $this->socialIssueRepository->findAll();
$socialIssues = array_map(fn($issue) => [ $socialIssues = array_map(fn ($issue) => [
'id' => $issue->getId(), 'id' => $issue->getId(),
'title' => $this->socialIssueRender->renderString($issue, []), 'title' => $this->socialIssueRender->renderString($issue, []),
'ordering' => $issue->getOrdering(), 'ordering' => $issue->getOrdering(),
@ -106,7 +106,7 @@ class SocialWorkExportController extends AbstractController
$socialActions = $this->socialActionRepository->findAll(); $socialActions = $this->socialActionRepository->findAll();
$socialActions = array_map(fn($action) => [ $socialActions = array_map(fn ($action) => [
'id' => $action->getId(), 'id' => $action->getId(),
'title' => $this->socialActionRender->renderString($action, []), 'title' => $this->socialActionRender->renderString($action, []),
'desactivationDate' => $action->getDesactivationDate(), 'desactivationDate' => $action->getDesactivationDate(),