Commit Graph

933 Commits

Author SHA1 Message Date
julienfastre 931c69eee4 Merge remote-tracking branch 'origin/master' into upgrade-sf5 2024-04-04 18:45:01 +02:00
julienfastre df0afcd228 Fix activity filter inconsistency in document generation
This commit resolves issue 259 where the filtering of activities differed within the document generation and in the list of activities for an accompanying period. This amendment to the Chill Activity Bundle ensures consistent behavior. Additionally, new test methods and query adjustments were applied to the ActivityACLAwareRepository for better functionality.
2024-03-14 21:16:05 +01:00
julielenaerts 5b714f17be order scopes alphabetically 2024-02-26 14:40:41 +01:00
julielenaerts bbb167bb85 order user jobs alphabetically when returning all active user jobs 2024-02-26 13:36:44 +01:00
julielenaerts d713087dcb Changie and php style fixes 2024-02-26 13:30:26 +01:00
julielenaerts 569aeeef87 Fix wrong translation of user job service -> métier 2024-02-26 12:23:11 +01:00
julienfastre bb4b7e9735 Make all existing export test data provider static 2024-02-16 21:52:47 +01:00
julienfastre b9ae878791 Aggregators: Update test methods to static and return array
Modified aggregator test methods throughout the Chill project to be now static methods. Also updated yield construction to array returns for more standardised code.
2024-02-16 21:33:57 +01:00
julienfastre 35d55cced4 Update test methods to static in AbstractFilterTest
The methods getFormData() and getQueryBuilders() across multiple test classes have been updated to static methods. This refactoring is part of a broader effort to improve code structure and readability. A rector rule has been employed to assist in the systematic update of these existing methods.
2024-02-16 19:09:15 +01:00
julienfastre f889d67e94 fixes after merge of master into upgrade-sf4 2024-02-12 22:31:16 +01:00
julienfastre 37af488f69 Merge branch 'master' into upgrade-sf5 2024-02-12 21:50:34 +01:00
julienfastre 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
julienfastre 13854e59de Add grouping parenthesis on condition about social issue and social action visibility
This improve readability and avoid errors with boolean operator precedence
2024-02-07 14:22:28 +01:00
julielenaerts 4736fca679 Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 2024-02-07 14:22:27 +01:00
julienfastre 036fe8d6f8 upgrade php-cs 3.49 2024-02-07 10:43:53 +01:00
julielenaerts 0b50cbfe4c adjust form for activity type presence field, setting placeholder to false 2024-01-10 13:12:59 +01:00
julielenaerts e67c5d98ef force pipeline to run again 2024-01-10 11:09:33 +01:00
julielenaerts 3c8e59e088 php cs fixes after updating php cs fixer 2024-01-10 10:31:25 +01:00
julienfastre 825cd127d1 update php-cs-fixer and rector + fix rules 2024-01-09 13:50:45 +01:00
julienfastre 5703fd0046 Refactor code to directly use Doctrine's ManagerRegistry
Replaced most of the invocations of getDoctrine()->getManager() with ManagerRegistry->getManager(), and added ManagerRegistry injection to controllers where needed. This is part of an ongoing effort to improve code clarity, and avoid unnecessary method chaining in various parts of the codebase.
2023-12-16 19:09:34 +01:00
julienfastre 1098bafd3d Replaced the deprecated 'self::$container->get' with 'self::getContainer()->get' using rector
This change is made to comply with the new Symfony standards and to avoid deprecation warnings for future versions. The update touches various functionalities, including retrieving EntityManagerInterface instance and various service classes within the test files.
2023-12-14 23:36:56 +01:00
julienfastre da997badd9 Fix phpstan issues 2023-12-12 22:43:44 +01:00
julienfastre 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
julienfastre 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
julienfastre f0605c6b08 Use dedicated FilterListAccompanyingPeriodHelper to filter confidential course in different lists 2023-12-07 16:18:37 +01:00
julienfastre fe54e51362 Add dates in the filter "filter course by activity type" 2023-12-04 18:17:00 +01:00
julienfastre b17b2a8cfb Export: add export "number of household associated with an activity" 2023-12-04 16:39:01 +01:00
julienfastre 2883e085ed DX: Fix aggregator: "group activity by reason" 2023-11-20 18:07:06 +01:00
julienfastre b05ed86d1e DX: Fix aggregator: "group activity by type" 2023-11-20 18:06:55 +01:00
julienfastre af6bee2497 Export: add an export which count persons on activity 2023-11-15 13:25:08 +01:00
julienfastre cbc83c0e63 Export: add grouping "group activity by person" (activites saved in person context) 2023-11-13 15:29:01 +01:00
julienfastre 27012d842d Export: add an ActivityPresenceFilter 2023-11-13 15:29:01 +01:00
julienfastre 4112e59af4 Export: add an ActivityPresenceAggregator 2023-11-09 17:35:34 +01:00
julienfastre bb1602934c Fix "group activity by creator job" aggregator 2023-11-07 16:07:24 +01:00
julienfastre 83fe3ec3fc Export: add a "filter activity by creator job" filter 2023-11-07 16:06:22 +01:00
julienfastre 6280453523 Fix activity date filter: validation of form using RollingDate 2023-11-05 23:29:33 +01:00
julienfastre dc860d0c46 DX: new CS for new version of php-cs-fixer 2023-11-05 23:14:19 +01:00
julienfastre 6fd80f9f2e [export] fix data type from form: either collection or array 2023-11-05 23:08:13 +01:00
julienfastre 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
julienfastre 54ae17a8d2 Fix label on some filters 2023-10-24 15:39:57 +02:00
julienfastre 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
julienfastre 7bff5ce39e DX: rename UserScopeFilter to CreatorScopeFilter 2023-10-24 14:17:08 +02:00
julienfastre 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
julienfastre 5f805626f7 [export] sort filters and aggregators by title 2023-10-19 14:39:22 +02:00
julienfastre 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
julienfastre 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
julienfastre f799fe0649 [export] add a grouping of accompanying period by opening and closing date 2023-10-19 10:33:54 +02:00
julienfastre d54d34be7c release of version 2.9.1 2023-10-17 17:39:30 +02:00
julienfastre bc2041cbdd apply more cs rules for php-cs 2023-10-17 13:27:03 +02:00
julienfastre adf1110340 Merge remote-tracking branch 'origin/master' into rector/rules-symfony 2023-10-17 09:29:33 +02:00