exports: add new modifiers declarations to split filter/aggregators between activities linked to person <> acp

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)

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)

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)

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";
 }

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,
         ];
     }

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,
         ];
     }

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,
         ];
     }

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,
         ];
     }

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,
         ];
     }

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,
         ];
     }

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,
         ];
     }

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,
         ];
     }

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)

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)

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)