Commit Graph

4173 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
363785b779 Update schema to store accompanying period work referrer history 2023-10-11 15:37:44 +02:00
4e13b2ae3a fix type-hints 2023-10-05 11:17:42 +02:00
239372270e Update schema to store accompanying period work referrer history 2023-10-05 09:33:23 +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
935210aa1d use translation 2023-10-04 11:54:29 +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
e3559774fd Improve the signature definition 2023-10-03 21:25:22 +02:00
c6a06ebaf9 [export] fix 6 job/scope agg/filters in acp (queries with 2 history) 2023-10-03 19:43:18 +02:00
c00c26c3e5 [export] fix 2 job/scope 'WorkingOnCourse' filters in acp 2023-10-03 19:43:18 +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
1973a4b849 [export] fix 2 job/scope aggregators in acp 2023-10-03 19:40:23 +02:00
bea21d45fc [export] fix 2 job/scope aggregators in activity and acp 2023-10-03 19:40:23 +02:00
4460db1dc4 Fix syntax error 2023-10-03 19:40:23 +02:00
2100d45671 fix phpstan error 2023-10-03 19:40:23 +02:00
aeb0d5eab8 [export] fix acpw socialWork agent ScopeFilter query + unit test (partial) 2023-10-03 19:40:23 +02:00
bc69f83c37 [export] fix acpw socialWork agent JobFilter query + unit test (partial) 2023-10-03 19:40:23 +02:00
9b272e9b9e [export] fix acp user Scope Filter query + unit test (partial) 2023-10-03 19:40:23 +02:00
f225a83a3e [export] fix acp userJob Filter query + unit test (partial) 2023-10-03 19:40:23 +02:00
e738bf0f5e [export] fix translations in message yaml tree 2023-10-03 19:40:23 +02:00
0953faedc4 [export] fix acpw socialWork agent ScopeAggregator query + unit test 2023-10-03 19:40:23 +02:00
7c25ca8dd4 [export] fix acpw socialWork agent JobAggregator query + unit test 2023-10-03 19:40:23 +02:00
8b7600e09f [export] fix acp UserJobAggregator query + unit test 2023-10-03 19:40:23 +02:00
9db0011b2e [export] fix acp ReferrerScopeAggregator query + unit test
TO CHECK: logic in alterQuery. calc_date is same for 2 histories ?
2023-10-03 19:40:23 +02:00
ef8ac6041a Fix deprecation of transchoice 2023-10-02 17:46:19 +02:00
d2864605b9 Fix path to templates using the new syntax 2023-10-02 12:38:18 +02:00
2efd5ebc9a Merge branch 'master' into rector/rules-symfony 2023-10-02 12:30:15 +02:00
a625260c36 Merge branch '162-change-job-on-course-when-reassigning-user' into 'master'
Reassign list: when reassigning course, the job associated to the period...

Closes #162

See merge request Chill-Projet/chill-bundles!596
2023-10-02 10:24:55 +00:00
28006374fb Merge branch '143-doublon-list-acp' into 'master'
SocialActionFilter: use a subquery "exists" instead of a where clause (many-to-many association).

Closes #143

See merge request Chill-Projet/chill-bundles!590
2023-10-02 10:24:39 +00:00
e08ab0666f Add a constraint to avoid doublons in table chill_person_accompanying_period_location_history
#143
2023-10-02 12:20:15 +02:00
217232fe4f SocialActionFilter: use a subquery "exists" instead of a where clause (many-to-many association) 2023-10-02 12:14:36 +02:00
0c5b35926b php cs fixer and phpstan 2023-09-29 07:52:50 +02:00
8dce0473ff Fix signature for OneToOne CRUD Controller 2023-09-28 15:24:07 +02:00
e5a449118e Reassign list: when reassigning course, the job associated to the period becomes the job of the new referrer (user)
https://gitlab.com/Chill-Projet/chill-bundles/-/issues/162
2023-09-28 14:56:53 +02:00
9c436d5c69 Re-associate filters for export "count persons" 2023-09-28 14:32:58 +02:00
981be7b363 SocialWorkRepository: on search by accompanying period, enlarge the dateranges for take into account work with same endDate / startDate
Close https://gitlab.com/Chill-Projet/chill-bundles/-/issues/144
2023-09-28 12:36:33 +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
5f8b86b839 apply rector rules after merging master branch 2023-09-27 16:01:59 +02:00
65aa0a1588 Merge remote-tracking branch 'origin/master' into rector/rules-symfony 2023-09-27 15:25:29 +02:00
48b3ed0a1f Merge branch '155-fix-regulation-list-postal-code-search' into 'master'
Feature: in regulation list, search by postal code instead of postal code's string content

Closes #155

See merge request Chill-Projet/chill-bundles!594
2023-09-26 16:03:30 +00:00
df3781a993 Regulation list: serach by exact postal code, and not the postal code's string content 2023-09-26 18:00:59 +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
fcc00fdf8f Remove dump messages 2023-09-26 17:28:14 +02:00