Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed: let the aggregator "Activity by type" be shown again

Browse Source
This commit is contained in:
Julien Fastré 2022-11-17 19:01:06 +01:00
parent 3ebf3ae148
commit 88fb48e2be
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
View File

@ -44,7 +44,7 @@ class ActivityTypeAggregator implements AggregatorInterface
public function alterQuery(QueryBuilder $qb, $data) public function alterQuery(QueryBuilder $qb, $data)
{ {
if (!in_array('acttype', $qb->getAllAliases(), true)) { 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)); $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));

11
src/Bundle/ChillActivityBundle/config/services/export.yaml
View File

@ -41,6 +41,12 @@ services:
tags: tags:
- { name: chill.export, alias: 'avg_activity_visit_duration_linked_to_acp' } - { 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 ## Filters
chill.activity.export.type_filter: chill.activity.export.type_filter:
class: Chill\ActivityBundle\Export\Filter\ActivityTypeFilter class: Chill\ActivityBundle\Export\Filter\ActivityTypeFilter
@ -129,10 +135,9 @@ services:
tags: tags:
- { name: chill.export_aggregator, alias: activity_reason_aggregator } - { name: chill.export_aggregator, alias: activity_reason_aggregator }
chill.activity.export.type_aggregator: Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator:
class: Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator
tags: tags:
- { name: chill.export_aggregator, alias: activity_type_aggregator } - { name: chill.export_aggregator, alias: activity_common_type_aggregator }
chill.activity.export.user_aggregator: chill.activity.export.user_aggregator:
class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator