1882 Commits

Author SHA1 Message Date
ebb856fe85
fix rendering of accompanying course commen with at_date 2024-06-07 13:06:46 +02:00
4c3f082163
Merge remote-tracking branch 'origin/master' into issue178_affichage_metiers 2024-06-07 12:03:30 +02:00
635b1ee537 merge upgrade-sf5 branch to have latest fixes 2024-06-06 13:01:12 +02:00
dcfa569e3a
Upgrade CKEditor and refactor configuration with use of typescript 2024-06-01 00:35:08 +02:00
f60a595ab6 Update vue toast version and implementation 2024-05-29 11:37:04 +02:00
84f515d451
Merge remote-tracking branch 'origin/master' into upgrade-sf5 2024-05-28 14:16:01 +02:00
775535e683
refactor file drop widget 2024-05-28 11:25:59 +02:00
47a928a6cd
Add DAV edit link to StoredObject serialization
Enabled the adding of access link, specifically DAV edit link to the JSON serialization of the StoredObject entity. The patch also adjusted the serializer groups of various attributes of StoredObject from "read, write" to "write". Lastly, these changes were reflected in the accompanying CourseWork Controller and the FormEvaluation Vue component.
2024-05-23 18:25:20 +02:00
9a010f76cc
Fix some translations (already existing in v2) 2024-04-29 15:28:44 +02:00
6c9101c167 Adapt the rendering of user in accompanyingPeriodWork list and item templates 2024-04-16 11:55:54 +02:00
bc683b28d6 update normalizers to take into account referrerHistory logic for accompanying period work 2024-04-16 11:55:50 +02:00
853014d8d2 remove attempt to adjust accompanyingperiod work for display of user job and service at specific date 2024-04-16 11:52:58 +02:00
d62e9ce269 Implement 'at date' for display of service and user job in accompanying period work entities (for twig templates) -> vue component still to fix 2024-04-16 11:52:58 +02:00
e3bd68112e
fix test for editing household metadata 2024-04-08 13:44:22 +02:00
97f2c75de8 Change syntax of check on null for closing motive 2024-02-21 20:14:18 +01:00
00444e1e56 Add check on null value in template for closing motive 2024-02-20 10:10:44 +01:00
cc281762b3
Translate message on conflict in AccompanyingPeriodWorkEdit App 2024-02-08 14:33:30 +01:00
aa0cadfa84
Add conflict resolution for generated API + add test
Implemented additional code to handle version conflicts when editing accompanying period work. By keeping track of the current version and returning an HTTP conflict response when it doesn't match with the provided entity version, users are properly alerted to update their entity before continuing. Furthermore, adjusted BadRequestHttpException to match correct arguments order and introduced entity version as query parameter for the URL.

ensure kernel is shutdown after generating data
2024-02-08 14:33:30 +01:00
3bb911b4d0
Update version within PUT request
Try to add api logic

check for version being the same instead of smaller

implementing optimistic locking and displaying correct message in frontend

rector fixes

adjust violation message and add translation in translation.yaml

add translator in apiController
2024-02-08 12:09:51 +01:00
f00b39980c
Add version of the social action to the state
put correct serialization groups
2024-02-08 12:08:36 +01:00
09882bb4be
Add translations that were missing according to console error 2024-02-08 12:08:35 +01:00
c704ffa379 Merge branch '161-fix-ordering-filter-social-action-type' into 'master'
Export: Fix vue app in "filter action by type, goals and result"

Closes #219, #141, and #161

See merge request Chill-Projet/chill-bundles!616
2023-11-23 15:50:57 +00:00
947b7b90e2
Fix SocialWorkTypeFilter: allow null value in date, and avoid vuejs module ExportFormActionGoal to override the export form content 2023-11-23 16:02:55 +01:00
975ea417b7 Further update gender options 2023-11-21 11:37:19 +01:00
cbaeb3d7e8 fix double translation keys 2023-11-21 08:13:25 +01:00
f609ddb315 change all instances of neuter to both 2023-11-21 07:58:45 +01:00
eb01c7c203
Export: on filter "action by type goals, and results", restore the fields when editing a saved export 2023-11-16 14:22:52 +01:00
53b4747697
fixup! Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 2023-11-16 11:55:15 +01:00
89e19502d3
Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 2023-11-16 11:53:57 +01:00
d8fa743bc9
Export: fix loading of form for "filter action by type, goal and result" 2023-11-16 10:57:59 +01: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
65aa0a1588
Merge remote-tracking branch 'origin/master' into rector/rules-symfony 2023-09-27 15:25:29 +02:00
0e47a1cf59 Merge branch '38-gestion-doublon' into 'master'
fix the doublons module

Closes #38

See merge request Chill-Projet/chill-bundles!577
2023-09-14 14:08:51 +00:00
99cf7b8e8d UX: minor design correction on badge-person in household banner 2023-09-14 15:47:16 +02:00
68f2c7df25 Fixed: [vuejs] fix missing translation in HouseholdMembersEditor component 2023-09-14 15:47:16 +02:00
cd85e37c1b do active center filtering in frontend for person creation 2023-09-14 14:30:58 +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
92b1b17679 Merge branch 'master' into 38-gestion-doublon 2023-09-07 16:08:27 +02:00
fe5e1e5557
UX: minor design correction on badge-person in household banner 2023-09-06 16:19:58 +02:00
16fcd03a02
Fixed: [vuejs] fix missing translation in HouseholdMembersEditor component 2023-09-06 16:19:58 +02:00
e839b03cc9
Update path to twig template with new syntax 2023-07-28 12:16:50 +02:00
e6da727a11 Merge branch 'issue120_filter_social_actions' into 'master'
Add filter to social actions

See merge request Chill-Projet/chill-bundles!570
2023-07-14 09:14:21 +00:00
f2673d6c83
Merge remote-tracking branch 'origin/master' into issue120_filter_social_actions 2023-07-13 21:14:31 +02:00
4220d1a2d3 Revert "UX: [vue][onTheFly] improve residential address position in modale"
This reverts commit 62d610680176ae8abc547d0c439c7a856f7adb40.
2023-07-12 17:44:47 +02:00
2259a31260 show detail button in banners 2023-07-12 17:25:49 +02:00
1930c48d28 Align address detail button style with banner context buttons 2023-07-12 17:03:55 +02:00
29306d2b66 UX: [vue][onTheFly] improve residential address position in modale 2023-07-12 17:03:55 +02:00
1ae27152c2 Merge branch 'master' into 616_rapid-action 2023-07-12 15:38:51 +02:00
0423540976 FIX [duplicate][personpicker] use dynamic person picker to assign duplicate manually 2023-07-12 11:17:25 +02:00