Merge remote-tracking branch 'origin/master' into 616_rapid-action

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

@@ -1,5 +1,13 @@
 services:
-    Chill\PersonBundle\Actions\Remove\PersonMove:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\PersonBundle\Actions\Remove\PersonMove: ~
+
+    Chill\PersonBundle\Actions\Remove\PersonMoveManager:
         arguments:
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $handlers: !tagged_iterator chill_person.person_move_handler
+
+    Chill\PersonBundle\Actions\Remove\Handler\:
+        resource: '../../Actions/Remove/Handler'

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

@@ -1,11 +1,14 @@
 services:
-    Chill\PersonBundle\Controller\PersonController:
+    _defaults:
         autowire: true
+        autoconfigure: true
+
+    Chill\PersonBundle\Controller\PersonController:
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\TimelinePersonController:
         arguments:
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $eventDispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
             $timelineBuilder: '@chill_main.timeline_builder'
             $paginatorFactory: '@chill_main.paginator_factory'
         tags: ['controller.service_arguments']
@@ -28,7 +31,7 @@ services:
             $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
             $personRepository: '@Chill\PersonBundle\Repository\PersonRepository'
             $personMove: '@Chill\PersonBundle\Actions\Remove\PersonMove'
-            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $eventDispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingCourseController:

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

@@ -96,11 +96,14 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_activeonedaybetweendates_filter }
 
-    chill.person.export.filter_referrer:
-        class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_referrer_filter }
 
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilterBetweenDates:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_referrer_filter_between_dates }
+
     chill.person.export.filter_openbetweendates:
         class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter
         tags:
@@ -147,6 +150,10 @@ services:
         tags:
             - { name: chill.export_filter, alias: accompanyingcourse_info_within_filter }
 
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\NotAssociatedWithAReferenceAddressFilter:
+        tags:
+            - { name: chill.export_filter, alias: accompanyingcourse_not_having_addr_reference_filter }
+
     ## Aggregators
     chill.person.export.aggregator_referrer_scope:
         class: Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator
@@ -251,3 +258,15 @@ services:
     Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeWorkingOnCourseAggregator:
         tags:
             - { name: chill.export_aggregator, alias: accompanyingcourse_scope_working_on_course_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OpeningDateAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_opening_date_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingDateAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_closing_date_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\PersonParticipatingAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_person_part_aggregator }

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

@@ -0,0 +1,31 @@
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    # exports
+    Chill\PersonBundle\Export\Export\CountAccompanyingCourseStepHistory:
+        tags:
+            - { name: chill.export, alias: count_acpstephistory }
+
+    # filters
+    Chill\PersonBundle\Export\Filter\AccompanyingPeriodStepHistoryFilters\ByDateFilter:
+        tags:
+            - { name: chill.export_filter, alias: acpstephistory_filter_by_date }
+
+    Chill\PersonBundle\Export\Filter\AccompanyingPeriodStepHistoryFilters\ByStepFilter:
+        tags:
+            - { name: chill.export_filter, alias: acpstephistory_filter_by_step }
+
+    # aggregators
+    Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByClosingMotiveAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: acpstephistory_agg_by_closing_motive }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByDateAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: acpstephistory_agg_by_date }
+
+    Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByStepAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: acpstephistory_agg_by_step }

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

@@ -1,38 +1,30 @@
 services:
+    _defaults:
+        autoconfigure: true
+        autowire: true
 
     ## Indicators
-    chill.person.export.count_household:
-        class: Chill\PersonBundle\Export\Export\CountHousehold
-        autowire: true
-        autoconfigure: true
+    Chill\PersonBundle\Export\Export\CountHouseholdInPeriod:
         tags:
             - { name: chill.export, alias: count_household }
 
     Chill\PersonBundle\Export\Export\ListHouseholdInPeriod:
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_household_in_period }
 
     ## Filters
     chill.person.export.filter_household_composition:
         class: Chill\PersonBundle\Export\Filter\HouseholdFilters\CompositionFilter
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export_filter, alias: household_composition_filter }
 
     ## Aggregators
     chill.person.export.aggregator_household_composition:
         class: Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: household_composition_aggregator }
 
     chill.person.export.aggregator_household_childrennumber:
         class: Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: household_childrennumber_aggregator }

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

@@ -4,35 +4,31 @@ services:
         autowire: true
 
     ## Indicators
-    chill.person.export.count_person:
-        class: Chill\PersonBundle\Export\Export\CountPerson
-        autowire: true
-        autoconfigure: true
+    Chill\PersonBundle\Export\Export\CountPerson:
         tags:
             - { name: chill.export, alias: count_person }
 
