From c09c7a9615adf3a875900442eb2e34c325819fc7 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 17 Aug 2022 14:18:39 +0200 Subject: [PATCH] exports: add new modifiers declarations to split filter/aggregators between activities linked to person <> acp --- .../Export/Aggregator/ActivityReasonAggregator.php | 2 +- .../Export/Aggregator/ActivityTypeAggregator.php | 2 +- .../Export/Aggregator/ActivityUserAggregator.php | 2 +- src/Bundle/ChillActivityBundle/Export/Declarations.php | 4 ++++ .../Export/Export/LinkedToACP/AvgActivityDuration.php | 1 + .../Export/Export/LinkedToACP/AvgActivityVisitDuration.php | 1 + .../Export/Export/LinkedToACP/CountActivity.php | 2 +- .../Export/Export/LinkedToACP/SumActivityDuration.php | 1 + .../Export/Export/LinkedToACP/SumActivityVisitDuration.php | 1 + .../Export/Export/LinkedToPerson/CountActivity.php | 5 +++-- .../Export/Export/LinkedToPerson/ListActivity.php | 5 +++-- .../Export/Export/LinkedToPerson/StatActivityDuration.php | 5 +++-- .../ChillActivityBundle/Export/Filter/ActivityDateFilter.php | 2 +- .../Export/Filter/ActivityReasonFilter.php | 2 +- .../ChillActivityBundle/Export/Filter/ActivityTypeFilter.php | 2 +- 15 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php index b4d2f8e52..5c77159e3 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php @@ -107,7 +107,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali public function applyOn(): string { - return Declarations::ACTIVITY; + return Declarations::ACTIVITY_PERSON; } public function buildForm(FormBuilderInterface $builder) diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php index 8a5ce4d01..3d73e0648 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php @@ -54,7 +54,7 @@ class ActivityTypeAggregator implements AggregatorInterface public function applyOn(): string { - return Declarations::ACTIVITY; + return Declarations::ACTIVITY_PERSON; } public function buildForm(FormBuilderInterface $builder) diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php index 3cdeee0f9..be4149bf9 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php @@ -48,7 +48,7 @@ class ActivityUserAggregator implements AggregatorInterface public function applyOn(): string { - return Declarations::ACTIVITY; + return Declarations::ACTIVITY_PERSON; } public function buildForm(FormBuilderInterface $builder) diff --git a/src/Bundle/ChillActivityBundle/Export/Declarations.php b/src/Bundle/ChillActivityBundle/Export/Declarations.php index 76335415f..7a5b47028 100644 --- a/src/Bundle/ChillActivityBundle/Export/Declarations.php +++ b/src/Bundle/ChillActivityBundle/Export/Declarations.php @@ -17,4 +17,8 @@ namespace Chill\ActivityBundle\Export; abstract class Declarations { public const ACTIVITY = 'activity'; + + public const ACTIVITY_ACP = "activity_linked_to_acp"; + + public const ACTIVITY_PERSON = "activity_linked_to_person"; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php index ec9c1aecb..327dc9e30 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php @@ -67,6 +67,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface { return [ Declarations::ACTIVITY, + Declarations::ACTIVITY_ACP, //PersonDeclarations::ACP_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php index f74dbda6d..96c7941e9 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php @@ -67,6 +67,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac { return [ Declarations::ACTIVITY, + Declarations::ACTIVITY_ACP, //PersonDeclarations::ACP_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php index faefaedfc..2cbd7ddd8 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php @@ -101,7 +101,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface { return [ Declarations::ACTIVITY, - //PersonDeclarations::PERSON_TYPE, + Declarations::ACTIVITY_ACP, //PersonDeclarations::ACP_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php index d32840d04..40f8977a3 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php @@ -67,6 +67,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface { return [ Declarations::ACTIVITY, + Declarations::ACTIVITY_ACP, //PersonDeclarations::ACP_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php index 94be1a546..1bbc83a86 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php @@ -67,6 +67,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac { return [ Declarations::ACTIVITY, + Declarations::ACTIVITY_ACP, //PersonDeclarations::ACP_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php index 18ef1671d..96c79297e 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php @@ -71,9 +71,9 @@ class CountActivity implements ExportInterface, GroupedExportInterface return 'Count activities linked to a person'; } - public function getType() + public function getType(): string { - return 'activity'; + return Declarations::ACTIVITY; } public function initiateQuery(array $requiredModifiers, array $acl, array $data = []) @@ -102,6 +102,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface { return [ Declarations::ACTIVITY, + Declarations::ACTIVITY_PERSON, //PersonDeclarations::PERSON_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php index 3e8442a7e..3ded55b56 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php @@ -186,9 +186,9 @@ class ListActivity implements ListInterface, GroupedExportInterface return 'List activities linked to a person'; } - public function getType() + public function getType(): string { - return 'activity'; + return Declarations::ACTIVITY; } public function initiateQuery(array $requiredModifiers, array $acl, array $data = []) @@ -279,6 +279,7 @@ class ListActivity implements ListInterface, GroupedExportInterface { return [ Declarations::ACTIVITY, + Declarations::ACTIVITY_PERSON, //PersonDeclarations::PERSON_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php index 80f1803c5..94903b282 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php @@ -95,9 +95,9 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface } } - public function getType() + public function getType(): string { - return 'activity'; + return Declarations::ACTIVITY; } public function initiateQuery(array $requiredModifiers, array $acl, array $data = []) @@ -131,6 +131,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface { return [ Declarations::ACTIVITY, + Declarations::ACTIVITY_PERSON, //PersonDeclarations::PERSON_TYPE, ]; } diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php index 7a7fed3ee..977fa2f9e 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php @@ -60,7 +60,7 @@ class ActivityDateFilter implements FilterInterface public function applyOn(): string { - return Declarations::ACTIVITY; + return Declarations::ACTIVITY_PERSON; } public function buildForm(FormBuilderInterface $builder) diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php index de6baac03..eef032818 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php @@ -82,7 +82,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt public function applyOn(): string { - return Declarations::ACTIVITY; + return Declarations::ACTIVITY_PERSON; } public function buildForm(FormBuilderInterface $builder) diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php index 9019bf3cd..bfd80ecc7 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php @@ -64,7 +64,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter public function applyOn(): string { - return Declarations::ACTIVITY; + return Declarations::ACTIVITY_PERSON; } public function buildForm(FormBuilderInterface $builder)