9814a9d64f
cs fix
2022-10-10 14:57:58 +02:00
93b754fba2
Merge branch '11-fix-scope-person-document' into chill_amli_staging
...
# Conflicts:
# docs/source/installation/index.rst
# src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
# src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
# src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
# src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
# src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
# src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
# src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
# src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
# src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
# src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
# src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
# src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
# src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
# src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
# src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
# src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php
# src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
# src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php
# src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
# src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php
# src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php
# src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
# src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
# src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php
# src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php
# src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php
# src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
# src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php
# src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php
# src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php
# src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php
# src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php
# src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php
# src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php
# src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php
# src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php
# src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php
# src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php
# src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/FamilySituationFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php
# src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
# src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
# src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Export/CountSocialWorkActionsTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php
# src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
2022-10-10 14:12:12 +02:00
49731777b4
fix cs: declare type and license header mismatch
2022-10-06 20:51:44 +02:00
fb7c6f0a9b
fix cs: too much line before declaring strict type
2022-10-06 08:54:23 +02:00
63137c67f4
fix cs
2022-10-05 16:55:13 +02:00
c1d96af85f
fix cs
2022-10-05 15:08:53 +02:00
32187cfe06
Merge remote-tracking branch 'origin/testing' into chill_amli
2022-09-29 10:58:05 +02:00
1786fa838f
Merge branch '111_exports_suite' into testing
2022-09-28 09:49:33 +02:00
2c46886e36
Fix use import and add a "not null" condition on travel time
2022-09-26 14:59:31 +02:00
58eb089d1c
Fix use import and add a "not null" condition on travel time
2022-09-26 14:49:51 +02:00
6eff1962df
Fix import and add a "not null" condition on duration time
2022-09-26 14:43:04 +02:00
743e0b9403
Merge branch '111_exports_suite' into testing
2022-09-22 16:58:47 +02:00
b9d4b5650b
[Activity][Export] Fixed: use leftJoin on aggregators
2022-09-22 16:58:29 +02:00
37662a4187
batch replacing 'actacp' by 'acp'
2022-09-21 18:04:34 +02:00
97d6f35605
Merge branch '111_exports_suite' into testing
2022-09-21 17:31:13 +02:00
01fb93e9e0
[export][activity] count activities only once if the activity is present
...
multiple times due to JOIN
2022-09-21 17:28:55 +02:00
8b64933565
[activity][export]: Fixed: rename the alias for accompanying period, to
...
be suitable for usage with acp filters
2022-09-21 17:28:55 +02:00
6c0715669e
change name of échange to activité for amli
2022-09-21 16:45:20 +02:00
683717e572
Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite
2022-09-21 14:34:04 +02:00
3c8dbe56fc
exports: create new aggregator tests + minor corrections in aggregators
2022-09-21 14:31:46 +02:00
c059b7700e
Improve label for aliases in "Filter by Activity" and use of new-style
...
EntityRepository for ActivityType
* [activity][export] Feature: improve label for aliases in "Filter by activity type"
* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
2022-09-21 11:11:33 +02:00
eb112b8a85
exports: remove duplicate test
...
cfr commit 18a6a5a7eb
2022-09-21 10:33:49 +02:00
390009b395
export: create new filter tests
2022-09-21 10:17:53 +02:00
b25a1c3cbb
correct import path with filter/aggr
2022-09-21 10:17:53 +02:00
5af492b2db
Merge remote-tracking branch 'origin/111_exports_suite' into testing
2022-09-20 12:18:00 +02:00
d716e0c2c2
add missing roles and adapt role voter for exports houshold and activity
2022-09-17 08:23:28 +02:00
fb60808dca
export translations: improve title translations in filter/aggrs stack
2022-09-14 17:53:07 +02:00
18a6a5a7eb
exports: move acp ActivityType filter in ChillActivityBundle
2022-09-13 13:27:24 +02:00
02b53e23e5
Merge branch '111_exports_suite' into chill_amli
2022-09-12 12:55:43 +02:00
bd45fbc85c
merge master into chill amli to have exports
2022-09-12 12:53:26 +02:00
a817b0bf4c
exports: re-enable all modifiers stack with shared filters/aggrs
2022-09-08 11:31:23 +02:00
4aaf75a1a4
merge 111_exports_suite into testing branch
2022-09-08 10:03:21 +02:00
1dcff2f23c
exports: add condition with distinct alias on join clauses
2022-09-07 21:40:53 +02:00
81359877c4
exports: add condition with distinct alias on join clauses (wip)
2022-09-07 19:45:41 +02:00
e42d6c2d77
Merge branch 'master' into testing
2022-09-06 15:33:27 +02:00
1c92f58b3b
Merge branch 'tests/fixes-2022-09-05' into 111_exports_suite
2022-09-06 15:02:36 +02:00
75bdc335e5
remove usage of deprecated Role into Export
2022-09-05 17:26:36 +02:00
c442529799
fix cs
2022-09-05 14:49:07 +02:00
374ad43df6
exports: cleaning code
2022-09-01 10:11:53 +02:00
b5139ec460
exports: improve activity DateAggregator
...
- put orderby at the end
- addSelect with TO_CHAR() function (cancel EXRACT())
- uniformize addSelect cases
- orderBy with variable
- improve getLabels
2022-08-25 14:58:25 +02:00
7173e4be4a
exports: fix activity DateAggregator; add customs DQL Date/Time functions
2022-08-24 15:44:18 +02:00
52902e905a
exports: test all activity filters/aggregators and fix errors
2022-08-24 11:36:54 +02:00
dea7982ca8
exports: add activity linked_to_acp new aggregators (wip)
2022-08-22 19:04:48 +02:00
c4944cce17
exports: move activity old aggregators in PersonAggregators folder
2022-08-22 17:12:33 +02:00
f8f17a6a06
exports: move activity old filters in PersonFilters folder
2022-08-22 13:37:20 +02:00
248d56e598
exports: add activity linked_to_acp new filters
2022-08-22 13:28:50 +02:00
d04d758f27
exports: activityDate filter enable to activity linked to acl
2022-08-17 17:14:24 +02:00
c199bb5534
exports: activity improve translations
2022-08-17 17:02:21 +02:00
26cd677501
exports: activity new indicators works + improve translations
2022-08-17 16:07:20 +02:00
c17036fcda
exports: fix activitytype filter/aggregator appliedTo activity_person and too activity_acl
2022-08-17 15:28:51 +02:00