-    chill.person.export.count_person_with_accompanying_course:
-        class: Chill\PersonBundle\Export\Export\CountPersonWithAccompanyingCourse
-        autowire: true
-        autoconfigure: true
+    Chill\PersonBundle\Export\Export\CountPersonWithAccompanyingCourse:
         tags:
             - { name: chill.export, alias: count_person_with_accompanying_course }
 
     Chill\PersonBundle\Export\Export\ListPerson:
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_person }
 
-    Chill\PersonBundle\Export\Export\ListPersonWithAccompanyingPeriod:
-        autowire: true
-        autoconfigure: true
+    Chill\PersonBundle\Export\Helper\ListPersonHelper:
+        arguments:
+            $customPersonHelpers: !tagged_iterator chill_person.list_person_customizer
+
+    Chill\PersonBundle\Export\Export\ListPersonHavingAccompanyingPeriod:
         tags:
             - { name: chill.export, alias: list_person_with_acp }
 
+    Chill\PersonBundle\Export\Export\ListPersonWithAccompanyingPeriodDetails:
+        tags:
+            - { name: chill.export, alias: list_person_with_acp_details }
+
     Chill\PersonBundle\Export\Export\ListAccompanyingPeriod:
-        autowire: true
-        autoconfigure: true
         tags:
             - { name: chill.export, alias: list_acp }
 
@@ -124,6 +120,10 @@ services:
         tags:
             - { name: chill.export_filter, alias: person_without_household_composition_filter }
 
+    Chill\PersonBundle\Export\Filter\PersonFilters\WithParticipationBetweenDatesFilter:
+        tags:
+            - { name: chill.export_filter, alias: person_with_participation_between_dates_filter }
+
     ## Aggregators
     chill.person.export.aggregator_nationality:
         class: Chill\PersonBundle\Export\Aggregator\PersonAggregators\NationalityAggregator
@@ -181,4 +181,6 @@ services:
         tags:
             - { name: chill.export_aggregator, alias: person_center_aggregator }
 
-
+    Chill\PersonBundle\Export\Aggregator\PersonAggregators\PostalCodeAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: person_postal_code_aggregator }

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

@@ -1,117 +1,144 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
-  ## Indicators
-  Chill\PersonBundle\Export\Export\CountAccompanyingPeriodWork:
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export, alias: count_social_work_actions }
+    ## Indicators
+    Chill\PersonBundle\Export\Export\CountAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod:
+        tags:
+            # the name is not matching the class name: it is kept for backward compatibility
+            - { name: chill.export, alias: count_social_work_actions }
 
-  Chill\PersonBundle\Export\Export\ListAccompanyingPeriodWork:
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export, alias: list_social_work_actions }
+    Chill\PersonBundle\Export\Export\CountAccompanyingPeriodWorkAssociatePersonOnWork:
+        tags:
+            - { name: chill.export, alias: count_social_work_actions_associate_person_work }
 
-  ## FILTERS
-  chill.person.export.filter_social_work_type:
-     class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\SocialWorkTypeFilter
-     autowire: true
-     autoconfigure: true
-     tags:
-         - { name: chill.export_filter, alias: social_work_type_filter }
+    Chill\PersonBundle\Export\Export\ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod:
+        tags:
+            # the name is not matching the class name: it is kept for backward compatibility
+            - { name: chill.export, alias: list_social_work_actions }
 
-  chill.person.export.filter_scope:
-    class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { name: chill.export_filter, alias: social_work_actions_scope_filter }
+    Chill\PersonBundle\Export\Export\ListAccompanyingPeriodWorkAssociatePersonOnWork:
+        tags:
+            - { name: chill.export, alias: list_social_work_actions_associate_person_work }
 
-  chill.person.export.filter_job:
-    class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\JobFilter
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { name: chill.export_filter, alias: social_work_actions_job_filter }
+    Chill\PersonBundle\Export\Export\CountPersonOnAccompanyingPeriodWorkAssociatePersonOnWork:
+        tags:
+            - { name: chill.export, alias: count_person_on_acwp_associate_person_work }
 
-  chill.person.export.filter_treatingagent:
-    class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\ReferrerFilter
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { name: chill.export_filter, alias: social_work_actions_treatingagent_filter }
+    Chill\PersonBundle\Export\Export\AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriod:
+        tags:
+            - { name: chill.export, alias: avg_duration_social_work_actions_person_associated_on_period }
 
