From 72a5a6cd2704be839062577782e242447d470206 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Tue, 9 Aug 2022 15:15:27 +0200
Subject: [PATCH] hop

---
 .../Export/CountActivityLinkedToACP.php       |  6 +++++-
 .../Export/Export/StatActivityDuration.php    |  7 ++++++-
 .../config/services/export.yaml               | 19 +++++++++++--------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Export/Export/CountActivityLinkedToACP.php b/src/Bundle/ChillActivityBundle/Export/Export/CountActivityLinkedToACP.php
index 02a358156..c182145a8 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/CountActivityLinkedToACP.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/CountActivityLinkedToACP.php
@@ -99,7 +99,11 @@ class CountActivityLinkedToACP implements ExportInterface, GroupedExportInterfac
 
     public function supportsModifiers()
     {
-        return [ExportDeclarations::PERSON_TYPE, Declarations::ACTIVITY, ExportDeclarations::ACP_SHARED];
+        return [
+            ExportDeclarations::PERSON_TYPE,
+            Declarations::ACTIVITY,
+            ExportDeclarations::ACP_SHARED
+        ];
     }
 
     public function getGroup(): string
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php b/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
index 5493046c2..5793c2b06 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
@@ -17,6 +17,8 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Export\Declarations as Person_Declarations;
+use Chill\ActivityBundle\Export\Declarations as Activity_Declarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -127,7 +129,10 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function supportsModifiers()
     {
-        return ['person', 'activity'];
+        return [
+            Person_Declarations::PERSON_TYPE,
+            Activity_Declarations::ACTIVITY
+        ];
     }
 
     public function getGroup(): string
diff --git a/src/Bundle/ChillActivityBundle/config/services/export.yaml b/src/Bundle/ChillActivityBundle/config/services/export.yaml
index daef12fed..366c9c1b1 100644
--- a/src/Bundle/ChillActivityBundle/config/services/export.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services/export.yaml
@@ -3,6 +3,7 @@ services:
         autowire: true
         autoconfigure: true
 
+    ## Indicators
     chill.activity.export.count_activity:
         class: Chill\ActivityBundle\Export\Export\CountActivity
         tags:
@@ -13,16 +14,17 @@ services:
         tags:
             - { name: chill.export, alias: 'count_activity_linked_to_acp' }
 
-    # chill.activity.export.sum_activity_duration:
-    #     class: Chill\ActivityBundle\Export\Export\StatActivityDuration
-    #     tags:
-    #         - { name: chill.export, alias: 'sum_activity_duration' }
+    chill.activity.export.sum_activity_duration:
+        class: Chill\ActivityBundle\Export\Export\StatActivityDuration
+        tags:
+            - { name: chill.export, alias: 'sum_activity_duration' }
 
-    # chill.activity.export.list_activity:
-    #     class: Chill\ActivityBundle\Export\Export\ListActivity
-    #     tags:
-    #         - { name: chill.export, alias: 'list_activity' }
+    chill.activity.export.list_activity:
+        class: Chill\ActivityBundle\Export\Export\ListActivity
+        tags:
+            - { name: chill.export, alias: 'list_activity' }
 
+    ## Filters
     chill.activity.export.reason_filter:
         class: Chill\ActivityBundle\Export\Filter\ActivityReasonFilter
         tags:
@@ -45,6 +47,7 @@ services:
                 name: chill.export_filter
                 alias: 'activity_person_having_ac_bw_date_filter'
 
+    ## Aggregators
     chill.activity.export.reason_aggregator:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
         tags: