184 Commits

Author SHA1 Message Date
bbb167bb85 order user jobs alphabetically when returning all active user jobs 2024-02-26 13:36:44 +01:00
67c3de733f
Refactor ActivityReasonAggregator: can be applied also on export for Activities linked with accompanying period
This commit renames the ActivityReasonAggregator's namespace from PersonAggregators to Aggregator and modifies its methods. The join method in the query builder has been changed from innerJoin to leftJoin, 'group by' part is simplified, and the applyOn method now returns Declarations::ACTIVITY instead of Declarations::ACTIVITY_PERSON. Further modifications apply to the getFormDefaultData method and the corresponding test.
2024-02-07 16:47:33 +01:00
036fe8d6f8
upgrade php-cs 3.49 2024-02-07 10:43:53 +01:00
3c8e59e088 php cs fixes after updating php cs fixer 2024-01-10 10:31:25 +01:00
2adb6105eb Merge branch '246-do-not-show-confidential-in-list' into 'master'
Filter confidential courses from list of accompanying periods and related

Closes #246

See merge request Chill-Projet/chill-bundles!633
2023-12-11 16:22:38 +00:00
dab80a84d8 Merge branch '235-add-date-filter-course-by-activity' into 'master'
Add dates in the filter "filter course by activity type"

Closes #235

See merge request Chill-Projet/chill-bundles!632
2023-12-07 15:25:09 +00:00
f0605c6b08
Use dedicated FilterListAccompanyingPeriodHelper to filter confidential course in different lists 2023-12-07 16:18:37 +01:00
fe54e51362
Add dates in the filter "filter course by activity type" 2023-12-04 18:17:00 +01:00
b17b2a8cfb
Export: add export "number of household associated with an activity" 2023-12-04 16:39:01 +01:00
2883e085ed
DX: Fix aggregator: "group activity by reason" 2023-11-20 18:07:06 +01:00
b05ed86d1e
DX: Fix aggregator: "group activity by type" 2023-11-20 18:06:55 +01:00
af6bee2497
Export: add an export which count persons on activity 2023-11-15 13:25:08 +01:00
cbc83c0e63
Export: add grouping "group activity by person" (activites saved in person context) 2023-11-13 15:29:01 +01:00
27012d842d
Export: add an ActivityPresenceFilter 2023-11-13 15:29:01 +01:00
4112e59af4
Export: add an ActivityPresenceAggregator 2023-11-09 17:35:34 +01:00
bb1602934c
Fix "group activity by creator job" aggregator 2023-11-07 16:07:24 +01:00
83fe3ec3fc
Export: add a "filter activity by creator job" filter 2023-11-07 16:06:22 +01:00
6280453523
Fix activity date filter: validation of form using RollingDate 2023-11-05 23:29:33 +01:00
6fd80f9f2e
[export] fix data type from form: either collection or array 2023-11-05 23:08:13 +01:00
461995b56b Merge branch '172-missing-exports' into 'master'
Fix some issues with exports

Closes #172

See merge request Chill-Projet/chill-bundles!601
2023-10-24 13:47:30 +00:00
54ae17a8d2
Fix label on some filters 2023-10-24 15:39:57 +02:00
617d09ab8a Merge branch '179-remove-filter-by-center-in-exports' into 'master'
Resolve "Export: permettre de ne pas filtrer les résultats par centre"

Closes #179

See merge request Chill-Projet/chill-bundles!599
2023-10-24 13:18:03 +00:00
7bff5ce39e
DX: rename UserScopeFilter to CreatorScopeFilter 2023-10-24 14:17:08 +02:00
a6e930958b
[export] create a parameter that will force to skip the filtering by center (ACL) when generating an export 2023-10-19 17:19:28 +02:00
981dc6a959
[export] add a filter and aggregator on accompanying periods: group by activity type (accompanying course having at least one activity from this type) 2023-10-19 10:33:56 +02:00
11fb9bcd0b
[export] add a filter and aggregator on activities: filter/group by persons taking part to the activity 2023-10-19 10:33:55 +02:00
f799fe0649
[export] add a grouping of accompanying period by opening and closing date 2023-10-19 10:33:54 +02:00
bc2041cbdd
apply more cs rules for php-cs 2023-10-17 13:27:03 +02:00
adf1110340
Merge remote-tracking branch 'origin/master' into rector/rules-symfony 2023-10-17 09:29:33 +02:00
a6fcdb5256
Merge remote-tracking branch 'origin/rector/rules-symfony' into rector/rules-symfony 2023-10-16 18:07:42 +02:00
be8975ee04
Merge branch '146_parcours_annules' into rector/rules-symfony 2023-10-16 17:52:06 +02:00
304bf4258b
Remove usage of setParameters in various filters 2023-10-16 16:20:25 +02:00
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
dac48ea4e0 last processing of review remarks 2023-10-04 11:19:39 +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
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