-  Chill\PersonBundle\Export\Filter\SocialWorkFilters\CurrentActionFilter:
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export_filter, alias: social_work_actions_current_filter }
+    Chill\PersonBundle\Export\Export\AvgDurationAPWorkPersonAssociatedOnWork:
+        tags:
+            - { name: chill.export, alias: avg_duration_social_work_actions_person_associated_on_work }
 
-  Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkStartDateBetweenDateFilter:
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export_filter, alias: social_work_actions_start_btw_dates_filter }
+    ## FILTERS
+    chill.person.export.filter_social_work_type:
+        class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\SocialWorkTypeFilter
+        tags:
+            - { name: chill.export_filter, alias: social_work_type_filter }
 
-  Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkEndDateBetweenDateFilter:
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export_filter, alias: social_work_actions_end_btw_dates_filter }
+    chill.person.export.filter_scope:
+        class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_scope_filter }
 
-      ## AGGREGATORS
-  chill.person.export.aggregator_action_type:
-    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { name: chill.export_aggregator, alias: social_work_actions_action_type_aggregator }
+    chill.person.export.filter_job:
+        class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\JobFilter
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_job_filter }
 
-  chill.person.export.aggregator_treatingagent_scope:
-      class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_scope_aggregator }
+    chill.person.export.filter_treatingagent:
+        class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\ReferrerFilter
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_treatingagent_filter }
 
-  chill.person.export.aggregator_treatingagent_job:
-      class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_job_aggregator }
+    Chill\PersonBundle\Export\Filter\SocialWorkFilters\CurrentActionFilter:
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_current_filter }
 
-  chill.person.export.aggregator_treatingagent:
-    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_aggregator }
+    Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkStartDateBetweenDateFilter:
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_start_btw_dates_filter }
 
-  chill.person.export.aggregator_goal:
-    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { name: chill.export_aggregator, alias: social_work_actions_goal_aggregator }
+    Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkEndDateBetweenDateFilter:
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_end_btw_dates_filter }
 
-  chill.person.export.aggregator_result:
-    class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ResultAggregator
-    autowire: true
-    autoconfigure: true
-    tags:
-        - { name: chill.export_aggregator, alias: social_work_actions_result_aggregator }
+    Chill\PersonBundle\Export\Filter\SocialWorkFilters\CreatorFilter:
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_creator_filter }
 
-  chill.person.export.aggregator_goalresult:
-      class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalResultAggregator
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export_aggregator, alias: social_work_actions_goal_result_aggregator }
+    Chill\PersonBundle\Export\Filter\SocialWorkFilters\CreatorJobFilter:
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_creator_job_filter }
 
-  Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CurrentActionAggregator:
-      autowire: true
-      autoconfigure: true
-      tags:
-          - { name: chill.export_aggregator, alias: social_work_actions_current_aggregator }
+    Chill\PersonBundle\Export\Filter\SocialWorkFilters\CreatorScopeFilter:
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_creator_scope_filter }
+
+    Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter:
+        tags:
+            - { name: chill.export_filter, alias: social_work_actions_evaluation_btw_dates_filter }
+
+
+        ## AGGREGATORS
+    chill.person.export.aggregator_action_type:
+        class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_action_type_aggregator }
+
+    chill.person.export.aggregator_treatingagent_scope:
+        class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_scope_aggregator }
+
+    chill.person.export.aggregator_treatingagent_job:
+        class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_job_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_treatingagent_aggregator }
+
+    chill.person.export.aggregator_goal:
+        class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_goal_aggregator }
+
+    chill.person.export.aggregator_result:
+        class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ResultAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_result_aggregator }
+
+    chill.person.export.aggregator_goalresult:
+        class: Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalResultAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_goal_result_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CurrentActionAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_current_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\HandlingThirdPartyAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: accompanyingcourse_handling3party_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CreatorAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_creator_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CreatorJobAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_creator_job_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CreatorScopeAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: social_work_actions_creator_scope_aggregator }
+
+    Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\HandlingThirdPartyFilter:
+        tags:
+            - { name: chill.export_filter, alias: 'acpw_handling3party_filter'}

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

@@ -6,7 +6,6 @@ services:
         tags: [ 'doctrine.fixture.orm' ]
 
     Chill\PersonBundle\DataFixtures\ORM\LoadCustomFields:
-        arguments:
-            $translatableStringHelper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
-            $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
+        autowire: true
+        autoconfigure: true
         tags: [ 'doctrine.fixture.orm' ]