From 88fb48e2bedc0da7ea12e812889635b4e1b7dc69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 17 Nov 2022 19:01:06 +0100 Subject: [PATCH] Fixed: let the aggregator "Activity by type" be shown again --- .../Export/Aggregator/ActivityTypeAggregator.php | 2 +- .../ChillActivityBundle/config/services/export.yaml | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php index 8c98e1049..071ccd232 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php @@ -44,7 +44,7 @@ class ActivityTypeAggregator implements AggregatorInterface public function alterQuery(QueryBuilder $qb, $data) { if (!in_array('acttype', $qb->getAllAliases(), true)) { - $qb->join('activity.activityType', 'acttype'); + $qb->leftJoin('activity.activityType', 'acttype'); } $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY)); diff --git a/src/Bundle/ChillActivityBundle/config/services/export.yaml b/src/Bundle/ChillActivityBundle/config/services/export.yaml index 57153a193..16addd2a3 100644 --- a/src/Bundle/ChillActivityBundle/config/services/export.yaml +++ b/src/Bundle/ChillActivityBundle/config/services/export.yaml @@ -41,6 +41,12 @@ services: tags: - { name: chill.export, alias: 'avg_activity_visit_duration_linked_to_acp' } + Chill\ActivityBundle\Export\Export\LinkedToACP\ListActivity: + tags: + - { name: chill.export, alias: 'list_activity_acp'} + + Chill\ActivityBundle\Export\Export\ListActivityHelper: ~ + ## Filters chill.activity.export.type_filter: class: Chill\ActivityBundle\Export\Filter\ActivityTypeFilter @@ -129,10 +135,9 @@ services: tags: - { name: chill.export_aggregator, alias: activity_reason_aggregator } - chill.activity.export.type_aggregator: - class: Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator + Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator: tags: - - { name: chill.export_aggregator, alias: activity_type_aggregator } + - { name: chill.export_aggregator, alias: activity_common_type_aggregator } chill.activity.export.user_aggregator: class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator