Commit Graph

928 Commits

Author SHA1 Message Date
68d28f3e28 Fix filtres and scopes to take into account job and scope when the refferrer is add to the accompanying period work 2023-10-16 11:52:03 +02:00
63e9d1a96f [export] add a filter and aggregator on activity: by creator job 2023-10-16 11:52:03 +02:00
978db5a5c5 update some queries in the interface to take into account history of user's scope and user's job 2023-10-16 11:52:02 +02:00
dac48ea4e0 last processing of review remarks 2023-10-04 11:19:39 +02:00
b4e5618e00 fix phpunit tests errors 2023-10-04 10:06:46 +02:00
15e23087ed cs-fixer, phpstan et rector 2023-10-04 09:45:15 +02:00
fa3fc2c781 [export] fix activity filters/aggregators + tests: 'at' based on activity date 2023-10-03 19:43:16 +02:00
84ba626fb5 add missing form child in getFormDefaultData() + sort methods
try to resolve 2 last unit tests errors on ci (no errors in local)
2023-10-03 19:42:06 +02:00
eddcfc3921 cs-fixer 2023-10-03 19:42:06 +02:00
f025b0d184 [export] fix 4 job/scope filters in activity and acp 2023-10-03 19:42:03 +02:00
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
bad302f512 Update template pathes to new syntax 2023-10-02 13:56:22 +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
0a6131abcc csfixer after (rebuild php container) 2023-09-07 12:16:47 +02:00
75bca46b98 cs fixer 2023-09-07 12:16:47 +02:00
1361e2bbf9 Fix test for TranslatableActivityTypeTest.php 2023-09-01 15:32:18 +02:00
37c1dfb0ba fix tests implementing AbstractAggregatorTest 2023-09-01 15:07:37 +02:00
a197a6b418 fix tests implementing AbstractFilterTest 2023-09-01 14:21:03 +02:00
7c58880139 Remove usage of deprecated Role class 2023-08-31 17:08:18 +02:00
b85cd1b994 DX: apply rector rules for phpunit up to 90 2023-08-31 11:08:42 +02:00
e4e52234ad Rector: apply rules for doctrine code quality 2023-08-31 10:35:52 +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
009a0326d9 Configure routes using annotation 2023-08-02 23:05:33 +02:00
378e417d5c Remove unnecessary comparison in ActivityController 2023-08-02 16:25:44 +02:00
e839b03cc9 Update path to twig template with new syntax 2023-07-28 12:16:50 +02:00
f570fe92a5 apply rector rules 2023-07-28 02:40:02 +02:00
c20f65eebb apply rector rules: symfony **UP TO** 44 2023-07-28 01:52:53 +02:00
aa553db659 apply rector rules after updating the code with master branch 2023-07-19 23:43:26 +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
075aca493b DX: type-hing oneToMany and ManyToMany properties as collection 2023-07-19 16:21:17 +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
0950074121 Merge branch '128-export-group-activity-by-localisation' into 'master'
Feature: [export] allow to group activities by location

Closes #128

See merge request Chill-Projet/chill-bundles!573
2023-07-12 16:11:51 +00:00
8391dbe448 Merge branch 'issue719_filter_activities_version_2' into 'master'
Filter the list of activities

See merge request Chill-Projet/chill-bundles!563
2023-07-12 16:11:10 +00:00
1ae27152c2 Merge branch 'master' into 616_rapid-action 2023-07-12 15:38:51 +02: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