Compare commits

...

1867 Commits

Author SHA1 Message Date
julielenaerts 34801dcd5f master merged into branch 2022-07-18 15:04:31 +02:00
julielenaerts cc2bee8188 php cs style fixes, stan ok! 2022-07-18 14:56:44 +02:00
julielenaerts 99154eaa99 changelog updated 2022-07-18 14:42:41 +02:00
julielenaerts b28677fac9 delete quitter et repositionner buttons from enfant hors menage 2022-07-18 14:39:24 +02:00
julielenaerts fb0135a0af update changelog 2022-07-18 12:01:07 +02:00
julielenaerts 88961e3e7e allow the deletion of a relationship 2022-07-18 12:00:09 +02:00
julienfastre 85796c2271 CS 2022-07-12 18:16:04 +02:00
julienfastre 83ee3c7cfd fixed: add required type-hinting to AccompanyingPeriodComment, necessary
for docgen rendering
2022-07-12 18:15:16 +02:00
julienfastre 8809abedf6 fixed: rendering of course in list of courses by household 2022-07-12 18:14:25 +02:00
julienfastre 5896a77ae9 Fixed: use CenterResolver where cases when center is resolved differently 2022-07-12 11:10:18 +02:00
julienfastre 11d1b26efc fixed: unable to create a course (due to method change in activity entity) 2022-07-12 10:44:40 +02:00
julienfastre 5f6c11bde9 Feature: show comment in #docgen generation for accompanying periods 2022-07-11 19:56:59 +02:00
julienfastre b3da9611ce Fixed: do not show postal code created by users in the list of postal codes 2022-07-11 19:37:32 +02:00
julienfastre ba8a80a202 Fixed: test for userjob associated to course in Regulation list 2022-07-11 19:32:19 +02:00
julienfastre 6998043159 Fixed: do not allow to create activities when no rights to do it
The ACTIVITY_FULL role does not give anymore the roles
CHILL_ACTIVITY_CREATE_PERSON and CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE.

Tags: #BC
2022-07-11 19:31:24 +02:00
julienfastre ce17c15d41 fixed: ACL in activity creations and edition 2022-07-11 18:24:48 +02:00
julienfastre 93560a62ef Feature: an activity has the same scope as an accompanying period, if it exists 2022-07-11 17:36:59 +02:00
julienfastre 3785e5096e Merge branch 'master' into fix_activity_rights 2022-07-11 17:17:35 +02:00
julienfastre 3748eb99c6 Fixed: add an exclude constraint to ensure on db side that there is only one step waiting for a transition 2022-07-11 17:10:40 +02:00
julienfastre c69af351cc fixed: do not show disabled jobs in list of jobs from the api 2022-07-11 16:20:48 +02:00
julienfastre 692c2bdac0 fixed: do not show disabled users in list of users from the api 2022-07-11 16:11:45 +02:00
julienfastre 6bcc28b4bb feature: hide course when the period is not active for the user, in search results and list of periods for a person 2022-07-11 15:57:38 +02:00
julienfastre a79a2b6ee9 fixed: warning message "usagers du parcours" does show only for current
members for a course
2022-07-11 15:26:04 +02:00
julienfastre 09b2c9a14e fixed: do not show same person twice if persons are members simultaneously 2022-07-11 15:11:35 +02:00
julienfastre 4ef48216ed fixed: do not allow to create a course or see a houshold from the search result, if the user does not have any rights to do it 2022-07-11 13:54:12 +02:00
julienfastre 16fed67dd0 fixed: do not allow to edit a course through the "warning" button on the course's index page 2022-07-11 13:45:52 +02:00
julienfastre 87a9d48bdf feature: allow to not check mainPerson, person1 or person2 when generating a document 2022-07-11 13:39:07 +02:00
julienfastre f3ca01fd88 cs: fix 2022-07-11 13:34:10 +02:00
julienfastre 5962d3f233 fixed: query for index in PersonDocumentACLAwareRepository 2022-07-11 12:57:21 +02:00
julienfastre ab08dab88a fixed: voter and permissions in accompanying course document 2022-07-11 12:57:08 +02:00
julienfastre 3bb8b713d1 fixed: migration of databse with address on same day fails 2022-07-11 03:32:43 +02:00
julienfastre 94c258e914 fixed: narrow search on postal code with an 'AND' clause instead of 'OR' clause 2022-07-10 22:00:04 +02:00
julienfastre 1d8f25e2c8 use the date parameter in deprecated method getLastAddress 2022-07-08 15:04:06 +02:00
julienfastre b4b67c6f0d Merge branch 'event_bundle_sf4' into 'master'
Event bundle sf4

See merge request Chill-Projet/chill-bundles!439
2022-07-08 10:21:31 +00:00
nobohan 9978e76a87 fix activity rights (WIP) 2022-07-07 15:25:17 +02:00
nobohan 36e35f2e8f [event] refactor admin for event bundle 2022-07-06 13:36:20 +02:00
nobohan 389f014d36 [event] fix deprecation (typing) 2022-07-05 10:18:07 +02:00
Mathieu Jaumotte 135b385c11 fix rust indent 2022-07-04 17:29:45 +02:00
nobohan 3cf8609e8f [event] fix deprecation (type missing) 2022-07-04 17:20:03 +02:00
Mathieu Jaumotte c82e128c5c Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-07-04 16:32:20 +02:00
Mathieu Jaumotte 3ddab4f6e2 documente un souci avec docker lors de l'installation de chill 2022-07-04 16:32:12 +02:00
nobohan 31e1bfdf80 export: cast role as string in PickCenterType 2022-07-04 16:19:03 +02:00
nobohan c76f2a81c9 [main] cast uniqid arg to string in ExportController 2022-06-30 07:37:27 +02:00
nobohan f48e197e0b [main] fix deprecations for Export/PickCenterType 2022-06-30 07:29:33 +02:00
nobohan f70e3b7997 quick fix: use Scope class instead of classname 2022-06-29 15:05:59 +02:00
julienfastre 66baf0391c Revert "only prefill agents traitants of action if parcours has a referrer, otherwise null"
This reverts commit 0943366d39.
2022-06-28 00:01:31 +02:00
julienfastre 4f81bffa67 add a test for relocking an existing lock 2022-06-27 23:57:42 +02:00
julienfastre 5432ce2b0f some fixes with wopi 2022-06-27 23:51:07 +02:00
julienfastre 03bc94178f re-implements document lock manager for wopi 2022-06-27 22:44:10 +02:00
LenaertsJ bf536aab38 Merge branch 'translations_dutch' into 'master'
Dutch translations

See merge request Chill-Projet/chill-bundles!403
2022-06-24 15:59:10 +00:00
LenaertsJ df593c7c7f Dutch translations 2022-06-24 15:59:10 +00:00
nobohan 07f4aaa590 quick fix: address: only add coordinates to selected postcode if coordinates exist 2022-06-23 15:46:17 +02:00
julienfastre 10095343ec handle lastUpdateTime for Wopi implementation
* get the last updated time from the stored object's storage
* improve perf on loading content from stored object's storage: keep the
response in cache
2022-06-20 21:22:02 +02:00
julienfastre 1742dd4951 add return path after changing location, and select2 on picking user location 2022-06-17 13:34:05 +02:00
julienfastre 832da83b27 fix tests for person controller update 2022-06-16 21:35:05 +02:00
julienfastre 0cfad13720 fix normalization for null accompanying period docgen 2022-06-16 21:30:46 +02:00
julienfastre dfb583fa8b fix cs 2022-06-16 15:37:59 +02:00
julienfastre da9eba2618 add regulation list and basic regulation list query 2022-06-16 15:37:51 +02:00
julienfastre 8982697a73 add missing translation message 2022-06-15 17:46:28 +02:00
julienfastre 1bd00c3f4c fix editing thirdparty without date 2022-06-15 17:46:28 +02:00
julielenaerts 7ac54a6c9f Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-06-15 16:06:15 +02:00
julielenaerts ccaf430b37 remove border from address 2022-06-15 16:06:06 +02:00
julielenaerts 72ce5c716d remove border from address 2022-06-15 16:02:37 +02:00
julielenaerts 86afe2f702 fix condition 2022-06-15 15:58:53 +02:00
julielenaerts f297548a3a adjust styling of address + button 2022-06-15 15:46:24 +02:00
julielenaerts d20d38e5f4 change icon house to map marker 2022-06-15 12:35:20 +02:00
julielenaerts 3735f24e10 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-06-15 12:26:22 +02:00
julielenaerts 4b5cdd471b fix showPane component for editing address 2022-06-15 11:55:49 +02:00
julienfastre f339cf56d6 notify the referrer from an activity page or list 2022-06-14 21:24:50 +02:00
julienfastre 4592be3a8d improve syntax for the js fix 2022-06-14 21:24:50 +02:00
julielenaerts 4e1d7278c6 change translation in twig template for creation of household in user create form 2022-06-14 17:33:12 +02:00
julielenaerts a26346859c change translation to add household for new user 2022-06-14 17:21:57 +02:00
julielenaerts a48b990c73 condition correction to fix display of addAddress btn in parcours and household tunnel 2022-06-14 17:15:33 +02:00
julielenaerts 0943366d39 only prefill agents traitants of action if parcours has a referrer, otherwise null 2022-06-13 17:59:29 +02:00
julielenaerts 4719a74307 constraint added to workflow transtion - cannot be null 2022-06-13 17:40:01 +02:00
julielenaerts 72167b9e77 fix merge conflict 2022-06-13 16:38:37 +02:00
julielenaerts c14ae98130 fix merge conflict 2022-06-13 16:36:09 +02:00
julielenaerts 83b928b0b0 fix merge conflict 2022-06-13 16:35:04 +02:00
julielenaerts f0187536c1 visual changes when option 'create household' is checked in user create form 2022-06-13 16:33:56 +02:00
julielenaerts fec27babbe visual changes when option 'create household' is checked in user create form 2022-06-13 15:35:35 +02:00
julielenaerts ceb0f741ef order of birthdate fields changed in advanced search 2022-06-13 15:05:18 +02:00
julielenaerts 149d4c3846 changelog updated 2022-06-13 09:46:45 +02:00
julielenaerts 9a29532362 fix bux to quickly add names that exist of multiple parts to the namefield of a person or thirdparty 2022-06-09 18:31:38 +02:00
julielenaerts d9dfe75378 minor layout improvement show parcours btn in task 2022-06-01 15:43:01 +02:00
julielenaerts 8d70562132 null error in task widget on homepage fixed 2022-06-01 11:37:29 +02:00
julielenaerts 83de518b45 update changelog 2022-06-01 11:08:20 +02:00
julielenaerts 21bc472886 Merge branch 'master' of gitlab.com:chill-projet/chill-bundles 2022-06-01 11:05:17 +02:00
julielenaerts 75490306a2 add pagination on workflow list page 2022-06-01 11:04:23 +02:00
julienfastre f92cef02cf fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost) 2022-05-30 22:43:50 +02:00
julienfastre a4e3ffbe27 fix cs 2022-05-30 22:41:47 +02:00
julienfastre 0849b2d5f4 docgen: fix title of origin 2022-05-30 21:16:40 +02:00
julienfastre 679d19e2a1 allow null values for private comment 2022-05-30 10:01:27 +02:00
julienfastre 7fb0e44307 fix null value for calendar in private comments 2022-05-28 01:45:11 +02:00
julienfastre 1496ae34f8 preload course json for a faster display 2022-05-28 00:07:11 +02:00
julienfastre b9c1dbd8c1 require weblink 2022-05-27 23:27:22 +02:00
julienfastre bc288a2161 feature: add a link to create a notification to the referrer 2022-05-27 23:24:54 +02:00
julienfastre c41ee1d9de add pagination on notification list 2022-05-27 22:47:32 +02:00
julienfastre 3ceda28994 Merge branch 'issue604_activity_list_documents' into 'master'
Issue604 activity list documents

See merge request Chill-Projet/chill-bundles!436
2022-05-27 20:35:03 +00:00
julienfastre 5d13a587df fix cs 2022-05-27 22:34:13 +02:00
julienfastre d49859e474 change order for title in stored object 2022-05-27 22:32:06 +02:00
julienfastre c9ea9112f1 do not add private comment into generated documents 2022-05-27 22:24:25 +02:00
julienfastre 3274ecfaec Merge remote-tracking branch 'origin/master' into issue604_activity_list_documents 2022-05-27 22:03:41 +02:00
julienfastre dba4cfbb2d Merge branch 'issue603_add_closing_motive_course' into 'master'
person: add closing motive to closed acc course

See merge request Chill-Projet/chill-bundles!435
2022-05-27 20:00:58 +00:00
julienfastre e6da1be5f5 Merge remote-tracking branch 'origin/master' into issue603_add_closing_motive_course 2022-05-27 21:57:19 +02:00
julienfastre cb1108a25e Merge branch 'issue586_filiations' into 'master'
household filiations issues

See merge request Chill-Projet/chill-bundles!433
2022-05-27 19:51:20 +00:00
julienfastre 3efb4a4a5e Merge remote-tracking branch 'origin/master' into issue586_filiations 2022-05-27 21:49:21 +02:00
julienfastre 9511d6eaee Merge branch 'issue601_admin_social_work_social_action' into 'master'
admin: repair social action edit

See merge request Chill-Projet/chill-bundles!434
2022-05-27 14:42:03 +00:00
julienfastre d4aba04a52 do not show action when editing goals 2022-05-27 16:41:38 +02:00
julienfastre 71a92a8b6b Merge remote-tracking branch 'origin/master' into issue601_admin_social_work_social_action 2022-05-27 16:37:03 +02:00
julienfastre 2cabe80bf6 Merge branch 'issue577_user_admin' into 'master'
main admin

See merge request Chill-Projet/chill-bundles!432
2022-05-27 14:35:59 +00:00
julienfastre 9680f7c01e remove deprecated notation for getting entity 2022-05-27 16:34:30 +02:00
julienfastre 3c8b2207c4 add civility in user docgen normalizer 2022-05-27 16:34:14 +02:00
julienfastre 7278a5f3fa fix strict typing and do not show link to edit password in user list 2022-05-27 16:24:55 +02:00
julienfastre 566c1c5380 Merge remote-tracking branch 'origin/master' into issue577_user_admin 2022-05-27 16:05:49 +02:00
julienfastre af7df7029b Merge branch 'issue578_display_userjob' into 'master'
Issue578 display userjob

See merge request Chill-Projet/chill-bundles!430
2022-05-27 14:04:09 +00:00
julienfastre 4d0717690b Merge remote-tracking branch 'origin/master' into issue578_display_userjob 2022-05-27 16:00:16 +02:00
julienfastre 96a0b76e85 Merge branch 'issue589_private_comments' into 'master'
Issue589 private comments

See merge request Chill-Projet/chill-bundles!418
2022-05-27 13:59:19 +00:00
julienfastre f3800ff38f fix issue with null comment and set correct variable name in signature 2022-05-27 15:58:51 +02:00
julienfastre 5e5a855578 fix cs 2022-05-27 15:48:50 +02:00
julienfastre 54a3e2b2ef Merge remote-tracking branch 'origin/master' into issue589_private_comments 2022-05-27 15:47:25 +02:00
julienfastre 014c460eef improvements on private comments 2022-05-27 15:40:08 +02:00
julienfastre 01f1605cb8 change indent of js files 2022-05-27 14:30:05 +02:00
nobohan 0a4ef3ad22 php code style + upd CHANGELOG 2022-05-27 09:39:36 +02:00
nobohan dbdf435721 docstore: safer display of form.title 2022-05-27 09:39:13 +02:00
nobohan cdbb70b9c5 activity: add title to generated document 2022-05-27 09:32:51 +02:00
nobohan 60c163ae9d storedObject: add title in form twig and in activity show 2022-05-25 17:30:26 +02:00
nobohan e8cf7ae8e1 stored object: add has_title option to form type of StoredObject 2022-05-25 17:14:21 +02:00
nobohan dea554ced4 storedObject: add title field on StoredObject entity 2022-05-25 16:32:52 +02:00
nobohan 5948ac5b2a [main] add a 'read more...' on comment embeddable when overflown 2022-05-25 14:18:38 +02:00
nobohan af898cbd12 person: add closing motive to closed acc course 2022-05-25 13:27:29 +02:00
nobohan 8863157fc9 upd CHANGELOG 2022-05-25 11:47:02 +02:00
nobohan 2ac78a12db admin: fix adding of evaluation to social action 2022-05-25 11:46:03 +02:00
nobohan bc410b02e7 admin: do not use disabled for form widget with collections, see https://github.com/symfony/symfony/issues/18998 2022-05-25 11:45:25 +02:00
nobohan 5ebaeeb4ba php cs fix 2022-05-25 10:38:09 +02:00
nobohan 4402d52de7 upd CHANGELOG 2022-05-25 10:35:15 +02:00
nobohan d6f1aa53dc [admin]: add select2 to Goal form type entity fields 2022-05-25 10:34:24 +02:00
nobohan da2c88c026 [admin] show/hide the user permissions group depending on config 2022-05-25 10:12:07 +02:00
nobohan a4210dd2c7 [main] allow hide permissions group list menu 2022-05-18 09:30:47 +02:00
nobohan d8db8c0f8e upd CHANGELOG 2022-05-17 17:46:01 +02:00
nobohan b13ac3a919 household filiations: fetch person info when unfolding person node 2022-05-17 17:24:17 +02:00
julienfastre 354c37ade2 fix issue when loading category 2022-05-16 15:33:02 +02:00
nobohan cecfa1a18a main: allow creation of user without password 2022-05-16 14:07:34 +02:00
nobohan f77031630f [main] allow hide change user password menu 2022-05-16 13:52:55 +02:00
nobohan 8eef073988 [main] filter user jobs by active jobs 2022-05-16 11:49:36 +02:00
nobohan 380c55698c main: add civility to User 2022-05-16 11:28:37 +02:00
julienfastre 9dd463882c fix dfault in db for user::attributes 2022-05-13 17:23:10 +02:00
julienfastre 6edc9b25db Merge branch 'issue596_admin_user' into 'master'
Admin interface

See merge request Chill-Projet/chill-bundles!429
2022-05-13 14:13:09 +00:00
julienfastre bb18082c3a fix type hinting 2022-05-13 16:07:33 +02:00
julienfastre 89a700ff61 fix cs 2022-05-13 16:05:38 +02:00
julienfastre 2a5bb28210 fix typo in tests 2022-05-13 16:05:08 +02:00
julienfastre aec01df202 admin users: filter by name or email 2022-05-13 16:00:34 +02:00
julienfastre a9df9f4880 add ordering on some social work + minor improves 2022-05-13 15:36:20 +02:00
julienfastre b26fcc4566 Merge remote-tracking branch 'origin/master' into issue596_admin_user 2022-05-13 15:08:49 +02:00
julienfastre 9970212075 Merge branch 'issue576_address_show_more_if_no_address' into 'master'
addAddress: can add extra info even if noAddress

See merge request Chill-Projet/chill-bundles!423
2022-05-13 13:06:51 +00:00
julienfastre fd935795e5 Merge remote-tracking branch 'origin/master' into issue576_address_show_more_if_no_address 2022-05-13 15:06:11 +02:00
julienfastre 52dd08e088 add default attributes for user 2022-05-13 14:51:02 +02:00
julienfastre 3fb3df9db1 remove not necessary debug log 2022-05-11 19:40:28 +02:00
julienfastre b98f4e2d76 fix construction of BadRequestHttpException 2022-05-11 19:39:36 +02:00
julienfastre 58fce9999d OnTheFly: do not show 'create adress and household' on edit action 2022-05-11 19:29:12 +02:00
julienfastre 49b1ca13f2 OnTheFly: fix error when updating person without changing civility 2022-05-11 19:25:07 +02:00
nobohan 6481f6a4c1 quick fix: safer way to add civility to body before PATCHing (AddPerson) 2022-05-11 17:04:17 +02:00
nobohan 05088b5964 upd CHANGELOG 2022-05-11 12:14:46 +02:00
nobohan f44b9ca05b admin: fix error when creating document category 2022-05-11 12:03:38 +02:00
nobohan fa458c54ec admin: adapt social work form type and templates 2022-05-11 11:50:17 +02:00
nobohan 629dbb9137 admin: missing translations and css class 2022-05-11 11:30:08 +02:00
nobohan 97fd9c557c admin: tentative to add filterOrder (cleaning) 2022-05-11 10:06:44 +02:00
nobohan f449dcbda1 admin: refine social work admin form 2022-05-10 18:06:29 +02:00
nobohan b7ed658f96 admin: fix new document category 2022-05-10 17:01:09 +02:00
nobohan f4652adbc2 admin: add fa icons to menu section title 2022-05-10 15:21:29 +02:00
nobohan fde1d563c2 admin custom fields integration 2022-05-10 14:36:10 +02:00
nobohan cb1bbe940f admin: docgen admin 2022-05-10 13:55:33 +02:00
nobohan be27df1fd5 admin: remove obsolet header => true tag + php code fix 2022-05-10 11:46:17 +02:00
nobohan 0e8b73638f admin for aside activity 2022-05-10 10:40:06 +02:00
nobohan c9b3bab508 admin sections for main bundle 2022-05-10 10:14:30 +02:00
nobohan 0f735c5749 admin sections for person bundle 2022-05-10 08:44:29 +02:00
nobohan 1a764025e1 admin: admin section for thirdparty 2022-05-09 17:14:25 +02:00
nobohan 1c04a873c0 admin: admin section for docstore 2022-05-09 17:07:36 +02:00
nobohan 3f399296c8 admin: admin section for calendar 2022-05-09 16:53:22 +02:00
nobohan fd67f327ae admin menu: simplify header style 2022-05-09 16:30:20 +02:00
nobohan 0f319a1003 admin: reorganising activity menu and submenus 2022-05-09 16:22:17 +02:00
nobohan 63bfd25acb admin: homepage + style menu 2022-05-09 15:14:37 +02:00
julienfastre 6453de32ec fix typo 2022-05-06 17:29:03 +02:00
julienfastre 3a115744fe add index to search postal code by reference 2022-05-06 17:14:21 +02:00
nobohan 24794c1285 admin: document category menu 2022-05-06 16:28:37 +02:00
nobohan 7cefce8305 admin: add ThirdParty admin 2022-05-06 15:51:29 +02:00
julienfastre 66c7504b22 Merge branch 'issue520_reference_address_update' into 'master'
Add new fields to AddressReference for update procedure

See merge request Chill-Projet/chill-bundles!395
2022-05-06 13:32:29 +00:00
nobohan a4f2d47c46 admin: add CancelReason admin 2022-05-06 15:25:49 +02:00
julienfastre 31d076d49b fix search on address: do not take deleted one into account 2022-05-06 15:22:10 +02:00
julienfastre 189974d5e4 Merge remote-tracking branch 'origin/master' into issue520_reference_address_update 2022-05-06 14:47:15 +02:00
julienfastre f55c06d5c5 Merge branch 'issue557_address_civility_in_form_person' into 'master'
Issue557 address and civility in form person

See merge request Chill-Projet/chill-bundles!410
2022-05-06 11:01:20 +00:00
julienfastre 6c246a0d38 allow to edit civility in onTheFly 2022-05-06 12:54:01 +02:00
julienfastre 6abbf9bf21 improves create a person with address
* validation: must have an address when 'create a form' is checked;
* minor improvements
2022-05-06 11:47:33 +02:00
julienfastre 64432bb08a Merge remote-tracking branch 'origin/master' into issue557_address_civility_in_form_person 2022-05-06 10:21:13 +02:00
nobohan 7907e4a050 admin: add household position and relation admin 2022-05-05 18:31:08 +02:00
nobohan 9ce7f10415 admin: add personresourcekind in the admin 2022-05-05 15:20:47 +02:00
nobohan 2fbdd169df admin: add AccompanyingPeriod Origin and closingMotive 2022-05-05 14:37:56 +02:00
nobohan 5daf09334b admin: admin section for social work related entities: SocialIssue, SocialAction, Goal, Result, Evaluation 2022-05-05 12:07:45 +02:00
nobohan 10aa727fb3 admin: reorganise person admin menu + fix marital status admin 2022-05-05 10:39:20 +02:00
nobohan 475e8adedc admin: merge admin user job 2022-05-05 10:20:04 +02:00
nobohan 54ced6ec3d admin: merge admin activity 2022-05-05 10:18:11 +02:00
nobohan 47f47ac017 admin: delete obsolet country controller 2022-05-05 10:11:12 +02:00
nobohan ba495def7e admin: refactor templates and delete some show pages for Center, Scope, User, UserJob, PermissionsGroup 2022-05-05 09:47:17 +02:00
nobohan b09d92eae8 admin: reorganise files according to conventions 2022-05-05 08:03:20 +02:00
nobohan ab90f72c7e update conventions 2022-05-05 07:13:53 +02:00
nobohan 16d74eaa0c admin: reorganize twig templates and admin menu 2022-05-04 17:34:44 +02:00
julielenaerts 10d0078716 add changelog 2022-05-04 15:16:13 +02:00
julielenaerts 6567143ff5 update job if users assigns him/herself as referrer and job is not null 2022-05-04 15:14:17 +02:00
nobohan e50e68a52b admin: add missing data_class option to form types 2022-05-04 14:09:10 +02:00
julielenaerts e19cac168b php csfixes 2022-05-04 13:00:46 +02:00
julielenaerts 416a88b93d fix form and take null cases into account 2022-05-04 12:30:44 +02:00
julielenaerts 784a725ce3 fix translation 2022-05-04 09:34:16 +02:00
julielenaerts 2ef3a3362a merge master into branch 2022-05-04 09:31:22 +02:00
nobohan 3f256ad907 admin: update marital status 2022-05-03 19:03:58 +02:00
nobohan 76af733bc3 admin: add civility 2022-05-03 18:33:56 +02:00
nobohan 9808675455 upd CHANGELOG 2022-05-03 09:28:33 +02:00
nobohan 04f27cc555 admin: add menu for languages and countries section 2022-05-03 09:27:04 +02:00
julienfastre a3c3834081 Merge branch 'issue534_bulk_reassign' into 'master'
Bulk reassign parcours

See merge request Chill-Projet/chill-bundles!398
2022-05-02 14:53:32 +00:00
nobohan 4c99abd6d3 Admin: Add country and languages to the admin 2022-05-02 16:51:41 +02:00
julielenaerts 0e0e0799d1 translation added 2022-05-02 16:51:14 +02:00
julielenaerts 02a8f5a863 Fix display privateComment in activity 2022-05-02 16:50:24 +02:00
julielenaerts ae624d25fc fix display of privateComment for action 2022-05-02 16:49:32 +02:00
julienfastre 14341b9768 fix cs 2022-05-02 16:44:26 +02:00
julienfastre ee14cd268b add role to get acl on confidential periods 2022-05-02 16:44:02 +02:00
julielenaerts 3122098447 remove privateCommentRender 2022-05-02 16:29:47 +02:00
julienfastre 065b10b877 fix somes validation and acompanying period voter 2022-05-02 16:22:25 +02:00
julienfastre 8113fddcb2 use pick dynamic user type for reassigning + layout stuffs 2022-05-02 15:37:23 +02:00
julielenaerts 1b6e84262b add translation 2022-05-02 15:27:44 +02:00
julielenaerts acee0ade24 add merge method 2022-05-02 14:01:41 +02:00
julielenaerts c629dd79cb fix serialization - deserialization 2022-05-02 14:01:07 +02:00
julienfastre 0ec859e345 remove isset test on variable which always exists 2022-05-02 12:30:16 +02:00
julienfastre eb2bc306f7 prevent duplicates in relationships data fixtures 2022-05-02 12:22:34 +02:00
nobohan 64d459466f activity admin: translations + remove label field for comment on admin activity type 2022-05-02 12:16:46 +02:00
julienfastre 372ec7c4b2 Merge remote-tracking branch 'origin/master' into issue534_bulk_reassign 2022-05-02 11:29:55 +02:00
julienfastre f917be0958 type hinting param for psalm 2022-04-30 02:12:29 +02:00
julienfastre 6fd0ff7960 remove unusedfile 2022-04-30 02:12:15 +02:00
julienfastre 45d2e0c9cd Merge branch 'undeprecate/repository-by-fqdn-only' into 'master'
replace some entity shortcut by fqdn

See merge request Chill-Projet/chill-bundles!426
2022-04-30 00:07:49 +00:00
julienfastre da3236425e rename namespace for family members bundle 2022-04-30 01:58:38 +02:00
julienfastre 79ac908631 remove a new set of unused files 2022-04-30 01:50:29 +02:00
julienfastre 8ba7a39335 fix conflicting doc between class Resource and resource 2022-04-30 01:46:14 +02:00
julienfastre 304c734f9b delete unused test fixtures app 2022-04-30 01:44:53 +02:00
julienfastre dae383dbd9 fix some psalm errors 2022-04-30 01:34:23 +02:00
julienfastre 3f63bc803d desactivate test whilpage is not working 2022-04-30 01:03:35 +02:00
julienfastre 472bc3f35d add missing keys to blank docgen person normalization 2022-04-30 00:55:40 +02:00
julienfastre 27e74014ce replace fqdn in docstore bundle 2022-04-30 00:48:38 +02:00
julienfastre f26d50a3a8 replace fqdn in customfields bundle 2022-04-30 00:46:48 +02:00
julienfastre 6da19b0135 replace fqdn in event bundle 2022-04-30 00:42:03 +02:00
julienfastre d0cc0e775f replace fqdn in calendar bundle 2022-04-30 00:39:17 +02:00
julienfastre 4b9b27a8ef replace docrine shortcuts in activity bundle by fqdn 2022-04-30 00:37:26 +02:00
julienfastre 864e1eeabb replace more doctrine shortcuts by fqdn 2022-04-30 00:35:11 +02:00
julienfastre a0392b9216 replace some entity shortcut by fqdn
* ChillPerson:Person
* ChillMain:Center
* ChillActivity:Activity
2022-04-30 00:20:18 +02:00
julienfastre 8ba51bafd0 fix loading report: use FQDN instead of entity shortcut 2022-04-30 00:06:58 +02:00
julienfastre afdc32d416 fix loading report: use FQDN instead of entity shortcut 2022-04-30 00:00:52 +02:00
nobohan de362dcad7 upd CHANGELOG 2022-04-29 22:04:36 +02:00
nobohan 2263e7be73 admin: order user job by id 2022-04-29 22:02:19 +02:00
nobohan 8d62ce46c6 admin: order user job type 2022-04-29 21:44:02 +02:00
nobohan fabf23f1f0 admin: add custom template for userjob edit 2022-04-29 21:21:09 +02:00
nobohan 192ab02be2 upd CHANGELOG 2022-04-29 20:02:26 +02:00
nobohan 62d59e6037 address: show address extra info even if noAddress 2022-04-29 20:00:11 +02:00
nobohan 83a888a32d addAddress: can add extra info even if noAddress 2022-04-29 19:44:06 +02:00
julienfastre e1fe2a396f Merge branch 'issue582_docgen_person' into 'master'
[person] more fields to PersonDocGenNormalizer

See merge request Chill-Projet/chill-bundles!422
2022-04-29 15:12:50 +00:00
julienfastre 99413cf328 fix cs 2022-04-29 17:04:55 +02:00
julienfastre fedcf7272c Merge remote-tracking branch 'origin/master' into issue582_docgen_person 2022-04-29 16:59:19 +02:00
julienfastre df4abd6661 Merge branch 'issue569_display_time' into 'master'
Display time for evaluation documents

See merge request Chill-Projet/chill-bundles!421
2022-04-29 14:56:37 +00:00
julienfastre ad96319d97 use traits to handle createdAt/updatedAt and by on AccompanyingCourseEvaluationDocument 2022-04-29 16:53:17 +02:00
julienfastre fcbf62f613 fix cs 2022-04-29 16:41:13 +02:00
julienfastre cc139782b1 Merge remote-tracking branch 'origin/master' into issue569_display_time 2022-04-29 16:28:29 +02:00
julienfastre 770010ceb8 Add command to remove old draft accompanying periods 2022-04-29 15:51:54 +02:00
julienfastre 1e06926f6d Load relationships without gender in french fixtures 2022-04-29 14:11:32 +02:00
julienfastre ed35822eb5 changelog: release 2022-04-29 14:10:41 +02:00
nobohan 671950708c [person] prevent circular references in PersonDocGenNormalizer 2022-04-29 10:54:56 +02:00
julienfastre 7a96671f35 Merge branch 'issue593_bug_addAddress' into 'master'
address: fix bug when editing address: update localisation and...

See merge request Chill-Projet/chill-bundles!419
2022-04-28 16:05:01 +00:00
julienfastre 6daee268bf Merge remote-tracking branch 'origin/master' into issue593_bug_addAddress 2022-04-28 17:46:42 +02:00
nobohan 4675525225 [person] add maritalStatusComment to PersonDocGenNormalizer 2022-04-28 17:34:53 +02:00
julienfastre 86a7bb5880 Merge branch 'issue566_commentaire_fonctionnalites' into 'master'
Issue566 commentaire fonctionnalites

See merge request Chill-Projet/chill-bundles!416
2022-04-28 15:33:06 +00:00
julienfastre 6eaa553d77 Merge remote-tracking branch 'origin/master' into issue566_commentaire_fonctionnalites 2022-04-28 17:13:54 +02:00
julielenaerts daa09e2df3 update changelog 2022-04-27 17:15:04 +02:00
julielenaerts 09aa7ff631 change date to datetime for evaluation document 2022-04-27 17:13:38 +02:00
julienfastre a28ac8f28c Merge branch 'issue561_avoid_search_address_with_undefined_city' into 'master'
avoid address reference search on undefined post code

See merge request Chill-Projet/chill-bundles!407
2022-04-27 13:30:34 +00:00
julienfastre ea6a9b3e2d Merge remote-tracking branch 'origin/master' into issue561_avoid_search_address_with_undefined_city 2022-04-27 15:30:12 +02:00
julienfastre a8527b6cbb Merge branch 'issue560_relationship_validation' into 'master'
person: add validation to relationship to avoid duplicate

See merge request Chill-Projet/chill-bundles!415
2022-04-27 13:28:21 +00:00
julienfastre ad9ac8ec0a Merge remote-tracking branch 'origin/master' into issue560_relationship_validation 2022-04-27 15:00:02 +02:00
julienfastre 44f9601759 Merge branch 'fixes/fixes-phpstan-2022-04-27' into 'master'
Fixes/fixes phpstan 2022 04 27

See merge request Chill-Projet/chill-bundles!420
2022-04-27 12:53:31 +00:00
julielenaerts 9244040d7b csfixes 2022-04-27 14:51:37 +02:00
julielenaerts 467ae5f474 master merged into branch 2022-04-27 14:50:37 +02:00
julienfastre aa356185a5 Merge remote-tracking branch 'origin/master' into issue561_avoid_search_address_with_undefined_city 2022-04-27 14:50:24 +02:00
julienfastre 9789c79402 use strict type comparison and replace use of BadRequestException by BadRequestHttpException 2022-04-27 14:46:43 +02:00
julienfastre fa7850196f force using strict type on comparison 2022-04-27 14:46:08 +02:00
julienfastre 4794039250 declare properties used for cache 2022-04-27 14:45:42 +02:00
julienfastre 916e3ab02d ignore phpcs cache for phpstan 2022-04-27 14:31:59 +02:00
julienfastre 48daed26f9 replace BadRequestException by BadRequestHttpException 2022-04-27 14:31:39 +02:00
julielenaerts c56a125a78 privateComment for action (not working yet) 2022-04-27 11:52:01 +02:00
julielenaerts 4dc56db018 show of activity adjusted for private comment 2022-04-27 11:51:32 +02:00
julielenaerts e878960da9 Private comment adjusted for rendez-vous 2022-04-27 11:51:18 +02:00
julielenaerts b2003c74a6 renderbox for private comments (not working yet) 2022-04-27 11:50:53 +02:00
julielenaerts 27ce146aa0 Serializer made for privateComment 2022-04-27 11:50:32 +02:00
julielenaerts 3ed2b36057 privateCommentType adjusted 2022-04-27 11:50:14 +02:00
julielenaerts e8dcb45abb remove dump 2022-04-27 11:49:31 +02:00
nobohan 6662e0fb5f upd CHANGELOG 2022-04-27 10:40:11 +02:00
nobohan 76549581e6 address: fix bug when editing address: update localisation and addressreferenceId + better update of the map in edition 2022-04-27 10:38:25 +02:00
julienfastre f14c915502 Merge branch 'issue565_document_storedObject' into 'master'
storedObject: add validation in properties where it is used

See merge request Chill-Projet/chill-bundles!417
2022-04-27 07:01:06 +00:00
julienfastre 2e44926088 fix cs 2022-04-27 09:00:47 +02:00
julienfastre fcec3af5a8 fix type for condition in ParticipationController 2022-04-27 08:45:22 +02:00
julienfastre 452c4b85c6 Merge remote-tracking branch 'origin/master' into issue565_document_storedObject 2022-04-27 08:43:35 +02:00
julienfastre d5864027d6 Merge branch 'issue471_activity_socialissue-action' into 'master'
Activity: socialIssue and socialAction

See merge request Chill-Projet/chill-bundles!366
2022-04-26 19:22:54 +00:00
julienfastre c2061110dd fix cs 2022-04-26 21:16:55 +02:00
julienfastre b2fb86111d fix social action consistency 2022-04-26 21:12:31 +02:00
julienfastre db6c4f15f8 Merge remote-tracking branch 'origin/master' into issue471_activity_socialissue-action 2022-04-26 20:29:07 +02:00
julienfastre 12231912d6 remove dead code 2022-04-26 20:27:24 +02:00
julienfastre 7b0c8d21ee sort properties alphabetically 2022-04-26 20:27:08 +02:00
julielenaerts 37a198b860 PrivateCommentEmbeddable created and added to entities + datamapper 2022-04-26 20:21:33 +02:00
julielenaerts 64b5de2c03 migrations deleted 2022-04-26 20:19:40 +02:00
julienfastre f713b1ddc8 allow to edit encrypted documents 2022-04-26 17:46:25 +02:00
julienfastre faf1559770 Merge branch 'master' into feat/add-document-encrypter-service 2022-04-26 14:52:13 +02:00
julienfastre 5a1ce399f6 fix creation of evaluation in js 2022-04-26 14:26:51 +02:00
julienfastre 505384c2a0 fix generation of document 2022-04-26 14:11:59 +02:00
julienfastre a7654edefa add missing services 2022-04-26 14:11:28 +02:00
julienfastre 81689e3507 fix catching response 400 in relatorio driver 2022-04-26 14:11:04 +02:00
julienfastre b891ba842d update changelog 2022-04-26 12:03:06 +02:00
julienfastre 3ceae0473d Merge remote-tracking branch 'origin/master' 2022-04-26 11:57:37 +02:00
julienfastre 8ba70b08c4 storedObject: remove traverse=true on assert valid 2022-04-26 09:54:49 +00:00
julienfastre 795a8e9daf Merge remote-tracking branch 'origin/master' 2022-04-26 11:54:01 +02:00
nobohan 3f47503528 storedObject: allow for null data in storedObject 2022-04-26 11:53:17 +02:00
Pol Dellaiera 81edaef062 Fix: Route name change. 2022-04-26 11:50:59 +02:00
Pol Dellaiera dc48b4b9c7 Fix #581: Collabora / wopi: le bouton "imprimer" ne fonctionne pas. 2022-04-26 11:47:46 +02:00
julielenaerts 2684345981 voter updates 2022-04-26 11:34:49 +02:00
julielenaerts 51d1e5422b remove unnecessary code 2022-04-26 10:27:45 +02:00
julielenaerts 064286aa2f private comment for action. still needs (de)normalization 2022-04-26 09:52:00 +02:00
julienfastre e72a2004d7 Merge remote-tracking branch 'origin/master' into feat/add-document-encrypter-service 2022-04-26 09:37:30 +02:00
julienfastre 329fb05db0 Merge branch 'issue571_ordering_socialactions' into 'master'
Ordering social actions

See merge request Chill-Projet/chill-bundles!412
2022-04-25 20:14:59 +00:00
julienfastre 75250402c8 fix ordering of social actions 2022-04-25 22:14:36 +02:00
julienfastre e5209ca6d9 do not make a loop to normalizer for a native php object 2022-04-25 22:14:23 +02:00
julienfastre 4512b94293 Merge remote-tracking branch 'origin/master' into issue571_ordering_socialactions 2022-04-25 21:35:16 +02:00
julienfastre 217f95472b Merge branch 'issue574_accordeon_parcours' into 'master'
Accordeon for closed parcours in person search results

See merge request Chill-Projet/chill-bundles!413
2022-04-25 19:34:49 +00:00
julienfastre b7abf6b6bf Merge remote-tracking branch 'origin/master' into issue571_ordering_socialactions 2022-04-25 21:30:48 +02:00
julienfastre c39fa1c49b remove legacy folded/unfolded style requirements for showing label on accordion 2022-04-25 21:27:56 +02:00
julienfastre 81c8d0ec77 move extension of accordion bootstrap to dedicated file 2022-04-25 21:23:41 +02:00
julienfastre 72012a70d9 button "closed" with same layout than in course header 2022-04-25 21:23:12 +02:00
julienfastre 916560c522 list with period: full sentences in translation component 2022-04-25 21:21:38 +02:00
julienfastre 57d6240cd1 Merge remote-tracking branch 'origin/master' into issue574_accordeon_parcours 2022-04-25 20:46:57 +02:00
julienfastre 2d460adc4d Merge branch 'issue568_agents_traitants' into 'master'
Display agents traitants

See merge request Chill-Projet/chill-bundles!411
2022-04-25 17:30:18 +00:00
julienfastre d155c76013 Merge remote-tracking branch 'origin/master' into issue568_agents_traitants 2022-04-25 19:22:52 +02:00
julienfastre 529a9e5f58 fix notification counter on entity 2022-04-25 16:34:49 +02:00
julienfastre 2b837e0445 Merge branch 'issue545_datepicker' into 'master'
Fix datepicker

See merge request Chill-Projet/chill-bundles!405
2022-04-25 14:19:36 +00:00
julienfastre 4279acc2f8 convert date for new household 2022-04-25 16:11:42 +02:00
julienfastre 8fb3870ca0 remove dead code 2022-04-25 15:59:35 +02:00
julielenaerts 171cc79a4a Add private comment to rendez-vous 2022-04-25 15:47:51 +02:00
julielenaerts 79fa030323 add private comment input field to edit form 2022-04-25 15:47:13 +02:00
julielenaerts b36fd57e4f Add private comment options to activity type (visibility + label) 2022-04-25 15:46:55 +02:00
julielenaerts ff72b28861 Revert "private comment added to activity"
This reverts commit 1f2638626c.
2022-04-25 14:52:28 +02:00
julielenaerts 1f2638626c private comment added to activity 2022-04-25 14:43:44 +02:00
nobohan 5ae6c6397c storedObject: add validation in properties where it is used 2022-04-25 13:52:49 +02:00
nobohan f8410de569 person: correct relationship no duplicate validator 2022-04-25 11:34:17 +02:00
nobohan 3ad8223949 person: add unique index on table relationship to avoid duplicate fromperson_id/toperson_id pairs - typo cs fixer 2022-04-25 11:24:29 +02:00
nobohan 111906c2b9 person: add unique index on table relationship to avoid duplicate fromperson_id/toperson_id pairs 2022-04-25 11:23:28 +02:00
julielenaerts f5efb07e3c csfixes 2022-04-25 10:32:02 +02:00
julielenaerts 79e46c7fe8 changelog updated 2022-04-25 10:30:44 +02:00
julielenaerts 09503768f5 unpin comment is possible + delete and edit by all users that can edit period 2022-04-25 10:29:26 +02:00
julienfastre 41ff21ee23 update changelog with last release 2022-04-25 09:38:36 +02:00
julienfastre 30bb2e8393 Merge remote-tracking branch 'origin/master' into issue545_datepicker 2022-04-25 09:37:35 +02:00
julielenaerts ca166655da changelog updated 2022-04-22 18:05:47 +02:00
julielenaerts 8f69f852b9 fix merge conflict 2022-04-22 18:04:20 +02:00
julielenaerts 6747cad210 add amount of closed periods in accordeon message 2022-04-22 18:02:59 +02:00
julielenaerts 0cbcd91c3f closed periods in accordeon + styling 2022-04-22 17:49:57 +02:00
nobohan 63dacb9ebb upd CHANGELOG 2022-04-22 17:24:29 +02:00
nobohan 5acd49357e person: add validation on relationship between person 2022-04-22 17:22:56 +02:00
julielenaerts d757e07dfc macro added + closed parcours displayed in accordeon 2022-04-22 17:22:46 +02:00
julielenaerts 92c04c545f csfixes 2022-04-22 17:15:02 +02:00
julielenaerts f681e50167 role added to voter, but no check yet 2022-04-22 17:14:27 +02:00
julielenaerts 9c428f989c final touches to controller 2022-04-22 17:14:11 +02:00
julielenaerts ef84576903 fix merge conflict 2022-04-22 16:51:21 +02:00
julielenaerts 12df38d32d infinite loop bug on flush 2022-04-22 16:49:54 +02:00
julielenaerts 084d77c8f4 new user is assigned, but crash on flush() 2022-04-22 16:49:54 +02:00
julielenaerts 2646fa5b65 redo bulk assign 2022-04-22 16:49:54 +02:00
julielenaerts 81bff2bb76 trying to get selected periods to be caught after form submit 2022-04-22 16:49:54 +02:00
julielenaerts 291d340aa0 change view btn to edit btn 2022-04-22 16:49:54 +02:00
julielenaerts 38a26f0bc1 beginning of ACL added 2022-04-22 16:49:54 +02:00
julielenaerts 18025012a8 selected periods are not coming through in POST. Value not valid 2022-04-22 16:49:35 +02:00
julielenaerts 805b9dc0df attempts to submit reassign form 2022-04-22 16:49:35 +02:00
julielenaerts 9f064784f2 first commit 2022-04-22 16:49:35 +02:00
nobohan 07ea2b771c person: add validation to relationship to avoid duplicate 2022-04-22 16:37:21 +02:00
julienfastre 83dd8f810c Merge branch 'notification/deferring-sending-notification-to-terminate' into 'master'
Notification/deferring sending notification to terminate

See merge request Chill-Projet/chill-bundles!414
2022-04-22 10:48:18 +00:00
julienfastre bd0b45b4dd fix cs 2022-04-22 12:47:50 +02:00
julienfastre 6dbe8068ae update changelog 2022-04-22 12:31:33 +02:00
julienfastre 19561c63cb do not persist if no notification is scheduled 2022-04-22 12:31:23 +02:00
julienfastre 354f130e9e use NotificationPersister into PersonMoveEventSubscriber 2022-04-22 12:12:50 +02:00
julienfastre 2d9af8f8c0 period: fix method hasPreviousUser and create method isChangedUser, and use it in Notification 2022-04-22 12:12:30 +02:00
julienfastre f7d9551dc1 fix cs 2022-04-22 11:41:38 +02:00
julienfastre abc3caee00 AccompanyingPeriod: fix method hasPreviousUser 2022-04-22 11:40:29 +02:00
julienfastre 33f93d484d deferring the sending of notification to kernel.terminate: prepare 2022-04-22 11:34:41 +02:00
julielenaerts 8470604b8f macro added + closed parcours displayed in accordeon 2022-04-21 22:06:22 +02:00
julielenaerts b85e6aae3f csfixes 2022-04-21 21:22:18 +02:00
julielenaerts a4baf89a6a social actions ordered in store 2022-04-21 21:05:32 +02:00
julielenaerts 0a05dcd753 add ordering to serialization 2022-04-21 20:49:54 +02:00
nobohan 3ed562e5d9 person: create a person with address and attribute the household to the create ousehold button 2022-04-21 18:23:47 +02:00
julielenaerts c6be7955fd remove save button datepicker parcours. set timeout 2022-04-21 13:59:45 +02:00
julienfastre e246ccbcd9 [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error 2022-04-20 18:34:29 +02:00
julienfastre 44b537f05e [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older 2022-04-20 18:34:27 +02:00
julielenaerts 0fd23c61a1 Wording changed when user is not associated to household 2022-04-20 17:19:20 +02:00
julielenaerts 6cad0be181 Ignore thirdparty for socialaction created via activity 2022-04-20 17:08:27 +02:00
julielenaerts 9a0eb1c74c Renaming of tabs and removal of social actions tab 2022-04-20 16:33:05 +02:00
julielenaerts a70c561596 Number of parcours of user displayed in blue pill 2022-04-20 16:23:08 +02:00
julielenaerts daa3eabd43 Change wording for save document button 2022-04-20 16:12:58 +02:00
julielenaerts b24de76d77 display agents traitants 2022-04-20 15:16:26 +02:00
julielenaerts 92d394b669 changelog updated 2022-04-20 14:22:35 +02:00
julielenaerts c17d20f945 comment out success message parcours start date 2022-04-20 14:18:24 +02:00
julielenaerts be77c3729b take empty date strings into account 2022-04-20 14:09:28 +02:00
julielenaerts ad1e7b576c remove success toast for parcours startdate + take empty string values into account for action dates 2022-04-20 13:58:45 +02:00
julienfastre bf0578b6d7 [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older 2022-04-20 13:49:47 +02:00
julielenaerts 0ce23230da fix evaluation datepickers in edit 2022-04-20 13:32:51 +02:00
julienfastre 8b7404e531 Email on designation: allow raw characters
As the content-type of the email is text/plain, we should not escape
special character.

Add the raw filter on string which will be escaped by twig.
2022-04-20 13:05:11 +02:00
julielenaerts bc550ea42a updating openingdate parcours fixed 2022-04-20 12:14:19 +02:00
julielenaerts 65e6471a02 fix datepicker for social action edit form.
still a problem with the display of already set evaluation dates... need to be transformed to correct format to display
2022-04-20 12:14:19 +02:00
julielenaerts de9d2aa885 fix datepicker for householdmember editor 2022-04-20 12:14:19 +02:00
julielenaerts 66ab38c60f prefill startdate with now 2022-04-20 12:14:19 +02:00
julielenaerts 8882c99f5a fix datepicker for social action 2022-04-20 12:14:19 +02:00
julienfastre 8512a5e1bc person list with period: use sameas twig operator instead of using '==' operator to introduce requestor 2022-04-20 11:24:20 +02:00
julienfastre 7f97215fe9 activity form: keep the same order for attendee field between edit and new form 2022-04-20 10:03:58 +02:00
julienfastre 6427fc64cd invert 'incoming' and 'receiving' 2022-04-20 10:00:48 +02:00
julienfastre 26d5bf03bd add order by on document list 2022-04-20 10:00:48 +02:00
nobohan f2c60cfd20 php code style fix 2022-04-20 08:52:15 +02:00
nobohan 7a6aa6edcb upd CHANGELOG 2022-04-20 08:51:00 +02:00
nobohan bad5506b98 person: create a person with address (and household without position (remove required position for household member) 2022-04-19 18:01:25 +02:00
nobohan c214c2f4a4 household: safe display of household members without positions 2022-04-19 17:09:10 +02:00
Pol Dellaiera 7048f670ed Fix #552: Return AccessDeniedException when trying to access a document and user is not logged in. 2022-04-19 15:45:47 +02:00
julielenaerts c757fa068a Translations added for error message in parcours 2022-04-19 15:21:23 +02:00
julielenaerts ebc4ec0d7c updating openingdate parcours fixed 2022-04-19 15:09:25 +02:00
nobohan 4bc8da9655 person: create a person with address (php form) 2022-04-19 14:56:41 +02:00
julielenaerts 69394df89b infinite loop bug on flush 2022-04-19 14:02:47 +02:00
nobohan 84038c0ff2 person: Add checkobox for adding address in AddPerson - css 2022-04-19 13:17:40 +02:00
nobohan 584111b5f7 person: Add checkobox for adding address in AddPerson 2022-04-19 11:39:08 +02:00
nobohan 355c5cf8fd person: add address when creating person in AddPerson: fix POSTing household 2022-04-19 09:54:42 +02:00
nobohan 57ed90a696 person: post an address when creating a person 2022-04-15 13:41:47 +02:00
nobohan bea019e9bc household: API endpoint for posting a household 2022-04-15 12:23:16 +02:00
nobohan ae45f5f40b person: add address when creating a person 2022-04-15 11:11:41 +02:00
nobohan 946ae31d11 upd CHANGELOG 2022-04-14 21:47:51 +02:00
nobohan 4009f3ffda php code fix 2022-04-14 21:47:38 +02:00
nobohan 7d3239d6d6 person: fix adding civility to a person with OnTheFly form 2022-04-14 21:37:16 +02:00
nobohan 7a2151f23a AddPerson: add civility when creating a person 2022-04-14 18:04:36 +02:00
nobohan c1ec2933e5 person: create a new person: add a civility field 2022-04-14 17:08:44 +02:00
julienfastre 617473f6a5 notification - grant access by key - temporarily disable email verification due to character escaping in email 2022-04-14 01:36:01 +02:00
julienfastre 124a6a58fc fix cs 2022-04-14 01:13:16 +02:00
julienfastre afa38e9dd5 addresses: add constraint in database to avoid error later 2022-04-14 01:11:39 +02:00
julienfastre a52f29bb78 accompanyingWorkEditor: add label on form document title 2022-04-14 01:11:14 +02:00
julienfastre b95ff337b6 add more time duration for aside activities 2022-04-14 00:41:15 +02:00
julienfastre 92a169be1e Merge branch 'issue541_change_moving_date' into 'master'
household address: add a form for editing the validFrom date

See merge request Chill-Projet/chill-bundles!402
2022-04-13 22:11:34 +00:00
julienfastre e6d59bc837 fix cs 2022-04-14 00:11:15 +02:00
julienfastre 31731c6f44 Merge remote-tracking branch 'origin/master' into issue541_change_moving_date 2022-04-14 00:04:30 +02:00
julienfastre 86ec020f80 fixes on address valid from edit for household 2022-04-14 00:02:57 +02:00
julienfastre 07351e2946 Merge branch 'issue543_double_click_household' into 'master'
householdmemberseditor: fix composition type bug

See merge request Chill-Projet/chill-bundles!406
2022-04-13 21:37:41 +00:00
julienfastre 405694a0b4 Merge remote-tracking branch 'origin/master' into issue541_change_moving_date 2022-04-13 23:30:51 +02:00
julienfastre bad39364c2 Merge remote-tracking branch 'origin/master' into issue543_double_click_household 2022-04-13 23:26:38 +02:00
julienfastre c0b39e4e7c Merge branch 'notifications/allow-to-send-to-email' into 'master'
Notifications/allow to send to email

See merge request Chill-Projet/chill-bundles!409
2022-04-13 21:25:35 +00:00
julienfastre f98b35f009 Merge remote-tracking branch 'origin/master' into issue543_double_click_household 2022-04-13 23:20:23 +02:00
julienfastre 8770188d54 update changelog 2022-04-13 23:18:50 +02:00
julienfastre 35c7d55b8c fix cs 2022-04-13 23:17:16 +02:00
julienfastre 2a53fb9341 show email adresses on notification list 2022-04-13 23:16:02 +02:00
julienfastre e7f0cd50c9 controller to grant access to notification by access key 2022-04-13 23:05:38 +02:00
julienfastre a41d6cf744 notification: send an email to addressesEmails 2022-04-13 22:50:32 +02:00
julienfastre 24d28b0a52 notification: alter form type to add and remove email addresses 2022-04-13 22:11:01 +02:00
julienfastre 4425f2ad49 fix type for Notification email addresses 2022-04-13 21:43:41 +02:00
julienfastre a8db07a383 notification / add email: fix entity Notification 2022-04-13 21:33:18 +02:00
julienfastre ef9fd80ad5 update schema to send to emails 2022-04-13 18:02:11 +02:00
julienfastre e6169ddffa Merge branch 'docgen/improve-context-courses' into 'master'
docgen: some fixes and improvements

See merge request Chill-Projet/chill-bundles!408
2022-04-13 07:53:43 +00:00
julienfastre ccf7c885bb fix normalization for phonenumber on person when phonenumber is null 2022-04-13 09:44:21 +02:00
julienfastre 01c571ab06 fix path to table 2022-04-11 21:04:36 +02:00
julienfastre 69b2dce7ee docgen/budget: add comment for each budget line (resource and charge)
The comments are cocatenated by lines of each type, and separated by a
`|`
2022-04-11 18:11:20 +02:00
julienfastre 910245f855 update changelog 2022-04-11 17:45:57 +02:00
julienfastre 7fbb3dfd07 docgen: add more persons choices in person1, person2 and mainPerson
Allow to pick amongst:

* requestor (if person)
* resources of course (if person)
* resources of person (if person)
2022-04-11 17:43:31 +02:00
julienfastre 9765bc5663 fix cs 2022-04-11 17:12:59 +02:00
julienfastre bb65909bfa add docgen context for a list of activities in a course 2022-04-11 16:52:11 +02:00
julielenaerts 03b0a8766e remove dumps 2022-04-08 19:12:11 +02:00
julielenaerts 5eea202586 fix adding sibling action 2022-04-08 19:04:13 +02:00
julielenaerts a78c62789c if parent in collection replace with child, problem, sibling isn't added 2022-04-08 18:56:37 +02:00
julielenaerts 68671e297c Merge branch 'issue471_activity_socialissue-action' of gitlab.com:Chill-Projet/chill-bundles into issue471_activity_socialissue-action 2022-04-08 13:24:49 +02:00
julielenaerts c3179da320 new user is assigned, but crash on flush() 2022-04-08 12:13:19 +02:00
julielenaerts 2a32284471 redo bulk assign 2022-04-08 09:56:57 +02:00
julienfastre 4257a918f3 fix error when search pattern is empty 2022-04-08 00:11:08 +02:00
julienfastre 7ffb3dc74f task: fix route name 2022-04-07 23:49:32 +02:00
julienfastre 0f926e9dfe allow to display pinned comment in item of accompanying course list 2022-04-07 22:40:20 +02:00
julienfastre fc55567a64 update changelog 2022-04-07 22:12:13 +02:00
julienfastre 009030b5fb notification list: move action buttons outside of the toggle 2022-04-07 21:59:02 +02:00
julienfastre 6e1cabc8fc fix detecting of non-read notification 2022-04-07 21:55:04 +02:00
julienfastre 572c602387 filter users which are disabled 2022-04-07 21:47:56 +02:00
julienfastre 26a4577420 order query for location and add pagination in list 2022-04-07 21:08:11 +02:00
nobohan c0ee51068c avoid address reference search on undefined post code 2022-04-07 16:55:54 +02:00
julielenaerts f09870931c switch to using getDescendantsWithThis() 2022-04-07 16:11:00 +02:00
julielenaerts ea21f2d9c4 improvement, but still not correct 2022-04-07 16:11:00 +02:00
julielenaerts d81a41bb17 Test added for activity-social action and social issue 2022-04-07 16:11:00 +02:00
julielenaerts 7851d9956e csfixes 2022-04-07 16:11:00 +02:00
julielenaerts f35479e4d2 fix logic in activity entity 2022-04-07 16:11:00 +02:00
julielenaerts 432b105be5 update changelog 2022-04-07 16:11:00 +02:00
julielenaerts 988b67bd4b logic added to only keep youngest descendant. works for issue, seems not to for action 2022-04-07 16:11:00 +02:00
julienfastre f64409e5e6 allow every person which has part for a workflow to see the workflow page 2022-04-07 16:06:26 +02:00
julienfastre a1baf99294 able to see the workflow if the evaluation document has been deleted 2022-04-07 15:54:53 +02:00
julienfastre d9bb18e042 hardcode the list of supported mime types for edition with collabora 2022-04-07 15:37:17 +02:00
julienfastre 00a6ef0598 fix creating of accompanying period work 2022-04-07 11:05:34 +02:00
nobohan c03e38f4ff upd CHANGELOG 2022-04-07 10:47:14 +02:00
nobohan f9bcc5b1e9 householdmemberseditor: fix composition type bug 2022-04-07 10:45:46 +02:00
julielenaerts 56340b44d5 trying to get selected periods to be caught after form submit 2022-04-07 10:24:14 +02:00
julienfastre 934a066910 remove error disappearing from phpstan 2022-04-06 22:40:09 +02:00
julienfastre 095afb90c7 AddPerson search: fix aborting query when the query is altered by user 2022-04-06 21:47:01 +02:00
julienfastre 645549ae34 effectively filter on all words in third party search 2022-04-06 21:45:49 +02:00
julielenaerts 02b12c097d change view btn to edit btn 2022-04-06 16:53:26 +02:00
nobohan d34462d849 php code fix 2022-04-06 15:34:11 +02:00
nobohan c65a73604d upd CHANGELOG 2022-04-06 15:33:07 +02:00
nobohan 6a4edd000f household address: add max date for changing the validFrom date 2022-04-06 15:31:17 +02:00
nobohan 017b7bca87 address: handle cases when null street and streetnumber are given 2022-04-06 15:14:51 +02:00
julienfastre 612d053892 fix phpstan and phpcs 2022-04-06 13:59:05 +02:00
julienfastre 8edc68859e do not allow to freeze a document 2022-04-06 13:41:34 +02:00
julienfastre a4afe73efe take into account system notification in counter and fix hardcoded user id 2022-04-06 13:35:24 +02:00
julienfastre 2b67f105f7 Merge branch 'issues521_531_540' into 'master'
issues graphiques 521 531 540

See merge request Chill-Projet/chill-bundles!399
2022-04-06 10:43:29 +00:00
julienfastre 95b114a144 do not show button to send notification on draft courses 2022-04-06 12:42:12 +02:00
julienfastre 5477a70c84 add ACL around creation of work in course 2022-04-06 12:41:50 +02:00
julienfastre 7d69ec6d6b Merge remote-tracking branch 'origin/master' into issues521_531_540 2022-04-06 12:29:11 +02:00
julienfastre 17594b58ab Merge branch 'issue548_notifs_buttons' into 'master'
notification toggle read: correct js syntax

See merge request Chill-Projet/chill-bundles!404
2022-04-06 10:24:27 +00:00
julienfastre cddd3c20c8 Merge remote-tracking branch 'origin/master' into issue548_notifs_buttons 2022-04-06 12:16:23 +02:00
julienfastre 25a37974e5 Merge branch 'issues522_523' into 'master'
activity: add spacing between buttons + better alignment

See merge request Chill-Projet/chill-bundles!397
2022-04-06 10:08:59 +00:00
julienfastre 066afc07a8 update changelog 2022-04-06 12:08:44 +02:00
julienfastre 56c3f05ec9 Merge remote-tracking branch 'origin/master' into issues522_523 2022-04-06 12:04:54 +02:00
julienfastre 1907beaf6e Merge branch 'change_interlocuteurs_display' into 'master'
Change display of interlocuteurs (parcours)

See merge request Chill-Projet/chill-bundles!396
2022-04-06 10:01:26 +00:00
julienfastre 37c04d3f12 update changelog 2022-04-06 12:00:49 +02:00
julienfastre a7fbce0add Merge remote-tracking branch 'origin/master' into change_interlocuteurs_display 2022-04-06 11:59:18 +02:00
julielenaerts e663bae5c4 fix datepicker for social action edit form.
still a problem with the display of already set evaluation dates... need to be transformed to correct format to display
2022-04-06 11:26:04 +02:00
julielenaerts ad6a68487c fix datepicker for householdmember editor 2022-04-06 11:24:01 +02:00
nobohan 88f377778c upd CHANGELOG 2022-04-06 09:28:57 +02:00
nobohan d6deaeb324 notification unread: correct class 2022-04-06 09:26:14 +02:00
nobohan f2744fba43 notification toggle read: correct js syntax 2022-04-05 22:28:35 +02:00
julielenaerts 72a62a3a1b prefill startdate with now 2022-04-05 16:03:07 +02:00
julielenaerts bcde4497cc fix datepicker for social action 2022-04-05 15:56:02 +02:00
nobohan c3731ae2db address reference: add filtering by deletedAt 2022-04-05 10:21:14 +02:00
nobohan ddce7603ad household address: add condition for minimum value for vaildFrom date 2022-04-02 10:53:54 +02:00
nobohan 3a3eb68288 household address: add a form for editing the validFrom date 2022-04-01 16:17:04 +02:00
julienfastre a4ece21f2b in household, force validTo of address to be NULL 2022-04-01 15:06:00 +02:00
julienfastre c7762dd6d2 fix trimming for email in person / thirdparty 2022-03-31 12:51:53 +02:00
julienfastre f47fb17b8d fix denormalization of invalid dates 2022-03-31 12:48:27 +02:00
julienfastre 51dc255be5 fix phonenumber denormalization when null value is given 2022-03-31 12:48:27 +02:00
julienfastre 6ddbb79157 format phonenumber in third party normalization 2022-03-31 12:48:27 +02:00
julielenaerts dcddf4b3f1 trim email 2022-03-31 10:24:58 +02:00
julienfastre e027958c63 Merge branch 'fix-tests-2022-03-30' into 'master'
Fix tests 2022 03 30

See merge request Chill-Projet/chill-bundles!400
2022-03-30 20:20:03 +00:00
julienfastre 034a416612 fix test which fails randomly 2022-03-30 22:02:45 +02:00
julienfastre 63cdc97c47 fix phpstan errors on ThirdPartyRender 2022-03-30 21:52:43 +02:00
julienfastre ae10a8bd1c fix post action on api controller: too many argument 2022-03-30 21:51:39 +02:00
julienfastre eb2bad0f47 docgen normalization budget: fix budget when person is null 2022-03-30 21:35:02 +02:00
julienfastre bc43d8bae5 force type on Person entity 2022-03-30 21:01:17 +02:00
julienfastre 83dfe530e9 household editor: handle case when the person is repositionned in the
same household, and the person is already in a position "without
household"
2022-03-30 17:00:07 +02:00
julienfastre c477996acf fix cs 2022-03-30 16:43:16 +02:00
julienfastre 36b1f05524 do not launch PersonMoveEvent when moving to the same household 2022-03-30 16:42:57 +02:00
julienfastre dae9d48574 really do not show thirdparty which are not active 2022-03-30 15:26:45 +02:00
julienfastre 9812710cd0 do not show duplicate menu entry temporarily 2022-03-30 15:08:34 +02:00
julienfastre 3b083c31e7 add tests for moving to not share position in another household 2022-03-30 12:57:16 +02:00
julienfastre 1b567327b7 fix normalisation for phonenumber in person entity 2022-03-30 12:37:18 +02:00
nobohan 1d6d8dc002 accompanyingcourse work: add ACL rights for create and edit buttons 2022-03-30 12:01:35 +02:00
julienfastre 38e92ee981 fix cs 2022-03-30 11:58:17 +02:00
julienfastre e433b6a42b Do not dispatch PersonMoveEvent if moving to a position not sharing
household
2022-03-30 11:57:43 +02:00
julienfastre df24d085ca Household members editor: leave household when repositionning to same
household, not sharing household
2022-03-30 11:53:06 +02:00
nobohan f29ead4961 accompanying course: fix display bug in accompanying course resume 2022-03-30 11:26:19 +02:00
nobohan b361ab2d74 workflow: add div for delete workflow form 2022-03-30 11:10:23 +02:00
julienfastre de4f65fede change strategy for searching: use the AND between words, instead of OR 2022-03-29 12:42:17 +02:00
julielenaerts ed1ddbe53d beginning of ACL added 2022-03-28 17:06:29 +02:00
julielenaerts 818370f037 selected periods are not coming through in POST. Value not valid 2022-03-28 16:46:39 +02:00
nobohan 10fcd4f732 accompanying course: evaluation documents: align buttons 2022-03-28 15:12:16 +02:00
nobohan bc8709f9a1 activity: add spacing between buttons + better alignment 2022-03-28 14:30:49 +02:00
julielenaerts 3d6745e535 display of interlocuteurs changed to flex-table to prevent cut-off of information 2022-03-28 12:00:13 +02:00
julielenaerts 961c0a867c workflow notification display block for social action item 2022-03-28 11:42:24 +02:00
julielenaerts f5327fe8ab trailing guillemet removed 2022-03-28 11:25:07 +02:00
julielenaerts 6f270188f7 buttons made sticky for parcours documents 2022-03-28 11:22:42 +02:00
julielenaerts 5895334244 update changelog 2022-03-25 17:23:14 +01:00
julielenaerts 1812592d43 fix create person on the fly 2022-03-25 17:22:10 +01:00
julielenaerts 3babbe5e84 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-25 17:06:06 +01:00
julielenaerts 632ea710c8 budget menu entry placed in different order 2022-03-25 17:05:41 +01:00
julielenaerts 7963076505 attempts to submit reassign form 2022-03-25 16:59:05 +01:00
julienfastre bdcb135adb re-introduce link to create user 2022-03-25 15:48:30 +01:00
nobohan 58f1984c77 Add new fields to AddressReference for update procedure 2022-03-25 15:14:13 +01:00
julienfastre 3b93d2c0a5 Merge remote-tracking branch 'origin/master' 2022-03-25 14:28:18 +01:00
julienfastre f24b2931dd Merge branch 'issue585_canEditWopiDocument' into 'master'
Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported

See merge request Chill-Projet/chill-bundles!394
2022-03-25 13:04:24 +00:00
julienfastre c1e972963f invert condition with key infos 2022-03-25 14:03:43 +01:00
julienfastre ce2e05464f Merge remote-tracking branch 'origin/master' into issue585_canEditWopiDocument 2022-03-25 13:48:46 +01:00
julienfastre dbe0c9097f Merge branch 'issue533_notification_for_workflow_bug' into 'master'
correct notification for workflow display bug

See merge request Chill-Projet/chill-bundles!393
2022-03-25 12:39:46 +00:00
julienfastre e68c12e0e7 fix cs 2022-03-25 13:39:27 +01:00
julienfastre c99a967fb9 slightly improvve the render box for workflow in notification 2022-03-25 13:35:52 +01:00
julienfastre d11eebefae fix some authorization check in menu 2022-03-25 13:11:03 +01:00
julienfastre b423821ae9 check existence of form before using it 2022-03-25 13:10:40 +01:00
julielenaerts f2ae183682 first commit 2022-03-25 13:01:33 +01:00
julienfastre 7a0234adb2 Merge remote-tracking branch 'origin/master' into issue533_notification_for_workflow_bug 2022-03-25 12:45:29 +01:00
nobohan f36fc0ba60 upd CHANGELOG 2022-03-25 11:46:57 +01:00
nobohan cff126953e Accompanying course evaluation documents: disable the WOPI edit link if no keyInfos 2022-03-25 11:45:13 +01:00
nobohan 89064f55a1 Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported 2022-03-25 11:36:51 +01:00
julielenaerts f69dab5ca5 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-25 11:09:23 +01:00
julielenaerts 259cdd34c4 fix validation person resource 2022-03-25 11:07:12 +01:00
nobohan 9dca42e242 correct notification for workflow display bug 2022-03-25 10:44:15 +01:00
nobohan 248e4e93ed quick fix: change style of input field for document title in AccompanyingCourseWork documents 2022-03-25 10:16:48 +01:00
nobohan db2bf1e98e quick fix: change style of input field for document title in AccompanyingCourseWork documents 2022-03-25 10:15:33 +01:00
julienfastre ea66db07a4 fix cs 2022-03-24 22:10:07 +01:00
julienfastre 5f35a42fe3 allow phonumber helper to format null value 2022-03-24 22:09:12 +01:00
julienfastre e82b2bd10a fix personcontent / content switch in some pages 2022-03-24 20:54:34 +01:00
julienfastre ad4f400262 Merge remote-tracking branch 'origin/master' 2022-03-24 20:53:40 +01:00
julienfastre 866bcec114 Merge remote-tracking branch 'origin/master' 2022-03-24 20:53:10 +01:00
julienfastre 367188b03d Merge branch 'issue491_thirdparty_edit_modal' into 'master'
Thirdparty: fix edit modal + add firstname

See merge request Chill-Projet/chill-bundles!379
2022-03-24 18:33:31 +00:00
julienfastre dd4d463c42 fix bug when setting civility to null in on the fly 2022-03-24 19:32:53 +01:00
julienfastre 1031f0d40e thirdparty: firstname after name in form 2022-03-24 19:18:48 +01:00
julienfastre 5d7943f871 index firstname in database 2022-03-24 19:06:53 +01:00
julienfastre d0c34c0206 set empty thridparty.firstname to a string 2022-03-24 18:51:29 +01:00
julienfastre 726b8f0e3c Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-24 18:44:42 +01:00
julienfastre 5d4149db35 Merge remote-tracking branch 'origin/issue491_thirdparty_edit_modal' into issue491_thirdparty_edit_modal 2022-03-24 18:41:22 +01:00
julienfastre f04474c82f Merge branch 'issue494_activity_field_visibility' into 'master'
Activity display fields based on ActivityType + show error message

See merge request Chill-Projet/chill-bundles!376
2022-03-24 17:29:38 +00:00
julienfastre 156398caba Merge remote-tracking branch 'origin/master' into issue494_activity_field_visibility 2022-03-24 18:25:03 +01:00
julienfastre ae3091f620 Merge branch 'issue469_budget' into 'master'
Adapt BudgetBundle to Vendee

See merge request Chill-Projet/chill-bundles!357
2022-03-24 17:23:26 +00:00
julienfastre 84f9fdba28 add budget to docgen 2022-03-24 18:22:49 +01:00
julienfastre 531f940b65 add a debug feature in docgenerator template controller 2022-03-24 18:22:36 +01:00
julienfastre d907f3f11b desactivate calculator in current budget for household 2022-03-24 16:29:13 +01:00
julienfastre 02409d4992 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-24 16:22:52 +01:00
julienfastre 771b6a59a5 Merge branch 'issue519_filiation_create_person' into 'master'
Add person to filiation

See merge request Chill-Projet/chill-bundles!392
2022-03-24 14:08:54 +00:00
julienfastre 2e336ac874 update case when the person was already on the graph 2022-03-24 15:07:46 +01:00
julielenaerts a61c9553e1 csfixes 2022-03-24 11:42:16 +01:00
julielenaerts 3243a7e0a2 fix merge conflict in changelog 2022-03-24 11:41:02 +01:00
julielenaerts 06cc84a21f conditional statements to allow for personne moral creation and edit 2022-03-24 11:40:06 +01:00
julielenaerts 688914906d merge firstname branch 2022-03-24 11:13:07 +01:00
julienfastre f9d87876f2 Merge remote-tracking branch 'origin/master' into issue519_filiation_create_person 2022-03-24 11:12:56 +01:00
julienfastre 7df70cab98 allow a user/referrer to see his own courses, even if the scope is not his own 2022-03-24 10:58:43 +01:00
julielenaerts 287ea80be9 Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-24 10:56:51 +01:00
julielenaerts dc3d88a1ef final fix to make current civility and profession values visible in edit form 2022-03-24 10:56:28 +01:00
julielenaerts cba6394823 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-24 09:10:53 +01:00
julielenaerts eea0711a04 autowire sectionmenu service 2022-03-24 09:10:32 +01:00
julienfastre 949bdfd993 add missing property (phpstanerror) 2022-03-23 22:59:45 +01:00
julienfastre 3067da5d24 fix tests for removing temporarily resources on person 2022-03-23 22:56:45 +01:00
julienfastre 546c925224 Enforce a limit for search results when searching through api 2022-03-23 22:51:45 +01:00
julienfastre d7b5944c5f temporarily desactivate resources for docgen 2022-03-23 22:51:45 +01:00
julielenaerts aa234e0749 activity annexe button made sticky 2022-03-23 17:33:23 +01:00
julielenaerts 506118b3f1 edit and create of thirdparty pers physique is possible, but current civility and profession don't display yet in edit form 2022-03-23 16:10:02 +01:00
julielenaerts 52a78902f7 Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-23 15:53:55 +01:00
julielenaerts e89489fde9 update changelog 2022-03-23 15:04:52 +01:00
julielenaerts a7be9c0a83 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-23 14:59:44 +01:00
julielenaerts 6331d8fd3e validation fix for person ressource 2022-03-23 14:59:30 +01:00
nobohan eb6790b17d quick fix: missing translation 2022-03-23 14:58:09 +01:00
LenaertsJ 61f010f5ad Merge branch 'issue507_conditional_menu_entries' into 'master'
Options added for section menu entries

See merge request Chill-Projet/chill-bundles!391
2022-03-23 13:23:32 +00:00
julielenaerts 30fd36b741 forgotten translation added 2022-03-23 14:16:38 +01:00
julielenaerts 91aacb91cc merge master into branch 2022-03-23 14:07:26 +01:00
julienfastre 73c17febd9 remove inter database reference 2022-03-23 00:05:36 +01:00
julienfastre 99dc9dd4a8 handle case when user is null in comment embeddable 2022-03-22 23:36:02 +01:00
julienfastre c5ffca22ff ease docgen normlisation for resources 2022-03-22 22:37:19 +01:00
julienfastre 89e7eb85ff fix cs 2022-03-22 22:36:01 +01:00
julielenaerts 98d5de29b0 translations added 2022-03-22 16:09:03 +01:00
julielenaerts 4939c8c8e4 changelog updated 2022-03-22 15:50:31 +01:00
julielenaerts 8d5c66dc40 person can be added to filiation graph and relationship created 2022-03-22 15:49:25 +01:00
julielenaerts 02571bf727 switch to using getDescendantsWithThis() 2022-03-22 13:45:20 +01:00
julielenaerts 2c6cbeb8ca minor fix in vue component to update thirdparty firstname 2022-03-22 11:30:33 +01:00
julielenaerts 13a7d791a1 fixes to allow for firstname value of null 2022-03-22 11:07:26 +01:00
julielenaerts ae555fed00 migration executed down and new one created to allow firstname nullable 2022-03-22 11:07:05 +01:00
julienfastre 6d65009987 Merge remote-tracking branch 'origin/master' 2022-03-21 18:05:38 +01:00
julienfastre 386e88387d Merge branch 'issue560_ACCent_parcours_household' into 'master'
Create parcours from within household context

See merge request Chill-Projet/chill-bundles!390
2022-03-21 17:05:00 +00:00
julienfastre 22473d6547 Merge remote-tracking branch 'origin/master' into issue560_ACCent_parcours_household 2022-03-21 18:01:26 +01:00
julienfastre e7b4f1a54f Merge branch 'issues546_553_554_documents_acc_period_activity' into 'master'
issues553_554_documents_activity

See merge request Chill-Projet/chill-bundles!389
2022-03-21 17:00:21 +00:00
julienfastre 1f6565d2ef add return path when creating an activity 2022-03-21 17:59:41 +01:00
julienfastre e838a82556 Merge remote-tracking branch 'origin/master' into issues546_553_554_documents_acc_period_activity 2022-03-21 17:35:10 +01:00
julienfastre eebca7b0f1 Merge branch 'issue517_extend_document_to_person_vendee' into 'master'
commentembeddable: add a condition for the early return in normalisation

See merge request Chill-Projet/chill-bundles!388
2022-03-21 16:33:23 +00:00
julienfastre 169d4dc41c finalize normalization on ressources 2022-03-21 17:33:01 +01:00
julielenaerts 9e063180bf forgotten translation 2022-03-21 16:37:14 +01:00
julielenaerts 5b0b15f395 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-21 16:23:16 +01:00
julielenaerts 736d43e756 translation fixed 2022-03-21 16:23:06 +01:00
julienfastre b4add2de95 Merge remote-tracking branch 'origin/master' into issue517_extend_document_to_person_vendee 2022-03-21 16:20:03 +01:00
julienfastre 37a8928e41 remove dump 2022-03-21 16:19:27 +01:00
julienfastre 0a0243eb85 Merge branch 'issue511_document_evaluations' into 'master'
AccompanyingCourseWorkEdit: replace document by a new one, fix deleting

See merge request Chill-Projet/chill-bundles!384
2022-03-21 15:17:34 +00:00
julienfastre a6c7c1d997 fix tests for user 2022-03-21 16:17:19 +01:00
julielenaerts c7caa2ba76 addpersons component, doesnt hear emitted event... 2022-03-21 16:13:02 +01:00
julienfastre 2ce8b1110d allow to change color for asyncupload button 2022-03-21 16:13:02 +01:00
julienfastre 11d57094e8 fix cs 2022-03-21 15:22:40 +01:00
julienfastre 704392a729 do not add referrer if user is null (fix condition) 2022-03-21 15:21:29 +01:00
julienfastre efeda81e05 do not add referrer if user is null 2022-03-21 15:17:33 +01:00
julienfastre ae5940eb48 Merge remote-tracking branch 'origin/master' into issue511_document_evaluations 2022-03-21 15:00:40 +01:00
julienfastre 638ae3315f Merge branch 'issue509_parcours_referent' into 'master'
Reassign parcours of absent user

See merge request Chill-Projet/chill-bundles!387
2022-03-21 13:58:33 +00:00
julienfastre ac9e55e2fc fix methods for accompanying period repository acl aware
* add method to interface
* delegate ACL to another method
2022-03-21 14:54:01 +01:00
julienfastre 293efc03b4 fixes for reasign list
* use existing method in UserRepository and use a method instead of
building a query outside of the repository;
* use renderString to render users
* fix building of filter form (add $data). This make the use of the
method "get" instead of post
2022-03-21 13:35:14 +01:00
julienfastre f084078cf2 Merge remote-tracking branch 'origin/master' into issue509_parcours_referent 2022-03-21 12:59:24 +01:00
julienfastre c8a66f008e Merge branch 'issue502_user_in_actions' into 'master'
Issue502 referres in AccompanyingPeriodWork

See merge request Chill-Projet/chill-bundles!381
2022-03-21 11:55:24 +00:00
julienfastre b6b6c25b3b adapt queries for listing near recents evaluation and work on homepage, taking care of referrers 2022-03-21 12:54:50 +01:00
julienfastre cb35aed202 use remove-items UI api for listing referrers 2022-03-21 12:45:20 +01:00
julielenaerts eebe1d669a first commit 2022-03-21 12:39:33 +01:00
julienfastre 8f462da627 fix cs 2022-03-21 12:32:46 +01:00
julienfastre 3aaecc8630 set creator as referrer for works 2022-03-21 12:32:40 +01:00
julielenaerts 9b97b03d42 csfixes 2022-03-21 12:16:49 +01:00
julielenaerts bdb07a3a05 options added to create person or parcours and to access global history 2022-03-21 12:10:03 +01:00
julienfastre 2fda5b751b Merge remote-tracking branch 'origin/master' into issue502_user_in_actions 2022-03-21 11:53:21 +01:00
julienfastre ddb048daca Merge branch 'issue479_admin_user' into 'master'
user admin

See merge request Chill-Projet/chill-bundles!372
2022-03-21 10:47:43 +00:00
julienfastre ac42de7863 Merge branch 'fix-test-2022-03-21' 2022-03-21 11:46:48 +01:00
julienfastre 2c55cfe1dc by default, translate menu items 2022-03-21 11:41:16 +01:00
julienfastre 3ba3498892 Merge remote-tracking branch 'origin/master' into issue479_admin_user 2022-03-21 11:36:28 +01:00
julienfastre 99276dc41c fix cs 2022-03-21 11:35:50 +01:00
julienfastre fced8ef4b7 try to fix test with null id 2022-03-21 11:34:54 +01:00
julienfastre 247f1879e3 Merge remote-tracking branch 'origin/master' into issue471_activity_socialissue-action 2022-03-21 11:16:19 +01:00
julielenaerts a06a0788c1 csfixes 2022-03-21 10:22:28 +01:00
julielenaerts 5a8291dc87 merge master into branch 2022-03-21 10:21:59 +01:00
julielenaerts 15af0203ff add menu entry in section menu 2022-03-21 10:21:12 +01:00
julielenaerts 7006196691 csfixes 2022-03-21 09:54:53 +01:00
julielenaerts 5cbe14464d fix in view template to display firstname + lastname in title if it exists 2022-03-21 09:53:59 +01:00
julielenaerts 2463a492c8 merge master into branch 2022-03-21 09:40:39 +01:00
julielenaerts 72f69f0f82 changelog updated 2022-03-19 12:11:49 +01:00
julielenaerts a2daeff384 csfixes 2022-03-19 12:10:47 +01:00
julielenaerts caaa25ef8e controller action to create parcours from within household + link added in template 2022-03-19 12:08:20 +01:00
julielenaerts ff5aeaae17 translation changed in action evaluation section 2022-03-19 11:32:16 +01:00
julielenaerts 184a664bf9 english text translated in thirdparty view page 2022-03-19 11:25:56 +01:00
nobohan dbc604d84a AccompanyingCourseWorkEdit: download existing documents 2022-03-18 17:02:35 +01:00
nobohan 9c353669ea activity: fix delete button for documents 2022-03-18 16:11:09 +01:00
julienfastre 8d92cc0ba7 remove history from menus, temporarily 2022-03-18 15:40:01 +01:00
nobohan 215b859725 activity: hide delete button from asyncupload and add delete buttons from chill collection 2022-03-18 15:25:45 +01:00
julienfastre da67fa4c4f fix role for creating activity in person 2022-03-18 14:33:05 +01:00
julienfastre 5b4c3ae9b3 Merge branch 'issue503_workflow_document_template' into 'master'
Workflow document template

See merge request Chill-Projet/chill-bundles!382
2022-03-18 13:24:40 +00:00
julienfastre fdb36ab047 add document title to workflow EvaluationDocument handler 2022-03-18 14:18:47 +01:00
julienfastre a1b1e6bb17 Merge remote-tracking branch 'origin/master' into issue503_workflow_document_template 2022-03-18 14:01:43 +01:00
nobohan 73dd97f7d3 upd CHANGELOG 2022-03-18 13:58:20 +01:00
julienfastre bfd51c6615 allow downloads in LO editor 2022-03-18 13:55:33 +01:00
nobohan b84e161399 quick fix css class in acc period evaluation form, issue client 557 2022-03-18 12:35:14 +01:00
nobohan 3b8c329ff6 upd CHANGELOG 2022-03-17 19:08:13 +01:00
nobohan e7299bac4a person: add person ressource to person docgen normaliser 2022-03-17 19:07:11 +01:00
Marc Ducobu 80d518e4af Merge branch 'fixdataimportcp4digits' into 'master'
Fix pbm importing CP from France on 4 digits

See merge request Chill-Projet/chill-bundles!386
2022-03-17 17:44:39 +00:00
Marc Ducobu 730762d1c6 Merge branch 'master' into fixdataimportcp4digits 2022-03-17 18:37:00 +01:00
Marc Ducobu 288f0dbf69 Fix pbm importing CP from France on 4 digits 2022-03-17 18:34:55 +01:00
Marc Ducobu 2c02150b1a Use CS Fixer 2022-03-17 18:29:16 +01:00
nobohan 5e0a693108 commentembeddable: add a condition for the early return in normalisation 2022-03-17 17:51:25 +01:00
julielenaerts 72ba2c6bca paginator added + phpcsfixes 2022-03-17 14:13:21 +01:00
julielenaerts 6adb647ccc changelog updated 2022-03-17 12:31:44 +01:00
julielenaerts 97731b0a9b controller + template made to list confirmed parcours for a specific user 2022-03-17 12:28:00 +01:00
Marc Ducobu 1e63d00767 Fix pbm importing CP from France on 4 digits 2022-03-16 16:27:17 +01:00
julielenaerts 6151d0ce54 fix name suggestion badges underneath input fields 2022-03-16 12:32:54 +01:00
julielenaerts 9551e10d2b improvement, but still not correct 2022-03-16 11:55:19 +01:00
julielenaerts 387b7c2fbd first commit 2022-03-16 11:36:46 +01:00
julielenaerts 39ba21f308 merge master into branch 2022-03-16 11:36:07 +01:00
Pol Dellaiera 22755de1dd fix: Remove PrependExtensionInterface.
It is now handled by `chill_main` bundle.
2022-03-15 13:45:07 +01:00
Pol Dellaiera 3d7fcd99a8 fix: Remove console.log. 2022-03-15 13:45:07 +01:00
Pol Dellaiera 35d723e5fb refactor: Use StoredObjectManager. 2022-03-15 13:45:07 +01:00
Pol Dellaiera 62af980ea5 feat: Add new StoredObjectManager service.
To read and write onto `StoredObject` document using a common interface.
2022-03-15 13:41:38 +01:00
Pol Dellaiera 8abed67e1c refactor: Return a string instead of a resource. 2022-03-15 09:40:32 +01:00
Pol Dellaiera b8992b8eeb misc: Update interface doc. 2022-03-15 09:40:32 +01:00
Pol Dellaiera 6ddbf35a7b misc: Add return types. 2022-03-15 09:40:32 +01:00
Pol Dellaiera 325ab0daf3 chore: Update composer.json files. 2022-03-15 09:40:32 +01:00
julienfastre 1a783e1881 Merge branch 'issue495_AccPeriodWorkEval_circular_reference' into 'master'
AccompanyingPeriodWorkEvaluation: fix circular reference when serialising

See merge request Chill-Projet/chill-bundles!383
2022-03-14 20:48:37 +00:00
julienfastre d04f5a527b remove link to action on homepage, in evaluation list 2022-03-14 21:46:21 +01:00
julienfastre f51279e83e fix saving maxDate when denormalizing object 2022-03-14 21:46:01 +01:00
julienfastre 90bebbad7d fix normalization for docgen 2022-03-14 21:27:21 +01:00
nobohan 82052f5d70 AccompanyingCourseWorkEdit: fix setting title of document with a fresh upload 2022-03-14 15:13:21 +01:00
nobohan 369397bf4f upd CHANGELOG 2022-03-14 14:42:53 +01:00
julienfastre c61577edda Merge remote-tracking branch 'origin/master' into issue495_AccPeriodWorkEval_circular_reference 2022-03-14 14:42:24 +01:00
nobohan 1beae4d713 AccompanyingCourseWorkEdit: download existing documents 2022-03-14 14:42:04 +01:00
julielenaerts 352302b7aa merge master into branch 2022-03-14 13:51:43 +01:00
julienfastre 01b60f334a Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal 2022-03-14 13:43:39 +01:00
julielenaerts 0546a43d63 changelog updated 2022-03-14 13:41:32 +01:00
julienfastre 5c68879509 fix doctrine annotation to make it comply with cs 2022-03-14 13:41:11 +01:00
julienfastre 9d844f6692 Merge branch 'issue505_create_household_composition' into 'master'
Issue505 create household composition

See merge request Chill-Projet/chill-bundles!378
2022-03-14 12:40:15 +00:00
julienfastre 28509f651d fix button and acl in household composition list 2022-03-14 13:39:33 +01:00
julienfastre b590444375 Merge remote-tracking branch 'origin/master' into issue505_create_household_composition 2022-03-14 13:35:43 +01:00
julienfastre 873258fc84 update button person ressource creation 2022-03-14 13:35:03 +01:00
julienfastre 7988becc45 Merge branch 'issue504_person_ressource_create' into 'master'
Separate create page person resource

See merge request Chill-Projet/chill-bundles!377
2022-03-14 12:33:42 +00:00
julienfastre 45c4a7ae64 Merge remote-tracking branch 'origin/master' into issue504_person_ressource_create 2022-03-14 13:30:32 +01:00
julienfastre 05803787a9 Merge branch 'issue493_order_parcours' into 'master'
Issue493 order parcours

See merge request Chill-Projet/chill-bundles!375
2022-03-14 12:28:33 +00:00
julienfastre 33acc645ea Merge remote-tracking branch 'origin/master' into issue493_order_parcours 2022-03-14 13:27:26 +01:00
julienfastre 0ce787701f Merge branch 'fix_blur_toggle' into 'master'
finding solution for toggle button position

See merge request Chill-Projet/chill-bundles!374
2022-03-14 12:26:25 +00:00
julienfastre e9cacbb74a add comment for future refactorisation 2022-03-14 13:26:07 +01:00
julienfastre a2f8f7ae43 add badge on third party in residential address list 2022-03-14 13:18:41 +01:00
julienfastre a49c53772e Merge remote-tracking branch 'origin/master' into fix_blur_toggle 2022-03-14 13:15:05 +01:00
julienfastre 1adccdb06e Merge branch 'issue489_address_onTheFly' into 'master'
Address history onTheFly for linked person

See merge request Chill-Projet/chill-bundles!373
2022-03-14 12:14:08 +00:00
julienfastre 22d593fc12 Merge remote-tracking branch 'origin/master' into issue489_address_onTheFly 2022-03-14 13:12:53 +01:00
julienfastre de7ec6fa54 Merge branch 'issue477_autosave_comment_parcours' into 'master'
Issue477 autosave comment parcours

See merge request Chill-Projet/chill-bundles!370
2022-03-14 12:12:07 +00:00
julienfastre 90948e5513 Merge remote-tracking branch 'origin/master' into issue477_autosave_comment_parcours 2022-03-14 13:11:53 +01:00
julienfastre bd79391efc fix autosave of comment 2022-03-14 13:04:29 +01:00
julielenaerts 4ea72f7d9d csfixes 2022-03-14 11:49:58 +01:00
julielenaerts 96e38a8a6d eventlistener added to capitalize names correctly 2022-03-14 11:49:01 +01:00
julielenaerts 09e6872724 firstname added to onthefly for child or contact 2022-03-14 11:48:39 +01:00
julielenaerts f44f9d356b migration adjusted to have actual empty string instead of '' 2022-03-14 11:16:58 +01:00
nobohan 9f0ab5aee7 upd CHANGELOG 2022-03-14 10:43:28 +01:00
nobohan 6eac6044cd AccompanyingCourseWorkEdit: replace document by a new one (working now) 2022-03-14 10:42:16 +01:00
julielenaerts a24cd693e3 firstname field added to twig form for child or contact types 2022-03-14 10:23:47 +01:00
julienfastre f63aab327d Merge branch 'issue480_bug_householdrenderbox' into 'master'
bugfix when position of member is null

See merge request Chill-Projet/chill-bundles!365
2022-03-14 08:58:52 +00:00
julienfastre 0c9499dd58 Merge remote-tracking branch 'origin/master' into issue480_bug_householdrenderbox 2022-03-14 09:53:23 +01:00
julielenaerts 00787adf2b firstname property added to thirdparty + canonicalize function adapted 2022-03-14 09:35:22 +01:00
nobohan dbe186547f AccompanyingCourseWorkEdit: replace document by a new one 2022-03-13 22:31:26 +01:00
nobohan 13f0b8610c quick fix: missing translation in Task 2022-03-11 16:37:26 +01:00
nobohan f9e8bf4f2d upd CHANGELOG 2022-03-11 10:22:09 +01:00
nobohan 44e93dd5f8 AccompanyingPeriodWorkEvaluation: fix circular reference when serialising 2022-03-11 10:20:42 +01:00
nobohan ee8f331de4 Revert "AccompanyingPeriodWorkEvaluation: fix circular reference when serialising"
This reverts commit 99f8aeb6cd.
2022-03-11 10:18:14 +01:00
nobohan 99f8aeb6cd AccompanyingPeriodWorkEvaluation: fix circular reference when serialising 2022-03-11 10:01:20 +01:00
nobohan fc1fe7c277 php cs fix 2022-03-10 18:14:57 +01:00
nobohan a8b6609dbf comment in accompanying course: add loader + fix when resetting to empty string 2022-03-10 18:12:42 +01:00
nobohan ded2ac7d48 accompanyiing period comment: fix removing of comment 2022-03-10 17:01:52 +01:00
nobohan 16a0dc4621 fix role for AccPeriod Comment API 2022-03-10 16:46:10 +01:00
nobohan ba668d3b9d upd CHANGELOG 2022-03-10 16:27:03 +01:00
nobohan 690a443bdb fix code style for AccompanyingPeriodWork - referrers 2022-03-10 16:25:05 +01:00
nobohan 137eb184d0 accompanying period work: display referrers in the list of work 2022-03-10 16:18:59 +01:00
julielenaerts 0a2730540e lost text removed plus condition to editing file uncommented 2022-03-10 14:45:43 +01:00
julielenaerts 9284a4bc29 ACL added and buttons to download and edit document 2022-03-10 14:30:19 +01:00
nobohan f2edc1ef0c set constrint ondelete for comment in AccompanyingPeriod 2022-03-10 14:23:00 +01:00
julielenaerts bf2d9acc5a correction of template, display title linked to workflow doc 2022-03-10 14:03:37 +01:00
julielenaerts 2628e58ea0 document title added + concerned users 2022-03-10 12:28:17 +01:00
nobohan da650fa1f2 AccompanyingPeriodWork: add doctrine event listener to add logged user to referrers collection 2022-03-10 10:53:40 +01:00
nobohan 55a65ee6e9 accompanyingPeriodWork: add referrer in vuejs form 2022-03-10 10:32:20 +01:00
nobohan 492c22d1b7 AccompanyingPeriodWork: add referrers field 2022-03-10 08:40:11 +01:00
julielenaerts e153fa34e9 merge master into branch 2022-03-09 20:48:30 +01:00
julielenaerts d272e1398c fix merge conflict in changelog 2022-03-09 20:45:42 +01:00
julielenaerts 9457926a35 fix merge conflict 2022-03-09 20:43:31 +01:00
julielenaerts 8ff80ac65e changelog updated 2022-03-09 20:42:48 +01:00
julielenaerts 3d1ded8b1c position of toggle button improved (differentation between twig and vue) + fix fa-eye-slash in vue component 2022-03-09 20:41:24 +01:00
julielenaerts c611f35cd6 finding solution for toggle button position 2022-03-09 20:41:24 +01:00
julielenaerts f79cfda74a update changelog 2022-03-09 20:31:02 +01:00
julielenaerts ff4b90835e show current civility and profession in edit form + fix saving of edited information 2022-03-09 20:29:38 +01:00
julielenaerts d5501bcfbd remove console logs to avoid mess in the console 2022-03-09 20:07:41 +01:00
julielenaerts fb1552f6b7 update changelog and csfixes 2022-03-09 14:07:41 +01:00
julielenaerts e28da7e99b create-edit composition placed in separate page to avoid confusion 2022-03-09 14:06:18 +01:00
julielenaerts 4b899d337a changelog updated 2022-03-09 13:36:26 +01:00
julielenaerts d6933fce35 add contact button color changed 2022-03-09 13:35:55 +01:00
julielenaerts aefd09693b position of toggle button improved (differentation between twig and vue) + fix fa-eye-slash in vue component 2022-03-09 12:10:33 +01:00
julielenaerts 8555277827 changelog updated 2022-03-09 11:06:10 +01:00
julielenaerts 6f58a9a8bb separate create page 2022-03-09 11:06:00 +01:00
julielenaerts b02739cc3c phonenumber placeholder removed 2022-03-09 09:35:47 +01:00
julielenaerts b8d9d59d76 condition added to display thirdparty centers or not 2022-03-09 09:19:29 +01:00
nobohan ba52e95253 display error messages above form when creating new Location 2022-03-08 17:21:49 +01:00
nobohan 2e69dbb7c9 upd CHANGELOG 2022-03-08 17:06:58 +01:00
julienfastre 13d579dc33 add 'for' in macro workflow breadcrumb 2022-03-08 17:06:30 +01:00
nobohan efcc602d53 Activity form: add required class name on required field built with vue 2022-03-08 16:09:22 +01:00
julielenaerts ee82bd2867 change personne to usager and & to ET 2022-03-08 16:03:59 +01:00
nobohan fcc5d3d349 Activity: small fixes on displaying social Issues and social Actions hidden fields 2022-03-08 15:41:03 +01:00
julienfastre af3b761208 evaluationWorkDocument: fill title with document is generated 2022-03-08 14:41:25 +01:00
julienfastre 23e61ac6a7 fixes stan errors 2022-03-08 11:43:47 +01:00
julienfastre e4ae495a3f add empty lines on addresses when address is empty 2022-03-08 11:43:47 +01:00
julienfastre ec99bc95fa add itemMeta variable for course list 2022-03-08 11:43:47 +01:00
nobohan b68b43118b update CHANGELOG 2022-03-08 11:38:40 +01:00
nobohan db95e935d9 order accompanying period by opening date in search person 2022-03-08 11:37:08 +01:00
nobohan dc5ff53a57 order accompanying course by openingDate for Household 2022-03-08 11:21:59 +01:00
nobohan 50a2de1559 order accompanying course by openingDate for Person 2022-03-08 11:20:06 +01:00
julielenaerts d18ab5cf49 fix display of email in person renderbox if null or empty string 2022-03-08 11:00:31 +01:00
julielenaerts 1860478aea finding solution for toggle button position 2022-03-08 09:48:17 +01:00
nobohan 17e83deb55 User admin: put pagination 2022-03-08 09:46:41 +01:00
julielenaerts 16be28681a Test added for activity-social action and social issue 2022-03-07 15:13:47 +01:00
julielenaerts 388b666b5d person badge changed to include onTheFly + changelog updated 2022-03-07 14:36:44 +01:00
nobohan 9b06ccc3e6 user admin: use flex-table and flex-bloc in twig 2022-03-07 11:13:11 +01:00
julienfastre efbd9b0185 do not allow to remove doc or evaluations if workflow is associated 2022-03-07 00:30:53 +01:00
julienfastre b2a61071bf create voter which blocks deletion if a workflow exists 2022-03-07 00:30:53 +01:00
julienfastre f0849eeef5 Merge branch 'issue484_link_household' into 'master'
add current household link to person banner

See merge request Chill-Projet/chill-bundles!369
2022-03-06 21:58:37 +00:00
julienfastre c7f2eedd4b Merge remote-tracking branch 'origin/master' into issue484_link_household 2022-03-06 22:57:12 +01:00
julienfastre ab74478afc Merge branch 'issue478_remove_localisation' into 'master'
fix parcours localisation

See merge request Chill-Projet/chill-bundles!368
2022-03-06 21:56:04 +00:00
julienfastre f88d0ee19e Merge remote-tracking branch 'origin/master' into issue478_remove_localisation 2022-03-06 22:54:48 +01:00
julienfastre 727480d6d1 Merge branch 'issue472_filter_job_user_in_set_referrer' into 'master'
assign User to undispatched acc period: filter users by job type

See merge request Chill-Projet/chill-bundles!367
2022-03-06 21:52:43 +00:00
julienfastre af79ffd544 Merge remote-tracking branch 'origin/master' into issue472_filter_job_user_in_set_referrer 2022-03-06 22:40:14 +01:00
julienfastre 80aee185a7 Merge branch 'url_in_accompanyingPeriodWork_evaluations' into 'master'
Url in accompanying period work evaluations

See merge request Chill-Projet/chill-bundles!364
2022-03-06 21:37:27 +00:00
julienfastre 7afada5dad fix cs 2022-03-06 22:36:38 +01:00
julienfastre 739c7e9a77 Merge remote-tracking branch 'origin/master' into url_in_accompanyingPeriodWork_evaluations 2022-03-06 22:33:16 +01:00
julienfastre 03471a74fe fix creating alt phonenumber 2022-03-06 22:28:33 +01:00
julienfastre 44ed2e44e0 another way to fix phonenumber and telephone in third party / OnTheFly 2022-03-06 22:16:48 +01:00
julielenaerts 68aa80269f rebase onto master 2022-03-04 17:29:36 +01:00
julielenaerts 2012df512c merge conflict fixed 2022-03-04 17:27:26 +01:00
julielenaerts 1c21b80703 csfixes 2022-03-04 17:25:37 +01:00
julielenaerts 25fe105590 fix logic in activity entity 2022-03-04 17:25:37 +01:00
julielenaerts b6e530fec6 update changelog 2022-03-04 17:25:37 +01:00
julielenaerts 4ef2274803 logic added to only keep youngest descendant. works for issue, seems not to for action 2022-03-04 17:25:22 +01:00
julielenaerts 3352999862 rebase onto master 2022-03-04 17:23:37 +01:00
julielenaerts 5605813826 Update changelog 2022-03-04 17:22:27 +01:00
julielenaerts 72795240b9 Add current household link in person banner 2022-03-04 17:22:06 +01:00
julielenaerts d0772fc306 Add email to twig personRenderBox 2022-03-04 17:08:41 +01:00
nobohan def90893de upd CHANGELOG 2022-03-04 15:12:11 +01:00
nobohan 4b692edd7d accompanying course comment: autosave the comment 2022-03-04 15:09:50 +01:00
nobohan 6472c554ed accompanying course comment: more tentative to delete the comment 2022-03-04 14:22:25 +01:00
nobohan f04118218d accompanying course comment: tentative to delete the comment 2022-03-04 13:56:03 +01:00
nobohan cde6e8f368 accompanying course: allow PATCH on a comment entity 2022-03-04 13:01:01 +01:00
julielenaerts 474fffcbb5 changelog updated 2022-03-04 12:08:00 +01:00
julielenaerts 0333e79b0a csfixes 2022-03-04 12:07:29 +01:00
julielenaerts 7c043e9d85 fix logic in activity entity 2022-03-04 12:06:53 +01:00
nobohan 6d46efa610 accompanying course: fix posting of pinned comment 2022-03-04 11:53:27 +01:00
nobohan 84f2e1c72a Accompanying Period: set cascade persist on pinnedComment 2022-03-04 10:34:47 +01:00
nobohan 1c1dec1f5b upd CHANGELOG 2022-03-04 08:46:32 +01:00
nobohan 3ff9291580 assign User to undsipatched acc period: filter users by job type 2022-03-04 08:46:32 +01:00
julielenaerts 9265a15427 Update changelog 2022-03-03 21:12:00 +01:00
julielenaerts 6d3b88aee9 Add current household link in person banner 2022-03-03 21:09:50 +01:00
julielenaerts 827c85ac56 fix parcours localisation 2022-03-03 20:37:12 +01:00
nobohan 7b52a10943 upd CHANGELOG 2022-03-03 17:21:54 +01:00
nobohan 187c9d82b6 assign User to undsipatched acc period: filter users by job type 2022-03-03 16:37:58 +01:00
julielenaerts 214ef09fe7 update changelog 2022-03-03 16:29:35 +01:00
julielenaerts 892be42580 update changelog 2022-03-03 16:28:31 +01:00
julielenaerts 18694a34cf logic added to only keep youngest descendant. works for issue, seems not to for action 2022-03-03 16:24:37 +01:00
julienfastre e9236875d2 quick fix for phonenumber alt on person 2022-03-03 15:44:30 +01:00
julienfastre db4b0b104b Merge branch 'issue464_document_on_person' into 'master'
Person Document generation

See merge request Chill-Projet/chill-bundles!360
2022-03-03 14:27:53 +00:00
julienfastre 4ad65b616d fix tests for person json normalizer and residential address stuff 2022-03-03 15:20:21 +01:00
nobohan c5eac09478 php cs fix on migration 2022-03-03 15:17:05 +01:00
nobohan a88e052eb6 upd CHANGELOG 2022-03-03 15:12:47 +01:00
nobohan 568a1d95f4 AccompanyingCourseWorkEdit: add url to vuejs form 2022-03-03 15:10:05 +01:00
julienfastre 9769aa1386 fix loading of residential address form type 2022-03-03 15:07:45 +01:00
julienfastre bf4a3a2c91 add id to docgen normalization fo a person 2022-03-03 15:01:14 +01:00
julienfastre 3df2335cf4 Merge remote-tracking branch 'origin/master' into issue464_document_on_person 2022-03-03 14:42:06 +01:00
julienfastre 1c7c217d1c Merge branch 'issue470_location_in_activity_validation' into 'master'
activity: do not override location if already exist (when validating new activity)

See merge request Chill-Projet/chill-bundles!363
2022-03-03 13:40:43 +00:00
julienfastre f0e41f839f fix error when context is a string in personJsonNormalizer 2022-03-03 14:39:20 +01:00
nobohan 349db2142d person: add url field to SocialWork Evaluation entity + populate with http title values 2022-03-03 14:39:00 +01:00
julielenaerts 34b3c6fa32 bugfix when position of member is null 2022-03-03 14:15:20 +01:00
julienfastre b1c0e18e51 Merge remote-tracking branch 'origin/master' into issue470_location_in_activity_validation 2022-03-03 13:59:44 +01:00
julienfastre 6edf0bcb3b fix delete links in documents 2022-03-03 13:57:00 +01:00
julienfastre 6171b3411f fix creation of document when overriding center resolver 2022-03-03 13:07:36 +01:00
julienfastre 86bf0115dd fix condition when empty phonenumber 2022-03-03 13:05:01 +01:00
julienfastre 19cad9a7a4 do not update names after person update 2022-03-03 12:43:04 +01:00
julienfastre a736c2a67e fix migrations 2022-03-03 12:32:38 +01:00
julienfastre 636f92b168 Revert "add migrations files"
This reverts commit 7f5a91fc49.
2022-03-03 12:10:25 +01:00
nobohan 1b66941746 upd CHANGELOG 2022-03-03 12:05:55 +01:00
nobohan dca17c409b activity: do not override location if already exist (when validating new activity) 2022-03-03 12:03:22 +01:00
julienfastre 7f5a91fc49 add migrations files 2022-03-03 11:42:43 +01:00
julienfastre 3ab71c8a2e update chill-app with migrations for budget 2022-03-03 11:12:30 +01:00
julienfastre fdf1911c15 fix default config 2022-03-03 11:07:02 +01:00
julienfastre ba24abf788 fix cs 2022-03-03 10:56:36 +01:00
julienfastre 076728bf5f enable chilld budget bundle in test app 2022-03-03 10:55:25 +01:00
julienfastre 0833bb49ca fixes for budgets 2022-03-03 10:37:10 +01:00
nobohan 23fd4be2e5 upd CHANGELOG 2022-03-03 10:17:29 +01:00
nobohan 4406016f82 code fix for PersonContext 2022-03-03 10:17:16 +01:00
julienfastre ac12e75714 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-02 22:01:28 +01:00
julienfastre d50d68aa86 Merge branch 'issue439_residential_address_otf' into 'master'
residential address in OnTheFly

See merge request Chill-Projet/chill-bundles!350
2022-03-02 20:58:19 +00:00
julienfastre fccac80222 Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf 2022-03-02 21:53:17 +01:00
julienfastre bf70d344bf remove missing error on phpstan 2022-03-02 21:45:14 +01:00
julienfastre d0591d0351 Merge branch '20-update-telephone-type-new-approach' into 'master'
fix: Use `odolbeau/phone-number-bundle` for formatting phone number type fields.

See merge request Chill-Projet/chill-bundles!322
2022-03-02 20:39:52 +00:00
julienfastre c83d6d392f [docgen/template] do not list template wich are inactive
See https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/473
2022-03-02 21:35:16 +01:00
julienfastre 09ca1ec6bb fix phstan error 2022-03-02 21:23:05 +01:00
julienfastre 970431197f display phonenumber in tel link 2022-03-02 21:19:44 +01:00
julienfastre 9fdd9da486 display phonenumber and mobilenumber in search results 2022-03-02 21:10:37 +01:00
julienfastre b9eee51de6 fix cs 2022-03-02 21:02:58 +01:00
julienfastre c0ec64e4be add leadiing country code while seraching numbers 2022-03-02 21:02:32 +01:00
julielenaerts 74a84e42a6 update changelog and csfixes 2022-03-02 19:24:33 +01:00
julielenaerts 595ddf5b6f fix display of thirdparty contact badges in twig template 2022-03-02 19:20:26 +01:00
julielenaerts abe183fd10 fix position of toggle button
so it doesn't cover content or falls outside box
2022-03-02 19:11:34 +01:00
julielenaerts 9a0883eb5f Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-02 18:08:16 +01:00
julielenaerts 663295d436 fix edit name of thirdparty 2022-03-02 18:07:55 +01:00
Mathieu Jaumotte 9f9986d367 Merge branch 'issue475_bug_graphique' 2022-03-02 17:38:20 +01:00
Mathieu Jaumotte db37527f72 try to resolve bug with flot-button.bottom placement (2) 2022-03-02 17:36:24 +01:00
julienfastre 6171a221b2 fix cs 2022-03-02 16:59:20 +01:00
julienfastre 1312fd0941 allow psalm to fail 2022-03-02 16:41:53 +01:00
julienfastre c1832d39f1 remove fixed phpstan issue 2022-03-02 16:40:50 +01:00
julienfastre 3756631595 fix some psalm issues 2022-03-02 16:39:36 +01:00
julielenaerts 969f0b8aeb Display of budget result 2022-03-02 16:38:55 +01:00
julielenaerts 8b37f008e6 csfixes 2022-03-02 16:38:31 +01:00
julienfastre a7a933c7a7 fix test for phonenumber update: desactivate temporarily 2022-03-02 16:32:28 +01:00
julienfastre 15bc3e62d3 fix cs 2022-03-02 16:29:21 +01:00
julienfastre 5ce62f5458 phonenumber helper: remove unused method and fix tests 2022-03-02 16:27:55 +01:00
julielenaerts 283b378291 fix template bug 2022-03-02 16:19:17 +01:00
julienfastre 3e30684198 normalization on 3party phone 2022-03-02 16:19:02 +01:00
julienfastre c2e284682f phonenumber on 3party: twig stuffs 2022-03-02 16:13:17 +01:00
julienfastre 5407dbfc98 form for third party telephone 2022-03-02 16:05:08 +01:00
julienfastre fa23bfd7d5 fix upgrade formula for phonenumber 2022-03-02 16:02:23 +01:00
julienfastre 09de7cbf7d allow null values on phonenumber in location and person 2022-03-02 15:53:39 +01:00
julienfastre 6a3c8017f0 upgrade phonenumber on 3party: migrations 2022-03-02 15:50:01 +01:00
julielenaerts 9bb149fb02 added missing translations + further adjustment templates 2022-03-02 15:44:49 +01:00
julienfastre eb6ec8a4af apply phonenumber on locations 2022-03-02 15:08:16 +01:00
julienfastre c8c2c4c859 phonenumber type for form 2022-03-02 15:01:04 +01:00
julienfastre 7bd93e53c2 fix formatting upgrade clause 2022-03-02 14:23:50 +01:00
julienfastre 5d6f3de694 normalize phonenumber in person docgen normalizer 2022-03-02 14:22:12 +01:00
julienfastre 3eb826d422 default value for Phonenumbers 2022-03-02 14:21:53 +01:00
julienfastre e9ffdb1f03 fix cs 2022-03-02 14:11:47 +01:00
julienfastre f4f488dad1 normalization of phonenumber 2022-03-02 14:10:48 +01:00
julienfastre 2a9f1dc238 restore templating class 2022-03-02 13:51:19 +01:00
julienfastre 8482c8ffa7 update app 2022-03-02 13:50:35 +01:00
julienfastre 54ad7a4b8f restore showing phonenumber 2022-03-02 13:48:48 +01:00
julienfastre ed4cf67e79 set carrier code parameter and lint existing phonenmubers 2022-03-02 13:01:01 +01:00
Mathieu Jaumotte 550168fd7c Merge branch 'issue475_bug_graphique' 2022-03-02 13:00:51 +01:00
Mathieu Jaumotte 8470430c57 try to resolve bug with flot-button.bottom placement 2022-03-02 13:00:23 +01:00
julielenaerts 5dc117037d change label styling for view of resource/charge (suggestion) 2022-03-02 12:02:49 +01:00
julielenaerts 7f1083aa40 Use select2 field 2022-03-02 12:02:16 +01:00
julielenaerts 900adc7105 improvements templates 2022-03-02 11:44:10 +01:00
julielenaerts 0648154ba1 remove comments 2022-03-02 11:43:55 +01:00
julielenaerts 86de8137e4 restyling layout of table 2022-03-02 11:42:54 +01:00
Mathieu Jaumotte a9415488dd Merge branch 'list_documents_page' 2022-03-02 09:55:16 +01:00
Mathieu Jaumotte 8945703785 fix template mistakes 2022-03-02 09:53:51 +01:00
julienfastre 9f90cc8fe1 Merge remote-tracking branch 'origin/master' into 20-update-telephone-type-new-approach 2022-03-01 16:55:33 +01:00
nobohan d6d7edf25d Add doc generation for PersonDocument form 2022-03-01 16:14:21 +01:00
Mathieu Jaumotte 7b17dc692e Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-01 16:14:00 +01:00
Mathieu Jaumotte e5f7120733 Merge branch 'list_documents_page' 2022-03-01 16:13:20 +01:00
Mathieu Jaumotte 1a05ffab96 fix flex item-col placement for documents list 2022-03-01 16:13:11 +01:00
Mathieu Jaumotte aad7a21bc3 Merge branch 'list_documents_page' 2022-03-01 16:09:10 +01:00
Mathieu Jaumotte ae0bf7bfd7 fix flex item-col placement for documents list 2022-03-01 16:08:52 +01:00
julienfastre d2ecc5d3a3 Merge branch 'issue442_toggle_emergency' into 'master'
Toggle emergency only by referrer

See merge request Chill-Projet/chill-bundles!331
2022-03-01 15:02:01 +00:00
julienfastre 22aefca5c9 Merge remote-tracking branch 'origin/issue442_toggle_emergency' into issue442_toggle_emergency 2022-03-01 15:58:20 +01:00
julienfastre cce790f2f8 add validator which force confidential course to keep a referrer 2022-03-01 15:55:18 +01:00
nobohan 84478c651e Person: remove useless serialisation groups 2022-03-01 15:54:36 +01:00
nobohan 88e9a96e0e Person document generation: clean build Admin form + add household and relations groups 2022-03-01 15:51:34 +01:00
julielenaerts cefa304fb5 mixup colors fixed. color of resource to be discusses still 2022-03-01 15:49:37 +01:00
nobohan a187bac7b0 DocGeneratorTemplateController: fix in case there is no public form 2022-03-01 15:48:32 +01:00
julielenaerts 83760cc980 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-01 15:42:59 +01:00
julielenaerts 2b108d0d70 update changelog 2022-03-01 15:32:47 +01:00
julielenaerts f5accb827c fix inline address -> reopen issue462 2022-03-01 15:27:18 +01:00
nobohan 4543c411e7 quick fix: remove duplicate email info in PersonRenderBox.vue 2022-03-01 15:24:44 +01:00
nobohan 7aefa5014c Add docgen:read group on Person + 2 fields in PersonContext admin form 2022-03-01 15:17:17 +01:00
nobohan d163783ed3 Person Document: add a PersonContext class 2022-03-01 15:17:17 +01:00
Mathieu Jaumotte 4536f30da2 Merge branch 'list_documents_page' 2022-03-01 15:11:01 +01:00
Mathieu Jaumotte 8764aacd92 fix confusion between document dates 2022-03-01 15:03:21 +01:00
julienfastre 8b8f6027cc Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-03-01 14:52:56 +01:00
julielenaerts 6769752c26 merge with master 2022-03-01 14:40:14 +01:00
nobohan 5695bb0e9e add missing key in v-for loop 2022-03-01 14:36:47 +01:00
nobohan 48a32f2403 residential address: filter by person in the repository 2022-03-01 14:36:22 +01:00
julielenaerts 695b9d5bea merge with master 2022-03-01 14:32:03 +01:00
julielenaerts f38cfb4b28 adjustments templates 2022-03-01 14:30:12 +01:00
nobohan a7240e8cc6 PersonJsonNormalizer: fix circular reference with residential address 2022-03-01 14:15:39 +01:00
julielenaerts 67948f7f3a styles in scss with webpack 2022-03-01 14:00:14 +01:00
Mathieu Jaumotte 52d8776fbb Merge branch 'list_documents_page' 2022-03-01 11:34:07 +01:00
Mathieu Jaumotte 0d38cae217 fix macro metadata + fix merge conflicts from branch ux_corrections 2022-03-01 11:33:33 +01:00
julielenaerts d6bad9e030 reorganization of templates 2022-03-01 11:07:53 +01:00
Pol Dellaiera b146f17d2f Update twig function isEditable. 2022-03-01 09:58:57 +01:00
julienfastre df675cd757 Merge branch 'issue463' into 'master'
issue 463: add delete button on draft periods page

See merge request Chill-Projet/chill-bundles!361
2022-03-01 08:50:23 +00:00
julienfastre ecc2e390f7 Merge remote-tracking branch 'origin/master' into issue463 2022-03-01 09:48:19 +01:00
julienfastre c3e0b3b708 Merge branch 'issue458_ChillCollectionType' into 'master'
ChillCollectionType: fix bug when adding 2 new items in an empty collection

See merge request Chill-Projet/chill-bundles!359
2022-03-01 08:47:01 +00:00
julienfastre 449a6a1b4e Merge remote-tracking branch 'origin/master' into issue458_ChillCollectionType 2022-03-01 09:28:44 +01:00
julienfastre eb874a15a6 Merge branch 'issue366_modal_thirdparty' into 'master'
Thirdparty renderbox improvements

See merge request Chill-Projet/chill-bundles!356
2022-03-01 08:24:54 +00:00
julielenaerts 3b26466a6c remove duplicate key in thirdparty serializer 2022-02-28 20:07:13 +01:00
julielenaerts a6ac6ee6d8 fix merge conflicts 2022-02-28 19:47:22 +01:00
julielenaerts a59994355b fix merge conflict 2022-02-28 17:14:37 +01:00
julienfastre 06c279627a Merge remote-tracking branch 'origin/master' into workflow/fixes-2022-02 2022-02-28 16:29:57 +01:00
julienfastre 1e146f542e try to fix some things 2022-02-28 16:09:52 +01:00
julienfastre cdd21c94c6 Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf 2022-02-28 15:11:50 +01:00
Pol Dellaiera 30cdcb0836 serializer update 2022-02-28 15:01:26 +01:00
Pol Dellaiera 29308110ea Templating 2022-02-28 15:01:26 +01:00
Pol Dellaiera 18c57d532c Update Person entity fixup 2022-02-28 15:01:26 +01:00
Pol Dellaiera b814e812b6 Update migrations. 2022-02-28 15:01:26 +01:00
Pol Dellaiera dbbbd99788 Use PhoneNumber form type. 2022-02-28 15:01:26 +01:00
Pol Dellaiera 47676c67ff Add doctrine phone_number type. 2022-02-28 15:01:26 +01:00
Pol Dellaiera 7ad78fbce1 remove regex 2022-02-28 15:01:26 +01:00
Pol Dellaiera 37e38436a8 Try to add placeholder 2022-02-28 15:01:24 +01:00
Pol Dellaiera e1b3719746 Tests 2022-02-28 15:00:56 +01:00
Pol Dellaiera 68a64aa67f fixup PhoneNumberHelper 2022-02-28 15:00:55 +01:00
Pol Dellaiera d780d95157 work in progress 2022-02-28 15:00:55 +01:00
Pol Dellaiera 4822acb6fb fix: Use odolbeau/phone-number-bundle for formatting phone number type fields.
There is no need to use the bundle, we could have used the library instead. However, this idea is to switch to that bundle at some point.
2022-02-28 15:00:55 +01:00
Mathieu Jaumotte 260ce8ba17 issue 463: add delete button on draft periods page 2022-02-28 14:47:35 +01:00
julienfastre 822f0aa737 fix cs 2022-02-28 14:38:25 +01:00
julienfastre e10a6b4bf2 Merge branch 'issue441_enfant_confie' 2022-02-28 14:37:38 +01:00
julienfastre 8e1f3a5cc0 Merge branch 'issue345_internal_thirdparty_contact' into 'master'
Add contact to thirdparty from within modal

See merge request Chill-Projet/chill-bundles!284
2022-02-28 13:28:13 +00:00
julienfastre 31ec6c70ef fix cs 2022-02-28 14:27:31 +01:00
Mathieu Jaumotte cd84700400 Merge branch 'ux_corrections' 2022-02-28 14:23:54 +01:00
julienfastre 08fa1edbee Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact 2022-02-28 14:22:52 +01:00
Mathieu Jaumotte 15d9593d0f design correction on list documents page 2022-02-28 14:22:15 +01:00
julienfastre 010afded18 order civilities 2022-02-28 13:56:52 +01:00
julienfastre c12f633829 fixes 2022-02-28 13:52:41 +01:00
julielenaerts fb6f0c316e update changelog 2022-02-28 12:22:17 +01:00
julielenaerts b1ed263c4e add email in personrenderbox 2022-02-28 12:18:58 +01:00
julielenaerts 846e487e27 fix display of address in renderbox 2022-02-28 12:13:58 +01:00
julielenaerts 72a9183ca8 fix in case of no profession 2022-02-28 12:04:05 +01:00
julienfastre fe89704672 Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact 2022-02-28 11:39:16 +01:00
julienfastre 93d023007e Merge branch 'issue388_order_social_issues' into 'master'
person: rewrite social issue api controller for ordering

See merge request Chill-Projet/chill-bundles!323
2022-02-28 10:38:24 +00:00
julienfastre 8bf179934d update psalm to ignore new error (sorry) 2022-02-28 11:37:03 +01:00
julielenaerts 24c79cc4b1 fix merge conflicts 2022-02-28 10:20:29 +01:00
julienfastre f93282d657 fix cs 2022-02-28 10:13:00 +01:00
julielenaerts 18c0e6a6bf template adjustments for household members 2022-02-28 10:12:40 +01:00
julienfastre 3a602385cc Merge remote-tracking branch 'origin/master' into issue388_order_social_issues 2022-02-28 09:51:40 +01:00
julielenaerts 26373e5d23 template adjustments for household members 2022-02-28 09:47:47 +01:00
julienfastre cb4c3b46b9 fix creating two workflow on accompanying period work 2022-02-27 03:03:29 +01:00
julienfastre abb81bf45f remove console log 2022-02-27 02:44:01 +01:00
julienfastre a9694da557 add workflow on evaluationdocument in UI 2022-02-27 02:38:08 +01:00
nobohan d205939361 ChillCollectionType: fix bug when adding 2 new items in an empty collection 2022-02-25 17:52:20 +01:00
julielenaerts deadeb341e more template adjustments 2022-02-25 17:45:50 +01:00
julielenaerts 274c6115cc index templates fixed for display of past and future budgets 2022-02-25 17:01:24 +01:00
julielenaerts 416665f209 translations added 2022-02-25 17:01:04 +01:00
julielenaerts f60f927549 Fix budget voter for use with household 2022-02-25 16:40:27 +01:00
julielenaerts 2e59c1415b csfixes plus changelog updated 2022-02-25 16:24:25 +01:00
julielenaerts d852477c51 Add budget of household members to overview page of household budget 2022-02-25 16:20:52 +01:00
julielenaerts f8d5f13a88 add methods to get budgetResources and budgetCharges in person entity 2022-02-25 16:20:07 +01:00
julienfastre af0d7765ff fixes for adding evaluation document 2022-02-25 16:13:31 +01:00
julienfastre c1f5730c4d Merge remote-tracking branch 'origin/issue466_file_upload' into workflow/fixes-2022-02 2022-02-25 15:40:38 +01:00
julienfastre da019a146a finalize handling workflow for evaluation document 2022-02-25 15:40:23 +01:00
nobohan 4bd50d0148 fix code style for AccompanyingPeriodWorkEvaluation 2022-02-25 15:31:24 +01:00
nobohan 1826b20b40 upd CHANGELOG 2022-02-25 15:26:08 +01:00
julienfastre 356d1a7133 fix usage of workflow handler title in show workflow page 2022-02-25 15:18:01 +01:00
nobohan 2cc7473276 more tentative to correct AccPeriodWorkEvaluationDenormalizer 2022-02-25 15:06:16 +01:00
nobohan 2ea5c4b0c7 fix error when using AccPeriodWorkEvaluationDenormalizer 2022-02-25 14:58:11 +01:00
julienfastre 432cce280b simplify showing title of workflow, and add handler for evaluationDocument 2022-02-25 14:02:36 +01:00
julielenaerts 530297bc67 csfixes 2022-02-25 13:59:05 +01:00
julielenaerts c416f1ef6d fix bug to resolve onthefly component within thirdparty renderbox 2022-02-25 13:58:17 +01:00
julielenaerts 3a5e956e49 updated changelog 2022-02-25 13:20:46 +01:00
julielenaerts 5cf4013a99 cs fixes 2022-02-25 13:12:25 +01:00
julielenaerts 16cca07e12 throw 403 error instead of 422 and display toast message 2022-02-25 13:11:30 +01:00
nobohan aae360d6ab AccCourseWorkEdit: remove documents in vuejs form 2022-02-25 12:45:18 +01:00
julienfastre bf25740098 list for workflows: previous and old workflows 2022-02-25 12:43:04 +01:00
julienfastre 18836f312a fix cs 2022-02-25 12:11:05 +01:00
julienfastre 2b257cc402 improve title rendering on workflows 2022-02-25 12:09:53 +01:00
nobohan 289d79e011 AccCourseWorkEdit: fix setting title on documents 2022-02-25 11:52:04 +01:00
julienfastre b7d6d69101 list workflow on index pages 2022-02-25 11:51:28 +01:00
nobohan 15487cd84c Add AccompanyingPeriodWorkEvaluationDenormalizer 2022-02-25 11:10:14 +01:00
julielenaerts fc5a893b00 template fixes and controller fixes for household budget 2022-02-25 10:30:37 +01:00
julielenaerts 92a6fed521 phpstan fixes 2022-02-25 09:48:33 +01:00
julielenaerts 051ed19f97 cs-fixes 2022-02-25 09:29:28 +01:00
julienfastre 1479e2ae9a entity workflow: handle sending an access key by email 2022-02-24 21:53:05 +01:00
nobohan 1ab4f997ba AccompanyingPeriodWork: add title in vue AccPeriodWorkEvaluationDocument form 2022-02-24 17:38:29 +01:00
nobohan 24b11f609d AccompanyingPeriodWork: add title on AccPeriodWorkEvaluationDocument 2022-02-24 16:11:29 +01:00
julielenaerts c4e0b68ebe change block personcontent to content more consistent with other templates and less need for if-statements 2022-02-24 15:59:13 +01:00
julielenaerts f8ec0f85e5 property household added to entity 2022-02-24 15:49:47 +01:00
julielenaerts ed33514aee Voter adapted for use within vendee 2022-02-24 15:49:28 +01:00
julielenaerts 0d96c1f12d Repositories adapted for use with person or household 2022-02-24 15:49:04 +01:00
julielenaerts 0fcf21bd35 Controllers adjusted for use with person or household 2022-02-24 15:48:39 +01:00
julielenaerts 9065ec40b1 Menu entry added household menu 2022-02-24 15:47:58 +01:00
julielenaerts 8f6ab15621 migrations 2022-02-24 15:46:22 +01:00
julielenaerts fd69ae3d4a Translation folder renamed to translation in accordance to other bundles 2022-02-24 15:46:08 +01:00
julielenaerts 81b42ef99a templates adjusted to allow use for person and household 2022-02-24 15:45:35 +01:00
julielenaerts c546d23421 scss file added plus config webpack
still missing something, because doesn't work yet
2022-02-24 15:44:37 +01:00
nobohan 0661eb8701 accompanyingCourseWork: add documents to vue form 2022-02-24 15:24:58 +01:00
nobohan c073ec14c8 doc store bundle: add groups and correct denormalisation 2022-02-24 15:22:28 +01:00
nobohan bf26092764 chilldocstore: add normalizer for StoredObject- correct typo 2022-02-24 14:56:16 +01:00
nobohan e035a6fd94 chilldocstore: add normalizer for StoredObject 2022-02-24 14:54:56 +01:00
julienfastre ff1ff8f5bb workflow: allow a user to get access to validation step by an access key 2022-02-24 12:17:13 +01:00
nobohan 3f43574371 docstore: use API entrypoint for storing storedObject in AddAsyncUpload.vue 2022-02-24 12:11:34 +01:00
nobohan b1390f4e9b docstore: add swagger documentation 2022-02-24 11:20:11 +01:00
nobohan fd29a4ce65 docstore: add api entrypoint POST for stored object 2022-02-24 11:18:11 +01:00
nobohan 4655892815 AddAsyncupload: translations and options 2022-02-24 10:04:06 +01:00
julienfastre e46220ff72 [Household - list members during membership] avoid to show two membersship with the same person 2022-02-24 09:45:46 +01:00
nobohan f19a090549 AddAsyncUpload.vue: add asyncupload form 2022-02-24 09:05:16 +01:00
julienfastre 08f9819453 add accessKey to entity workflow step 2022-02-23 18:33:29 +01:00
julielenaerts 7067d4b5bd Attempt to make voter work 2022-02-23 18:07:54 +01:00
julielenaerts de0be15fff Added budget link to household menu + created controller file
no content for controller yet
2022-02-23 18:07:38 +01:00
julienfastre b56d8c2956 fix delete workflow 2022-02-23 17:53:18 +01:00
nobohan 5f71b46bb7 tentative to add asyncupload into modal 2022-02-23 17:21:35 +01:00
julielenaerts fd16222c51 translations folder moved 2022-02-23 17:20:19 +01:00
julielenaerts 185d1dbf49 Styling view page 2022-02-23 17:16:26 +01:00
julielenaerts 576f46f845 styling of index page
style needs to be moved to correct file and changed scss
2022-02-23 15:58:06 +01:00
nobohan 154f976762 DocStore bundle: create a vue component for uploading document 2022-02-23 15:46:21 +01:00
julielenaerts d5477e94b1 fix merge conflicts 2022-02-23 14:55:43 +01:00
julielenaerts 67ae506bb5 Testing to see what still works, minor changes 2022-02-23 14:53:37 +01:00
julielenaerts 5a514cf2db Moving migration folder and adding migration 2022-02-23 14:53:01 +01:00
julielenaerts 1fdc994c0a adding budget to person menu 2022-02-23 14:52:37 +01:00
julielenaerts 35aa05fb97 change namespaces, removing AMLI 2022-02-23 14:52:04 +01:00
julielenaerts 70c7b1385e change namespaces, removing AMLI 2022-02-23 11:24:24 +01:00
julielenaerts d486f2ddfc fix styling of confidential toggle button in renderboxes 2022-02-23 10:46:25 +01:00
julielenaerts fc5ca30df0 Merge branch 'issue366_modal_thirdparty' of gitlab.com:Chill-Projet/chill-bundles into issue366_modal_thirdparty 2022-02-23 10:24:42 +01:00
julielenaerts 0601fa0142 changelog updated 2022-02-23 10:24:24 +01:00
julielenaerts fffed6e3f6 Attempt to add on-the-fly for parent badge
Error: failed to resolve component on-the-fly
2022-02-23 10:24:01 +01:00
julienfastre ffe4dd4a98 add delete feature for entityWorkflow (wip) 2022-02-23 10:08:11 +01:00
julielenaerts cc4dfdb042 style adjustment 2022-02-22 15:24:14 +01:00
julielenaerts fd0ca3b29d style adjustment + if contact display qualité 2022-02-22 15:18:38 +01:00
julielenaerts daab42109b style adjustment 2022-02-22 15:07:40 +01:00
julielenaerts ab5bb3963b Add qualité in personsuggestion 2022-02-22 15:06:31 +01:00
julielenaerts 262bb13b6c Adding fonction in personrenderbox 2022-02-22 15:05:43 +01:00
julielenaerts 5d530aaae9 Fix confidential toggle bug 2022-02-22 15:04:53 +01:00
nobohan f0e6bfc6c6 update CHANGELOG 2022-02-22 12:57:16 +01:00
nobohan d4283a0b94 social issue api controller: correct orderBy query 2022-02-22 12:53:47 +01:00
nobohan 568c4b60ef merge master into issue388 2022-02-22 12:47:56 +01:00
nobohan 736ca2272b fix unused imports 2022-02-22 12:44:40 +01:00
nobohan 88059884ec fix unused imports 2022-02-22 12:40:46 +01:00
nobohan ce1d213082 [person] order social issues: remove custom controller and order only by 'ordering' 2022-02-22 12:36:04 +01:00
nobohan 71f3a3403c php code fix for Enfant Confie 2022-02-22 12:12:53 +01:00
nobohan fbeda163f0 update CHANGELOG 2022-02-22 12:07:56 +01:00
nobohan 08c1bb7992 remove useless registerForAuyoconfiguration 2022-02-22 11:11:41 +01:00
nobohan 2f7b237c4c PersonJsonNormalizer interface: remove functions 2022-02-22 11:08:38 +01:00
nobohan 665027085d move DenormalizerAwareInterface and NormalizerAwareInterface from the interface to the class 2022-02-22 11:05:18 +01:00
nobohan 2618003177 personRenderBox: correct addition of suffixText 2022-02-22 10:48:14 +01:00
julienfastre 8f597eb254 update changelog 2022-02-21 17:40:09 +01:00
julienfastre 775d223be2 fix cs 2022-02-21 17:30:33 +01:00
julienfastre 3849776511 Merge remote-tracking branch 'origin/master' into kill_small_issues 2022-02-21 17:29:37 +01:00
julienfastre cb3301bcef Merge remote-tracking branch 'origin/master' into thirdparty/redirect-to-parent-when-child-is-viewed 2022-02-21 17:27:20 +01:00
julienfastre 8d74566eac update changelog 2022-02-21 17:20:15 +01:00
julienfastre 4a03c2aa43 Merge remote-tracking branch 'origin/master' into issue447_pickCivilityType 2022-02-21 17:19:21 +01:00
julielenaerts 292d56cfbe email added to person renderbox 2022-02-21 16:38:55 +01:00
julielenaerts b41e016a6d Merge branch 'issue366_modal_thirdparty' of gitlab.com:Chill-Projet/chill-bundles into issue366_modal_thirdparty 2022-02-21 16:38:35 +01:00
julienfastre 0a2e2301a9 document ThirdParty type and categories [ci-skip] 2022-02-21 15:25:46 +01:00
julielenaerts 874c90e0e0 start to display profession/fonction of thirdparty 2022-02-21 14:30:30 +01:00
julienfastre bb8898a4ec Merge branch 'course_add_event_on_person_move' into 'master'
Course add event on person move

See merge request Chill-Projet/chill-bundles!333
2022-02-21 12:29:43 +00:00
julienfastre 213da59b0b fix test failing due to microseconds difference 2022-02-21 13:22:35 +01:00
julienfastre 4e9879ba92 update changelog 2022-02-21 12:49:19 +01:00
julienfastre 0690704391 Merge remote-tracking branch 'origin/master' into course_add_event_on_person_move 2022-02-21 12:46:10 +01:00
julienfastre 610b861345 fix test on PersonAddressMoveEvent::personChangeAddress 2022-02-21 12:44:43 +01:00
julienfastre b7f8ba4385 fix cs 2022-02-21 00:52:40 +01:00
julienfastre a923a1f135 update changelog [ci-skip] 2022-02-21 00:41:50 +01:00
julienfastre 0d804dd817 3party: redirect to parent when child is opened in view mode 2022-02-21 00:39:02 +01:00
julienfastre 4f4b1bfbaa PersonAddressMove: fix tests, address history on household, and household::getMembersOnRange 2022-02-21 00:12:57 +01:00
julienfastre caa63ea97a PersonAddressMoveEvent on household move (wip) 2022-02-19 14:04:51 +01:00
julienfastre 8675bb65c1 PersonMoveEventSubscriber: handle case when the move is before the last
locationHistory, but the move affects "now"
2022-02-19 10:27:44 +01:00
julienfastre 104af6d9b5 allow null value in end date in location history 2022-02-19 09:43:20 +01:00
julienfastre 2f2d4493ae Merge remote-tracking branch 'origin/master' into course_add_event_on_person_move 2022-02-19 09:31:00 +01:00
julielenaerts 2d23068354 start to display profession/fonction of thirdparty 2022-02-18 17:07:53 +01:00
julielenaerts b65dacca72 bugfix onthefly thirdparty edit form
phonenumber was interchanged with telephone. Editing phonenumber was therefore not possible
2022-02-18 16:25:13 +01:00
julielenaerts 265c8b776b bugfix in resourceItem
when address is null it gave an error and modal wouldn't close
2022-02-18 16:25:13 +01:00
julielenaerts 4920c8b28b Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-18 15:59:54 +01:00
julielenaerts 4f9acf3174 use correct translatorInterface instead of deprecated one 2022-02-18 15:59:36 +01:00
julielenaerts 962957409b use correct translatorInterface instead of deprecated one 2022-02-18 15:51:52 +01:00
julielenaerts 0b4d79fd5e display only last three actions in parcours resume 2022-02-18 15:51:00 +01:00
julielenaerts 0efd3d2af3 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-18 14:46:55 +01:00
nobohan 02e5a1158d Create 3rd paerty contact: close modal after creation and check for errors 2022-02-18 14:44:19 +01:00
julielenaerts cfe32828a4 csfixes 2022-02-18 14:38:09 +01:00
nobohan ca6bfea51f Create 3rd party contact: fix adding civility and profession to payload 2022-02-18 14:17:39 +01:00
nobohan 8c7da5f80c Merge branch 'master' into issue345_internal_thirdparty_contact 2022-02-18 11:22:51 +01:00
nobohan 57175e1c0b upd CHANGELOG 2022-02-18 09:18:09 +01:00
nobohan c5d2953ecb php code fix for Residential Address 2022-02-18 09:15:13 +01:00
julienfastre ee8044b857 Merge branch 'workflow/fix-sending-notifications' into 'master'
workflow: fix sending notifications

See merge request Chill-Projet/chill-bundles!347
2022-02-17 22:40:53 +00:00
julienfastre 1fda56b5f7 Merge remote-tracking branch 'origin/master' into workflow/fix-sending-notifications 2022-02-17 23:34:20 +01:00
julienfastre ca79da2f9b Merge branch 'issue434_endDate_enfantHorsMenage' into 'master'
Add end date field for enfant hors menage

See merge request Chill-Projet/chill-bundles!341
2022-02-17 22:33:47 +00:00
julienfastre c90e6231f9 Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage 2022-02-17 23:31:14 +01:00
julienfastre e86fa41180 Merge branch 'issue448_search_3rd_party' into 'master'
thirdparty search: add where clause for searching into children

See merge request Chill-Projet/chill-bundles!344
2022-02-17 22:28:25 +00:00
julienfastre ebea4b7008 Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage 2022-02-17 23:25:07 +01:00
julienfastre 9565464489 Merge branch 'homepage/add-workflow' into 'master'
add workflow on widget homepage

See merge request Chill-Projet/chill-bundles!343
2022-02-17 22:19:25 +00:00
julienfastre 05f83bf566 Merge remote-tracking branch 'origin/master' into issue448_search_3rd_party 2022-02-17 23:16:41 +01:00
julienfastre 673d0c1e53 Merge branch 'issue422_and_others_on_AddPersons' into 'master'
addPersons improvements

See merge request Chill-Projet/chill-bundles!340
2022-02-17 22:15:43 +00:00
julienfastre fe35a29fb8 homepage vue / my workflow: replace "document" by object type 2022-02-17 23:12:14 +01:00
julienfastre 53d51fea2f Merge remote-tracking branch 'origin/master' into issue422_and_others_on_AddPersons 2022-02-17 22:51:52 +01:00
julienfastre caaebd593b misc fixes for Thirdparty / addPerson
* set default values for ThirdParty in ThirdParty.vue
* set correct value for binding with phone (telephone instead of
phonenumber)
* add validation on ThirdParty/denomination: at least two characters, no
Null value
2022-02-17 22:42:52 +01:00
julienfastre 672fa48140 Merge branch 'issue415_filter_suggested_entities_by_close_participations' into 'master'
accompanying course: filter suggested entities by open participations

See merge request Chill-Projet/chill-bundles!339
2022-02-17 20:46:03 +00:00
julienfastre a9aeea234c Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations 2022-02-17 21:45:43 +01:00
julienfastre 1683685f6b Merge branch 'issue465_display_person_resources' into 'master'
Display more info for person ressources

See merge request Chill-Projet/chill-bundles!338
2022-02-17 20:38:32 +00:00
julienfastre e4aac56f2d Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations 2022-02-17 21:35:18 +01:00
julienfastre d6990349d8 PersonResource: add link to person or 3party in the associated person or
3party part

There was a mismatch between "opening a resource to see the resource
details" and "see the associated person/3party details". On the previous location,
the user would expect to open the resource details, and not the person
details.
2022-02-17 21:28:27 +01:00
julienfastre 9ac2f7e359 Merge branch 'issue476_activity_fix_concerned_group' into 'master'
activity: can click through the cross icon for removing person in concerned group + fix duplicate display

See merge request Chill-Projet/chill-bundles!337
2022-02-17 20:22:04 +00:00
julienfastre f86c0353a2 Merge remote-tracking branch 'origin/master' into issue465_display_person_resources 2022-02-17 21:17:40 +01:00
julienfastre 0a289e1edd Merge remote-tracking branch 'origin/master' into issue476_activity_fix_concerned_group 2022-02-17 21:11:45 +01:00
julienfastre c2c5bec0e5 in period notification, handle case when period referrer is null 2022-02-17 21:08:55 +01:00
julienfastre 68bfca8a1f Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-02-17 20:04:45 +01:00
nobohan 6e1b95aa60 residential address: show residential address or info in PersonRenderBox + add ThirdPartyText 2022-02-17 18:05:34 +01:00
nobohan baf9b6e1ae residential address: correct normalization 2022-02-17 18:04:50 +01:00
julielenaerts 5ff47050ff replace deprecated TranslatorInterface by new one 2022-02-17 17:20:47 +01:00
nobohan c302f2dcf9 PersonRenderBox: add residential address 2022-02-17 16:29:51 +01:00
nobohan 24fc7a216b person: add current residential address in normalizer 2022-02-17 15:42:37 +01:00
nobohan 2926965400 move residentialAddress entity to the ChillPerson bundle 2022-02-17 15:08:12 +01:00
nobohan 341177aa5e fix conflict in CHANGELOG 2022-02-17 14:22:55 +01:00
julielenaerts 56923aa1b8 use statement added to fix CI 2022-02-17 10:04:56 +01:00
julielenaerts 62f54a3c27 changelog updated 2022-02-17 09:57:39 +01:00
julielenaerts 64e9461586 'ressources' changed to 'personnes ressources' plus order in menu changed 2022-02-17 09:57:29 +01:00
julielenaerts 5e01eebd25 'gabarit' changed to 'modèle' 2022-02-17 09:57:02 +01:00
julielenaerts bae2a385aa notification word 'one' changed to number 2022-02-17 09:56:41 +01:00
julielenaerts 9861e3fe1c csfixes 2022-02-17 09:43:49 +01:00
julienfastre 95b2fcead7 update changelog [ci-skip] 2022-02-16 21:58:49 +01:00
julienfastre 45beb27f83 fix sending notifications 2022-02-16 21:54:37 +01:00
nobohan b992bde41d Created an interface for PersonJsonNormalizer 2022-02-16 21:09:27 +01:00
julienfastre aebb21935b fix page "my accompanying period" and do not show drafts periods in
homepage (+ ordering)
2022-02-16 19:57:35 +01:00
julielenaerts 20104f1b3b implementation in thirdpartyType 2022-02-16 16:58:37 +01:00
julielenaerts 25264447bc csfixes 2022-02-16 16:56:02 +01:00
julielenaerts c1036a3627 fix getParent() 2022-02-16 16:54:55 +01:00
julielenaerts f1a9a872bb creation of CivilityPicker and attempt to implement -> still error 2022-02-16 16:38:53 +01:00
julielenaerts df322d7ebb creation of CivilityPicker and attempt to implement -> still error 2022-02-16 16:37:13 +01:00
nobohan 56a4fd3fa0 Person: add suffixText in PersonText.vue 2022-02-16 16:20:08 +01:00
nobohan 02716a6a93 PersonRender: adapt twig template to suffixText 2022-02-16 15:55:26 +01:00
julielenaerts d4534b56a0 bugfix listing mes parcours for user 2022-02-16 15:28:08 +01:00
nobohan 81b7b49170 ChillEntityRenderExtension: change the way the service in constructed by using tags 2022-02-16 15:23:32 +01:00
julielenaerts c8922a6a82 minor correction 2022-02-16 14:26:00 +01:00
julielenaerts cdf0bb30c9 display of correct message for 403 error fixed + translation 2022-02-16 14:25:34 +01:00
julielenaerts e4793e1a77 minor fixes 2022-02-16 13:52:20 +01:00
julielenaerts 8347ddd5be bugfix if there is no address edit of resourceItem was not possible 2022-02-16 13:51:51 +01:00
julielenaerts 12412e05a7 removal double entry 2022-02-16 13:33:45 +01:00
nobohan dd99c35e35 upd CHANGELOG 2022-02-16 11:24:30 +01:00
nobohan 9d651a70e9 merge last AddPerson branch 2022-02-16 11:23:21 +01:00
julielenaerts b0d50d315c Merge conflict in changelog fixed 2022-02-16 10:56:44 +01:00
julielenaerts 41bddf2db6 return interchange of name and text back to how it was before -> solves one bug recreates the other 2022-02-16 10:55:44 +01:00
julielenaerts 769700fe83 comment removed 2022-02-16 10:55:44 +01:00
julielenaerts 433ccb1fc4 bugfix of double civility abbreviation after edit 2022-02-16 10:55:44 +01:00
julielenaerts 145c1d59e9 bugfix emit saveFormOnTheFly and add newly created contact to suggestion list immediately 2022-02-16 10:55:44 +01:00
julielenaerts ae8cc0f700 attempt to not include parent address 2022-02-16 10:55:24 +01:00
julielenaerts a764da3e99 changelog updated 2022-02-16 10:55:05 +01:00
julielenaerts 8f92f79f85 placeholders for civility and profession 2022-02-16 10:55:05 +01:00
julielenaerts f093765d03 correction for POST phonenumber and email 2022-02-16 10:55:05 +01:00
julielenaerts c44d962ba8 only show addcontact button for personne morale 2022-02-16 10:55:05 +01:00
julielenaerts 20d22b726c possible to add a contact to a thirdparty 2022-02-16 10:55:05 +01:00
julielenaerts 8fa2f0e7ad small corrections 2022-02-16 10:54:42 +01:00
julielenaerts 604c7f385e further attempts to do POST of thirdparty contact, passing parent id causes problems + civility and profession fk's are not saved on POST 2022-02-16 10:54:42 +01:00
julielenaerts 1a07c9d71a v-model added so data is taken from the form for all fields + modal title correction 2022-02-16 10:54:20 +01:00
julielenaerts f7e287d415 onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-02-16 10:54:04 +01:00
julielenaerts b16cc2dc27 translations added 2022-02-16 10:53:34 +01:00
julielenaerts 188447fc10 use correct button 2022-02-16 10:48:23 +01:00
julielenaerts b920bf6d22 parent id added to thirdparty data 2022-02-16 10:47:59 +01:00
julielenaerts 32ff54e130 v-model added so data is taken from the form for all fields + modal title correction 2022-02-16 10:47:59 +01:00
julielenaerts 02c09687a4 onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-02-16 10:47:13 +01:00
julielenaerts 3b1fc4aacb translations added 2022-02-16 10:46:57 +01:00
julielenaerts bf9469d538 endpoints created for profession and civility for use in vue component 2022-02-16 10:46:35 +01:00
julielenaerts c2dec360b1 unsaved changes 2022-02-16 10:46:06 +01:00
julielenaerts dc7422bf56 unsaved changes 2022-02-16 10:46:06 +01:00
julielenaerts 89edf508f5 button added to add contact to personne morale (styling not correct yet) + opening of onTheFly thirdparty, but conditions and parameters not yet correct 2022-02-16 10:46:06 +01:00
nobohan 50410d190f replace PersonRender by PersonRenderInterface 2022-02-16 10:38:58 +01:00
nobohan b54e076ca0 PersonRenderInterface: remove methods 2022-02-16 10:27:34 +01:00
julielenaerts 2ab7556ac3 Add workflows tab to dashboard 2022-02-16 10:26:00 +01:00
julielenaerts 3d38da7b37 Add workflow notifications to the dashboard 2022-02-16 10:25:18 +01:00
julielenaerts 056d5a3f98 Remove counter from 'mes parcours' 2022-02-16 10:24:05 +01:00
julienfastre 17612afd87 fix phpstan issues 2022-02-16 00:08:06 +01:00
julienfastre 0a4913f341 handle event PersonMoveEvent on Period 2022-02-15 23:52:15 +01:00
nobohan 3aa12d2e8c [person] Add a PersonRenderInterface 2022-02-15 17:48:54 +01:00
julielenaerts a6504366b4 Fix to display message in toast when user is forbidden to do something
Translation does not work
2022-02-15 14:34:40 +01:00
julielenaerts 4e83e7905a Validation of confidential toggle added to accompanyingPeriod validator 2022-02-15 14:22:41 +01:00
nobohan 96b1854fef php code style fix 2022-02-15 13:57:02 +01:00
nobohan 489473806f upd CHANGELOG 2022-02-15 13:41:59 +01:00
nobohan f5bc8dca5e thirdparty search: adapt pertinence select clause for searching into children 2022-02-15 13:39:46 +01:00
nobohan bc99c85802 thirdparty search: add where clause for searching into children 2022-02-15 13:16:04 +01:00
julielenaerts 385664e2bc fix merge conflict 2022-02-15 10:01:01 +01:00
julienfastre 1658fee090 test on members editor post move + listen for event (wip) 2022-02-15 00:23:01 +01:00
julienfastre b9dbb1916a migration for history, and create history location on each change 2022-02-14 23:03:40 +01:00
nobohan 99afd2e830 OnTheFly: set a dynamic default 2022-02-14 22:03:11 +01:00
julienfastre 861f461bc5 workflow context for accompanying course document: ensure persons are represented as an array in json 2022-02-14 20:19:56 +01:00
julienfastre b6c118a0c8 add informations to workflow normalization 2022-02-14 20:02:24 +01:00
julienfastre 89d3ab38f0 add endpoint to list workflows 2022-02-14 20:02:07 +01:00
julienfastre 441704dc29 first impl of event (WIP) 2022-02-14 18:29:11 +01:00
julielenaerts 8ee451c6e0 fixes 2022-02-14 18:00:09 +01:00
nobohan 785e690404 On-the-fly: remove dead code: the logic of patching a person/thirdparty is now in the component in 2022-02-14 16:48:33 +01:00
nobohan 2fcd7a21a4 Accompanying course: can edit requestor in case no address 2022-02-14 16:47:35 +01:00
julienfastre f2221565c5 update changelog [ci-skip] 2022-02-14 16:39:04 +01:00
nobohan d5c1591205 Accompanying course: remove unnecessary console.log 2022-02-14 16:15:38 +01:00
nobohan 7895699ef3 stronger client-side validation of addresses: also validate when initForm 2022-02-14 15:47:21 +01:00
nobohan bd9963e65f Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber) 2022-02-14 15:00:57 +01:00
julielenaerts df61fbff12 merge conflicts resolved 2022-02-14 14:55:47 +01:00
julienfastre 9ead38ee22 Merge branch 'issue_vendee_456_document_field_not_required' into 'master'
doc generation: add age and obele in the mainPerson, person1 and person2 list...

See merge request Chill-Projet/chill-bundles!336
2022-02-14 13:43:52 +00:00
julienfastre 6402962990 customize the 'none' into something more user-frieldly 2022-02-14 14:36:37 +01:00
julienfastre 9e9fa5039f fix cs 2022-02-14 14:26:12 +01:00
julienfastre e6d503a1e2 Merge remote-tracking branch 'origin/master' into issue_vendee_456_document_field_not_required 2022-02-14 14:25:10 +01:00
julienfastre 844650b685 fix sending notification when unsetting a referrer from a period
When the user removes the referrer, a notification was send to a `null`
addressee, which causes an unhandled exception.
2022-02-14 14:22:33 +01:00
julielenaerts 4920142540 changelog updated 2022-02-14 14:14:05 +01:00
nobohan a7a1f699bb AddPersons: fix regression bug when editing a person/thirdparty without query 2022-02-14 14:13:06 +01:00
julielenaerts 61cf838458 if condition to check if a sender is assigned or if notification was assigned automatically by the system 2022-02-14 14:05:59 +01:00
nobohan 229a91ddf0 Accompanying course: treat vuejs warning by refactoring + delete unused v-model 2022-02-14 13:59:49 +01:00
julienfastre 68d0c66402 fix cs 2022-02-14 13:48:47 +01:00
julienfastre c2a132a40b Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-02-14 13:40:23 +01:00
nobohan 94729a66ca AddPersons: add suggestion of name when creating new person or thirdparty 2022-02-14 12:22:02 +01:00
julielenaerts bd05315de3 csfixes 2022-02-14 12:02:32 +01:00
julielenaerts d254a9e14a add endDate field in HouseholdMember form for enfant hors menage 2022-02-14 12:02:15 +01:00
julielenaerts e028c1ca2b thirdparty contact address blurred in view page if confidential 2022-02-14 11:44:12 +01:00
nobohan 1c3f6c7c1e AddPersons: allow creation of person or thirdparty depending on allowed types 2022-02-14 11:12:37 +01:00
nobohan f8888462f1 addPersons: allow creation of person or thirdparty only (no users) 2022-02-14 10:23:49 +01:00
nobohan 4e2be091cd Merge branch 'issue415_filter_suggested_entities_by_close_participations' of gitlab.com:Chill-Projet/chill-bundles into issue415_filter_suggested_entities_by_close_participations 2022-02-11 17:41:50 +01:00
nobohan 40a1726ca7 upd CHANGELOG 2022-02-11 17:41:39 +01:00
nobohan fc9deb8ba8 accompanying course: filter suggested entities by open participations 2022-02-11 17:41:12 +01:00
nobohan b1993dbf22 accompanying course: filter suggested entities by open participations 2022-02-11 17:37:45 +01:00
julienfastre 7dd6cd04ba Merge branch 'issue419_AddPersons_clear_ul' into 'master'
Issue419  remove ul-li in AddPersons

See merge request Chill-Projet/chill-bundles!328
2022-02-11 16:31:55 +00:00
julienfastre 1072f539dc Merge branch 'issue440_mesparcours_brouillon' into 'master'
Mes parcours brouillon

See merge request Chill-Projet/chill-bundles!330
2022-02-11 16:23:05 +00:00
julienfastre 9bcf4cce9f Merge branch 'master' into 'issue440_mesparcours_brouillon'
# Conflicts:
#   CHANGELOG.md
2022-02-11 16:22:51 +00:00
julienfastre 9223beac47 Merge branch 'issue416_chill_document_edit_button' into 'master'
Issue416 chill document edit button

See merge request Chill-Projet/chill-bundles!326
2022-02-11 16:21:15 +00:00
julienfastre 62c78e650f fix access denied when updating a work 2022-02-11 17:20:26 +01:00
julienfastre e7d0c1cac6 fix cs 2022-02-11 17:14:14 +01:00
julienfastre b859283766 fix error on creating an accompanying period work 2022-02-11 17:09:56 +01:00
julielenaerts 973644c62d csfixes 2022-02-11 17:07:47 +01:00
julielenaerts b9af54892b changelog updated 2022-02-11 17:04:15 +01:00
julielenaerts f9154233e4 using renderbox and adjusting style + show button if person or thirdparty 2022-02-11 17:02:31 +01:00
julienfastre e595500cb8 apply changes on person document 2022-02-11 17:01:36 +01:00
nobohan aa7da2559c [activity] correct associated persons by considering only open participations 2022-02-11 16:48:15 +01:00
julielenaerts 753a007172 translation added for kind of resource 2022-02-11 16:32:28 +01:00
julienfastre f34847f9f6 Merge remote-tracking branch 'origin/master' into issue416_chill_document_edit_button 2022-02-11 16:09:00 +01:00
julienfastre 0fa119c984 Merge branch 'issue_414_documents_list' into 'master'
created and updated traits added + template property added to Document entity

See merge request Chill-Projet/chill-bundles!316
2022-02-11 15:05:21 +00:00
julienfastre 270d00c1e8 fix phpstan and cs 2022-02-11 16:04:27 +01:00
julienfastre 983c5f3c6a fix probably missing variables in PersonDocumentType 2022-02-11 16:04:27 +01:00
julienfastre c6141e473f fix test in twig template 2022-02-11 16:04:26 +01:00
julielenaerts c30cb5879d changelog updated 2022-02-11 16:04:24 +01:00
julielenaerts 29e384ada5 scope placed within condition in edit form personDocument 2022-02-11 16:04:01 +01:00
julielenaerts c8e5ba4738 phpcsfixes 2022-02-11 16:04:01 +01:00
julielenaerts bf0b7f1bb2 Create AccompanyingCourseDocumentRepository and use to add pagination 2022-02-11 16:04:01 +01:00
julielenaerts d6cc69b919 Add pagination in the findBy() 2022-02-11 16:04:01 +01:00
julielenaerts ac33c6aad8 Add sticky buttons for create 2022-02-11 16:04:01 +01:00
julielenaerts 89383a5ec4 deprecated service replaced and error removed from phpstan file 2022-02-11 16:04:00 +01:00
julielenaerts 0fd26da299 comments in migration removed 2022-02-11 16:04:00 +01:00
julienfastre 6fa99655b2 delegates the acl for fetching person documents to an ACLAwareREpository 2022-02-11 16:04:00 +01:00
julienfastre a387305ef8 remove scope in PersonDocumentType when disabled 2022-02-11 16:04:00 +01:00
julielenaerts e0c7daf3fd Pagination added 2022-02-11 16:04:00 +01:00
julielenaerts 4304baeca5 scope put in condition in personDocument form - temporarily commented out 2022-02-11 16:04:00 +01:00
julielenaerts d2a567c79e condition added in show template for scope 2022-02-11 16:04:00 +01:00
julielenaerts 3c04ced1a3 templates adjusted 2022-02-11 16:04:00 +01:00
julielenaerts a28d8a7287 only add scope field conditionally in personDocumentType analogue to SingleTaskType 2022-02-11 16:04:00 +01:00
julielenaerts 1c055e842e created and updated traits added + template property added to Document entity 2022-02-11 16:04:00 +01:00
julienfastre dea283d655 fix phpstan and cs 2022-02-11 16:03:22 +01:00
nobohan 01a3af694a activity: can click through the cross icon for removing person in concerned group 2022-02-11 15:49:49 +01:00
julienfastre 58c8373c81 Merge branch 'issue378_normalize_requestor' into 'master'
accompanying course: normalize the requestor entity

See merge request Chill-Projet/chill-bundles!329
2022-02-11 14:45:32 +00:00
julienfastre a1ccfadac1 fix probably missing variables in PersonDocumentType 2022-02-11 15:42:40 +01:00
julienfastre 632b1262f9 Merge remote-tracking branch 'origin/master' into issue_414_documents_list 2022-02-11 15:34:31 +01:00
julienfastre e157624479 Merge branch 'master' into 'issue378_normalize_requestor'
# Conflicts:
#   CHANGELOG.md
2022-02-11 14:31:53 +00:00
julienfastre 3a2370d536 fix missing cases for accompanying period draft list
fix when:

* if there isn't any information into course => better render box
* if there isn't any course into list => display warning
2022-02-11 15:26:17 +01:00
nobohan eee38e9577 remove isDead from insert vue on the fly as dead sign (obele) is included in personRender->renderString 2022-02-11 15:18:54 +01:00
julielenaerts 50b7df1f4a adding thirdparty info 2022-02-11 15:16:28 +01:00
julienfastre 981c94906d Merge remote-tracking branch 'origin/master' into issue440_mesparcours_brouillon 2022-02-11 15:11:20 +01:00
julienfastre adce90c151 Merge remote-tracking branch 'origin/master' into issue440_mesparcours_brouillon 2022-02-11 15:11:08 +01:00
julienfastre 83f8402081 Merge branch 'issue415_household_address' into 'master'
Display address of current household in history page

See merge request Chill-Projet/chill-bundles!334
2022-02-11 14:10:52 +00:00
julienfastre 22417ee9f9 fix tests for address render 2022-02-11 15:03:54 +01:00
julielenaerts 3c5d269ece template fixes residential address 2022-02-11 14:58:11 +01:00
julienfastre 42579b5752 fix translation and how holder is shown 2022-02-11 14:49:59 +01:00
julienfastre 15023d348a Merge remote-tracking branch 'origin/master' into issue415_household_address 2022-02-11 14:39:27 +01:00
julienfastre fbf777e134 fix cs 2022-02-11 14:35:10 +01:00
julienfastre 450277f32a fix test in twig template 2022-02-11 14:34:35 +01:00
nobohan 1f5d529d33 php code fix 2022-02-11 14:30:31 +01:00
julielenaerts 93128cb61b if conditions joined 2022-02-11 14:28:42 +01:00
nobohan c19099e76c upd CHANGELOG 2022-02-11 14:28:37 +01:00
julienfastre d3d655293e Merge remote-tracking branch 'origin/master' into issue_414_documents_list 2022-02-11 14:24:36 +01:00
nobohan 692343aae4 doc generation: add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge 2022-02-11 14:24:12 +01:00
julienfastre 0592601aa6 Merge branch 'household-editor/show-full-address' 2022-02-11 14:22:41 +01:00
julienfastre a17f5948fb Merge remote-tracking branch 'origin/master' 2022-02-11 14:22:27 +01:00
nobohan 4dd9bc1123 doc generation: do not set required fields for mainPerson, person1, person2 2022-02-11 14:22:20 +01:00
julienfastre 6578f66fec update changelog 2022-02-11 14:22:10 +01:00
julienfastre 3f2a19a6f0 Merge remote-tracking branch 'origin/master' into household-editor/show-full-address 2022-02-11 14:21:06 +01:00
julienfastre d5160ead4c Apply 1 suggestion(s) to 1 file(s) 2022-02-11 13:18:51 +00:00
julienfastre a6e9cbdece Merge branch 'fix-tests-2022-02-11' into 'master'
fix ci

See merge request Chill-Projet/chill-bundles!335
2022-02-11 13:18:32 +00:00
julienfastre 657bf7075b fix ci 2022-02-11 13:18:32 +00:00
julielenaerts f1c3e8dc1b Merge remote-tracking branch 'origin/master' 2022-02-11 14:18:20 +01:00
julielenaerts a9624b36f7 create person and household option added to dropdown 2022-02-11 14:17:59 +01:00
julienfastre db4aec9a18 Merge branch 'issue427_returnPath' into 'master'
on the fly component: add returnPath when viewing

See merge request Chill-Projet/chill-bundles!324
2022-02-11 13:16:51 +00:00
julienfastre c34ce48a53 Merge branch 'master' into 'issue427_returnPath'
# Conflicts:
#   CHANGELOG.md
2022-02-11 13:16:40 +00:00
julienfastre 93345c09a1 fix cs 2022-02-11 13:45:21 +01:00
julienfastre b5a1985fa1 test "find household by reference": add exception in data provider
The data provider cannot generate data if no address reference in
database. Throw an exception in this case.
2022-02-11 13:43:29 +01:00
julienfastre 9b4c350213 fix tests for accompanying period comments 2022-02-11 13:36:35 +01:00
julienfastre 199a441593 fix tests for EntityWorkflow 2022-02-11 13:24:29 +01:00
Mathieu Jaumotte f42d106e3c Merge branch 'accent440' 2022-02-11 13:17:19 +01:00
Mathieu Jaumotte 13eddbfc5b changelog 2022-02-11 13:16:48 +01:00
Mathieu Jaumotte 7c30126fed Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-11 13:14:45 +01:00
julienfastre e3c5f6f95f fix phpcs, psalm and phpstan 2022-02-11 13:07:38 +01:00
Mathieu Jaumotte a86f1a05ac Merge branch 'accent440' 2022-02-11 13:04:35 +01:00
Mathieu Jaumotte 9ba0cb0c2a homepage_widget: fix translation for emergency badge 2022-02-11 12:56:15 +01:00
julielenaerts add8588767 changelog updated 2022-02-11 12:36:05 +01:00
julielenaerts a083a320ae display address of current household 2022-02-11 12:34:18 +01:00
julienfastre 64fa7f2e00 Merge branch 'issue433_email_addPerson' into 'master'
AddPerson: email and altNames corrections and validation

See merge request Chill-Projet/chill-bundles!327
2022-02-11 11:33:23 +00:00
julienfastre c7a830ee28 Merge branch 'master' into 'issue433_email_addPerson'
# Conflicts:
#   CHANGELOG.md
2022-02-11 11:33:09 +00:00
Mathieu Jaumotte 9aa51406fa Merge branch 'accent419' 2022-02-11 12:26:27 +01:00
julienfastre 344981cf99 Merge branch 'master' into issue433_email_addPerson 2022-02-11 12:16:49 +01:00
Mathieu Jaumotte 28c4d6b92f vue pick entity: fix i18n translations in create thirdparty modal 2022-02-11 12:16:01 +01:00
Mathieu Jaumotte ef2ab5faf6 vue pick entity: improve picked condition when value is empty string 2022-02-11 12:12:12 +01:00
julienfastre 54dbf711f9 fix cs 2022-02-11 12:10:44 +01:00
julienfastre bb93cb23a7 fix handling of address 2022-02-11 12:09:42 +01:00
julielenaerts 60951231c4 Merge branch 'issue415_household_address' of gitlab.com:Chill-Projet/chill-bundles into issue415_household_address 2022-02-11 11:57:49 +01:00
julielenaerts ece30b63c3 in process... need to be sure which address to display exactly 2022-02-11 11:45:23 +01:00
julielenaerts 94503505f7 changelog updated 2022-02-11 11:40:56 +01:00
julielenaerts 48589f3368 scope placed within condition in edit form personDocument 2022-02-11 11:33:07 +01:00
julielenaerts 1e04c178dc phpcsfixes 2022-02-11 11:28:32 +01:00
julielenaerts 37ed703abe Create AccompanyingCourseDocumentRepository and use to add pagination 2022-02-11 11:26:21 +01:00
julielenaerts 7ed20d2fc5 Add pagination in the findBy() 2022-02-11 11:25:53 +01:00
julielenaerts 5fe2a8e737 Add sticky buttons for create 2022-02-11 11:25:27 +01:00
nobohan 861abe708b upd CHANGELOG 2022-02-11 10:55:37 +01:00
julienfastre 57a88845dc Merge remote-tracking branch 'origin/master' into issue388_order_social_issues 2022-02-11 10:54:37 +01:00
nobohan f43e216e13 fix normalisation of AccompanyingCourse requestor api 2022-02-11 10:53:05 +01:00
julielenaerts 5210e7985f deprecated service replaced and error removed from phpstan file 2022-02-11 10:46:46 +01:00
julielenaerts ddabdff206 comments in migration removed 2022-02-11 10:45:30 +01:00
Mathieu Jaumotte 5a692db30f Fix review remarks 2022-02-10 17:51:45 +01:00
julienfastre 659983fef1 delegates the acl for fetching person documents to an ACLAwareREpository 2022-02-10 00:37:24 +01:00
julienfastre aca5a3c731 remove scope in PersonDocumentType when disabled 2022-02-10 00:12:55 +01:00
julienfastre 406cfc86cd add order in localisation entity list (api) 2022-02-09 23:44:38 +01:00
julienfastre 90da067fbd address: show full address in address text and adapt Vue 2022-02-09 22:21:48 +01:00
julielenaerts 3532e9dd8c changelog updated 2022-02-09 18:22:28 +01:00
julielenaerts fddb74f107 toggleConfidential reset to what it was before 2022-02-09 18:05:55 +01:00
Mathieu Jaumotte e7a6742964 OpenWopiLink, option title is maintened (replace button by options) 2022-02-09 18:04:56 +01:00
julielenaerts ee817b1d62 url's and method changed for toggleIntensity and toggleConfidential 2022-02-09 17:56:53 +01:00
Mathieu Jaumotte 3ffeaf419a mimetype document mapping (temporary) 2022-02-09 17:39:43 +01:00
julielenaerts a399804094 Endpoint created + swagger documentation + controller action 2022-02-09 17:38:35 +01:00
julielenaerts 05e9f118d7 Corrections voter + entity property intensity, not emergency 2022-02-09 17:18:45 +01:00
Mathieu Jaumotte ce2f64acd0 wopi edit extension: button call collabora not in a modal, but in a page (twig way) 2022-02-09 17:10:12 +01:00
julielenaerts 7aad5be29f Toggle_emergency variable added to voter 2022-02-09 17:08:29 +01:00
julielenaerts 41b0dd50bd emergency property write permission removed from entity 2022-02-09 17:07:58 +01:00
Mathieu Jaumotte 08f544f6ea add btn-wopilink button ; fix OpenWopiLink when options is null 2022-02-09 16:29:57 +01:00
julielenaerts 4e862cc585 Changelog updated 2022-02-09 16:20:59 +01:00
julielenaerts 05d2c3b2e8 Minor style adjustment within template
The content of the div aligned center
2022-02-09 16:19:42 +01:00
julielenaerts 513207e510 PHP csfixes 2022-02-09 16:08:27 +01:00
julielenaerts dee6ed6707 Listing of mes parcours changed to only display confirmed or closed
draft parcours are displayed in mes parcours brouillon
2022-02-09 16:02:21 +01:00
julielenaerts d60095987c Changelog updated 2022-02-09 15:59:19 +01:00
julielenaerts b4f9be0d92 openingDate only displayed on parcours that are not in draft state 2022-02-09 15:59:10 +01:00
julielenaerts a2a0f6af44 mes parcours brouillon added to usermenu 2022-02-09 15:58:54 +01:00
julielenaerts 7fa0353d8c Pagination added 2022-02-09 15:10:04 +01:00
julielenaerts 9256c71715 scope put in condition in personDocument form - temporarily commented out 2022-02-09 14:38:20 +01:00
julielenaerts 5520f3df50 condition added in show template for scope 2022-02-09 14:37:48 +01:00
julielenaerts a6c0d8b219 templates adjusted 2022-02-09 14:37:06 +01:00
Mathieu Jaumotte f6e667700e move twig function in runtime 2022-02-09 13:19:58 +01:00
julielenaerts f94ef0798a Merge branch 'issue_414_documents_list' of gitlab.com:Chill-Projet/chill-bundles into issue_414_documents_list 2022-02-09 10:15:18 +01:00
julielenaerts 7bd7476200 only add scope field conditionally in personDocumentType analogue to SingleTaskType 2022-02-09 10:15:09 +01:00
julielenaerts a2752765af created and updated traits added + template property added to Document entity 2022-02-09 09:54:21 +01:00
julielenaerts 4de2cbe807 return interchange of name and text back to how it was before -> solves one bug recreates the other 2022-02-09 09:53:15 +01:00
julienfastre 1e81256404 fix cs 2022-02-08 19:37:59 +01:00
julienfastre 6b571e87b4 fix typos 2022-02-08 19:37:11 +01:00
julienfastre 4314823a70 change order for accompanying period work list 2022-02-08 19:36:45 +01:00
julienfastre dc08ced6c9 fix notification subject 2022-02-07 21:49:34 +01:00
julienfastre 9d660311f0 improve translation on working about houshold members 2022-02-07 20:54:06 +01:00
julienfastre b3e65f0733 fix validation when comment content is empty 2022-02-07 20:53:44 +01:00
julienfastre 03007370bc fix "impossible to confirm a course"
In some case, the "confirm" button for the form AccompanyingCourse was
disable, due to wrong condition.

This commit also fixes the filtering for users, and allow to remove a
user associated with an accompanyingCourse.
2022-02-07 17:44:03 +01:00
julienfastre f9b514c869 fix assertion of type.
https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/266
2022-02-07 11:22:35 +01:00
julielenaerts bc2d4c1066 Merge remote-tracking branch 'origin/issue433_email_addPerson' into issue345_internal_thirdparty_contact 2022-02-04 11:09:51 +01:00
julielenaerts 298b597dd0 comment removed 2022-02-04 10:50:59 +01:00
nobohan 91ba08dfa1 accompanying course: normalize the requestor entity 2022-02-04 10:34:32 +01:00
julielenaerts 481456a038 Merge conflicts fixed 2022-02-04 10:25:46 +01:00
nobohan 06142797c3 AddPersons: add missing css class + upd CHANGELOG 2022-02-03 16:25:59 +01:00
nobohan 4185b660cc AddPersons: remove ul-li html tags from AddPersons 2022-02-03 16:17:05 +01:00
Mathieu Jaumotte ad46776164 hide save and close button in modal header 2022-02-03 15:58:57 +01:00
julienfastre 2343a4a334 add links between document in workflow and course 2022-02-03 13:49:52 +01:00
julienfastre 3f83c323be fix creating workflow from document in accompanying course 2022-02-03 13:16:13 +01:00
julienfastre 9a9ed64298 fix on test after creating an activity without generating a document 2022-02-03 12:54:44 +01:00
nobohan a0cadb46db upd CHANGELOG 2022-02-03 11:32:11 +01:00
nobohan f139af8b6f accompanying course work: fix on-the-fly update of thirdParty 2022-02-03 11:26:31 +01:00
nobohan 1f0ef6e187 on-the-fly: close modal only after validation 2022-02-03 11:07:32 +01:00
nobohan 4afea55465 addperson: repair altname: add altname if known 2022-02-03 09:17:45 +01:00
nobohan 3d5723facb AddPerson: correct thirdparty PATCH url + add email and altnames in AddPerson and serializer 2022-02-03 08:59:56 +01:00
julienfastre 211ecf1c3e add cache to workflow counter 2022-02-02 23:19:59 +01:00
julienfastre 796b4ff76b Merge branch 'master' into issue431_worklow_notifications 2022-02-02 22:40:37 +01:00
julienfastre 9553e18d83 do not uppercase/lowercase ref in activity list 2022-02-02 22:17:24 +01:00
julienfastre 02d9a713de set requestor before acdtions 2022-02-02 22:16:15 +01:00
julienfastre 6cc4fa582e fix validation error with startDate 2022-02-02 22:15:53 +01:00
Mathieu Jaumotte b8d43f36eb document: add macro mapping forkawesome icon from mime type 2022-02-02 19:39:17 +01:00
Mathieu Jaumotte 06b3d63133 pass options in twig extension filter 2022-02-02 18:28:59 +01:00
Mathieu Jaumotte 232e71f46c uniformize ui with sticky-form-button 2022-02-02 18:25:44 +01:00
Mathieu Jaumotte 0b5a0e65a8 ckeck document mime (TO BE CHECKED) 2022-02-02 16:53:13 +01:00
Mathieu Jaumotte ef42227e6c data-doc-title is a not required props 2022-02-02 15:13:48 +01:00
Mathieu Jaumotte 2af3de4f61 chill_document_edit_button: create new twig extension 2022-02-02 14:57:25 +01:00
julielenaerts 8bafa37fe1 dump removed 2022-02-02 10:32:46 +01:00
nobohan a83b0326d7 upd CHANGELOG 2022-02-02 07:04:14 +01:00
julienfastre 53e03395f2 renaming date de fermeture en date de cloture in accompanying course 2022-02-01 22:36:51 +01:00
julienfastre 5fef4048a4 use renderbox in activity list recent 2022-02-01 22:36:26 +01:00
julienfastre d8929a6222 Merge branch 'master' into homepage/rewrite 2022-02-01 21:26:27 +01:00
julienfastre 33af7f36a0 remove dump 2022-02-01 21:23:50 +01:00
julienfastre 3f2454cead disable multiselect search in City and Street search 2022-02-01 21:23:15 +01:00
julienfastre 0ac9f2df8c fix loading of file template 2022-02-01 21:20:11 +01:00
Mathieu Jaumotte 333224a9d5 update changelog 2022-02-01 19:19:50 +01:00
Mathieu Jaumotte 496e5f0259 homepage: fix counter appareance on MyCustoms vue tab 2022-02-01 19:13:25 +01:00
julienfastre f2a62822a4 Merge remote-tracking branch 'origin/master' 2022-02-01 18:43:39 +01:00
julienfastre 7879a99197 Merge branch 'master' into issue425_errorMessage_closeParcours 2022-02-01 18:42:59 +01:00
julielenaerts 72d8cc297f Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-01 18:41:07 +01:00
julielenaerts 1a0674a20b using badges instead of eye for person resource list 2022-02-01 18:40:57 +01:00
julienfastre 572aa2c14e Merge remote-tracking branch 'origin/master' into issue426_household_composition 2022-02-01 18:29:02 +01:00
julienfastre bc4b2c4e86 Merge branch 'master' into issue428_person_resource_ameliorations 2022-02-01 18:08:48 +01:00
julienfastre a227e88e79 Merge branch 'master' into small_issues_421_424 2022-02-01 18:05:33 +01:00
julienfastre d9e9f472fb Merge remote-tracking branch 'origin/small_issues_421_424' into small_issues_421_424 2022-02-01 18:02:25 +01:00
julienfastre fcff4bf863 fix phpcs 2022-02-01 18:01:34 +01:00
julienfastre 79b82e09e1 add document from activity 2022-02-01 17:58:20 +01:00
nobohan a78f29cffc on the fly component: add returnPath when viewing 2022-02-01 17:44:55 +01:00
Mathieu Jaumotte e98b1b049b add context to MyEvaluations (action and course containers) 2022-02-01 17:28:30 +01:00
julielenaerts 99efa51794 csfixes 2022-02-01 17:23:45 +01:00
julielenaerts 76932e6e8c bugfix in notificationhandler. Not sure about the fix in the template 2022-02-01 17:23:12 +01:00
julielenaerts 97d2e3d5b5 counter created for workflows for which user is a destuser and that are not finalized 2022-02-01 17:22:45 +01:00
nobohan 2c94811c8f person: social issue api controller: add onPostIndexBuildQuery 2022-02-01 17:01:19 +01:00
Mathieu Jaumotte a2063ab13b Merge branch 'master' into homepage/rewrite 2022-02-01 16:54:49 +01:00
nobohan eb32b13bcc person: rewrite social issue api controller for ordering 2022-02-01 16:49:14 +01:00
Mathieu Jaumotte 2bb718f3ea fix popover header on vue ListWorkflow breadcrumb 2022-02-01 15:51:42 +01:00
julienfastre c6373a075d refactor pickTemplate and adapt existing usage 2022-02-01 15:49:23 +01:00
julielenaerts 46337ef25d in process... need to be sure which address to display exactly 2022-02-01 15:09:42 +01:00
Mathieu Jaumotte 2f5fecf414 notifications: fix comments counter 2022-02-01 14:56:50 +01:00
julienfastre 5d2cb8c712 homepage: add social action in evaluation serialisation 2022-02-01 14:14:55 +01:00
Mathieu Jaumotte 460502a1f2 mask unready comments counter 2022-02-01 14:13:08 +01:00
Mathieu Jaumotte cdd7a16d18 homepage_widget counters pluralization 2022-02-01 14:10:19 +01:00
Mathieu Jaumotte ec29758547 detect span.counter and allow to put styles on the number 2022-02-01 14:09:29 +01:00
julielenaerts c5cbdd97ff csfixes 2022-02-01 13:52:42 +01:00
julielenaerts 05fc5a1829 changelog updated 2022-02-01 13:52:13 +01:00
julielenaerts c3de3c6c39 validation adjusted to greaterThanOrEqual and different message passed 2022-02-01 13:51:21 +01:00
julielenaerts 1530e9d13a changelog updated 2022-02-01 12:37:09 +01:00
julielenaerts a986b4ae98 csfixes 2022-02-01 12:33:09 +01:00
julielenaerts 0854b7fc6a delete action created in controller and template 2022-02-01 12:32:34 +01:00
Mathieu Jaumotte 730199cca4 Merge branch 'foldlist_in_entity' into homepage/rewrite 2022-02-01 12:23:19 +01:00
julienfastre de1dddbb85 validation: no more workflow without dest 2022-02-01 12:19:51 +01:00
julienfastre a612d7dd9f improve workflow decision form 2022-02-01 12:19:51 +01:00
julienfastre 50e722e637 fix workflow redirection in accompanying period work edit 2022-02-01 12:19:51 +01:00
Mathieu Jaumotte e4d5e40a8b improve homepage_widget tables with datas 2022-02-01 12:07:16 +01:00
julielenaerts 479ec25d99 Merge branch 'issue428_person_resource_ameliorations' of gitlab.com:Chill-Projet/chill-bundles into issue428_person_resource_ameliorations 2022-02-01 10:18:21 +01:00
julielenaerts 930b6ff77e minor style changes 2022-02-01 10:17:08 +01:00
julielenaerts 7d8bd089a2 double edit button removed 2022-02-01 10:09:48 +01:00
Pol Dellaiera ebdcc5a07d fix: Update namespace to prevent having issues with PSR4 autoloading. 2022-02-01 09:11:14 +01:00
Pol Dellaiera 0f31a49890 fix: Update namespace to prevent having issues with PSR4 autoloading. 2022-02-01 09:10:32 +01:00
LenaertsJ 2c566bb21c Merge branch 'master' into 'issue428_person_resource_ameliorations'
# Conflicts:
#   CHANGELOG.md
2022-01-31 17:50:08 +00:00
julielenaerts a0bc6c7604 csfixes 2022-01-31 18:47:06 +01:00
julielenaerts a4457664d4 bugfix addPersons 2022-01-31 18:33:29 +01:00
julielenaerts b42ae76bdf Merge branch 'small_issues_421_424' of gitlab.com:Chill-Projet/chill-bundles into small_issues_421_424 2022-01-31 17:46:18 +01:00
julielenaerts 2eb1ebd263 changelog updated with bugfix 2022-01-31 17:45:22 +01:00
julielenaerts b79885cd21 bugfix creation of person or thirdparty through onTheFly 2022-01-31 17:45:04 +01:00
julielenaerts 69dd920fd6 php csfixes 2022-01-31 17:45:04 +01:00
julielenaerts 0689ca366d changelog updated 2022-01-31 17:44:04 +01:00
julielenaerts af1c268784 commentfield for marital status is always visible 2022-01-31 17:43:50 +01:00
julielenaerts 1162c436c1 demandeur not displayed in search list if anonymous 2022-01-31 17:43:50 +01:00
julienfastre 170ce2d51c minor fix and renaming 2022-01-31 16:55:19 +01:00
Mathieu Jaumotte 571a8a0edc Merge branch 'foldlist_in_entity' of gitlab.com:Chill-Projet/chill-bundles into foldlist_in_entity 2022-01-31 15:55:52 +01:00
Mathieu Jaumotte bdbb83ab85 wip count comments 2022-01-31 15:53:57 +01:00
julienfastre 971789d5cf Merge remote-tracking branch 'origin/master' into foldlist_in_entity 2022-01-31 15:51:21 +01:00
julienfastre 72815e4b70 Merge branch 'homepage/rewrite' 2022-01-31 15:40:40 +01:00
julienfastre 44183957b8 Merge remote-tracking branch 'origin/master' into homepage/rewrite 2022-01-31 15:36:53 +01:00
julienfastre 434d672d8a Merge branch 'master' into small_issues_421_424 2022-01-31 14:49:38 +01:00
julienfastre 5f6cffa08a fix regression in serach results appareance in addpersons 2022-01-31 14:49:23 +01:00
julielenaerts e21ff588ae csfixes 2022-01-31 14:42:54 +01:00
julielenaerts 0383571a9e changelog updated 2022-01-31 14:42:17 +01:00
julielenaerts f358e78734 onthefly button added to view person or thirdparty + badge changed if thirdparty is a contact 2022-01-31 14:39:40 +01:00
julienfastre 43ef31b93f Merge remote-tracking branch 'origin/master' into small_issues_421_424 2022-01-31 14:28:30 +01:00
julienfastre 222dae3c32 Merge remote-tracking branch 'origin/master' into issue420_closeModalAddPerson 2022-01-31 14:24:45 +01:00
julienfastre 08c13b8c98 Merge remote-tracking branch 'origin/master' into issue412_413_activity 2022-01-31 14:22:34 +01:00
julienfastre 1bc2500b28 update changelog [ci-skip] 2022-01-31 14:18:10 +01:00
Mathieu Jaumotte f648a9351b workflow: fix some stuffs 2022-01-31 14:17:10 +01:00
julienfastre ffe466a334 fix icon for searching 2022-01-31 14:16:33 +01:00
nobohan 3978e7c959 upd CHANGELOG 2022-01-31 13:48:21 +01:00
nobohan 2eb5c45a4d accompanying course: fetch scopes only for app (not for banner) 2022-01-31 13:46:43 +01:00
julielenaerts 15393d9da9 changelog updated with bugfix 2022-01-31 13:45:41 +01:00
julielenaerts 695d22adba bugfix creation of person or thirdparty through onTheFly 2022-01-31 13:39:52 +01:00
nobohan fefe208260 accompanying course: fetch users and suggested referrers only for app, not for banner 2022-01-31 13:32:34 +01:00
julielenaerts bc1a63354c php csfixes 2022-01-31 13:11:25 +01:00
Mathieu Jaumotte c14101714c update changelog 2022-01-31 13:09:13 +01:00
julielenaerts faebb0fe30 changelog updated 2022-01-31 13:08:55 +01:00
julienfastre 8ec5636c57 Merge remote-tracking branch 'origin/master' into household-editor/push-to-household 2022-01-31 13:07:26 +01:00
julielenaerts 68d99050bc commentfield for marital status is always visible 2022-01-31 13:06:59 +01:00
Mathieu Jaumotte fba7060a91 update changelog 2022-01-31 13:05:41 +01:00
julienfastre 6894fa7101 Merge branch 'issue389_add_age' into 'master'
add age/ person text component

See merge request Chill-Projet/chill-bundles!308
2022-01-31 12:04:48 +00:00
julienfastre 41fa1d9ca6 fix cs 2022-01-31 13:02:43 +01:00
julienfastre f4bca2f410 add person text in accompanying period work 2022-01-31 13:00:48 +01:00
Mathieu Jaumotte 6198891202 add anchor to retrieve evaluations section in accompanyingCourseWorkEdit page 2022-01-31 12:47:31 +01:00
Mathieu Jaumotte c806c06279 homepage_widget: basically build tables for evaluations, tasks and courses 2022-01-31 12:46:44 +01:00
julienfastre e04c02055c add age in some place and re-organize some usage of the component 2022-01-31 12:45:50 +01:00
julielenaerts 4fa1bb4341 demandeur not displayed in search list if anonymous 2022-01-31 12:45:02 +01:00
LenaertsJ ac5675933d Merge branch 'issue411_openingDate_parcours' into 'master'
Opening date of parcour

See merge request Chill-Projet/chill-bundles!313
2022-01-31 11:07:07 +00:00
Mathieu Jaumotte e7db71b0f3 fast actions are custom overrided buttons 2022-01-31 12:03:42 +01:00
nobohan 1967fc4bed upd CHANGELOG 2022-01-31 12:01:52 +01:00
nobohan befd5dac42 person: accompanying course: treat validation error when editing on-the-fly entities 2022-01-31 12:00:40 +01:00
julienfastre 186b8847d9 Merge remote-tracking branch 'origin/issue389_add_age' into issue389_add_age 2022-01-31 11:46:07 +01:00
julienfastre 90d0cbc3b1 Merge remote-tracking branch 'origin/master' into issue389_add_age 2022-01-31 11:44:55 +01:00
LenaertsJ ac3d39b151 Merge branch 'master' into 'issue389_add_age'
# Conflicts:
#   CHANGELOG.md
2022-01-31 10:25:32 +00:00
Mathieu Jaumotte efb5bd64b4 notification-list: todo add a comment counter 2022-01-31 11:25:23 +01:00
LenaertsJ 76a7b019eb Merge branch 'master' into 'issue411_openingDate_parcours'
# Conflicts:
#   CHANGELOG.md
2022-01-31 10:19:54 +00:00
julielenaerts 739540af64 created and updated traits added + template property added to Document entity 2022-01-31 11:13:22 +01:00
Mathieu Jaumotte 230d73498e workflow list: mask title 2022-01-31 11:02:01 +01:00
nobohan a68a43adc0 upd CHANGELOG 2022-01-31 10:55:11 +01:00
nobohan 5a75e38f33 accompanying course: close modal when edit participation 2022-01-31 10:48:04 +01:00
julienfastre 1c02eb23fd fix user search 2022-01-31 10:41:08 +01:00
Mathieu Jaumotte 1ba5df1280 hop 2022-01-31 09:45:37 +01:00
Mathieu Jaumotte 73c4a5d39d better color coherency with buttons 2022-01-30 19:45:09 +01:00
Mathieu Jaumotte 0a58c43952 fix date format on popover 2022-01-30 19:43:17 +01:00
Mathieu Jaumotte a3b823d33f improve workflow button 2022-01-30 16:43:09 +01:00
Mathieu Jaumotte de45555c5a add popover html content 2022-01-30 16:35:47 +01:00
Mathieu Jaumotte 0add020e57 workflows in entity: other vue component call workflow modal 2022-01-30 13:53:51 +01:00
Mathieu Jaumotte 84a76d2c76 ListWorkflow: styles for list (like in twig) 2022-01-30 13:36:37 +01:00
Mathieu Jaumotte d88207132b workflows in entity: twig call once vue component that list in modal with add button, or just display add button if none 2022-01-30 11:26:04 +01:00
Mathieu Jaumotte 932d0e86d9 Merge branch 'foldlist_in_entity' of gitlab.com:Chill-Projet/chill-bundles into foldlist_in_entity 2022-01-29 12:37:48 +01:00
julienfastre 671f1223b5 Merge branch 'issue_mes_parcours' into 'master'
Mes parcours

See merge request Chill-Projet/chill-bundles!307
2022-01-29 02:09:04 +00:00
julienfastre 1a04d903fc fixes for page 'mes parcours' 2022-01-29 03:08:34 +01:00
julienfastre 125dd4d980 Merge remote-tracking branch 'origin/master' into issue_mes_parcours 2022-01-29 02:58:32 +01:00
julienfastre 2ddab027ed Merge remote-tracking branch 'origin/master' into issue410_restyle_parcourslist_personSearch 2022-01-29 02:57:05 +01:00
julienfastre 1724400d7c button requestor on the right 2022-01-29 02:56:06 +01:00
julienfastre d1a0934bb1 search household in household mmebers editor 2022-01-29 02:38:47 +01:00
julienfastre bc90664480 api endpoint for search household 2022-01-29 01:14:30 +01:00
julienfastre 99dc7490cb missing translation 2022-01-29 00:33:09 +01:00
julienfastre 5ac485e06e example of workflow + finalize normalization 2022-01-29 00:20:35 +01:00
julienfastre dc184762d6 workflow history 2022-01-29 00:20:35 +01:00
julienfastre 86e7b0f007 rewrite workflow and handle finalize differently 2022-01-29 00:20:35 +01:00
julienfastre fdafe7c82b normalizer for entityworkflow 2022-01-29 00:20:35 +01:00
Mathieu Jaumotte d285d84068 wip 2022-01-28 22:30:18 +01:00
Mathieu Jaumotte da22532587 cancel comments in entity notifications 2022-01-28 22:27:30 +01:00
Mathieu Jaumotte b83ad77fd8 homepage_widget: details + courses table 2022-01-28 18:22:33 +01:00
Mathieu Jaumotte 00ac6aa1b9 homepage_widget: init counters on load, arrange MyCustoms tab 2022-01-28 18:10:48 +01:00
julielenaerts 318c001904 changelog updated 2022-01-28 18:07:20 +01:00
julielenaerts e2d406b97b php validation added 2022-01-28 18:06:13 +01:00
nobohan efff496f7a hot fix: pick-entity: set input.value to null if multiple=false 2022-01-28 18:01:29 +01:00
julielenaerts fe4eaa92be fix bug display current openingDate in datepicker 2022-01-28 17:36:59 +01:00
julielenaerts cb17a7e8a5 Visual improvements of date input fields in social action create form 2022-01-28 17:06:09 +01:00
julielenaerts ad4153a07e New component for parcours startDate 2022-01-28 17:05:41 +01:00
Mathieu Jaumotte e95093f144 Merge branch 'homepage/rewrite' of gitlab.com:Chill-Projet/chill-bundles into homepage/rewrite 2022-01-28 16:36:01 +01:00
julienfastre 59cdf07c7e add form in notification thread inside entities show 2022-01-28 16:23:41 +01:00
julienfastre 292c9380ad endpoint for recent accompanying period attributions 2022-01-28 15:39:37 +01:00
Mathieu Jaumotte 701ad17299 Merge branch 'homepage/rewrite' of gitlab.com:Chill-Projet/chill-bundles into homepage/rewrite 2022-01-28 15:24:05 +01:00
Mathieu Jaumotte 7f41f14959 resume page: move notify button in masonry bloc and notification list below in content 2022-01-28 15:21:44 +01:00
julienfastre fcd5fba13e add history for user in accompanying period (+ counter) 2022-01-28 14:42:18 +01:00
Mathieu Jaumotte 2c57eab4d2 workflows list: rename tabs translations 2022-01-28 14:18:11 +01:00
julienfastre 2cd51eed2e Merge remote-tracking branch 'origin/master' into homepage/rewrite 2022-01-28 14:13:28 +01:00
Mathieu Jaumotte 72e306b583 change add notification button color 2022-01-28 12:46:58 +01:00
Mathieu Jaumotte 917dd49d07 workflows: add freeze mechanism on breadcrumbs, edit document button, and history 2022-01-28 12:41:44 +01:00
julielenaerts 71ca912749 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-01-28 12:25:06 +01:00
julielenaerts 4620e32b82 changelog updated 2022-01-28 12:20:29 +01:00
julielenaerts 0cda5d637d styling of parcours list in person search changed 2022-01-28 12:16:32 +01:00
julielenaerts 646f39b9ed Merge conflicts fixed 2022-01-28 12:15:51 +01:00
nobohan 105fe16122 upd CHANGELOG 2022-01-28 11:40:30 +01:00
nobohan 4d1a553474 show activity attendee (présence) in the activity list 2022-01-28 11:40:08 +01:00
julielenaerts 5bfdee0c28 corrections review 2022-01-28 11:09:14 +01:00
julienfastre ae33392ad0 update changelog 2022-01-28 10:58:24 +01:00
julienfastre 0e0fe90277 Merge branch 'issue399_dynamicPicker_asideActivity' into 'master'
dynamic picker aside activity

See merge request Chill-Projet/chill-bundles!305
2022-01-28 09:55:27 +00:00
LenaertsJ 792eafce72 dynamic picker aside activity 2022-01-28 09:55:26 +00:00
julienfastre 616d01a6c9 Merge branch 'issue403_residential_address' into 'master'
residentialAddress

See merge request Chill-Projet/chill-bundles!302
2022-01-28 09:48:00 +00:00
juminet 21edc74ada residentialAddress 2022-01-28 09:48:00 +00:00
Mathieu Jaumotte ab23290599 refund extension_list_notification template: change place and content 2022-01-28 10:22:48 +01:00
Mathieu Jaumotte 1a2e1eaf2a put notification comments in a separate include 2022-01-28 10:22:17 +01:00
julielenaerts feaee8a0b1 a few more implementations in twig templates 2022-01-28 10:07:34 +01:00
julielenaerts 0a26e7f326 using serialized age instead of function + translation fix 2022-01-28 09:57:14 +01:00
Mathieu Jaumotte ebf85d4e4d Merge branch 'homepage/rewrite' of gitlab.com:Chill-Projet/chill-bundles into homepage/rewrite 2022-01-28 09:56:52 +01:00
Mathieu Jaumotte 72cffd7a3d minor changes 2022-01-28 09:56:20 +01:00
julienfastre 65418b17ce Merge branch 'issues_362_filiations' into 'master'
filiations: small adjustments (colors, labels, ...)

See merge request Chill-Projet/chill-bundles!309
2022-01-28 08:49:59 +00:00
juminet 8432c215a3 filiations: small adjustments (colors, labels, ...) 2022-01-28 08:49:59 +00:00
nobohan 87e1f8f077 hot fix: initialize typed comment in CommentEmbeddable 2022-01-28 09:47:36 +01:00
nobohan 33f393203e activity admin: change validation rule for social action visible field 2022-01-27 19:43:08 +01:00
julielenaerts 6aa1e136b4 fix bug when suggested person is thirdparty 2022-01-27 18:14:32 +01:00
julielenaerts 10a9b6c909 using normalizer for age and added obele 2022-01-27 18:13:46 +01:00
julienfastre ce912e4405 ajout compteurs 2022-01-27 17:28:59 +01:00
julienfastre ab11d3e8b3 Merge branch 'issue400_sort_activity' into 'master'
activity: order activities by date and by id

See merge request Chill-Projet/chill-bundles!301
2022-01-27 16:12:08 +00:00
juminet 445fe0cee4 activity: order activities by date and by id 2022-01-27 16:12:07 +00:00
julienfastre 7c6c8de456 Merge branch 'issue394_address_confidential' into 'master'
confidential address

See merge request Chill-Projet/chill-bundles!299
2022-01-27 16:08:58 +00:00
julienfastre 0378df42b6 fix cs 2022-01-27 17:08:00 +01:00
julienfastre ad8d40cb1c work on confidential / blur module 2022-01-27 16:52:46 +01:00
julielenaerts f4516f8369 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-01-27 16:31:41 +01:00
julielenaerts 5b25f82963 changelog updated 2022-01-27 16:24:35 +01:00
julielenaerts 8720cc730e implementation of person-text 2022-01-27 16:19:19 +01:00
julielenaerts 44d1535bfb style fixes 2022-01-27 16:18:54 +01:00
julielenaerts 8d663cdee6 creation of vue component person-text 2022-01-27 16:18:35 +01:00
julienfastre 7c8b08c3a7 Merge branch 'master' into issue394_address_confidential 2022-01-27 15:39:10 +01:00
julienfastre 6df570d96c set referrer app 2022-01-27 15:22:15 +01:00
julielenaerts 3ce650eea6 Merge branch 'issue389_add_age' of gitlab.com:Chill-Projet/chill-bundles into issue389_add_age 2022-01-27 13:03:02 +01:00
julielenaerts 6ef7d9b47b adding age in renderbox and renderstring, implementation of renderbox option in household summary 2022-01-27 12:59:14 +01:00
julielenaerts af3847366b adding age in renderbox and renderstring, implementation of renderbox option in household summary 2022-01-27 12:33:50 +01:00
julielenaerts d70f8aa712 phpstan fixes 2022-01-27 11:50:26 +01:00
julielenaerts 14463dcd38 changelog updated 2022-01-27 11:45:03 +01:00
julielenaerts b9c2d63a53 mes parcours page created 2022-01-27 11:42:14 +01:00
julielenaerts 3fd4c6339a Merge conflicts resolved 2022-01-27 11:34:57 +01:00
julienfastre 4d76de5f9f fix normalization for person in docgen 2022-01-26 23:52:27 +01:00
julienfastre 0a92ad905b variables for docgen 2022-01-26 23:49:24 +01:00
julienfastre 7af7135971 use trait to implement TrackCreationInterface and TrackUpdateInterface 2022-01-26 21:51:13 +01:00
julienfastre c70a4dc664 fix loading of evaluations 2022-01-26 21:46:07 +01:00
julienfastre dc0fae7549 fixes person resources 2022-01-26 17:53:09 +01:00
julielenaerts b38924cc3d Revert "Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles"
This reverts commit 58c4e37116.
2022-01-26 16:38:58 +01:00
julielenaerts 58c4e37116 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-01-26 16:04:09 +01:00
julielenaerts 3656825d20 bug fix in form and controller 2022-01-26 15:56:10 +01:00
Mathieu Jaumotte 39a7cecd24 homepage_widget: improve notifications rows 2022-01-26 15:44:17 +01:00
julielenaerts 6d382f93e8 use pickDynamicUserType 2022-01-26 15:08:47 +01:00
julienfastre 6e554e74ab Merge branch 'issue382_person_resource' 2022-01-26 14:43:50 +01:00
julielenaerts 4c125865cf fix of twig if condition for person resources 2022-01-26 14:21:39 +01:00
julienfastre 12c68a4c9f Merge branch 'issue406_truncate_comment' into 'master'
Truncate comment

See merge request Chill-Projet/chill-bundles!304
2022-01-26 13:06:04 +00:00
julienfastre 66ac5c7435 Merge remote-tracking branch 'origin/master' into issue406_truncate_comment 2022-01-26 14:03:49 +01:00
julienfastre e4b46a188c Merge branch 'master' into issue406_truncate_comment 2022-01-26 14:01:42 +01:00
julienfastre 7a78e8a6a7 fixes for pesonnes ressources 2022-01-26 14:00:45 +01:00
julienfastre 4496836cb2 Merge branch 'issue382_person_resource' into 'master'
Creation of PersonResource

See merge request Chill-Projet/chill-bundles!291
2022-01-26 12:52:15 +00:00
LenaertsJ 88d1fe24b4 Creation of PersonResource 2022-01-26 12:52:15 +00:00
julienfastre 0ea1708fe9 Merge branch 'master' into issue382_person_resource 2022-01-26 13:50:58 +01:00
julienfastre a9b7cf93e9 adaptation for list for regulation 2022-01-26 13:50:19 +01:00
julielenaerts 5d36e56641 changelog updated 2022-01-26 12:57:14 +01:00
julielenaerts f00dfad98e csfixes 2022-01-26 12:56:02 +01:00
julielenaerts 7943c22ae7 comments truncated and link added to comment page 2022-01-26 12:55:48 +01:00
julielenaerts d365fcea39 merge conflict in changelog resolved 2022-01-26 12:13:37 +01:00
julielenaerts 9f9f9d7881 csfixes 2022-01-26 12:10:51 +01:00
julielenaerts 20f814766c merge fixes 2022-01-26 12:10:18 +01:00
julielenaerts ed00a882af cs-fixes 2022-01-26 12:08:18 +01:00
julielenaerts 5d7501d36e violation added if all three association entities are null 2022-01-26 12:08:18 +01:00
julielenaerts ab5f9923a6 CSfixer changes 2022-01-26 12:08:18 +01:00
julielenaerts 1a5e8b9d7b Fix user/thirdparty/freetext field in edit form 2022-01-26 12:08:18 +01:00
julielenaerts f7f2bb0caa reorganize templates to fix edit form 2022-01-26 12:08:18 +01:00
julielenaerts bf7fcfa41a bugfixes in display of dynamicPicker 2022-01-26 12:08:18 +01:00
julielenaerts 9056ea8449 styling changes collapse form 2022-01-26 12:08:18 +01:00
julielenaerts f0e349a2b0 show-hide files combined into one js file 2022-01-26 12:08:18 +01:00
julielenaerts 2ccc6f1976 fix backend error of data transformer 2022-01-26 12:08:18 +01:00
julienfastre cf041cf49e merge dynamic types 2022-01-26 12:08:18 +01:00
julienfastre 72d593e416 improve migration 2022-01-26 12:08:18 +01:00
julielenaerts 287dca07aa php cs-fixes 2022-01-26 12:08:18 +01:00
julielenaerts 910f9a7e8e update changelog 2022-01-26 12:08:18 +01:00
julielenaerts 9457483a6b different dynamic entity picker types created 2022-01-26 12:08:18 +01:00
julielenaerts 6d07168529 type variable added and file renamed in transformer 2022-01-26 12:08:18 +01:00
julielenaerts 420f81ea24 fix phpstan error 2022-01-26 12:08:18 +01:00
julielenaerts 416b62fc60 show hide functional 2022-01-26 12:08:18 +01:00
julielenaerts ecae7dab44 add placeholders for inputs 2022-01-26 12:07:39 +01:00
julielenaerts 126bd1a4eb fix for comment embeddable null + template adjustments 2022-01-26 12:07:39 +01:00
julielenaerts 450792e446 fix embeddableComment field, but still cannot be null and date+user_id are not set...? 2022-01-26 12:07:39 +01:00
julielenaerts ec155b1d67 bug fixed in entity 2022-01-26 12:07:39 +01:00
julielenaerts 02b2af7d51 attempt to make show hide work 2022-01-26 12:07:39 +01:00
julielenaerts 0a6a2c968c all views created for person resource 2022-01-26 12:07:39 +01:00
julielenaerts 4b188e2df6 adjustments to form + rendering of resource kinds 2022-01-26 12:07:39 +01:00
julielenaerts d6bf1988f6 migration adjusted 2022-01-26 12:07:39 +01:00
julielenaerts 94c9505c05 js files put in place + select menus added for selecting person/thirdparty/... show-hide not working yet 2022-01-26 12:07:39 +01:00
julielenaerts 4a5a1440ff form created + general layout of templates 2022-01-26 12:06:44 +01:00
julielenaerts b31cc460fa route and menu entry added in person menu + start of templates/controller 2022-01-26 12:06:44 +01:00
julielenaerts 48c3432191 changelog entry added 2022-01-26 12:06:44 +01:00
julielenaerts 7b4405f6fe entities + migration created 2022-01-26 12:04:16 +01:00
julielenaerts ce3a74326d cs-fixes 2022-01-26 12:01:14 +01:00
julielenaerts 51ab013bd7 violation added if all three association entities are null 2022-01-26 11:20:47 +01:00
Mathieu Jaumotte 41a6366efe vue homepage_widget: improve translations, titles, tabs order, add no data statement 2022-01-26 10:13:58 +01:00
Mathieu Jaumotte c3c2fd30f0 better title proportions 2022-01-25 21:42:04 +01:00
Mathieu Jaumotte 1952e4aa5a render table results for works tab 2022-01-25 21:39:20 +01:00
Mathieu Jaumotte 1e1311b7c8 add counter pills in tabs 2022-01-25 21:09:11 +01:00
Mathieu Jaumotte fc1ed8b71e display table with notifications datas, prepare others tabs to render datas 2022-01-25 20:08:39 +01:00
Mathieu Jaumotte 2144b247b3 store all makeFetch, with isLoaded check 2022-01-25 18:36:54 +01:00
Mathieu Jaumotte e4629ed599 store first makeFetch, with loading spinner 2022-01-25 17:40:08 +01:00
julielenaerts f27dca6fb5 CSfixer changes 2022-01-25 16:41:44 +01:00
julielenaerts 8c27ec0720 Fix user/thirdparty/freetext field in edit form 2022-01-25 16:38:37 +01:00
julielenaerts 8392e2e6bd reorganize templates to fix edit form 2022-01-25 16:09:11 +01:00
julielenaerts 963b0b1ed2 bugfixes in display of dynamicPicker 2022-01-25 16:08:40 +01:00
Pol Dellaiera 7513187a6d Revert "fix cs"
This reverts commit 7b3e9cb490.
2022-01-25 15:54:20 +01:00
Pol Dellaiera 990fc0e484 Remove obsolete file. 2022-01-25 15:50:07 +01:00
Mathieu Jaumotte 8fce27a128 move styles in better place 2022-01-25 15:43:45 +01:00
julielenaerts 55c2c41cea styling changes collapse form 2022-01-25 14:46:09 +01:00
julielenaerts 0bd10b6dfa show-hide files combined into one js file 2022-01-25 14:45:38 +01:00
julielenaerts 8cd01d4317 fix backend error of data transformer 2022-01-25 14:43:51 +01:00
Mathieu Jaumotte 71293e3378 Merge branch '397_homepage' into homepage/rewrite 2022-01-25 14:41:53 +01:00
julienfastre cb58afa44a Merge branch 'master' into homepage/rewrite 2022-01-25 14:40:38 +01:00
julienfastre 7b3e9cb490 fix cs 2022-01-25 14:40:28 +01:00
Mathieu Jaumotte fb720a382f sticky buttons smaller 2022-01-25 14:32:57 +01:00
julienfastre a4bfa1cb16 Merge remote-tracking branch 'origin/master' into homepage/rewrite 2022-01-25 14:28:29 +01:00
Mathieu Jaumotte 502f2aceed init sub-components and active tab mechanism 2022-01-25 13:02:24 +01:00
Pol Dellaiera eb9cc0b63f Update minor things. 2022-01-25 12:19:14 +01:00
Pol Dellaiera 7ee554b48d Update minor things. 2022-01-25 11:56:30 +01:00
Pol Dellaiera 2e6d281bfc cs: Autofix coding standard based on updated rules. 2022-01-25 11:46:29 +01:00
Pol Dellaiera 4b1bf7ce23 Remove obsolete file. 2022-01-25 11:33:14 +01:00
Pol Dellaiera 2d574fea2e chore: Remove duplicate entries from composer.json and normalize it. 2022-01-25 11:29:59 +01:00
Mathieu Jaumotte 0e2772336f create new app vue homepage_widget, with store 2022-01-25 11:27:31 +01:00
Mathieu Jaumotte 320d11671a prepare homepage_widget template 2022-01-25 10:54:08 +01:00
julienfastre 6ef5390a26 update change log with release 2022-01-24 20:00:14 +01:00
julienfastre dec26e2ba4 merge dynamic types 2022-01-24 19:42:06 +01:00
julienfastre 514d75fa5f improve migration 2022-01-24 19:26:16 +01:00
julienfastre 0ac51da31a Merge remote-tracking branch 'origin/issue386_dynamic_type_picker' into issue382_person_resource 2022-01-24 19:23:24 +01:00
julienfastre 90d43b0bd3 Merge remote-tracking branch 'origin/master' into issue382_person_resource 2022-01-24 19:21:06 +01:00
julienfastre 5fe0790912 fix error when creating evaluation 2022-01-24 19:17:04 +01:00
julienfastre ff66aa5590 fix debug message 2022-01-24 15:14:45 +01:00
julienfastre 8e2d3616b5 Merge remote-tracking branch 'origin/master' into issue383_referent_in_acc_course 2022-01-24 15:04:55 +01:00
julienfastre c046824ea3 Merge branch 'issue385_comments_accourse' into 'master'
Bug fix pinned comments parcours

See merge request Chill-Projet/chill-bundles!297
2022-01-24 13:55:50 +00:00
julienfastre a9b216b16b Merge remote-tracking branch 'origin/master' into issue385_comments_accourse 2022-01-24 14:54:00 +01:00
julienfastre f866eae581 Merge branch 'issue347_document_gen_activity' into 'master'
activity: doc gen

See merge request Chill-Projet/chill-bundles!295
2022-01-24 13:51:14 +00:00
juminet 21d4e49fce activity: doc gen 2022-01-24 13:51:14 +00:00
julielenaerts b87f14255d bugfix of double civility abbreviation after edit 2022-01-24 14:44:53 +01:00
julielenaerts 0f2cbbe553 bugfix emit saveFormOnTheFly and add newly created contact to suggestion list immediately 2022-01-24 14:24:56 +01:00
julienfastre 17b887160a Merge branch '105_worflow' into 'master'
105 worflow

See merge request Chill-Projet/chill-bundles!275
2022-01-24 13:17:46 +00:00
Mathieu Jaumotte c7dbaae8d6 105 worflow 2022-01-24 13:17:46 +00:00
nobohan 25ee11e4ff upd CHANGELOG 2022-01-24 13:48:47 +01:00
nobohan df661fc7c4 address: render blur address if confidential in address render box (twig) 2022-01-24 12:13:34 +01:00
nobohan 6b78c06dfb address: use address.confidential in AddressRenderBox.vue 2022-01-24 12:04:23 +01:00
julienfastre daff4e4200 Merge branch 'household/composition-add' into 'master'
Household/composition add + fixes household composition editor

See merge request Chill-Projet/chill-bundles!290
2022-01-24 10:59:00 +00:00
julienfastre 53b3f98bba Household/composition add + fixes household composition editor 2022-01-24 10:59:00 +00:00
julienfastre 2b47868d88 Merge branch 'notification/improve' into 'master'
Improve notifications

See merge request Chill-Projet/chill-bundles!294
2022-01-24 10:09:57 +00:00
julienfastre 54c2b92962 Improve notifications 2022-01-24 10:09:57 +00:00
nobohan d087f051f0 address: remove maxlenght constraint in vuejs form for corridor, flat, steps, floor 2022-01-24 11:08:25 +01:00
nobohan b3edba3abe address: add confidential in vuejs edit form 2022-01-24 11:04:17 +01:00
nobohan 02d8ceba25 address: add confidential in normalizer + code style fix 2022-01-24 10:42:05 +01:00
nobohan 741043c177 address: alter some address field to TEXT + add confidential field 2022-01-24 10:05:47 +01:00
julienfastre c42f62de4c fix phpstan errors: undefined variable or type invalid 2022-01-24 00:32:47 +01:00
julienfastre e23ef35b75 list of unread notificaiton api endpoint 2022-01-24 00:24:20 +01:00
julienfastre eccc75aecf fix cs 2022-01-23 23:22:04 +01:00
julienfastre 7e2fbf93f9 task: api endpoint for my tasks 2022-01-23 23:13:25 +01:00
julienfastre 6ab8f95f7d list of "my evaluation near end" 2022-01-23 22:40:17 +01:00
julienfastre ad05b3bf05 fix variable name in work list page 2022-01-23 22:25:52 +01:00
julienfastre 1faa9812db fix variable name in work list page 2022-01-23 22:24:48 +01:00
julienfastre a786578cbe fix cs 2022-01-23 21:52:27 +01:00
julienfastre c08bd76e4b adding parameter until and since on 'work near end' 2022-01-23 21:52:16 +01:00
julienfastre 20a4950c60 accompanying period work list for my, near end date 2022-01-23 13:23:50 +01:00
julielenaerts cdbae1eade bugfix in parcours display if deathdate of associated person is not defined (ex. for thirdparty) 2022-01-21 17:00:04 +01:00
julielenaerts 92788ccdc0 php cs-fixes 2022-01-21 15:58:55 +01:00
julielenaerts 84993ca05b update changelog 2022-01-21 15:55:22 +01:00
julielenaerts 972657b38e different dynamic entity picker types created 2022-01-21 15:53:52 +01:00
julielenaerts b26d0905a3 type variable added and file renamed in transformer 2022-01-21 15:01:12 +01:00
julielenaerts 4ab0a28f7d fix phpstan error 2022-01-21 13:05:38 +01:00
julielenaerts 52009bd7c6 show hide functional 2022-01-21 12:35:33 +01:00
julielenaerts 7acd6c7fc3 add placeholders for inputs 2022-01-21 12:34:14 +01:00
julielenaerts f26cba415b fix for comment embeddable null + template adjustments 2022-01-21 12:08:41 +01:00
julielenaerts 8a2e588190 fix embeddableComment field, but still cannot be null and date+user_id are not set...? 2022-01-20 17:14:14 +01:00
julielenaerts d63d9c2f4e bug fixed in entity 2022-01-20 17:13:28 +01:00
julielenaerts dcdee1d6e3 attempt to make show hide work 2022-01-20 17:12:18 +01:00
julielenaerts dd589af1be all views created for person resource 2022-01-20 17:11:51 +01:00
nobohan ce594692b3 accompanying course: confirm DRAFT acc. period when suggestedReferrers is unique or null 2022-01-20 16:59:01 +01:00
nobohan 17076024f7 accompanying course: fix filtering of suggested referrers 2022-01-20 14:27:36 +01:00
nobohan 61607fee3d accompanying course: code fix 2022-01-20 14:14:30 +01:00
nobohan 25ebeebdfb accompanying course: display closed acc. period in list 2022-01-20 08:32:48 +01:00
nobohan 343b2a6f2f accompanying course: re-open: translations + fine-tuning 2022-01-20 08:21:09 +01:00
nobohan d4efe81dbb person: can reopen an accompanying course 2022-01-19 21:46:40 +01:00
nobohan 9d6afc4bb2 accompanying course: close social issues selector on select 2022-01-19 21:04:35 +01:00
julielenaerts 2bdf116698 adjustments to form + rendering of resource kinds 2022-01-19 19:46:01 +01:00
julielenaerts 96dc711b4f migration adjusted 2022-01-19 19:38:57 +01:00
nobohan d1918e4be0 accompanying course: filter referrer by job 2022-01-19 17:48:00 +01:00
julielenaerts 256c5688a0 attempt to not include parent address 2022-01-19 16:51:21 +01:00
nobohan 040c5f8847 accompanying course: change wording for scopes 2022-01-19 16:18:04 +01:00
nobohan 9b5990916f job in accompanying course: fix error in setting job property 2022-01-19 15:40:38 +01:00
nobohan 74e94637b9 job in accompanying course: validation 2022-01-19 15:40:38 +01:00
nobohan 216c035bac vuejs: add missing translations for multiselect 2022-01-19 15:40:38 +01:00
nobohan 16c86daafb accompanying course: add selector for accompanying course job 2022-01-19 15:40:38 +01:00
nobohan 175fa7bf2f php code fix 2022-01-19 15:40:38 +01:00
nobohan 9f7f6e33e8 user-job: make an endpoint for userJob + doc swagger 2022-01-19 15:40:38 +01:00
nobohan 3471bdec0d accompanyingPeriod: add job 2022-01-19 15:40:38 +01:00
julielenaerts 6460007aa1 changelog updated 2022-01-19 12:18:09 +01:00
julielenaerts f84e088e7b placeholders for civility and profession 2022-01-19 12:14:37 +01:00
julielenaerts b8e16d2929 correction for POST phonenumber and email 2022-01-19 11:06:07 +01:00
julielenaerts 88fc5e94fa only show addcontact button for personne morale 2022-01-19 11:00:53 +01:00
julielenaerts 4431428c26 possible to add a contact to a thirdparty 2022-01-19 10:57:31 +01:00
julielenaerts 724ce8c9af small corrections 2022-01-19 09:57:19 +01:00
julielenaerts 001e2f9622 js files put in place + select menus added for selecting person/thirdparty/... show-hide not working yet 2022-01-19 09:48:39 +01:00
julielenaerts 58ac4b01ef form created + general layout of templates 2022-01-18 14:54:03 +01:00
julielenaerts 6e4bfd45c6 route and menu entry added in person menu + start of templates/controller 2022-01-18 13:55:09 +01:00
julielenaerts ff0b0678a5 changelog entry added 2022-01-18 11:11:29 +01:00
julielenaerts 3b56cc818b entities + migration created 2022-01-18 11:08:24 +01:00
julielenaerts a31b74e0e5 further attempts to do POST of thirdparty contact, passing parent id causes problems + civility and profession fk's are not saved on POST 2022-01-17 12:00:22 +01:00
julielenaerts 47615e2e5d merge conflicts fixed 2022-01-14 16:13:35 +01:00
julielenaerts 475585c5e7 use correct button 2022-01-14 09:30:00 +01:00
Mathieu Jaumotte a2e086be75 add a chill button "tpchild", to create on-the-fly thirdparty (kind=child) 2022-01-14 09:30:00 +01:00
julielenaerts e6cf1994b0 parent id added to thirdparty data 2022-01-14 09:30:00 +01:00
julielenaerts bea0b69858 v-model added so data is taken from the form for all fields + modal title correction 2022-01-14 09:30:00 +01:00
julielenaerts 95547e961e onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-01-14 09:28:19 +01:00
julielenaerts c4a859f2d2 translations added 2022-01-14 09:27:36 +01:00
julielenaerts a39bd79930 endpoints created for profession and civility for use in vue component 2022-01-14 09:27:06 +01:00
julielenaerts 424d0533b8 unsaved changes 2022-01-14 09:27:06 +01:00
julielenaerts 5a7d187a10 unsaved changes 2022-01-14 09:27:06 +01:00
julielenaerts dc8dd6a423 button added to add contact to personne morale (styling not correct yet) + opening of onTheFly thirdparty, but conditions and parameters not yet correct 2022-01-14 09:27:06 +01:00
julielenaerts 006e8cdc27 minor bug fix for view page of thirdparty property 'types' -> 'thirdPartyTypes' 2022-01-14 09:27:06 +01:00
julielenaerts cf4f6f06e9 use correct button 2022-01-13 17:58:30 +01:00
Mathieu Jaumotte e467820345 add a chill button "tpchild", to create on-the-fly thirdparty (kind=child) 2022-01-13 17:53:32 +01:00
julielenaerts 416a1c4e4d parent id added to thirdparty data 2022-01-13 16:36:54 +01:00
julielenaerts 1febfc11e5 v-model added so data is taken from the form for all fields + modal title correction 2022-01-13 16:30:52 +01:00
julielenaerts a288fdf12d resolve merge conflict 2022-01-13 14:40:37 +01:00
julielenaerts 6a3f17962b onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet 2022-01-13 14:35:53 +01:00
julielenaerts 3860adc435 translations added 2022-01-13 14:34:28 +01:00
julielenaerts 65daf2d0cf endpoints created for profession and civility for use in vue component 2022-01-13 14:33:57 +01:00
julielenaerts 9bf41bbd34 unsaved changes 2022-01-12 17:41:58 +01:00
julielenaerts de7de22492 unsaved changes 2022-01-12 17:40:36 +01:00
julielenaerts ea66fb4c37 button added to add contact to personne morale (styling not correct yet) + opening of onTheFly thirdparty, but conditions and parameters not yet correct 2022-01-12 17:38:24 +01:00
julielenaerts c1232037a9 minor bug fix for view page of thirdparty property 'types' -> 'thirdPartyTypes' 2022-01-12 13:52:26 +01:00
julielenaerts 75eb6414ce test set back to what it was otherwise error 2021-12-02 15:38:27 +01:00
julielenaerts 5e7445a4fe stylefix 2021-12-02 15:31:38 +01:00
julielenaerts c527b1b3cf validation attempt with assert\callback: still doesn't work 2021-12-02 15:31:08 +01:00
julielenaerts acacef936c changelog updated and stylefix 2021-12-02 12:49:33 +01:00
julielenaerts f971dc05eb test written, but the validation expression is not yet correct 2021-12-02 12:33:10 +01:00
julielenaerts 9aba4ea8f6 first commit 2021-11-29 14:06:22 +01:00
1377 changed files with 39130 additions and 50372 deletions
+7
View File
@@ -18,3 +18,10 @@ max_line_length = 80
[COMMIT_EDITMSG]
max_line_length = 0
<<<<<<< Updated upstream
=======
[*.{js, vue, ts}]
indent_size = 2
indent_style = space
>>>>>>> Stashed changes
-64
View File
@@ -1,64 +0,0 @@
##
## Manually dump .env files in .env.local.php with
## `$ composer symfony:dump-env prod`
##
## Project environment
APP_ENV=dev
## Enable debug
APP_DEBUG=true
## Locale
LOCALE=fr
## Framework secret
APP_SECRET=ThisTokenIsNotSoSecretChangeIt
## Symfony/swiftmailer
MAILER_TRANSPORT=smtp
MAILER_HOST=smtp
MAILER_PORT=1025
MAILER_CRYPT=
MAILER_AUTH=
MAILER_USER=
MAILER_PASSWORD=
MAILER_URL=${MAILER_TRANSPORT}://${MAILER_HOST}:${MAILER_PORT}?encryption=${MAILER_CRYPT}&auth_mode=${MAILER_AUTH}&username=${MAILER_USER}&password=${MAILER_PASSWORD}
## Notifications
NOTIFICATION_HOST=localhost:8001
NOTIFICATION_FROM_EMAIL=admin@chill.social
NOTIFICATION_FROM_NAME=Chill
## Gelf
GELF_HOST=gelf
GELF_PORT=12201
## OVH OpenStack Storage User/Role
OS_USERNAME=
OS_PASSWORD=
OS_TENANT_ID=
OS_REGION_NAME=GRA
OS_AUTH_URL=https://auth.cloud.ovh.net/v2.0/
## OVH OpenStack Storage Container
ASYNC_UPLOAD_TEMP_URL_KEY=
ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
ASYNC_UPLOAD_TEMP_URL_CONTAINER=
## Redis Cache
REDIS_HOST=redis
REDIS_PORT=6379
REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
## Twilio
TWILIO_SID=~
TWILIO_SECRET=~
## DOCKER IMAGES REGISTRY
#IMAGE_PHP=
#IMAGE_NGINX=
## DOCKER IMAGES VERSION
#VERSION=test
VERSION=prod
+1
View File
@@ -22,3 +22,4 @@ docs/build/
/.php-cs-fixer.cache
/.idea/
/.psalm/
+2
View File
@@ -29,6 +29,7 @@ variables:
REDIS_URL: redis://redis:6379
# change vendor dir to make the app install into tests/apps
COMPOSER_VENDOR_DIR: tests/app/vendor
DEFAULT_CARRIER_CODE: BE
stages:
- Composer install
@@ -78,6 +79,7 @@ psalm_tests:
image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
script:
- bin/grumphp run --tasks=psalm
allow_failure: true
artifacts:
expire_in: 30 min
paths:
+318 -2
View File
@@ -11,17 +11,328 @@ and this project adheres to
## Unreleased
<!-- write down unreleased development here -->
* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
* [workflow]: added pagination to workflow list page
* [homepage_widget]: null error on tasks widget fixed
* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
* [filiation]: Allow the deletion of a relationship in filiations (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/608)
* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
## Test releases
### 2022-05-30
* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
### 2022-05-27
* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
### 2022-05-06
* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
### 2021-04-29
* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
* Load relationships without gender in french fixtures
* Add command to remove old draft accompanying periods
* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
### 2021-04-28
* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
### 2021-04-26
* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
### 2021-04-24
* [notification email on course designation] allow raw string in email content generation
* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
* [Notifications] delay the sending of notificaiton to kernel.terminate
* [Notifications / Period user change] fix the sending of notification when user changes
* [Activity form] invert 'incoming' and 'receiving' in Activity form
* [Activity form] keep the same order for 'attendee' field in new and edit form
* [list with period] use "sameas" test operator to introduce requestor in list
* [notification email on course designation] allow raw string in email content generation
* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)
### 2021-04-13
* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
* [docgen] add a new context with a list of activities in course
* [docgen] add a comment in budget lines
* [notifications] allow to send a notification to an email address. The address receive an access link
* [adresses] add constraints in database to avoid errors later: postcode not null, and validfrom <= validto
* [accompanying work editor] add a label on document title input
### 2021-04-07
* notification list: move action buttons outside of the toggle
* fix detecting of non-read notification
* filter users which are disabled in search user api
* order query for location and add pagination in list
* allow every person which has part for a workflow to see the workflow page
* able to see the workflow if the evaluation document has been deleted
* hardcode the list of supported mime types for edition with collabora
* list of accompanying course: allow to see the pinned comment in list_item
### 2021-04-06
* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
* [activity] espace entre les boutons pour supprimer les documents
### continuous release in February and March
* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
* [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos
(https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585)
* [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
* [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
* [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
* [search] enforce limit of results for fetching rsults by search api https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/576
* [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
* [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
* [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
* [person] AccompanyingCourseWorkEdit: fix deleting evaluation documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/546)
* [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
* [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
* [person] AccompanyingPeriodWork: add referrers to work, add doctrine event listener to add logged user to referrers collection and display a referrers list in work list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/502)
* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
* [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
* [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
* [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
* [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
* [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
* [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
* [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
* [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
* [person] Add title to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
* [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388)
* [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
* [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463)
* [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441)
* [budget]: budget enabled for persons and households (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/469)
* [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
* [documents] Improve flex-table item-col placement when long buttons and long metadata
* [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482)
* [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
* [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
* [template] do not list inactive templates (for doc generator)
* [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
* [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
* [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
* [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
* [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
* [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
* [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
* [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
* [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
* [thirdparty] For contacts show current civility/profession in edit form + fix saving of edited information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/491)
* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
* [thirdparty] add firstname field to thirdparty 'child' or 'contact' types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/508)
* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
* [parcours] List of parcours for a specific user so they can be reassigned in case of absence (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/509)
* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
* [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
* [person_resource] bugfix when adding thirdparty or freetext resource + prevent personOwner themselves to be added. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/526)
* [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
* [budget] order within the menu adjusted (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/592)
* [onthefly] fix create person. Bug was noticed in filiation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/591)
* [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532)
* [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530)
* [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
* [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
## Test releases
### test release 2022-02-21
* [notifications] Word 'un' changed to number '1' for notifications in user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/483)
* [documents] 'gabarit' changed to 'modèle' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/405)
* [person_resources] Menu name and order changed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/460)
* workflow: fix sending notifications
* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
* [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
* [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
* [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
* [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
* [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481)
* [3party]: 3party: redirect to parent when contact (child) is opened in view page
* [parcours / addresses]: launch an event when a person change address (either through changing household or because the household is associated to a new address). If the person is localising a course, the course location go back to a temporarily address.
* [thirdparty]: address/phonenumber/email/fonction displayed in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/401)
* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
### test release 2022-02-14
* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
* [doc-generator] do not set required fields for mainPerson, person1, person2 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement#456)
* [doc-generation] add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/370)
* [person] accompanying course work: fix on-the-fly update of thirdParty
* fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
* [person] accompanying course work: fix on-the-fly update of thirdParty
* [on-the-fly] close modal only after validation
* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
* change order for accompanying course work list
* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
* [parcours]: Only the referrer can toggle the intensity of the parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415)
* ajoute un ordre dans les localisation (api)
* [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419)
* [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440)
* [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454)
* display full address in address.text in normalization. Adapt AddressRenderBox
* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
### test release 2021-02-01
* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
* renomme date de début en date d'ouverture dans le formulaire parcours
* [homepage widget] improve content tables, improve counter pluralization with style on number
* [notification lists] add comments counter information
* [workflows] fix popover header with previous transition
* [parcours]: validation + message for closing parcours adjusted.
* [household]: household composition double edit button replaced by a delete action (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/426)
[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
* [person]: Comment on marital status is possible even if marital status is not defined (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/421)
* [parcours]: In the list of person results the requestor is not displayed if defined as anonymous (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/424)
* [bugfix]: modal closes and newly created person/thirdparty is selected when multiple persons/thirdparties are created through the modal (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/429)
* [person_resource]: Onthefly button added to view person/thirdparty and badge differentiation for a contact-thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/428)
* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
* [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
* [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
### test release 2021-01-31
* [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
* [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
* [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
* [activity] show activity attendee (présence) in the activity list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/412)
* [activity] admin: change validation rule for social action visible field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/413)
* [parcours]: component added to change the opening date of a parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/411)
* [search]: listing of parcours display changed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/410)
* [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
* [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
* [household member editor] allow to push to existing household
### test release 2021-01-28
* [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
* [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
* [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
* [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
* [person] Add residential address entity, form and list for each person
* [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
* dispatching list
### test release 2021-01-26
* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
* [person ressources]: module added
### test release 2022-01-24
* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
* [notification: formulaire création] descend la box avec la description dans le bas du formulaire
* [notification for activity]: fix link to activity
* [notification] add "URGENT" before accompanying course with emergency = true
* [notification] add a "read more" button on system notification
* [notification] add `[Chill]` in the subject of each notification, automatically
* [notification] add a counter for notification in activity list and accompanying period list, and search results
* [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before.
* [workflow] add breadcrumb to show steps
* [popover] add popover html popup mechanism (used by workflow breadcrumb)
* [templates] improve updatedBy macro in item metadatas
* [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
* [workflow]
* add My workflow section with my opened subscriptions
* apply workflow on documents, accompanyingCourseWork and Evaluations
* [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
### test release 2022-01-19
* vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271)
* [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
* [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
* [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
* [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
* [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386)
### test release 2022-01-17
@@ -31,10 +342,14 @@ and this project adheres to
* [main] Add mainLocation field to User entity and add it in user form type
* [course list in person context] show full username/label for ref
* [accompanying period work] remove the possibility to generate document from an accompanying period work
* vuejs: add validation on required fields for AddPerson, Address and Location components
* vuejs: treat 422 validation errors in locations and AddPerson components
* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
## Test releases
* vuejs: add validation on required fields for AddPerson, Address and Location components
* vuejs: treat 422 validation errors in locations and AddPerson components
* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
### test release 2022-01-12
@@ -164,6 +479,7 @@ and this project adheres to
* add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
* [period] Validation added when period is confidential and confirmed -> user cannot be null.
## Test releases
+23 -7
View File
@@ -2,7 +2,14 @@
en cours de rédaction
## Translations
Par bundle, toutes les traductions des pages twig se trouvent dans un seul fichier `translations/messages.fr.yaml`.
## Emplacement des fichiers
Les controllers, form type & templates twig sont placés à la racine des dossiers `Controller`, `Form` & `Ressources/views`, respectivement. Pour les pages Admin, on ne les mets plus dans des sous-dossiers Admin.
## Assets: nommage des entrypoints
Trois types d'entrypoint:
@@ -146,19 +153,20 @@ Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhai
Les routes sont nommées de cette manière:
`chill_bundle_entite_action`
`chill_(api|crud)_bundle_(api)_entite_action`
1. d'abord chill_ (pour tous les modules chill)
2. ensuite une string qui est identique, par bundle
3. si le point est un point d'api (json), alors ajouter la string `api`
4. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
5. ensuite une action (`list`, `view`, `edit`, `new`, ...)
2. ensuite `crud` ou `api`, optionnel, automatiquement ajouté si la route est générée par la configuration
3. ensuite une string qui indique le bundle (`main`, `person`, `activity`, ...)
4. ensuite, `api`, si la route est une route d'api.
5. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
6. ensuite une action (`list`, `view`, `edit`, `new`, ...)
Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
Le fait d'indiquer `api` en quatrième position permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.
### URL
### Nommage des URL
Les URL respectent également une convention:
@@ -219,6 +227,14 @@ Les éléments suivants devraient se trouver dans la liste:
Ces éléments peuvent être entrecoupés de l'identifiant d'une entité. Dans ce cas, cet identifiant se place juste après l'entité auquel il se rapporte.
#### Pour les URL de l'espace Admin
Même conventions que dans les autres pages html de l'application, **mais `admin` est ajouté en deuxième position**. Soit:
`/{_locale}/admin/bundle/entity/{id}/action`
## Règles UI chill
### Titre des pages
Executable
BIN
View File
Binary file not shown.
+18 -25
View File
@@ -10,8 +10,8 @@
"require": {
"php": "^7.4",
"champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
"champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8",
"champs-libres/wopi-lib": "dev-master#0e1da19bb6de820080b8651867a7e475be590060",
"champs-libres/wopi-bundle": "dev-master#6dd8e0a14e00131eb4b889ecc30270ee4a0e5224",
"champs-libres/wopi-lib": "dev-master#8615f4a45a39fc2b6a98765ea835fcfd39618787",
"doctrine/doctrine-bundle": "^2.1",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.7",
@@ -21,7 +21,8 @@
"knplabs/knp-time-bundle": "^1.12",
"league/csv": "^9.7.1",
"nyholm/psr7": "^1.4",
"ocramius/package-versions": "^1.10",
"ocramius/package-versions": "^1.10 || ^2",
"odolbeau/phone-number-bundle": "^3.6",
"phpoffice/phpspreadsheet": "^1.16",
"ramsey/uuid-doctrine": "^1.7",
"sensio/framework-extra-bundle": "^5.5",
@@ -32,6 +33,7 @@
"symfony/expression-language": "^4.4",
"symfony/form": "^4.4",
"symfony/framework-bundle": "^4.4",
"symfony/http-foundation": "^4.4",
"symfony/intl": "^4.4",
"symfony/mailer": "^5.4",
"symfony/mime": "^5.4",
@@ -43,6 +45,7 @@
"symfony/translation": "^4.4",
"symfony/twig-bundle": "^4.4",
"symfony/validator": "^4.4",
"symfony/web-link": "*",
"symfony/webpack-encore-bundle": "^1.11",
"symfony/workflow": "^4.4",
"symfony/yaml": "^4.4",
@@ -52,9 +55,6 @@
"twig/string-extra": "^3.3",
"twig/twig": "^3.0"
},
"conflict": {
"symfony/symfony": "*"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "^3.3",
"drupol/php-conventions": "^5",
@@ -71,23 +71,17 @@
"symfony/var-dumper": "^4.4",
"symfony/web-profiler-bundle": "^4.4"
},
"config": {
"bin-dir": "bin",
"optimize-autoloader": true,
"sort-packages": true,
"vendor-dir": "tests/app/vendor",
"allow-plugins": {
"composer/package-versions-deprecated": true,
"phpstan/extension-installer": true,
"ergebnis/composer-normalize": true,
"phpro/grumphp": true
}
"conflict": {
"symfony/symfony": "*"
},
"autoload": {
"psr-4": {
"Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
"Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
"Chill\\BudgetBundle\\": "src/Bundle/ChillBudgetBundle",
"Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
"Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle",
"Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
"Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
"Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
"Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
@@ -96,25 +90,24 @@
"Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
"Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
"Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
"Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
"Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
"Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
"Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
}
},
"autoload-dev": {
"psr-4": {
"App\\": "tests/app/src/",
"Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
"Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
"Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
}
},
"config": {
"allow-plugins": {
"composer/package-versions-deprecated": true,
"phpstan/extension-installer": true,
"ergebnis/composer-normalize": true,
"ocramius/package-versions": true,
"phpro/grumphp": true,
"ocramius/package-versions": true
"phpstan/extension-installer": true,
"roave/you-are-using-it-wrong": true
},
"bin-dir": "bin",
"optimize-autoloader": true,
@@ -123,8 +116,8 @@
},
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
"assets:install %PUBLIC_DIR%": "symfony-cmd",
"cache:clear": "symfony-cmd"
}
}
}
+1 -1
View File
@@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function.
{% block title 'Item list'|trans %}
{% block personcontent %}
{% block content %}
<table>
@@ -156,7 +156,7 @@ This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the p
It proposes 1 new block :
* personcontent
* content
* where to display the information of the person
+11
View File
@@ -65,6 +65,17 @@ This script will :
4. build assets
.. note::
In some cases it can happen that an old image (chill_base_php or chill_php) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
.. code-block:: bash
docker-compose images php
docker rmi -f chill_php:prod
docker-compose rm php
4. Start the project
====================
+1
View File
@@ -24,6 +24,7 @@ parameters:
- "/spec/"
- "/var/"
- "/vendor/"
- "/tests/app"
# Psalm
tasks.psalm.blocking: true
-3
View File
@@ -1,3 +0,0 @@
add npm/yarn dependency in package.json :
"select2-bootstrap-theme": "0.1.0-beta.10",
-5
View File
@@ -80,11 +80,6 @@ parameters:
count: 1
path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
message: "#^Foreach overwrites \\$action with its value variable\\.$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Foreach overwrites \\$action with its value variable\\.$#"
count: 1
-40
View File
@@ -5,11 +5,6 @@ parameters:
count: 1
path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
count: 3
path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
count: 1
@@ -25,41 +20,6 @@ parameters:
count: 1
path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Household\\\\MembersEditorFactory\\:\\:\\$validator\\.$#"
count: 2
path: src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
-
message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:countBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Undefined variable\\: \\$action$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Undefined variable\\: \\$limit$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Undefined variable\\: \\$offset$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Undefined variable\\: \\$orderBy$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Variable variables are not allowed\\.$#"
count: 4
+445 -1074
View File
File diff suppressed because it is too large Load Diff
-45
View File
@@ -25,16 +25,6 @@ parameters:
count: 1
path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
count: 3
path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
count: 2
path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
count: 3
@@ -250,11 +240,6 @@ parameters:
count: 1
path: src/Bundle/ChillMainBundle/Entity/Address.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
@@ -295,11 +280,6 @@ parameters:
count: 3
path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
-
message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 2
@@ -325,11 +305,6 @@ parameters:
count: 1
path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
@@ -360,11 +335,6 @@ parameters:
count: 6
path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 2
path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
@@ -400,11 +370,6 @@ parameters:
count: 1
path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
-
message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#"
count: 1
path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 3
@@ -475,18 +440,8 @@ parameters:
count: 1
path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
-
message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
count: 1
path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 1
path: src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+1
View File
@@ -3,6 +3,7 @@ parameters:
paths:
- src/
excludePaths:
- .php_cs*
- docs/
- src/Bundle/*/Tests/*
- src/Bundle/*/tests/*
+3
View File
@@ -40,6 +40,9 @@
<testsuite name="DocGeneratorBundle">
<directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
</testsuite>
<testsuite name="WopiBundle">
<directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
</testsuite>
</testsuites>
<listeners>
+9 -492
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="v4.15.0@a1b5e489e6fcebe40cb804793d964e99fc347820">
<files psalm-version="4.18.0.0">
<file src="src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php">
<UndefinedClass occurrences="4">
<code>'ChillActivityBundle:ActivityReasonCategory'</code>
@@ -47,6 +47,11 @@
<code>Activity[]|array</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php">
<DuplicateClass occurrences="1">
<code>AppKernel</code>
</DuplicateClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php">
<MissingFile occurrences="1">
<code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -164,72 +169,18 @@
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>\Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<TooFewArguments occurrences="2"/>
<UndefinedDocblockClass occurrences="1">
<code>Prophecy\Prophet</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>type</code>
</UndefinedDocblockClass>
@@ -254,11 +205,6 @@
<code>$asideActivityCategory</code>
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php">
<InvalidStaticInvocation occurrences="3">
<code>$calculator::getAlias()</code>
@@ -288,11 +234,6 @@
<code>'ChillCalendarBundle:Calendar'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php">
<UndefinedClass occurrences="1">
<code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
@@ -397,10 +338,6 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="4">
<code>type</code>
<code>type</code>
@@ -408,61 +345,6 @@
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php">
<UndefinedClass occurrences="1">
<code>'ChillDocStoreBundle:AccompanyingCourseDocument'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php">
<UndefinedClass occurrences="3">
<code>'ChillDocStoreBundle:DocumentCategory'</code>
@@ -470,11 +352,6 @@
<code>'ChillDocStoreBundle:DocumentCategory'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php">
<UndefinedClass occurrences="1">
<code>'ChillDocStoreBundle:PersonDocument'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillDocStoreBundle/Entity/Document.php">
<UndefinedDocblockClass occurrences="1">
<code>\Chill\PersonBundle\Entity\user</code>
@@ -570,9 +447,6 @@
<InvalidParamDefault occurrences="1">
<code>type</code>
</InvalidParamDefault>
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="8">
<code>'ChillEventBundle:Event'</code>
<code>'ChillEventBundle:Event'</code>
@@ -588,10 +462,6 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillMainBundle:Scope'</code>
</UndefinedClass>
@@ -891,11 +761,6 @@
<code>OptionsResolverInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Notification/Mailer.php">
<UndefinedDocblockClass occurrences="1">
<code>\Symfony\Component\Mailer\Exception\TransportExceptionInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Pagination/PageGenerator.php">
<UndefinedVariable occurrences="1">
<code>$current</code>
@@ -924,11 +789,6 @@
<code>$onlyEnabled</code>
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php">
<DuplicateClass occurrences="1">
<code>AppKernel</code>
</DuplicateClass>
</file>
<file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php">
<MissingFile occurrences="1">
<code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -1056,158 +916,15 @@
</UndefinedClass>
</file>
<file src="src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php">
<MethodSignatureMismatch occurrences="2">
<code>protected function tearDown()</code>
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="40">
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>$this-&gt;prophet</code>
<code>Prophecy\Prophet</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php">
<UndefinedClass occurrences="1">
<code>CenterType</code>
</UndefinedClass>
<UndefinedDocblockClass occurrences="1">
<code>CenterType</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="1">
<code>unknown</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php">
<UndefinedDocblockClass occurrences="1">
<code>unknown</code>
@@ -1412,20 +1129,6 @@
<code>OptionsResolverInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php">
<UndefinedClass occurrences="6">
<code>$qb</code>
<code>$qb</code>
<code>$qb</code>
<code>QueryBuilder</code>
<code>SocialAction</code>
<code>SocialAction</code>
</UndefinedClass>
<UndefinedVariable occurrences="2">
<code>$action</code>
<code>$orderBy</code>
</UndefinedVariable>
</file>
<file src="src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php">
<DuplicateClass occurrences="1">
<code>AppKernel</code>
@@ -1505,33 +1208,13 @@
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="2">
<code>AccompanyingPeriodRepository</code>
<code>stdClass</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php">
<InvalidThrow occurrences="1"/>
<MethodSignatureMismatch occurrences="3">
<code>public function setUp()</code>
<code>public function tearDown()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="3">
<code>'ChillMainBundle:Center'</code>
<code>'ChillPersonBundle:AccompanyingPeriod\ClosingMotive'</code>
@@ -1543,40 +1226,19 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>User</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php">
<InvalidScope occurrences="1">
<code>$this</code>
</InvalidScope>
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public static function tearDownAfterClass()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="2">
<code>'ChillMainBundle:Country'</code>
<code>'ChillPersonBundle:Person'</code>
@@ -1586,140 +1248,25 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="2">
<code>'ChillMainBundle:Country'</code>
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillPersonBundle:Person'</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php">
<AssignmentToVoid occurrences="1">
<code>$participationL</code>
</AssignmentToVoid>
<NullReference occurrences="1">
<code>getEndDate</code>
</NullReference>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php">
<UndefinedClass occurrences="1">
@@ -1820,20 +1367,13 @@
<code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
</MissingFile>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php">
<MethodSignatureMismatch occurrences="1">
<code>public function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php">
<InvalidParamDefault occurrences="1">
<code>type</code>
</InvalidParamDefault>
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="29">
<UndefinedDocblockClass occurrences="31">
<code>$client</code>
<code>$client</code>
<code>$client</code>
<code>$client</code>
<code>$client</code>
@@ -1865,16 +1405,7 @@
<code>type</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php">
<UndefinedClass occurrences="1">
<code>Exception</code>
</UndefinedClass>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public static function setUpBeforeClass()</code>
</MethodSignatureMismatch>
<UndefinedDocblockClass occurrences="3">
<code>type</code>
<code>type</code>
@@ -1882,10 +1413,6 @@
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php">
<MethodSignatureMismatch occurrences="2">
<code>public function setUp()</code>
<code>public function tearDown()</code>
</MethodSignatureMismatch>
<UndefinedClass occurrences="1">
<code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
</UndefinedClass>
@@ -1958,11 +1485,6 @@
<code>CacheItempPoolInterface</code>
</UndefinedDocblockClass>
</file>
<file src="src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php">
<UndefinedClass occurrences="1">
<code>$taggedService-&gt;getClass()::getKey()</code>
@@ -1988,11 +1510,6 @@
<code>$thirdParty</code>
</ParamNameMismatch>
</file>
<file src="src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php">
<MethodSignatureMismatch occurrences="1">
<code>protected function setUp()</code>
</MethodSignatureMismatch>
</file>
<file src="src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php">
<UndefinedDocblockClass occurrences="6">
<code>$object</code>
+12
View File
@@ -6,6 +6,7 @@
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd"
errorBaseline="psalm-baseline.xml"
cacheDirectory="./.psalm"
>
<projectFiles>
<directory name="src" />
@@ -13,4 +14,15 @@
<directory name="./tests/" />
</ignoreFiles>
</projectFiles>
<!-- suppress error around parameter bags - see https://github.com/symfony/symfony/issues/45609#issuecomment-1056816975 -->
<!-- maybe to desactivate with php 8.1 ? -->
<issueHandlers>
<UndefinedDocblockClass>
<errorLevel type="suppress">
<referencedClass name="UnitEnum" />
</errorLevel>
</UndefinedDocblockClass>
</issueHandlers>
</psalm>
@@ -21,6 +21,7 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepository;
use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
use Chill\MainBundle\Repository\LocationRepository;
use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -31,15 +32,17 @@ use DateTime;
use Doctrine\ORM\EntityManagerInterface;
use InvalidArgumentException;
use Psr\Log\LoggerInterface;
use RuntimeException;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Component\Serializer\SerializerInterface;
use function array_key_exists;
final class ActivityController extends AbstractController
@@ -54,6 +57,8 @@ final class ActivityController extends AbstractController
private ActivityTypeRepository $activityTypeRepository;
private CenterResolverManagerInterface $centerResolver;
private EntityManagerInterface $entityManager;
private EventDispatcherInterface $eventDispatcher;
@@ -80,7 +85,8 @@ final class ActivityController extends AbstractController
EntityManagerInterface $entityManager,
EventDispatcherInterface $eventDispatcher,
LoggerInterface $logger,
SerializerInterface $serializer
SerializerInterface $serializer,
CenterResolverManagerInterface $centerResolver
) {
$this->activityACLAwareRepository = $activityACLAwareRepository;
$this->activityTypeRepository = $activityTypeRepository;
@@ -94,6 +100,7 @@ final class ActivityController extends AbstractController
$this->eventDispatcher = $eventDispatcher;
$this->logger = $logger;
$this->serializer = $serializer;
$this->centerResolver = $centerResolver;
}
/**
@@ -177,14 +184,15 @@ final class ActivityController extends AbstractController
{
$view = null;
[$person, $accompanyingPeriod] = $this->getEntity($request);
$entity = $this->activityRepository->find($id);
if (null === $entity) {
throw $this->createNotFoundException('Unable to find Activity entity.');
}
$accompanyingPeriod = $entity->getAccompanyingPeriod();
$person = $entity->getPerson();
if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
$accompanyingPeriod = $entity->getAccompanyingPeriod();
@@ -195,21 +203,46 @@ final class ActivityController extends AbstractController
// $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
$form = $this->createForm(ActivityType::class, $entity, [
'center' => $entity->getCenter(),
'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
'role' => new Role('CHILL_ACTIVITY_UPDATE'),
'activityType' => $entity->getActivityType(),
'accompanyingPeriod' => $accompanyingPeriod,
])->handleRequest($request);
]);
if ($form->has('documents')) {
$form->add('gendocTemplateId', HiddenType::class, [
'mapped' => false,
'data' => null,
'attr' => [
// required for js
'data-template-id' => 'data-template-id',
],
]);
}
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$this->entityManager->persist($entity);
$this->entityManager->flush();
$this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
$params = $this->buildParamsToUrl($person, $accompanyingPeriod);
$params['id'] = $entity->getId();
if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
return $this->redirectToRoute(
'chill_docgenerator_generate_from_template',
[
'template' => $form->get('gendocTemplateId')->getData(),
'entityClassName' => Activity::class,
'entityId' => $entity->getId(),
'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params),
]
);
}
$this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
return $this->redirectToRoute('chill_activity_activity_show', $params);
}
@@ -255,7 +288,7 @@ final class ActivityController extends AbstractController
if ($person instanceof Person) {
$this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
$activities = $this->activityACLAwareRepository
->findByPerson($person, ActivityVoter::SEE, 0, null);
->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
$event = new PrivacyEvent($person, [
'element_class' => Activity::class,
@@ -268,7 +301,7 @@ final class ActivityController extends AbstractController
$this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
$activities = $this->activityACLAwareRepository
->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
$view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
}
@@ -388,16 +421,43 @@ final class ActivityController extends AbstractController
$this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);
$form = $this->createForm(ActivityType::class, $entity, [
'center' => $entity->getCenter(),
'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
'role' => new Role('CHILL_ACTIVITY_CREATE'),
'activityType' => $entity->getActivityType(),
'accompanyingPeriod' => $accompanyingPeriod,
])->handleRequest($request);
]);
if ($form->has('documents')) {
$form->add('gendocTemplateId', HiddenType::class, [
'mapped' => false,
'data' => null,
'attr' => [
// required for js
'data-template-id' => 'data-template-id',
],
]);
}
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$this->entityManager->persist($entity);
$this->entityManager->flush();
if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
return $this->redirectToRoute(
'chill_docgenerator_generate_from_template',
[
'template' => $form->get('gendocTemplateId')->getData(),
'entityClassName' => Activity::class,
'entityId' => $entity->getId(),
'returnPath' => $this->generateUrl('chill_activity_activity_edit', [
'id' => $entity->getId(),
]),
]
);
}
$this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
$params = $this->buildParamsToUrl($person, $accompanyingPeriod);
@@ -471,20 +531,21 @@ final class ActivityController extends AbstractController
public function showAction(Request $request, int $id): Response
{
$view = null;
$entity = $this->activityRepository->find($id);
[$person, $accompanyingPeriod] = $this->getEntity($request);
if (null === $entity) {
throw $this->createNotFoundException('Unable to find Activity entity.');
}
$accompanyingPeriod = $entity->getAccompanyingPeriod();
$person = $entity->getPerson();
if ($accompanyingPeriod instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
} elseif ($person instanceof Person) {
$view = 'ChillActivityBundle:Activity:showPerson.html.twig';
}
$entity = $this->activityRepository->find($id);
if (null === $entity) {
throw $this->createNotFoundException('Unable to find Activity entity.');
} else {
throw new RuntimeException('the activity should be linked with a period or person');
}
if (null !== $accompanyingPeriod) {
@@ -493,8 +554,7 @@ final class ActivityController extends AbstractController
$entity->personsNotAssociated = $entity->getPersonsNotAssociated();
}
// TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
// $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
$this->denyAccessUnlessGranted(ActivityVoter::SEE, $entity);
$deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
@@ -54,7 +54,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -75,7 +75,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
$entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -125,7 +125,7 @@ class ActivityReasonCategoryController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -54,7 +54,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -75,7 +75,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
$entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->findAll();
return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
'entities' => $entities,
@@ -105,7 +105,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -125,7 +125,7 @@ class ActivityReasonController extends AbstractController
{
$em = $this->getDoctrine()->getManager();
$entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
$entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
if (!$entity) {
throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -61,8 +61,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
ActivityVoter::FULL => [
ActivityVoter::CREATE_PERSON,
ActivityVoter::CREATE_ACCOMPANYING_COURSE,
ActivityVoter::DELETE,
ActivityVoter::UPDATE,
],
@@ -12,11 +12,12 @@ declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
use Chill\DocStoreBundle\Entity\Document;
use Chill\DocStoreBundle\Entity\StoredObject;
use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
use Chill\MainBundle\Entity\HasCenterInterface;
use Chill\MainBundle\Entity\HasScopeInterface;
use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
use Chill\MainBundle\Entity\HasCentersInterface;
use Chill\MainBundle\Entity\HasScopesInterface;
use Chill\MainBundle\Entity\Location;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Entity\User;
@@ -35,6 +36,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Serializer\Annotation\SerializedName;
use Symfony\Component\Validator\Constraints as Assert;
/**
* Class Activity.
@@ -53,7 +55,7 @@ use Symfony\Component\Serializer\Annotation\SerializedName;
* getUserFunction="getUser",
* path="scope")
*/
class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
{
public const SENTRECEIVED_RECEIVED = 'received';
@@ -67,7 +69,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
/**
* @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
* @SerializedName("activityType")
* @ORM\JoinColumn(name="type_id")
*/
@@ -75,21 +77,25 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
/**
* @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
* @Groups({"docgen:read"})
*/
private ?ActivityPresence $attendee = null;
/**
* @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
* @Groups({"docgen:read"})
*/
private CommentEmbeddable $comment;
/**
* @ORM\Column(type="datetime")
* @Groups({"docgen:read"})
*/
private DateTime $date;
/**
* @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
* @Assert\Valid(traverse=true)
*/
private Collection $documents;
@@ -100,6 +106,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
/**
* @ORM\Column(type="boolean", options={"default": false})
* @Groups({"docgen:read"})
*/
private bool $emergency = false;
@@ -107,13 +114,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
* @ORM\Id
* @ORM\Column(name="id", type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
*/
private ?int $id = null;
/**
* @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
* @groups({"read"})
* @groups({"read", "docgen:read"})
*/
private ?Location $location = null;
@@ -124,42 +131,50 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
/**
* @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
*/
private ?Collection $persons = null;
/**
* @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
*/
private PrivateCommentEmbeddable $privateComment;
/**
* @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
* @Groups({"docgen:read"})
*/
private Collection $reasons;
/**
* @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
* @Groups({"docgen:read"})
*/
private ?Scope $scope = null;
/**
* @ORM\Column(type="string", options={"default": ""})
* @Groups({"docgen:read"})
*/
private string $sentReceived = '';
/**
* @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
* @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
*/
private Collection $socialActions;
/**
* @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
* @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
*/
private Collection $socialIssues;
/**
* @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
*/
private ?Collection $thirdParties = null;
@@ -170,12 +185,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
/**
* @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
* @Groups({"docgen:read"})
*/
private User $user;
/**
* @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
*/
private ?Collection $users = null;
@@ -183,6 +199,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
{
$this->reasons = new ArrayCollection();
$this->comment = new CommentEmbeddable();
$this->privateComment = new PrivateCommentEmbeddable();
$this->persons = new ArrayCollection();
$this->thirdParties = new ArrayCollection();
$this->documents = new ArrayCollection();
@@ -191,7 +208,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
$this->socialActions = new ArrayCollection();
}
public function addDocument(Document $document): self
public function addDocument(StoredObject $document): self
{
$this->documents[] = $document;
@@ -223,11 +240,22 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
{
if (!$this->socialActions->contains($socialAction)) {
$this->socialActions[] = $socialAction;
$this->ensureSocialActionConsistency();
}
return $this;
}
/**
* Add a social issue.
*
* Note: the social issue consistency (the fact that only yougest social issues
* are kept) is processed by an entity listener:
*
* @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
*
* @return $this
*/
public function addSocialIssue(SocialIssue $socialIssue): self
{
if (!$this->socialIssues->contains($socialIssue)) {
@@ -278,13 +306,17 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
* get the center
* center is extracted from person.
*/
public function getCenter(): ?Center
public function getCenters(): iterable
{
if ($this->person instanceof Person) {
return $this->person->getCenter();
return [$this->person->getCenter()];
}
return null;
if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
return $this->getAccompanyingPeriod()->getCenters() ?? [];
}
return [];
}
public function getComment(): CommentEmbeddable
@@ -302,6 +334,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this->documents;
}
/**
* @Groups({"docgen:read"})
*/
public function getDurationMinute(): int
{
if (null === $this->durationTime) {
return 0;
}
return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
}
public function getDurationTime(): ?DateTime
{
return $this->durationTime;
@@ -337,7 +381,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
if (null !== $this->accompanyingPeriod) {
$personsAssociated = [];
foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
foreach ($this->accompanyingPeriod->getOpenParticipations() as $participation) {
if ($this->persons->contains($participation->getPerson())) {
$personsAssociated[] = $participation->getPerson();
}
@@ -367,6 +411,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return [];
}
public function getPrivateComment(): PrivateCommentEmbeddable
{
return $this->privateComment;
}
public function getReasons(): Collection
{
return $this->reasons;
@@ -377,6 +426,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this->scope;
}
public function getScopes(): iterable
{
if (null !== $this->getAccompanyingPeriod()) {
return $this->getAccompanyingPeriod()->getScopes();
}
if (null !== $this->getPerson()) {
return [$this->scope];
}
return [];
}
public function getSentReceived(): string
{
return $this->sentReceived;
@@ -402,6 +464,18 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this->travelTime;
}
/**
* @Groups({"docgen:read"})
*/
public function getTravelTimeMinute(): int
{
if (null === $this->travelTime) {
return 0;
}
return (int) round(($this->travelTime->getTimestamp() + $this->travelTime->getOffset()) / 60.0, 0);
}
/**
* @deprecated
*/
@@ -425,7 +499,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this->getEmergency();
}
public function removeDocument(Document $document): void
public function removeDocument(StoredObject $document): void
{
$this->documents->removeElement($document);
}
@@ -541,6 +615,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this;
}
public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
{
$this->privateComment = $privateComment;
return $this;
}
public function setReasons(?ArrayCollection $reasons): self
{
$this->reasons = $reasons;
@@ -599,4 +680,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
return $this;
}
private function ensureSocialActionConsistency(): void
{
$ancestors = SocialAction::findAncestorSocialActions($this->getSocialActions());
foreach ($ancestors as $ancestor) {
$this->removeSocialAction($ancestor);
}
}
}
@@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\ActivityBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Serializer\Annotation as Serializer;
/**
* Class ActivityPresence.
@@ -31,11 +32,14 @@ class ActivityPresence
* @ORM\Id
* @ORM\Column(name="id", type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
* @Serializer\Groups({"docgen:read"})
*/
private ?int $id;
/**
* @ORM\Column(type="json")
* @Serializer\Groups({"docgen:read"})
* @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
*/
private array $name = [];
@@ -13,8 +13,10 @@ namespace Chill\ActivityBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use InvalidArgumentException;
use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Validator\Constraints as Assert;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
/**
* Class ActivityType.
@@ -118,6 +120,7 @@ class ActivityType
* @ORM\Id
* @ORM\Column(name="id", type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
* @Groups({"docgen:read"})
*/
private ?int $id;
@@ -133,7 +136,8 @@ class ActivityType
/**
* @ORM\Column(type="json")
* @Groups({"read"})
* @Groups({"read", "docgen:read"})
* @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
*/
private array $name = [];
@@ -163,6 +167,16 @@ class ActivityType
*/
private int $personVisible = self::FIELD_REQUIRED;
/**
* @ORM\Column(type="string", nullable=false, options={"default": ""})
*/
private string $privateCommentLabel = '';
/**
* @ORM\Column(type="smallint", nullable=false, options={"default": 1})
*/
private int $privateCommentVisible = self::FIELD_OPTIONAL;
/**
* @ORM\Column(type="string", nullable=false, options={"default": ""})
*/
@@ -190,7 +204,6 @@ class ActivityType
/**
* @ORM\Column(type="smallint", nullable=false, options={"default": 1})
* @Assert\EqualTo(propertyPath="socialIssuesVisible", message="This parameter must be equal to social issue parameter")
*/
private int $socialActionsVisible = self::FIELD_INVISIBLE;
@@ -260,6 +273,23 @@ class ActivityType
*/
private int $userVisible = self::FIELD_REQUIRED;
/**
* @Assert\Callback
*
* @param mixed $payload
*/
public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
{
if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
$context
->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
->atPath('socialActionsVisible')
->addViolation();
}
}
}
/**
* Get active
* return true if the type is active.
@@ -396,6 +426,16 @@ class ActivityType
return $this->personVisible;
}
public function getPrivateCommentLabel(): string
{
return $this->privateCommentLabel;
}
public function getPrivateCommentVisible(): int
{
return $this->privateCommentVisible;
}
public function getReasonsLabel(): string
{
return $this->reasonsLabel;
@@ -668,6 +708,20 @@ class ActivityType
return $this;
}
public function setPrivateCommentLabel(string $privateCommentLabel): self
{
$this->privateCommentLabel = $privateCommentLabel;
return $this;
}
public function setPrivateCommentVisible(int $privateCommentVisible): self
{
$this->privateCommentVisible = $privateCommentVisible;
return $this;
}
public function setReasonsLabel(string $reasonsLabel): self
{
$this->reasonsLabel = $reasonsLabel;
@@ -66,9 +66,6 @@ class ActivityEntityListener
$newAction->addPerson($person);
}
foreach ($associatedThirdparties as $thirdparty) {
$newAction->setHandlingThierparty($thirdparty);
}
$this->em->persist($newAction);
$this->em->flush();
}
@@ -24,9 +24,9 @@ use Doctrine\ORM\Query;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use function array_key_exists;
use function count;
@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
class ActivityDateFilter implements FilterInterface
{
@@ -29,8 +29,8 @@ use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
use function count;
@@ -14,16 +14,20 @@ namespace Chill\ActivityBundle\Form;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Entity\ActivityPresence;
use Chill\ActivityBundle\Entity\ActivityReason;
use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
use Chill\DocStoreBundle\Form\StoredObjectType;
use Chill\MainBundle\Entity\Center;
use Chill\MainBundle\Entity\Location;
use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Form\Type\ChillCollectionType;
use Chill\MainBundle\Form\Type\ChillDateType;
use Chill\MainBundle\Form\Type\CommentType;
use Chill\MainBundle\Form\Type\PickUserDynamicType;
use Chill\MainBundle\Form\Type\PrivateCommentType;
use Chill\MainBundle\Form\Type\ScopePickerType;
use Chill\MainBundle\Form\Type\UserPickerType;
use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Entity\SocialWork\SocialAction;
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -49,6 +53,7 @@ use Symfony\Component\Form\FormEvents;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Role\Role;
use function in_array;
class ActivityType extends AbstractType
@@ -108,24 +113,25 @@ class ActivityType extends AbstractType
$activityType = $options['activityType'];
// TODO revoir la gestion des center au niveau du form des activité.
if ($options['center']) {
if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
$builder->add('scope', ScopePickerType::class, [
'center' => $options['center'],
'role' => $options['role'],
// TODO make required again once scope and rights are fixed
'required' => false,
'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
'required' => true,
]);
}
/** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingPeriod */
$accompanyingPeriod = null;
if ($options['accompanyingPeriod']) {
if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
$accompanyingPeriod = $options['accompanyingPeriod'];
}
if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
$builder->add('socialIssues', HiddenType::class);
$builder->add('socialIssues', HiddenType::class, [
'required' => $activityType->getSocialIssuesVisible() === 2,
]);
$builder->get('socialIssues')
->addModelTransformer(new CallbackTransformer(
static function (iterable $socialIssuesAsIterable): string {
@@ -151,7 +157,9 @@ class ActivityType extends AbstractType
}
if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
$builder->add('socialActions', HiddenType::class);
$builder->add('socialActions', HiddenType::class, [
'required' => $activityType->getSocialActionsVisible() === 2,
]);
$builder->get('socialActions')
->addModelTransformer(new CallbackTransformer(
static function (iterable $socialActionsAsIterable): string {
@@ -213,12 +221,10 @@ class ActivityType extends AbstractType
]);
}
if ($activityType->isVisible('user') && $options['center']) {
$builder->add('user', UserPickerType::class, [
if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
$builder->add('user', PickUserDynamicType::class, [
'label' => $activityType->getLabel('user'),
'required' => $activityType->isRequired('user'),
'center' => $options['center'],
'role' => $options['role'],
]);
}
@@ -247,6 +253,13 @@ class ActivityType extends AbstractType
]);
}
if ($activityType->isVisible('privateComment')) {
$builder->add('privateComment', PrivateCommentType::class, [
'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
'required' => false,
]);
}
if ($activityType->isVisible('persons')) {
$builder->add('persons', HiddenType::class);
$builder->get('persons')
@@ -305,9 +318,11 @@ class ActivityType extends AbstractType
'label' => $activityType->getLabel('documents'),
'required' => $activityType->isRequired('documents'),
'allow_add' => true,
'allow_delete' => true,
'button_add_label' => 'activity.Insert a document',
'button_remove_label' => 'activity.Remove a document',
'empty_collection_explain' => 'No documents',
'entry_options' => ['has_title' => true],
]);
}
@@ -338,7 +353,9 @@ class ActivityType extends AbstractType
}
if ($activityType->isVisible('location')) {
$builder->add('location', HiddenType::class)
$builder->add('location', HiddenType::class, [
'required' => $activityType->getLocationVisible() === 2,
])
->get('location')
->addModelTransformer(new CallbackTransformer(
static function (?Location $location): string {
@@ -366,8 +383,8 @@ class ActivityType extends AbstractType
'label' => $activityType->getLabel('sentReceived'),
'required' => $activityType->isRequired('sentReceived'),
'choices' => [
'Sent' => Activity::SENTRECEIVED_SENT,
'Received' => Activity::SENTRECEIVED_RECEIVED,
'Sent' => Activity::SENTRECEIVED_SENT,
],
]);
}
@@ -426,8 +443,8 @@ class ActivityType extends AbstractType
$resolver
->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
->setAllowedTypes('center', ['null', Center::class])
->setAllowedTypes('role', [Role::class, 'string'])
->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
}
@@ -57,7 +57,7 @@ class ActivityTypeType extends AbstractType
$fields = [
'persons', 'user', 'date', 'location', 'persons',
'thirdParties', 'durationTime', 'travelTime', 'attendee',
'reasons', 'comment', 'sentReceived', 'documents',
'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
'emergency', 'socialIssues', 'socialActions', 'users',
];
@@ -69,6 +69,9 @@ class ActivityTypeType extends AbstractType
'empty_data' => '',
]);
}
$builder
->add('commentVisible', ActivityFieldPresence::class);
}
public function configureOptions(OptionsResolver $resolver)
@@ -15,8 +15,6 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
use Knp\Menu\MenuItem;
use Symfony\Component\Security\Core\Security;
use function in_array;
final class AdminMenuBuilder implements LocalMenuBuilderInterface
{
private Security $security;
@@ -32,27 +30,38 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
return;
}
if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
$menu->addChild('Activities', [
'route' => 'chill_admin_activity_index',
])
->setExtras([
'order' => 2000,
'explain' => 'Activity configuration',
]);
} else {
$menu
->addChild('Activities', [
'route' => 'chill_admin_activity_index',
])
->setExtras([
'order' => '60',
]);
}
$menu->addChild('Activities', [
'route' => 'chill_activity_admin_index',
])
->setAttribute('class', 'list-group-item-header')
->setExtras([
'order' => 5000,
'icons' => ['exchange'],
]);
$menu->addChild('Activity Reasons', [
'route' => 'chill_activity_activityreason',
])->setExtras(['order' => 5010]);
$menu->addChild('Activity Reasons Category', [
'route' => 'chill_activity_activityreasoncategory',
])->setExtras(['order' => 5020]);
$menu->addChild('Activity type', [
'route' => 'chill_activity_type_admin',
])->setExtras(['order' => 5030]);
$menu->addChild('Activity Presences', [
'route' => 'chill_crud_activity_presence_index',
])->setExtras(['order' => 5040]);
$menu->addChild('Activity Types Categories', [
'route' => 'chill_activity_type_category_admin',
])->setExtras(['order' => 5050]);
}
public static function getMenuIds(): array
{
return ['admin_index', 'admin_section', 'admin_activity'];
return ['admin_section', 'admin_activity'];
}
}
@@ -15,7 +15,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
use Knp\Menu\MenuItem;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
class PersonMenuBuilder implements LocalMenuBuilderInterface
{
@@ -12,13 +12,20 @@ declare(strict_types=1);
namespace Chill\ActivityBundle\Repository;
use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Entity\ActivityPresence;
use Chill\ActivityBundle\Entity\ActivityType;
use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
use Chill\MainBundle\Entity\Location;
use Chill\MainBundle\Entity\LocationType;
use Chill\MainBundle\Entity\Scope;
use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\AbstractQuery;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Security\Core\Security;
@@ -72,6 +79,86 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
}
public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array
{
$rsm = new ResultSetMappingBuilder($this->em);
$sql = '
SELECT
a.id AS activity_id,
date,
CASE WHEN durationtime IS NOT NULL THEN (EXTRACT(EPOCH from durationtime) / 60)::int ELSE 0 END AS durationtimeminute,
attendee_id,
comment_comment,
emergency,
sentreceived,
CASE WHEN traveltime IS NOT NULL THEN (EXTRACT(EPOCH from traveltime) / 60)::int ELSE 0 END AS traveltimeminute,
t.id AS type_id, t.name as type_name,
p.id AS presence_id, p.name AS presence_name,
location.id AS location_id, location.address_id, location.name AS location_name, location.phonenumber1, location.phonenumber2, location.email,
location.locationtype_id, locationtype.title AS locationtype_title,
users.userids AS userids,
thirdparties.thirdpartyids,
persons.personids,
actions.socialactionids,
issues.socialissueids
FROM activity a
LEFT JOIN chill_main_location location ON a.location_id = location.id
LEFT JOIN chill_main_location_type locationtype ON location.locationtype_id = locationtype.id
LEFT JOIN activitytpresence p ON a.attendee_id = p.id
LEFT JOIN activitytype t ON a.type_id = t.id
LEFT JOIN LATERAL (SELECT jsonb_agg(user_id) userids, activity_id FROM activity_user AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS users ON TRUE
LEFT JOIN LATERAL (SELECT jsonb_agg(thirdparty_id) thirdpartyids, activity_id FROM activity_thirdparty AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS thirdparties ON TRUE
LEFT JOIN LATERAL (SELECT jsonb_agg(person_id) personids, activity_id FROM activity_person AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS persons ON TRUE
LEFT JOIN LATERAL (SELECT jsonb_agg(socialaction_id) socialactionids, activity_id FROM chill_activity_activity_chill_person_socialaction AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS actions ON TRUE
LEFT JOIN LATERAL (SELECT jsonb_agg(socialissue_id) socialissueids, activity_id FROM chill_activity_activity_chill_person_socialissue AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS issues ON TRUE
WHERE accompanyingperiod_id = ?
ORDER BY a.date DESC, a.id DESC
LIMIT ?
';
$rsm
->addEntityResult(Activity::class, 'a')
->addFieldResult('a', 'activity_id', 'id')
->addFieldResult('a', 'date', 'date')
->addFieldResult('a', 'comment', 'comment')
->addFieldResult('a', 'sentreceived', 'sentReceived')
->addFieldResult('a', 'emergency', 'emergency')
->addJoinedEntityResult(Location::class, 'location', 'a', 'location')
->addFieldResult('location', 'location_id', 'id')
->addFieldResult('location', 'location_name', 'name')
->addFieldResult('location', 'phonenumber1', 'phonenumber1')
->addFieldResult('location', 'phonenumber2', 'phonenumber2')
->addFieldResult('location', 'email', 'email')
->addJoinedEntityResult(LocationType::class, 'locationType', 'location', 'locationType')
->addFieldResult('locationType', 'locationtype_id', 'id')
->addFieldResult('locationType', 'locationtype_title', 'title')
->addJoinedEntityResult(ActivityType::class, 'activityType', 'a', 'activityType')
->addFieldResult('activityType', 'type_id', 'id')
->addFieldResult('activityType', 'type_name', 'name')
->addJoinedEntityResult(ActivityPresence::class, 'activityPresence', 'a', 'attendee')
->addFieldResult('activityPresence', 'presence_id', 'id')
->addFieldResult('activityPresence', 'presence_name', 'name')
// results which cannot be mapped into entity
->addScalarResult('comment_comment', 'comment', Types::TEXT)
->addScalarResult('userids', 'userIds', Types::JSON)
->addScalarResult('thirdpartyids', 'thirdPartyIds', Types::JSON)
->addScalarResult('personids', 'personIds', Types::JSON)
->addScalarResult('socialactionids', 'socialActionIds', Types::JSON)
->addScalarResult('socialissueids', 'socialIssueIds', Types::JSON)
->addScalarResult('durationtimeminute', 'durationTimeMinute', Types::INTEGER)
->addScalarResult('traveltimeminute', 'travelTimeMinute', Types::INTEGER);
$nq = $this->em->createNativeQuery($sql, $rsm);
$nq->setParameter(0, $period->getId())->setParameter(1, $limit);
return $nq->getResult(AbstractQuery::HYDRATE_ARRAY);
}
/**
* @param array $orderBy
*
@@ -21,6 +21,15 @@ interface ActivityACLAwareRepositoryInterface
*/
public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
/**
* Return a list of activities, simplified as array (not object).
*
* The aim of this method is to get a long list of activities and keep performance.
*
* @return array an array of array, each item representing an activity
*/
public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array;
/**
* @return Activity[]|array
*/
@@ -34,6 +34,8 @@ p.date-label {
font-size: 18pt;
}
div.dashboard,
h4.badge-title,
h3.badge-title,
h2.badge-title {
ul.list-content {
font-size: 70%;
@@ -0,0 +1,23 @@
div.chill-dropzone__below-zone {
a.btn-delete {
display: none;
}
}
ul[data-collection-name="documents"] {
button.remove-entry {
margin: 0.5rem 0!important;
}
}
// do it in js does not work
// document.addEventListener('DOMContentLoaded', e => {
// const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');
// dropzoneBelow.forEach(
// d => {
// const a = d.querySelector('a.btn-delete');
// d.removeChild(a);
// }
// )
// });
@@ -1,45 +1,52 @@
<template>
<teleport to="#add-persons" v-if="isComponentVisible">
<teleport to="#add-persons" v-if="isComponentVisible">
<div class="flex-bloc concerned-groups" :class="getContext">
<persons-bloc
v-for="bloc in contextPersonsBlocs"
v-bind:key="bloc.key"
v-bind:bloc="bloc"
v-bind:blocWidth="getBlocWidth"
v-bind:setPersonsInBloc="setPersonsInBloc">
</persons-bloc>
</div>
<div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
<ul class="list-suggest add-items inline">
<li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`">
<span>{{ p.text }}</span>
</li>
</ul>
</div>
<div class="flex-bloc concerned-groups" :class="getContext">
<persons-bloc
v-for="bloc in contextPersonsBlocs"
v-bind:key="bloc.key"
v-bind:bloc="bloc"
v-bind:blocWidth="getBlocWidth"
v-bind:setPersonsInBloc="setPersonsInBloc">
</persons-bloc>
</div>
<div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
<ul class="list-suggest add-items inline">
<li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`">
<person-text v-if="p.type === 'person'" :person="p"></person-text>
<span v-else>{{ p.text }}</span>
</li>
</ul>
</div>
<add-persons
buttonTitle="activity.add_persons"
modalTitle="activity.add_persons"
v-bind:key="addPersons.key"
v-bind:options="addPersonsOptions"
@addNewPersons="addNewPersons"
ref="addPersons">
</add-persons>
<ul class="record_actions">
<li class="add-persons">
<add-persons
buttonTitle="activity.add_persons"
modalTitle="activity.add_persons"
v-bind:key="addPersons.key"
v-bind:options="addPersonsOptions"
@addNewPersons="addNewPersons"
ref="addPersons">
</add-persons>
</li>
</ul>
</teleport>
</teleport>
</template>
<script>
import { mapState, mapGetters } from 'vuex';
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
export default {
name: "ConcernedGroups",
components: {
AddPersons,
PersonsBloc
PersonsBloc,
PersonText
},
data() {
return {
@@ -1,21 +1,29 @@
<template>
<li>
<span :title="person.text">
<span class="chill_denomination" @click.prevent="$emit('remove', person)">{{ textCutted }}</span>
<span :title="person.text" @click.prevent="$emit('remove', person)">
<span class="chill_denomination">
<person-text :person="person" :isCut="true"></person-text>
</span>
</span>
</li>
</template>
<script>
import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
export default {
name: "PersonBadge",
props: ['person'],
computed: {
textCutted() {
let more = (this.person.text.length > 15) ?'…' : '';
return this.person.text.slice(0,15) + more;
}
components: {
PersonText
},
// computed: {
// textCutted() {
// let more = (this.person.text.length > 15) ?'…' : '';
// return this.person.text.slice(0,15) + more;
// }
// },
emits: ['remove'],
}
</script>
@@ -1,7 +1,7 @@
<template>
<teleport to="#location">
<div class="mb-3 row">
<label class="col-form-label col-sm-4">
<label :class="locationClassList">
{{ $t("activity.location") }}
</label>
<div class="col-sm-8">
@@ -41,6 +41,12 @@ export default {
NewLocation,
VueMultiselect,
},
data() {
return {
locationClassList:
`col-form-label col-sm-4 ${document.querySelector('input#chill_activitybundle_activity_location').getAttribute('required') ? 'required' : ''}`,
}
},
computed: {
...mapState(["activity", "availableLocations"]),
...mapGetters(["suggestedEntities"]),
@@ -18,6 +18,12 @@
</template>
<template v-slot:body>
<form>
<div class="alert alert-warning" v-if="errors.length">
<ul>
<li v-for="(e, i) in errors" :key="i">{{ e }}</li>
</ul>
</div>
<div class="form-floating mb-3">
<select class="form-select form-select-lg" id="type" required v-model="selectType">
<option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
@@ -54,11 +60,6 @@
<label for="email">{{ $t('activity.location_fields.email') }}</label>
</div>
<div class="alert alert-warning" v-if="errors.length">
<ul>
<li v-for="(e, i) in errors" :key="i">{{ e }}</li>
</ul>
</div>
</form>
</template>
<template v-slot:footer>
@@ -3,7 +3,7 @@
<div class="mb-3 row">
<div class="col-4">
<label class="col-form-label">{{ $t('activity.social_issues') }}</label>
<label :class="socialIssuesClassList">{{ $t('activity.social_issues') }}</label>
</div>
<div class="col-8">
@@ -42,7 +42,7 @@
<div class="mb-3 row">
<div class="col-4">
<label class="col-form-label">{{ $t('activity.social_actions') }}</label>
<label :class="socialActionsClassList">{{ $t('activity.social_actions') }}</label>
</div>
<div class="col-8">
@@ -54,19 +54,19 @@
{{ $t('activity.select_first_a_social_issue') }}
</span>
<template v-else-if="socialActionsList.length > 0">
<check-social-action
v-if="socialIssuesSelected.length || socialActionsSelected.length"
v-for="action in socialActionsList"
:key="action.id"
:action="action"
:selection="socialActionsSelected"
@updateSelected="updateActionsSelected">
</check-social-action>
</template>
<template v-else-if="socialActionsList.length > 0">
<check-social-action
v-if="socialIssuesSelected.length || socialActionsSelected.length"
v-for="action in socialActionsList"
:key="action.id"
:action="action"
:selection="socialActionsSelected"
@updateSelected="updateActionsSelected">
</check-social-action>
</template>
<span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
{{ $t('activity.social_action_list_empty') }}
{{ $t('activity.social_action_list_empty') }}
</span>
@@ -94,6 +94,10 @@ export default {
issueIsLoading: false,
actionIsLoading: false,
actionAreLoaded: false,
socialIssuesClassList:
`col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialIssues').getAttribute('required') ? 'required' : ''}`,
socialActionsClassList:
`col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialActions').getAttribute('required') ? 'required' : ''}`,
}
},
computed: {
@@ -107,7 +111,7 @@ export default {
return this.$store.state.socialIssuesOther;
},
socialActionsList() {
return this.$store.state.socialActionsList;
return this.$store.getters.socialActionsListSorted;
},
socialActionsSelected() {
return this.$store.state.activity.socialActions;
@@ -2,11 +2,15 @@ import { createApp } from 'vue';
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
import { activityMessages } from './i18n'
import store from './store'
import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
import {fetchTemplates} from 'ChillDocGeneratorAssets/api/pickTemplate.js';
import App from './App.vue';
const i18n = _createI18n(activityMessages);
// app for activity
const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
const hasLocation = document.querySelector('#location') !== null;
const hasPerson = document.querySelector('#add-persons') !== null;
@@ -29,3 +33,54 @@ const app = createApp({
.use(i18n)
.component('app', App)
.mount('#activity');
// app for picking template
const i18nGendoc = _createI18n({});
document.querySelectorAll('div[data-docgen-template-picker]').forEach(el => {
fetchTemplates(el.dataset.entityClass).then(templates => {
const picker = {
template:
'<pick-template :templates="this.templates" :preventDefaultMoveToGenerate="true" ' +
':entityClass="faked" @go-to-generate-document="generateDoc"></pick-template>',
components: {
PickTemplate,
},
data() {
return {
templates: templates,
entityId: el.dataset.entityId,
}
},
methods: {
generateDoc({event, link, template}) {
console.log('generateDoc');
console.log('link', link);
console.log('template', template);
let hiddenInput = document.querySelector("input[data-template-id]");
if (hiddenInput === null) {
console.error('hidden input not found');
return;
}
hiddenInput.value = template;
let form = document.querySelector('form[name="chill_activitybundle_activity"');
if (form === null) {
console.error('form not found');
return;
}
form.submit();
}
}
};
createApp(picker).use(i18nGendoc).mount(el);
})
});
@@ -101,6 +101,9 @@ const store = createStore({
state.activity.activityType.thirdPartiesVisible !== 0)
);
},
socialActionsListSorted(state) {
return [ ...state.socialActionsList].sort((a, b) => a.ordering - b.ordering);
},
},
mutations: {
// SocialIssueAcc
@@ -131,7 +134,6 @@ const store = createStore({
state.socialActionsList = [];
},
addActionInList(state, action) {
//console.log('add action list', action.id);
state.socialActionsList.push(action);
},
updateActionsSelected(state, actions) {
@@ -110,10 +110,8 @@ export default function prepareLocations(store) {
console.log('default loation id', window.default_location_id);
if (window.default_location_id) {
for (let group of store.state.availableLocations) {
console.log(group);
let location = group.locations.find((l) => l.id === window.default_location_id);
console.log(location);
if (location !== undefined) {
if (location !== undefined & store.state.activity.location === null) {
store.dispatch('updateLocation', location);
break;
}
@@ -1,56 +0,0 @@
<?php
/**
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Kernel;
class AppKernel extends Kernel
{
/**
* @return string
*/
public function getCacheDir()
{
return sys_get_temp_dir() . '/ActivityBundle/cache';
}
/**
* @return string
*/
public function getLogDir()
{
return sys_get_temp_dir() . '/ActivityBundle/logs';
}
public function registerBundles()
{
return [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Chill\PersonBundle\ChillPersonBundle(),
new Chill\MainBundle\ChillMainBundle(),
new Chill\ActivityBundle\ChillActivityBundle(),
new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
//add here all the required bundle (some bundle are not required)
];
}
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
}
}
@@ -1,20 +0,0 @@
<?php
/**
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
use Composer\Autoload\ClassLoader;
use Doctrine\Common\Annotations\AnnotationRegistry;
/** @var ClassLoader $loader */
$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
AnnotationRegistry::registerLoader([$loader, 'loadClass']);
return $loader;
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,438 +0,0 @@
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "assets._default_package" (parent: assets.path_package).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.chain_provider" (parent: security.user.provider.chain).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory" (parent: security.user.provider.in_memory).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory_admin" (parent: security.user.provider.in_memory.user).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.users" (parent: doctrine.orm.security.user.provider).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.dev" (parent: security.firewall.context).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.context_listener.0" (parent: security.context_listener).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout_listener.default" (parent: security.logout_listener).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout.success_handler.default" (parent: security.logout.success_handler).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.dao.default" (parent: security.authentication.provider.dao).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.success_handler.default.form_login" (parent: security.authentication.success_handler).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.failure_handler.default.form_login" (parent: security.authentication.failure_handler).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form" (parent: security.authentication.listener.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form.default" (parent: security.authentication.listener.form).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.form_entry_point.default" (parent: security.authentication.form_entry_point).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.anonymous.default" (parent: security.authentication.listener.anonymous).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.anonymous.default" (parent: security.authentication.provider.anonymous).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.exception_listener.default" (parent: security.exception_listener).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.default" (parent: security.firewall.context).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.eventdispatcher" (parent: swiftmailer.transport.eventdispatcher.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.authhandler" (parent: swiftmailer.transport.authhandler.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.buffer" (parent: swiftmailer.transport.buffer.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.smtp" (parent: swiftmailer.transport.smtp.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default" (parent: swiftmailer.mailer.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.plugin.messagelogger" (parent: swiftmailer.plugin.messagelogger.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.configuration" (parent: doctrine.dbal.connection.configuration).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.profiling.default" (parent: doctrine.dbal.logger.profiling).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.chain.default" (parent: doctrine.dbal.logger.chain).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.event_manager" (parent: doctrine.dbal.connection.event_manager).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection" (parent: doctrine.dbal.connection).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_configuration" (parent: doctrine.orm.configuration).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_metadata_cache" (parent: doctrine_cache.abstract.array).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_result_cache" (parent: doctrine_cache.abstract.array).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_query_cache" (parent: doctrine_cache.abstract.array).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_manager_configurator" (parent: doctrine.orm.manager_configurator.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_entity_manager" (parent: doctrine.orm.entity_manager.abstract).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.request" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.translation" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.security" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.templating" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.profiler" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.router" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.php" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.event" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.assetic" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.doctrine" (parent: monolog.logger_prototype).
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "validator.mapping.class_metadata_factory"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "assetic.value_supplier"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.dbal.event_manager"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.metadata.annotation_reader"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.default_entity_manager.event_manager"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "sensio_framework_extra.security.expression_language"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.logging.inner"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.data_collector.inner"; reason: private alias
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.path_package"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.url_package"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.static_version_strategy"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.firewall.context"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory.user"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.chain"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout_listener"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.handler.cookie_clearing"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.success_handler"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.form_entry_point"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_success_handler"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.success_handler"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_failure_handler"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.failure_handler"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.form"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_form"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.simple_success_failure_handler"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_preauth"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.x509"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.remote_user"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.basic"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.digest"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.dao"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.simple"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.pre_authenticated"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.exception_listener"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.switchuser_listener"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.rememberme"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.rememberme"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.persistent"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.simplehash"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "monolog.logger_prototype"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.mailer.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.sendmail.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.mail.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.null.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.buffer.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.authhandler.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.eventdispatcher.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.redirecting.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.antiflood.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.impersonate.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.messagelogger.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.smtp.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.spool.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.file.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.memory.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assetic.worker.ensure_filter"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.apc"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.array"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.file_system"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.php_file"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcache"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcached"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.redis"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.wincache"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.xcache"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.zenddata"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.mongodb"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.riak"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.couchbase"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.chain"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.profiling"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.event_manager"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.configuration"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.configuration"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.entity_manager.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.manager_configurator.abstract"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.security.user.provider"; reason: abstract
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session" previously pointing to "session.storage.mock_file" to "session.storage.filesystem".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.native" previously pointing to "session.handler.native_file" to "session.handler".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.php_bridge" previously pointing to "session.handler.native_file" to "session.handler".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "assetic.twig_directory_resource.kernel" previously pointing to "templating.loader.filesystem" to "templating.loader".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.text" previously pointing to "templating.engine.twig" to "templating".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.choice" previously pointing to "templating.engine.twig" to "templating".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.title" previously pointing to "templating.engine.twig" to "templating".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "translator_listener" previously pointing to "translator.data_collector" to "translator".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "validator.builder" previously pointing to "translator.data_collector" to "translator".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "data_collector.translation" previously pointing to "translator.data_collector" to "translator".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.trans" previously pointing to "translator.data_collector" to "translator".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.custom_fields_group_type" previously pointing to "translator.data_collector" to "translator".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "locale_listener" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "templating.helper.router" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router.cache_warmer" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router_listener" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.logout_url_generator" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.routing" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.profiler" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.router" previously pointing to "router.default" to "router".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.controller.listener" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.routing.loader.annot_class" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.user_password_encoder.generic" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.validator.user_password" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.authentication.provider.dao.default" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig" previously pointing to "twig.loader.filesystem" to "twig.loader".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.email_sender.listener" previously pointing to "monolog.logger" to "logger".
Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.mailer.default" previously pointing to "swiftmailer.mailer.default.transport.smtp" to "swiftmailer.mailer.default.transport".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.cache_warmer.template_paths" to "cache_warmer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.asset_manager_cache_warmer" to "cache_warmer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translation.warmer" to "cache_warmer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "router.cache_warmer" to "cache_warmer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.proxy_cache_warmer" to "cache_warmer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.selector" to "translator.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.history" to "test.client".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.cookiejar" to "test.client".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.attribute_bag" to "session".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.flash_bag" to "session".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1" to "form.resolved_type_factory".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.extension" to "form.registry".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.type_extension.form.request_handler" to "form.type_extension.form.http_foundation".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.server_params" to "form.type_extension.form.request_handler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_generator" to "security.csrf.token_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_storage" to "security.csrf.token_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets._default_package" to "assets.packages".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "validator.validator_factory" to "validator.builder".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "profiler.storage" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.config" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.ajax" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.exception" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.events" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.logger" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.time" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.memory" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.twig" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.security" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.data_collector" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.doctrine" to "profiler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.xml" to "routing.resolver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.yml" to "routing.resolver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.php" to "routing.resolver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_dir" to "routing.resolver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_file" to "routing.resolver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.resolver" to "routing.loader".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.event_dispatcher.parent" to "debug.event_dispatcher".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "controller_resolver" to "debug.controller_resolver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.dao.default" to "security.authentication.manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.anonymous.default" to "security.authentication.manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.expression_voter" to "security.access.decision_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.role_hierarchy_voter" to "security.access.decision_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.authenticated_voter" to "security.access.decision_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.expression_language" to "security.access.expression_voter".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.firewall.map" to "security.firewall".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d" to "security.firewall.map".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.retry_entry_point" to "security.channel_listener".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user.provider.concrete.in_memory_admin" to "security.user.provider.concrete.in_memory".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.success_handler.default" to "security.logout_listener.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.handler.session" to "security.logout_listener.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user_checker" to "security.authentication.provider.dao.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.session_strategy" to "security.authentication.listener.form.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.success_handler.default.form_login" to "security.authentication.listener.form.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.failure_handler.default.form_login" to "security.authentication.listener.form.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.form_entry_point.default" to "security.exception_listener.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.channel_listener" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.context_listener.0" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout_listener.default" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.form.default" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.anonymous.default" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_listener" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.exception_listener.default" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.logout_url" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.security" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.profiler" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.trans" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.assets" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.actions" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.code" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.routing" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.yaml" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug.stopwatch" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.expression" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpkernel" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.form" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_extension" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.twig.doctrine_extension" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.dump" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.webprofiler" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.app_variable" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.configurator.environment" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.renderer" to "twig.extension.form".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.engine" to "twig.form.renderer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1" to "swiftmailer.mailer.default.transport.authhandler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2" to "swiftmailer.mailer.default.transport.authhandler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3" to "swiftmailer.mailer.default.transport.authhandler".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.transport.replacementfactory" to "swiftmailer.mailer.default.transport.buffer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader" to "assetic.asset_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillpersonbundle" to "assetic.asset_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillmainbundle" to "assetic.asset_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.kernel" to "assetic.asset_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.parameter_bag" to "assetic.asset_factory".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.value_supplier.default" to "assetic.twig_extension".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader.real" to "assetic.twig_formula_loader".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.config_cache" to "assetic.twig_formula_loader".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger.chain.default" to "doctrine.dbal.default_connection.configuration".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger" to "doctrine.dbal.logger.chain.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.configuration" to "doctrine.dbal.default_connection".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.event_manager" to "doctrine.dbal.default_connection".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_metadata_driver" to "doctrine.orm.default_configuration".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.naming_strategy.default" to "doctrine.orm.default_configuration".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.quote_strategy.default" to "doctrine.orm.default_configuration".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_configuration" to "doctrine.orm.default_entity_manager".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.security.expression_language.default" to "sensio_framework_extra.security.listener".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.doctrine_step" to "sensio_distribution.webconfigurator".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.secret_step" to "sensio_distribution.webconfigurator".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.logging" to "translator".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.buffer" to "swiftmailer.mailer.default.transport".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.authhandler" to "swiftmailer.mailer.default.transport".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.eventdispatcher" to "swiftmailer.mailer.default.transport".
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "controller_resolver"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.logging"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.selector"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translation.warmer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.flash_bag"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.attribute_bag"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.handler.write_check"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.extension"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.type_extension.form.request_handler"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.server_params"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_generator"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_storage"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_package"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets._default_package"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.engine.delegating"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.cache_warmer.template_paths"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.cache"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.chain"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.mapping.cache.apc"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.validator_factory"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "profiler.storage"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.config"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.ajax"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.exception"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.events"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.logger"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.time"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.memory"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.resolver"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.xml"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.yml"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.php"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "router.cache_warmer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.cached_reader"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "debug.event_dispatcher.parent"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.session_strategy"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user_checker"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.expression_language"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.authenticated_voter"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.role_hierarchy_voter"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.expression_voter"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.firewall.map"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.retry_entry_point"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.basic_entry_point"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.digest_entry_point"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.channel_listener"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.handler.session"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_listener"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.rememberme.token.provider.in_memory"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.logout_url"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.security"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.security"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user.provider.concrete.in_memory_admin"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener.0"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout_listener.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.success_handler.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.dao.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.success_handler.default.form_login"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.failure_handler.default.form_login"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.form.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.form_entry_point.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.exception_listener.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.app_variable"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.cache_warmer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.native_filesystem"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.chain"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.profiler"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.twig"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.trans"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.assets"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.actions"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.code"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.routing"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.yaml"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug.stopwatch"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.expression"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpkernel"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.form"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.engine"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.renderer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.configurator.environment"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.chrome_php"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.gelf_message"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.html"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.json"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.line"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.loggly"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.normalizer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.scalar"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.wildfire"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.failover"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.mailinvoker"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.replacementfactory"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.data_collector"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.eventdispatcher"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.authhandler"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.buffer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.config_cache"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.asset_manager_cache_warmer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.worker.cache_busting"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.parameter_bag"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.value_supplier.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_extension"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader.real"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.doctrine"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.twig.doctrine_extension"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.configuration"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger.chain.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.event_manager"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.proxy_cache_warmer"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.listeners.resolve_target_entity"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.underscore"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.ansi"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_configuration"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_yml_metadata_driver"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_metadata_driver"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_dir"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_file"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.security.expression_language.default"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.dump"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.webprofiler"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.doctrine_step"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.secret_step"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillpersonbundle"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillmainbundle"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.kernel"; reason: unused
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.finder" to "cache_warmer".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets.empty_version_strategy" to "assets.packages".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "annotations.reader" to "annotation_reader".
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_version_strategy"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.finder"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.reader"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.http_utils"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_map"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpfoundation"; reason: unused
Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_class"; reason: unused
@@ -1,88 +0,0 @@
<?php return array (
0 => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
1 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
2 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage',
3 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
4 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy',
5 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy',
6 => 'Symfony\\Component\\HttpFoundation\\Session\\Session',
7 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables',
8 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference',
9 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser',
10 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\TemplateLocator',
11 => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
12 => 'Symfony\\Component\\Routing\\RequestContext',
13 => 'Symfony\\Component\\Routing\\Router',
14 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
15 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\Router',
16 => 'Symfony\\Component\\Config\\FileLocator',
17 => 'Symfony\\Component\\Debug\\ErrorHandler',
18 => 'Symfony\\Component\\EventDispatcher\\Event',
19 => 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
20 => 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
21 => 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
22 => 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver',
23 => 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent',
24 => 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent',
25 => 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent',
26 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent',
27 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent',
28 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent',
29 => 'Symfony\\Component\\HttpKernel\\KernelEvents',
30 => 'Symfony\\Component\\HttpKernel\\Config\\FileLocator',
31 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
32 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
33 => 'Symfony\\Component\\Security\\Http\\Firewall',
34 => 'Symfony\\Component\\Security\\Core\\User\\UserProviderInterface',
35 => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager',
36 => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage',
37 => 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
38 => 'Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationChecker',
39 => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface',
40 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
41 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',
42 => 'Symfony\\Component\\HttpFoundation\\RequestMatcher',
43 => 'Twig_Environment',
44 => 'Twig_Extension',
45 => 'Twig_Extension_Core',
46 => 'Twig_Extension_Escaper',
47 => 'Twig_Extension_Optimizer',
48 => 'Twig_LoaderInterface',
49 => 'Twig_Markup',
50 => 'Twig_Template',
51 => 'Monolog\\Formatter\\FormatterInterface',
52 => 'Monolog\\Formatter\\LineFormatter',
53 => 'Monolog\\Handler\\HandlerInterface',
54 => 'Monolog\\Handler\\AbstractHandler',
55 => 'Monolog\\Handler\\AbstractProcessingHandler',
56 => 'Monolog\\Handler\\StreamHandler',
57 => 'Monolog\\Handler\\FingersCrossedHandler',
58 => 'Monolog\\Handler\\FilterHandler',
59 => 'Monolog\\Handler\\TestHandler',
60 => 'Monolog\\Logger',
61 => 'Symfony\\Bridge\\Monolog\\Logger',
62 => 'Symfony\\Bridge\\Monolog\\Handler\\DebugHandler',
63 => 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
64 => 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
65 => 'Symfony\\Bundle\\AsseticBundle\\DefaultValueSupplier',
66 => 'Symfony\\Bundle\\AsseticBundle\\Factory\\AssetFactory',
67 => 'Doctrine\\Common\\Annotations\\DocLexer',
68 => 'Doctrine\\Common\\Annotations\\FileCacheReader',
69 => 'Doctrine\\Common\\Annotations\\PhpParser',
70 => 'Doctrine\\Common\\Annotations\\Reader',
71 => 'Doctrine\\Common\\Lexer',
72 => 'Doctrine\\Common\\Persistence\\ConnectionRegistry',
73 => 'Doctrine\\Common\\Persistence\\Proxy',
74 => 'Doctrine\\Common\\Util\\ClassUtils',
75 => 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
76 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
77 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
78 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
79 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
80 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface',
81 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
82 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
83 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
84 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
85 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
);
@@ -1,77 +0,0 @@
imports:
- { resource: parameters.yml }
framework:
secret: Not very secret
router: { resource: "%kernel.root_dir%/config/routing.yml" }
form: true
csrf_protection: true
session: ~
default_locale: fr
translator: { fallback: fr }
profiler: { only_exceptions: false }
templating:
engines: ['twig']
doctrine:
dbal:
driver: pdo_pgsql
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
charset: UTF8
mapping_types:
jsonb: json_array
orm:
auto_generate_proxy_classes: "%kernel.debug%"
auto_mapping: true
# Assetic Configuration
assetic:
debug: "%kernel.debug%"
use_controller: false
bundles: [ ]
#java: /usr/bin/java
filters:
cssrewrite: ~
security:
providers:
chain_provider:
chain :
providers: [in_memory, users]
in_memory:
memory:
users:
admin: { password: olala, roles: 'ROLE_ADMIN' }
users:
entity:
class: Chill\MainBundle\Entity\User
property: username
encoders:
Chill\MainBundle\Entity\User:
algorithm: bcrypt
Symfony\Component\Security\Core\User\User: plaintext
firewalls:
dev:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false
default:
anonymous: ~
form_login:
csrf_parameter: _csrf_token
csrf_token_id: authenticate
csrf_provider: form.csrf_provider
logout: ~
http_basic:
access_control:
#disable authentication for tests
#- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
#- { path: ^/admin, roles: ROLE_ADMIN }
#- { path: ^/, roles: ROLE_USER }
@@ -1,7 +0,0 @@
imports:
- { resource: config.yml } #here we import a config.yml file, this is not required
framework:
test: ~
session:
storage_id: session.storage.filesystem
@@ -1,8 +0,0 @@
# config/config_test.yml
imports:
- { resource: config.yml } #here we import a config.yml file, this is not required
framework:
test: ~
session:
storage_id: session.storage.filesystem
@@ -1,9 +0,0 @@
#required by ConfigCustomizablesEntitiesTest::testNotEmptyConfig
imports:
- { resource: config_test.yml }
chill_custom_fields:
customizables_entities:
- { class: Test\With\A\Dummy\Entity, name: test }
@@ -1,7 +0,0 @@
parameters:
database_host: chill__database
database_port: 5432
database_name: postgres
database_user: postgres
database_password: postgres
locale: fr
@@ -1,7 +0,0 @@
parameters:
database_host: 127.0.0.1
database_port: 5432
database_name: test0
database_user: postgres
database_password: postgres
locale: fr
@@ -1,7 +0,0 @@
parameters:
database_host: 127.0.0.1
database_port: 5434
database_name: symfony
database_user: symfony
database_password: symfony
locale: fr
@@ -1,10 +0,0 @@
cl_custom_fields:
resource: .
type: chill_routes
chill_main:
resource: "@ChillMainBundle/Resources/config/routing.yml"
test_custom_field_form_render:
path: /customfieldsgroup/test/render/{id}
defaults: { _controller: ChillCustomFieldsBundle:CustomFieldsGroup:renderForm }
@@ -1,28 +0,0 @@
#!/usr/bin/env php
<?php
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Debug\Debug;
// if you don't want to setup permissions the proper way, just uncomment the following PHP line
// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
// for more information
//umask(0000);
set_time_limit(0);
/** @var \Composer\Autoload\ClassLoader $loader */
$loader = require __DIR__.'/autoload.php';
$input = new ArgvInput();
$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
if ($debug) {
Debug::enable();
}
$kernel = new AppKernel($env, $debug);
$application = new Application($kernel);
$application->run($input);
@@ -1,41 +0,0 @@
<?php
/**
* Chill is a software for social workers
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/
declare(strict_types=1);
use Symfony\Component\Debug\Debug;
use Symfony\Component\HttpFoundation\Request;
// If you don't want to setup permissions the proper way, just uncomment the following PHP line
// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
//umask(0000);
// This check prevents access to debug front controllers that are deployed by accident to production servers.
// Feel free to remove this, extend it, or make something more sophisticated.
if (
isset($_SERVER['HTTP_CLIENT_IP'])
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
|| !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
) {
header('HTTP/1.0 403 Forbidden');
exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
}
$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
Debug::enable();
require_once __DIR__ . '/../app/AppKernel.php';
$kernel = new AppKernel('dev', true);
$kernel->loadClassCache();
$request = Request::createFromGlobals();
$response = $kernel->handle($request);
$response->send();
$kernel->terminate($request, $response);
@@ -41,6 +41,17 @@
</div>
{% endif %}
{% if activity.attendee and t.attendeeVisible %}
<div class="wl-row">
<div class="wl-col title"><h3>{{ 'Attendee'|trans }}</h3></div>
<div class="wl-col list">
<p class="wl-item">
{{ activity.attendee.name|localize_translatable_string }}
</p>
</div>
</div>
{% endif %}
{% if activity.sentReceived is not empty and t.sentReceivedVisible %}
<div class="wl-row">
<div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div>
@@ -57,7 +68,7 @@
<div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
<div class="wl-col list">
<p class="wl-item">
{{ activity.user|chill_entity_render_string|capitalize }}
{{ activity.user|chill_entity_render_box }}
</p>
</div>
</div>
@@ -143,9 +154,17 @@
</div>
<div class="item-row separator">
<ul class="record_actions">
{{ recordAction }}
</ul>
<div class="item-col item-meta">
{% set notif_counter = chill_count_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %}
{% if notif_counter.total > 0 %}
{{ chill_counter_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) }}
{% endif %}
</div>
<div class="item-col">
<ul class="record_actions">
{{ recordAction }}
</ul>
</div>
</div>
</div>
@@ -8,7 +8,7 @@
action: 'show', displayBadge: true,
targetEntity: { name: type, id: entity.id },
buttonText: entity|chill_entity_render_string,
isDead: entity.deathdate is not null,
isDead: entity.deathdate is defined and entity.deathdate is not null,
parent: parent
} %}
{% endmacro %}
@@ -5,7 +5,7 @@
{% block title 'Remove activity'|trans %}
{% block personcontent %}
{% block content %}
{{ include('@ChillMain/Util/confirmation_template.html.twig',
{
'title' : 'Remove activity'|trans,
@@ -35,7 +35,7 @@
{{ form_row(edit_form.socialActions) }}
{% endif %}
{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
{%- if edit_form.socialIssues is defined or edit_form.socialActions is defined -%}
<div id="social-issues-acc"></div>
{% endif %}
@@ -83,15 +83,19 @@
{{ form_row(edit_form.comment) }}
{% endif %}
{%- if edit_form.documents is defined -%}
{{ form_row(edit_form.documents) }}
{%- if edit_form.privateComment is defined -%}
{{ form_row(edit_form.privateComment) }}
{% endif %}
{%- if edit_form.attendee is defined -%}
{{ form_row(edit_form.attendee) }}
{% endif %}
{# TODO .. status #}
{%- if edit_form.documents is defined -%}
{{ form_row(edit_form.documents) }}
<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
{% endif %}
{% set person_id = null %}
{% if entity.person %}
@@ -116,3 +120,11 @@
{{ form_end(edit_form) }}
{# {{ form(delete_form) }} #}
{% block js %}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
@@ -30,4 +30,5 @@
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{{ encore_entry_link_tags('page_edit_activity') }}
{% endblock %}
@@ -20,7 +20,7 @@
{% block title 'Update activity'|trans %}
{% block personcontent %}
{% block content %}
<div class="activity-edit">
<div id="activity"></div> {# <=== vue component #}
@@ -1,58 +1,80 @@
{% macro recordAction(activity, context = null, person_id = null, accompanying_course_id = null) %}
{% if no_action is not defined or no_action == false %}
<li>
<a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {
'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
'entityId': activity.id
}) }}">{{ 'notification.Notify'|trans }}</a>
</li>
{% endif %}
{% if context == 'person' and activity.accompanyingPeriod is not empty %}
{#
Disable person_id in following links, for redirect to accompanyingCourse context
#}
{% set person_id = null %}
{% set accompanying_course_id = activity.accompanyingPeriod.id %}
<li>
<a href="{{ chill_path_add_return_path('chill_activity_activity_list',{
'accompanying_period_id': accompanying_course_id
}) }}"
class="btn btn-primary"
title="{{ 'See activity in accompanying course context'|trans }}">
<i class="fa fa-random fa-fw"></i>
{{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }}
</a>
</li>
{% endif %}
<li>
<a href="{{ path('chill_activity_activity_show', {'id': activity.id,
'person_id': person_id,
'accompanying_period_id': accompanying_course_id
}) }}"
class="btn btn-show"
title="{{ 'Show'|trans }}"></a>
</li>
{% if no_action is not defined or no_action == false %}
{% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
{% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
{% if no_action is not defined or no_action == false %}
<li>
<a href="{{ path('chill_activity_activity_edit', {'id': activity.id,
'person_id': person_id,
'accompanying_period_id': accompanying_course_id
}) }}"
class="btn btn-update"
title="{{ 'Edit'|trans }}"></a>
{% set showGroup = activity.accompanyingPeriod is not null and activity.accompanyingPeriod.hasUser and activity.accompanyingPeriod.user is not same as(app.user) %}
<div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
{% if showGroup %}
<button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
{{ 'notification.Notify'|trans }}
</button>
<ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
<li>
<a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id, 'tos': [activity.accompanyingPeriod.user.id]}) }}">
{{ 'notification.Notify referrer'|trans }}
</a>
</li>
<li>
<a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
{{ 'notification.Notify any'|trans }}
</a>
</li>
</ul>
{% else %}
<a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
{{ 'notification.Notify'|trans }}
</a>
{% endif %}
</div>
</li>
{% endif %}
{% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
{% if context == 'person' and activity.accompanyingPeriod is not empty %}
{#
Disable person_id in following links, for redirect to accompanyingCourse context
#}
{% set person_id = null %}
{% set accompanying_course_id = activity.accompanyingPeriod.id %}
<li>
<a href="{{ path('chill_activity_activity_delete', {'id': activity.id,
'person_id': person_id,
<a href="{{ chill_path_add_return_path('chill_activity_activity_list',{
'accompanying_period_id': accompanying_course_id
}) }}"
class="btn btn-delete"
title="{{ 'Delete'|trans }}"></a>
class="btn btn-primary"
title="{{ 'See activity in accompanying course context'|trans }}">
<i class="fa fa-random fa-fw"></i>
{{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }}
</a>
</li>
{% endif %}
<li>
<a href="{{ path('chill_activity_activity_show', {'id': activity.id,
'person_id': person_id,
'accompanying_period_id': accompanying_course_id
}) }}"
class="btn btn-show"
title="{{ 'Show'|trans }}"></a>
</li>
{% if no_action is not defined or no_action == false %}
{% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
<li>
<a href="{{ path('chill_activity_activity_edit', {'id': activity.id,
'person_id': person_id,
'accompanying_period_id': accompanying_course_id
}) }}"
class="btn btn-update"
title="{{ 'Edit'|trans }}"></a>
</li>
{% endif %}
{% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
<li>
<a href="{{ path('chill_activity_activity_delete', {'id': activity.id,
'person_id': person_id,
'accompanying_period_id': accompanying_course_id
}) }}"
class="btn btn-delete"
title="{{ 'Delete'|trans }}"></a>
</li>
{% endif %}
{% endif %}
{% endif %}
{% endmacro %}
@@ -30,7 +30,7 @@
{{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
{% endblock %}
{% block personcontent %}
{% block content %}
{% set person_id = null %}
{% if person %}
@@ -13,7 +13,7 @@
<p class="date-label">{{ activity.date|format_date('short') }}</p>
{%- endif -%}
<span class="like-h3">{{ activity.type.name | localize_translatable_string }}</span>
<span class="like-h3">{{ activity.type.name|localize_translatable_string }}</span>
{% if activity.emergency %}
<span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
@@ -41,14 +41,14 @@
{% if activity.user and t.userVisible %}
<li>
<span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
<b>{{ activity.user.usernameCanonical }}</b>
<b>{{ activity.user|chill_entity_render_box}}</b>
</li>
{% endif %}
<li class="associated-persons">
<span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
{% for p in activity.personsAssociated %}
<span class="badge-person">{{ p|chill_entity_render_box }}</span>
<span class="badge-person">{{ p|chill_entity_render_box({'addAgeBadge': true}) }}</span>
{% endfor %}
</li>
</ul>
@@ -35,7 +35,7 @@
{{ form_row(form.socialActions) }}
{% endif %}
{%- if form.socialIssues is defined or form.socialIssues is defined -%}
{%- if form.socialIssues is defined or form.socialActions is defined -%}
<div id="social-issues-acc"></div>
{% endif %}
@@ -81,18 +81,22 @@
{% endif %}
{%- if form.comment is defined -%}
{# TODO .. public and private #}
{{ form_row(form.comment) }}
{% endif %}
{%- if form.documents is defined -%}
{{ form_row(form.documents) }}
{%- if form.privateComment is defined -%}
{{ form_row(form.privateComment) }}
{% endif %}
{%- if form.attendee is defined -%}
{{ form_row(form.attendee) }}
{% endif %}
{%- if form.documents is defined -%}
{{ form_row(form.documents) }}
<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
{% endif %}
{# TODO .. status #}
<ul class="record_actions sticky-form-buttons">
@@ -115,3 +119,11 @@
</li>
</ul>
{{ form_end(form) }}
{% block js %}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
@@ -17,10 +17,6 @@
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
'{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
});
window.activity = {{ activity_json|json_encode|raw }};
{% if default_location is not null %}window.default_location_id = {{ default_location.id }}{% endif %};
</script>
@@ -4,7 +4,7 @@
{% block title 'Activity creation' |trans %}
{% block personcontent %}
{% block content %}
<div class="activity-new">
<div id="activity"></div> {# <=== vue component #}
@@ -4,6 +4,6 @@
{% block title 'Activity creation'|trans %}
{% block personcontent %}
{% block content %}
{% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
{% endblock %}
@@ -1,4 +1,5 @@
{%- set t = entity.type -%}
{% set userId = app.user.id %}
{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
<h1>{{ "Activity"|trans }}</h1>
@@ -86,7 +87,7 @@
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
'context': context,
'render': 'bloc',
'badge_person': 'true'
'badge_person': true
} %}
<h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
@@ -146,13 +147,28 @@
</dd>
{% endif %}
{% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.hasCommentForUser(app.user) %}
{% if t.privateCommentLabel is not empty %}
<dt class="inline">{{ t.privateCommentLabel }}</dt>
{% else %}
<dt class="inline">{{ 'Private comment'|trans }}</dt>
{% endif %}
<dd>
<section class="chill-entity entity-comment-embeddable">
<blockquote class="chill-user-quote private-quote">
{{ entity.privateComment.comments[userId] }}
</blockquote>
</section>
</dd>
{% endif %}
{% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
<dt class="inline">{{ 'Documents'|trans }}</dt>
<dd>
{% if entity.documents|length > 0 %}
<ul>
{% for d in entity.documents %}
<li>{{ m.download_button(d) }}</li>
<li>{{ d.title }}{{ m.download_button(d) }}</li>
{% endfor %}
</ul>
{% else %}
@@ -165,11 +181,7 @@
<dt class="inline">{{ 'Attendee'|trans }}</dt>
<dd>
{% if entity.attendee is not null %}
{% if entity.attendee %}
{{ 'present'|trans|capitalize }}
{% else %}
{{ 'not present'|trans|capitalize }}
{% endif %}
{{ entity.attendee.name|localize_translatable_string }}
{% else %}
<span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
{% endif %}
@@ -181,6 +193,13 @@
</div>
</div>
<div class="notification notification-list">
{% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
{% if notifications is not empty %}
{{ notifications|raw }}
{% endif %}
</div>
{% set person_id = null %}
{% if person %}
{% set person_id = person.id %}
@@ -197,18 +216,42 @@
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
{% set showGroup = entity.accompanyingPeriod is not null and entity.accompanyingPeriod.hasUser and entity.accompanyingPeriod.user is not same as(app.user) %}
<div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
{% if showGroup %}
<button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
{{ 'notification.Notify'|trans }}
</button>
<ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
<li>
<a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id, 'tos': [entity.accompanyingPeriod.user.id]}) }}">
{{ 'notification.Notify referrer'|trans }}
</a>
</li>
<li>
<a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
{{ 'notification.Notify any'|trans }}
</a>
</li>
</ul>
{% else %}
<a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
{{ 'notification.Notify'|trans }}
</a>
{% endif %}
</div>
</li>
{% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
<li>
<a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
{{ 'Edit'|trans }}
</a>
</li>
<a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
class="btn btn-update">{{ 'Edit'|trans }}</a>
</li>
{% endif %}
{% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
<li>
<a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
{{ 'Delete'|trans }}
</a>
<a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
</li>
{% endif %}
</ul>
@@ -25,19 +25,5 @@
{% endblock content %}
{% block block_post_menu %}
<div class="post-menu pt-4">
<div class="d-grid gap-2">
<a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
<i class="fa fa-paper-plane fa-fw"></i>
{{ 'notification.Notify'|trans }}
</a>
</div>
{% set notifications = chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
{% if notifications is not empty %}
{{ notifications|raw }}
{% endif %}
</div>
<div class="post-menu pt-4"></div>
{% endblock %}
@@ -18,18 +18,17 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block personcontent -%}
{% block content -%}
<div class="activity-show">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
</div>
{% endblock personcontent %}
{% endblock %}
{% block block_post_menu %}
<div class="post-menu pt-4">
<div class="d-grid gap-2">
<a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
<i class="fa fa-paper-plane fa-fw"></i>
<a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
{{ 'notification.Notify'|trans }}
</a>
</div>
@@ -1,10 +1,10 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block title %}
{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
{% endblock %}
{% block layout_wvm_content %}
{% block admin_content %}
{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_view %}{% endblock %}
{% block content_form_actions_save_and_show %}{% endblock %}
@@ -1,4 +1,4 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityPresence list'|trans }}</h1>
@@ -34,7 +34,7 @@
</tbody>
</table>
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li>
<a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
{{ 'Create a new activity presence'|trans }}
@@ -1,11 +1,11 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block title %}
{% include('@ChillMain/CRUD/_new_title.html.twig') %}
{% include('@ChillMain/CRUD/_new_title.html.twig') %}
{% endblock %}
{% block layout_wvm_content %}
{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
{% block content_form_actions_save_and_show %}{% endblock %}
{% endembed %}
{% block admin_content %}
{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
{% block content_form_actions_save_and_show %}{% endblock %}
{% endembed %}
{% endblock %}
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReason edit'|trans }}</h1>
@@ -24,7 +8,7 @@
{{ form_row(edit_form.active) }}
{{ form_row(edit_form.category) }}
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReason list'|trans }}</h1>
@@ -45,7 +29,11 @@
</tbody>
</table>
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class='cancel'>
<a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
</li>
<li>
<a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
{{ 'Create a new activity reason'|trans }}
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReason creation'|trans }}</h1>
@@ -24,7 +8,7 @@
{{ form_row(form.active) }}
{{ form_row(form.category) }}
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReason'|trans }}</h1>
@@ -38,7 +22,7 @@
</tbody>
</table>
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReasonCategory edit'|trans }}</h1>
@@ -23,7 +7,7 @@
{{ form_row(edit_form.name) }}
{{ form_row(edit_form.active) }}
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReasonCategory list'|trans }}</h1>
@@ -46,7 +30,7 @@
</tbody>
</table>
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li>
<a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
{{ 'Create a new activity category reason'|trans }}
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReasonCategory creation'|trans }}</h1>
@@ -23,7 +7,7 @@
{{ form_row(form.name) }}
{{ form_row(form.active) }}
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityReasonCategory'|trans }}</h1>
@@ -37,7 +21,7 @@
</tr>
</tbody>
</table>
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
@@ -1,10 +1,10 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block title %}
{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
{% endblock %}
{% block layout_wvm_content %}
{% block admin_content %}
{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_view %}{% endblock %}
{% block content_form_actions_save_and_show %}{% endblock %}
@@ -1,20 +1,4 @@
{#
* Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityType list'|trans }}</h1>
@@ -50,7 +34,7 @@
</tbody>
</table>
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li>
<a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
{{ 'Create a new activity type'|trans }}
@@ -1,10 +1,10 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block title %}
{% include('@ChillMain/CRUD/_new_title.html.twig') %}
{% endblock %}
{% block layout_wvm_content %}
{% block admin_content %}
{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
{% block content_form_actions_save_and_show %}{% endblock %}
{% endembed %}
@@ -1,12 +1,12 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block title %}
{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
{% endblock %}
{% block layout_wvm_content %}
{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_view %}{% endblock %}
{% block content_form_actions_save_and_show %}{% endblock %}
{% endembed %}
{% block admin_content %}
{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
{% block content_form_actions_view %}{% endblock %}
{% block content_form_actions_save_and_show %}{% endblock %}
{% endembed %}
{% endblock %}
@@ -1,4 +1,4 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block admin_content %}
<h1>{{ 'ActivityTypeCategory list'|trans }}</h1>
@@ -34,7 +34,7 @@
</tbody>
</table>
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li>
<a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
{{ 'Create a new activity type category'|trans }}
@@ -1,11 +1,11 @@
{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
{% block title %}
{% include('@ChillMain/CRUD/_new_title.html.twig') %}
{% include('@ChillMain/CRUD/_new_title.html.twig') %}
{% endblock %}
{% block layout_wvm_content %}
{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
{% block content_form_actions_save_and_show %}{% endblock %}
{% endembed %}
{% block admin_content %}
{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
{% block content_form_actions_save_and_show %}{% endblock %}
{% endembed %}
{% endblock %}

Some files were not shown because too many files have changed in this diff Show More