Commit Graph

2477 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
21524f052e Create a custom dql function to build json object (JSON_BUILD_OBJECT) 2023-10-16 11:52:02 +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
0b6b25fd95 improve histories order since User entity 2023-10-04 12:49:30 +02:00
c526973475 [admin][templates] move job/scope history in an unique template and display history for a given user 2023-10-04 12:33:50 +02:00
58e189ee07 Improve type declaration 2023-10-04 11:21:39 +02:00
9f476dddaf php cs fixer 2023-10-04 11:20:20 +02:00
dac48ea4e0 last processing of review remarks 2023-10-04 11:19:39 +02:00
af4bee4d50 correct test 2023-10-04 10:43:37 +02:00
e3559774fd Improve the signature definition 2023-10-03 21:25:22 +02:00
d6a1044585 just mark other uses with mainScope and userJob !! 2023-10-03 19:43:18 +02:00
c5b153e6ed fix missing queries in job/scope history migration: remove mainscope_id and userjob_id from user table 2023-10-03 19:40:23 +02:00
2d4d1eda50 cs-fixer 2023-10-03 19:40:23 +02:00
baeccf0970 fix Entity/UserTest and phpstan error 2023-10-03 19:40:23 +02:00
6665a443b9 phpstan, rector, cs-fixer 2023-10-03 19:40:23 +02:00
fc919e9547 add tests for MainScope and UserJob getters/setters 2023-10-03 19:40:23 +02:00
949c5424f0 improve check in setters and add types in repositories 2023-10-03 19:40:23 +02:00
c590d60a7f make tables more readable in templates 2023-10-03 19:40:23 +02:00
6228cc5ede fix errors in user getter/setters for mainScope and userJob 2023-10-03 19:40:23 +02:00
024790128a adjust history order 2023-10-03 19:40:23 +02:00
d2feb0f0b4 Fix return type in user getters for mainScope and userJob 2023-10-03 19:40:23 +02:00
8a6f29ef79 add crud controller to user job/scope history 2023-10-03 19:40:23 +02:00
124abf563e Create twig templates for admin jobs/scopes histories 2023-10-03 19:40:20 +02:00
096fb6219f adapt User Entity to get/set MainScope and UserJob with Histories Collection 2023-10-03 19:35:44 +02:00
bebc746d57 migration for UserScopeHistory and UserJobHistory 2023-10-03 19:35:44 +02:00
d47e6c5ba1 add new entities UserScopeHistory and UserJobHistory 2023-10-03 19:35:44 +02:00
41f4bbfdce remove container aware interface from timeline builder 2023-10-02 15:03:05 +02:00
2d7bc06539 Fix CS 2023-10-02 15:02:15 +02:00
294aaf5bed Replace the CenterControllerTest by a smoke test
Since that the center's admin has been replaced by a CRUD Controller, we have to adapt the test accordingly.
2023-10-02 12:52:40 +02:00
b0a7612329 make test easier to read 2023-09-29 08:51:14 +02:00
0c5b35926b php cs fixer and phpstan 2023-09-29 07:52:50 +02:00
65aa0a1588 Merge remote-tracking branch 'origin/master' into rector/rules-symfony 2023-09-27 15:25:29 +02:00
d8b0e0671a ScopeResolverDispatcher: better type hinting 2023-09-26 16:59:09 +02:00
29983cc2ad Work on test, but still fails 2023-09-21 16:18:51 +02:00
260a173a61 Add test for accompanyingPeriodExportHelper: closing motive exclusion 2023-09-21 15:21:14 +02:00
500b37601a implement new export service for accompanyingcourse exports 2023-09-21 14:15:44 +02:00
5d41b37620 create helper service to exclude accompanying periods from export result based on closing motive 2023-09-21 13:06:19 +02:00
da3c6f2dd1 php cs fix 2023-09-14 17:17:36 +02:00
370c9c6d74 only display active centers in center form for exports 2023-09-14 17:01:58 +02:00
cd85e37c1b do active center filtering in frontend for person creation 2023-09-14 14:30:58 +02:00
b4f9501af5 php cs fixes 2023-09-14 11:47:54 +02:00
76f1814848 More identation on some method parameters 2023-09-13 10:12:04 +02:00
cd9611a669 Remove unused dependency on DefaultVoter (+ fix when throwing an exception) 2023-09-13 10:12:04 +02:00
d3b68f8f8f AuthorizationHelper: compare center and scope based on id, not on equality
For an unknown reason, in some circumstances, the use of the `===` comparator does not work when comparing Center instances and Scope instances. Then, we compare them based on the id.
2023-09-13 10:08:44 +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
19789acbbe php cs fixes 2023-09-12 15:18:03 +02:00
9600543fec Merge branch 'master' into use_crud_for_center 2023-09-11 14:57:51 +02:00
86315b1579 only show active centers from the reachable centers for creation of person 2023-09-11 14:43:52 +02:00
75bca46b98 cs fixer 2023-09-07 12:16:47 +02:00