From 2f8bafa2e29f4f10f8f6017c93c19bc20410bef0 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 4 Aug 2022 12:46:06 +0200 Subject: [PATCH] exports: split yaml services accompanying_period and accompanying_course * the 3 old filters are applyOn person -> move it in PersonFilters * there is a conditionnal option to enable them -> split yaml files --- .../ChillPersonExtension.php | 5 +- .../AccompanyingPeriodClosingFilter.php | 2 +- .../AccompanyingPeriodFilter.php | 2 +- .../AccompanyingPeriodOpeningFilter.php | 2 +- .../services/exports_accompanying_course.yaml | 152 +++++++++++++++++ .../services/exports_accompanying_period.yaml | 158 +----------------- .../config/services/exports_person.yaml | 5 +- 7 files changed, 164 insertions(+), 162 deletions(-) rename src/Bundle/ChillPersonBundle/Export/Filter/{AccompanyingCourseFilters => PersonFilters}/AccompanyingPeriodClosingFilter.php (97%) rename src/Bundle/ChillPersonBundle/Export/Filter/{AccompanyingCourseFilters => PersonFilters}/AccompanyingPeriodFilter.php (97%) rename src/Bundle/ChillPersonBundle/Export/Filter/{AccompanyingCourseFilters => PersonFilters}/AccompanyingPeriodOpeningFilter.php (97%) create mode 100644 src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php index 5b919a333..5818ef2ba 100644 --- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php +++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php @@ -75,8 +75,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config')); $loader->load('services.yaml'); $loader->load('services/widgets.yaml'); - $loader->load('services/exports_person.yaml'); - $loader->load('services/exports_social_actions.yaml'); $loader->load('services/fixtures.yaml'); $loader->load('services/controller.yaml'); $loader->load('services/search.yaml'); @@ -96,9 +94,12 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac $loader->load('services/doctrineEventListener.yaml'); $loader->load('services/accompanyingPeriodConsistency.yaml'); + $loader->load('services/exports_person.yaml'); if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') { $loader->load('services/exports_accompanying_period.yaml'); } + $loader->load('services/exports_accompanying_course.yaml'); + $loader->load('services/exports_social_actions.yaml'); } /** diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodClosingFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php similarity index 97% rename from src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodClosingFilter.php rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php index 373312e2f..ab22b830d 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodClosingFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodClosingFilter.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; +namespace Chill\PersonBundle\Export\Filter\PersonFilters; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Form\Type\ChillDateType; diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php similarity index 97% rename from src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodFilter.php rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php index 260956db9..d043abdc0 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodFilter.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; +namespace Chill\PersonBundle\Export\Filter\PersonFilters; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Form\Type\ChillDateType; diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodOpeningFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php similarity index 97% rename from src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodOpeningFilter.php rename to src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php index f737dfaab..4c4b0f85b 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AccompanyingPeriodOpeningFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AccompanyingPeriodOpeningFilter.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters; +namespace Chill\PersonBundle\Export\Filter\PersonFilters; use Chill\MainBundle\Export\FilterInterface; use Chill\MainBundle\Form\Type\ChillDateType; diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml new file mode 100644 index 000000000..76de0258f --- /dev/null +++ b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_course.yaml @@ -0,0 +1,152 @@ +services: + + ## 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_current_userscope: + class: Chill\PersonBundle\Export\Filter\CurrentUserScopeFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_current_userscope_filter } + + chill.person.export.filter_current_userjob: + class: Chill\PersonBundle\Export\Filter\CurrentUserJobFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_current_userjob_filter } + + chill.person.export.filter_socialissue: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialIssueFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_socialissue_filter } + + chill.person.export.filter_step: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_step_filter } + + chill.person.export.filter_geographicalunitstat: + class: Chill\PersonBundle\Export\Filter\GeographicalUnitStatFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_geographicalunitstat_filter } + + chill.person.export.filter_socialaction: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_socialaction_filter } + + chill.person.export.filter_evaluation: + class: Chill\PersonBundle\Export\Filter\EvaluationFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_evaluation_filter } + + chill.person.export.filter_activitytype: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActivityTypeFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_activitytype_filter } + + chill.person.export.filter_origin: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OriginFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_origin_filter } + + chill.person.export.filter_closingmotive: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ClosingMotiveFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_closingmotive_filter } + + chill.person.export.filter_administrative_location: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AdministrativeLocationFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_administrative_location_filter } + + chill.person.export.filter_requestor: + class: Chill\PersonBundle\Export\Filter\RequestorFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_requestor_filter } + + chill.person.export.filter_confidential: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ConfidentialFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_confidential_filter } + + chill.person.export.filter_emergency: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EmergencyFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_emergency_filter } + + chill.person.export.filter_intensity: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\IntensityFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_intensity_filter } + + chill.person.export.filter_activeondate: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_activeondate_filter } + + chill.person.export.filter_activeonedaybetweendates: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_activeonedaybetweendates_filter } + + chill.person.export.filter_referrer: + class: Chill\PersonBundle\Export\Filter\ReferrerFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_referrer_filter } + + chill.person.export.filter_openbetweendates: + class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter + autowire: true + autoconfigure: true + tags: + - { name: chill.export_filter, alias: accompanyingcourse_openbetweendates_filter } + + ## Aggregators \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml index 804fb5ff3..42ddd2181 100644 --- a/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/exports_accompanying_period.yaml @@ -1,168 +1,16 @@ services: - ## chill.person.export.filter_accompanying_period: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AccompanyingPeriodFilter + class: Chill\PersonBundle\Export\Filter\PersonFilters\AccompanyingPeriodFilter tags: - { name: chill.export_filter, alias: person_accc_period_filter } chill.person.export.filter_accompanying_period_opening: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AccompanyingPeriodOpeningFilter + class: Chill\PersonBundle\Export\Filter\PersonFilters\AccompanyingPeriodOpeningFilter tags: - { name: chill.export_filter, alias: person_acc_pe_op_filter } chill.person.export.filter_accompanying_period_closing: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AccompanyingPeriodClosingFilter + class: Chill\PersonBundle\Export\Filter\PersonFilters\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_current_userscope: - class: Chill\PersonBundle\Export\Filter\CurrentUserScopeFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_current_userscope_filter } - - chill.person.export.filter_current_userjob: - class: Chill\PersonBundle\Export\Filter\CurrentUserJobFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_current_userjob_filter } - - chill.person.export.filter_socialissue: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialIssueFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_socialissue_filter } - - chill.person.export.filter_step: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_step_filter } - - chill.person.export.filter_geographicalunitstat: - class: Chill\PersonBundle\Export\Filter\GeographicalUnitStatFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_geographicalunitstat_filter } - - chill.person.export.filter_socialaction: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_socialaction_filter } - - chill.person.export.filter_evaluation: - class: Chill\PersonBundle\Export\Filter\EvaluationFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_evaluation_filter } - - chill.person.export.filter_activitytype: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActivityTypeFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_activitytype_filter } - - chill.person.export.filter_origin: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OriginFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_origin_filter } - - chill.person.export.filter_closingmotive: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ClosingMotiveFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_closingmotive_filter } - - chill.person.export.filter_administrative_location: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AdministrativeLocationFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_administrative_location_filter } - - chill.person.export.filter_requestor: - class: Chill\PersonBundle\Export\Filter\RequestorFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_requestor_filter } - - chill.person.export.filter_confidential: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ConfidentialFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_confidential_filter } - - chill.person.export.filter_emergency: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EmergencyFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_emergency_filter } - - chill.person.export.filter_intensity: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\IntensityFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_intensity_filter } - - chill.person.export.filter_activeondate: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_activeondate_filter } - - chill.person.export.filter_activeonedaybetweendates: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_activeonedaybetweendates_filter } - - chill.person.export.filter_referrer: - class: Chill\PersonBundle\Export\Filter\ReferrerFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_referrer_filter } - - chill.person.export.filter_openbetweendates: - class: Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter - autowire: true - autoconfigure: true - tags: - - { name: chill.export_filter, alias: accompanyingcourse_openbetweendates_filter } - - ## Aggregators \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml b/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml index f94b32ae1..c8bd9d76a 100644 --- a/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/exports_person.yaml @@ -1,5 +1,6 @@ services: + ## Indicators chill.person.export.count_person: class: Chill\PersonBundle\Export\Export\CountPerson autowire: true @@ -24,7 +25,7 @@ services: tags: - { name: chill.export, alias: list_person_duplicate } -# FILTERS + ## Filters chill.person.export.filter_gender: class: Chill\PersonBundle\Export\Filter\PersonFilters\GenderFilter autowire: true @@ -82,7 +83,7 @@ services: tags: - { name: chill.export_filter, alias: person_nomadic_filter } -# AGGREGATORS + ## Aggregators chill.person.export.aggregator_nationality: class: Chill\PersonBundle\Export\Aggregator\PersonAggregators\NationalityAggregator autowire: true