merge 111 branch into this one

src/Bundle/ChillPersonBundle/config/services/exports.yaml

@@ -1,4 +1,5 @@
 services:
+
     chill.person.export.count_person:
         class: Chill\PersonBundle\Export\Export\CountPerson
         arguments:
@@ -25,20 +26,6 @@ services:
             - '%chill_main.notifications%'
         tags:
             - { name: chill.export, alias: list_person_duplicate }
-
-    chill.person.export.count_accompanyingcourse:
-        class: Chill\PersonBundle\Export\Export\CountAccompanyingCourse
-        arguments:
-            - "@doctrine.orm.entity_manager"
-        tags:
-            - { name: chill.export, alias: count_accompanyingcourse }
-
-    chill.person.export.avg_accompanyingcourse_duration:
-        class: Chill\PersonBundle\Export\Export\StatAccompanyingCourseDuration
-        arguments:
-            - '@Chill\PersonBundle\Repository\AccompanyingPeriodRepository'
-        tags:
-            - { name: chill.export, alias: avg_accompanyingcourse_duration }
     
     chill.person.export.count_social_actions:
         class: Chill\PersonBundle\Export\Export\CountSocialActions
@@ -65,22 +52,6 @@ services:
         autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: person_nationality_filter }
-
-    chill.person.export.filter_userscope:
-      class: Chill\PersonBundle\Export\Filter\UserScopeFilter
-      arguments:
-          $translator: '@translator'
-          $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-      tags:
-        - { name: chill.export_filter, alias: accompanyingcourse_userscope_filter }
-
-    chill.person.export.filter_userjob:
-      class: Chill\PersonBundle\Export\Filter\UserJobFilter
-      arguments:
-        $translator: '@translator'
-        $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-      tags:
-        - { name: chill.export_filter, alias: accompanyingcourse_userjob_filter }
             
     chill.person.export.aggregator_nationality:
         class: Chill\PersonBundle\Export\Aggregator\NationalityAggregator

src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml

@@ -1,4 +1,6 @@
-services:   
+services:
+
+    ##
     chill.person.export.filter_accompanying_period:
         class: Chill\PersonBundle\Export\Filter\AccompanyingPeriodFilter
         tags:
@@ -13,3 +15,84 @@ services:
         class: Chill\PersonBundle\Export\Filter\AccompanyingPeriodClosingFilter
         tags:
             - { name: chill.export_filter, alias: person_acc_pe_cl_filter }
+
+    ## Indicators
+    chill.person.export.count_accompanyingcourse:
+        class: Chill\PersonBundle\Export\Export\CountAccompanyingCourse
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export, alias: count_accompanyingcourse }
+
+    chill.person.export.avg_accompanyingcourse_duration:
+        class: Chill\PersonBundle\Export\Export\StatAccompanyingCourseDuration
+        autowire: true
+        autoconfigure: true
+        tags:
+          - { name: chill.export, alias: avg_accompanyingcourse_duration }
+
+    ## Filters
+    chill.person.export.filter_userscope:
+        class: Chill\PersonBundle\Export\Filter\UserScopeFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_userscope_filter }
+
+    chill.person.export.filter_userjob:
+        class: Chill\PersonBundle\Export\Filter\UserJobFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_userjob_filter }
+
+    chill.person.export.filter_socialissue:
+        class: Chill\PersonBundle\Export\Filter\SocialIssueFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_socialissue_filter }
+
+    chill.person.export.filter_step:
+        class: Chill\PersonBundle\Export\Filter\StepFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_step_filter }
+
+    chill.person.export.filter_origin:
+        class: Chill\PersonBundle\Export\Filter\OriginFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_origin_filter }
+
+    chill.person.export.filter_closingmotive:
+        class: Chill\PersonBundle\Export\Filter\ClosingMotiveFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_closingmotive_filter }
+
+    chill.person.export.filter_confidential:
+        class: Chill\PersonBundle\Export\Filter\ConfidentialFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_confidential_filter }
+
+    chill.person.export.filter_emergency:
+        class: Chill\PersonBundle\Export\Filter\EmergencyFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_emergency_filter }
+
+    chill.person.export.filter_intensity:
+        class: Chill\PersonBundle\Export\Filter\IntensityFilter
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_intensity_filter }
+
+    ## Aggregators