194 Commits

Author SHA1 Message Date
bea21d45fc [export] fix 2 job/scope aggregators in activity and acp 2023-10-03 19:40:23 +02:00
3aa10927d7 [export] fix 4 job/scope aggregators in activity and aside activity 2023-10-03 19:40:23 +02:00
0c5b35926b php cs fixer and phpstan 2023-09-29 07:52:50 +02:00
9c436d5c69
Re-associate filters for export "count persons" 2023-09-28 14:32:58 +02:00
05a8dba912
update cs using php-cs-fixer 3.30 2023-09-27 16:55:01 +02:00
27c1bb03ff
update cs 2023-09-27 16:45:42 +02:00
65aa0a1588
Merge remote-tracking branch 'origin/master' into rector/rules-symfony 2023-09-27 15:25:29 +02:00
d10dc7344e
Fix label of ActivityTypeFilter 2023-09-26 17:59:05 +02:00
4e27d71bea
Re-associate activity exports and filters
Some filter can work on both exports and lists associated to persons and accompanyings periods. They are moved to a more common namespace.

The modifiers in list are also fixed to allow an association with these filters.
2023-09-26 17:59:04 +02:00
500b37601a implement new export service for accompanyingcourse exports 2023-09-21 14:15:44 +02:00
754515f185 php cs fixes 2023-09-14 12:25:56 +02:00
d2323e91ca
new cs rule: single_line_empty_body
Rule is added to the last version of php-cs-fixer
2023-09-12 15:58:59 +02:00
9375d50112
Merge remote-tracking branch 'origin/master' into rector/rules-symfony
# Conflicts:
#	src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
#	src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
2023-09-12 15:21:15 +02:00
a197a6b418
fix tests implementing AbstractFilterTest 2023-09-01 14:21:03 +02:00
1c0fd57913
Apply rector rules + fix CS 2023-08-30 14:55:26 +02:00
87cdf2e53b Fixed: [export] bad type in form of EmergencyFilter and CalendarRangeFilter 2023-08-22 14:24:40 +02:00
023a29cb78
apply rector rules: php up to php82 2023-07-19 23:19:50 +02:00
74ed34ba97
apply rules rector 2023-07-19 22:48:26 +02:00
224c2c74e8
Merge remote-tracking branch 'origin/master' into rector/rules-up-to-php80
Conflicts:
	src/Bundle/ChillActivityBundle/Controller/ActivityController.php
	src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
	src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
	src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
	src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
	src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
	src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
	src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
	src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
	src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
	src/Bundle/ChillEventBundle/Search/EventSearch.php
	src/Bundle/ChillMainBundle/Controller/ExportController.php
	src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
	src/Bundle/ChillMainBundle/Cron/CronManager.php
	src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
	src/Bundle/ChillMainBundle/Export/ExportManager.php
	src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
	src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
	src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
	src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
	src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
	src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
	src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
	src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
	src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
	src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
	src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
	src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
2023-07-17 12:49:13 +02:00
f3912e5544 Merge branch '129-export-filter-course-having-activity' into 'master'
[export] Add a filter "filter course having an activity between two dates"

Closes #129

See merge request Chill-Projet/chill-bundles!574
2023-07-12 16:20:18 +00:00
2882038efc
[export] Add a filter "filter course having an activity between two dates" 2023-07-11 16:00:40 +02:00
6065680e1e
Feature: [export] allow to group activities by location 2023-07-11 15:01:32 +02:00
21f11fb034
execute rector run on filters and aggregators 2023-06-18 21:36:40 +02:00
50de389bc7
Revert "apply fixes for list"
This reverts commit 938027cc
2023-06-18 11:58:42 +02:00
960acb8c0a
Revert "apply rector rules for exports"
This reverts commit 3adf3625
2023-06-18 11:57:26 +02:00
12fdfd81c4
remove empty data which sparkle a bug in RadioListMapper 2023-06-06 09:37:43 +02:00
938027cc1e
apply fixes for list 2023-06-05 17:54:00 +02:00
3adf3625dc
apply rector rules for exports 2023-06-05 17:21:21 +02:00
c35994203d
fix phpstan issues 2023-04-28 22:55:01 +02:00
dde3002100
DX: apply rector rules up to php8.0 2023-04-28 22:30:33 +02:00
746ed4f5e5
DX: fix cs 2023-04-15 00:43:55 +02:00
858ade467c
DX: rector rules upt to PHP 74 2023-04-15 00:20:19 +02:00
4c5dae60a8
DX: apply rector rulesets up to PHP 73 2023-03-29 22:39:11 +02:00
48772efd54
DX: fix phpstan issues 2023-03-28 22:32:08 +02:00
672418e70a
Merge branch 'master' into upgrade-php82 2023-03-06 16:37:09 +01:00
f07ea3259e php cs fixes 2023-02-22 11:54:03 +01:00
950ca42f68
Merge branch 'master' into upgrade-php82 2023-02-09 18:43:02 +01:00
cc62c9cc4a Feature: [export][activity] Add filter on localisation for activities 2023-02-08 15:42:44 +00:00
70871176fc
DX: fix cs 2023-02-06 17:47:54 +01:00
6b90a7d2a7
Merge branch 'master' into VSR-issues 2023-01-24 15:36:22 +01:00
01790fa0cf
Fixed: [export] Fix checking of null value: take also empty string value 2023-01-11 17:42:50 +01:00
1f48900434
DX: fix CS 2023-01-11 16:55:10 +01:00
91494c07d5
Fixed: [export][Agreggator by type] handle correctly case when an acp or an activity does not have any location type 2023-01-11 16:55:03 +01:00
5fea61c450
Fixed: [export][activity type filter for acp] fix filter for acp, by activity type
Use an `EXISTS` subquery instead of a JOIN.
2023-01-11 16:34:10 +01:00
ff930e94f6 FEATURE: [export][form] use select2 for more user friendly form field 2022-12-13 10:07:00 +01:00
38ff46f03f FIX: [export][activity] mistake in the alias 2022-12-13 10:00:55 +01:00
aca81122d5
Merge branch 'calendar/finalization' into testing 2022-12-08 13:42:25 +01:00
368136ea57
Feature: [activity][list] Fix list for activities and refactor list with an helper 2022-12-05 18:26:01 +01:00
88fb48e2be
Fixed: let the aggregator "Activity by type" be shown again 2022-12-05 18:26:01 +01:00
9913938c1b show x instead of 1 or 0 for boolean field in export 2022-11-25 14:19:22 +01:00