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

Re-associate activity exports and filters

Browse Source 
Some filter can work on both exports and lists associated to persons and accompanyings periods. They are moved to a more common namespace.

The modifiers in list are also fixed to allow an association with these filters.
This commit is contained in:
Julien Fastré
2023-09-13 10:00:48 +02:00
parent fcc00fdf8f
commit 4e27d71bea
39 changed files with 197 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,7 @@ services:
tags:
- { name: chill.export_filter, alias: 'activity_type_filter' }
chill.activity.export.date_filter:
class: Chill\ActivityBundle\Export\Filter\ActivityDateFilter
Chill\ActivityBundle\Export\Filter\ActivityDateFilter:
tags:
- { name: chill.export_filter, alias: 'activity_date_filter' }
@@ -74,52 +73,43 @@ services:
name: chill.export_filter
alias: 'activity_person_having_ac_bw_date_filter'
chill.activity.export.filter_activitytype:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter
Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter:
tags:
- { name: chill.export_filter, alias: 'accompanyingcourse_activitytype_filter' }
chill.activity.export.location_filter:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationFilter
Chill\ActivityBundle\Export\Filter\LocationFilter:
tags:
- { name: chill.export_filter, alias: 'activity_location_filter' }
chill.activity.export.locationtype_filter:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter
Chill\ActivityBundle\Export\Filter\LocationTypeFilter:
tags:
- { name: chill.export_filter, alias: 'activity_locationtype_filter' }
Chill\ActivityBundle\Export\Filter\ACPFilters\ByCreatorFilter:
Chill\ActivityBundle\Export\Filter\ByCreatorFilter:
tags:
- { name: chill.export_filter, alias: 'activity_bycreator_filter' }
chill.activity.export.emergency_filter:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter
Chill\ActivityBundle\Export\Filter\EmergencyFilter:
tags:
- { name: chill.export_filter, alias: 'activity_emergency_filter' }
chill.activity.export.sentreceived_filter:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\SentReceivedFilter
Chill\ActivityBundle\Export\Filter\SentReceivedFilter:
tags:
- { name: chill.export_filter, alias: 'activity_sentreceived_filter' }
chill.activity.export.bysocialaction_filter:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter
Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter:
tags:
- { name: chill.export_filter, alias: 'activity_bysocialaction_filter' }
chill.activity.export.bysocialissue_filter:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter
Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter:
tags:
- { name: chill.export_filter, alias: 'activity_bysocialissue_filter' }
chill.activity.export.user_filter: # Creator (M2O)
class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserFilter
Chill\ActivityBundle\Export\Filter\UserFilter:
tags:
- { name: chill.export_filter, alias: 'activity_user_filter' }
chill.activity.export.userscope_filter:
class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserScopeFilter
Chill\ActivityBundle\Export\Filter\UserScopeFilter:
tags:
- { name: chill.export_filter, alias: 'activity_userscope_filter' }
@@ -157,22 +147,19 @@ services:
tags:
- { name: chill.export_aggregator, alias: activity_user_aggregator }
chill.activity.export.locationtype_aggregator:
class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator
Chill\ActivityBundle\Export\Aggregator\LocationTypeAggregator:
tags:
- { name: chill.export_aggregator, alias: activity_locationtype_aggregator }
chill.activity.export.date_aggregator:
class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator
Chill\ActivityBundle\Export\Aggregator\DateAggregator:
tags:
- { name: chill.export_aggregator, alias: activity_date_aggregator }
Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByCreatorAggregator:
Chill\ActivityBundle\Export\Aggregator\ByCreatorAggregator:
tags:
- { name: chill.export_aggregator, alias: activity_by_creator_aggregator }
chill.activity.export.bythirdparty_aggregator:
class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator
Chill\ActivityBundle\Export\Aggregator\ByThirdpartyAggregator:
tags:
- { name: chill.export_aggregator, alias: activity_bythirdparty_aggregator }
@@ -186,7 +173,7 @@ services:
tags:
- { name: chill.export_aggregator, alias: activity_bysocialissue_aggregator }
Chill\ActivityBundle\Export\Aggregator\ACPAggregators\CreatorScopeAggregator:
Chill\ActivityBundle\Export\Aggregator\CreatorScopeAggregator:
tags:
- { name: chill.export_aggregator, alias: activity_creator_scope_aggregator }