129 Commits

Author SHA1 Message Date
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
9553e18d83 do not uppercase/lowercase ref in activity list 2022-02-02 22:17:24 +01:00
5fef4048a4 use renderbox in activity list recent 2022-02-01 22:36:26 +01:00
79b82e09e1 add document from activity 2022-02-01 17:58:20 +01:00
c6373a075d refactor pickTemplate and adapt existing usage 2022-02-01 15:49:23 +01:00
971789d5cf Merge remote-tracking branch 'origin/master' into foldlist_in_entity 2022-01-31 15:51:21 +01:00
08c13b8c98 Merge remote-tracking branch 'origin/master' into issue412_413_activity 2022-01-31 14:22:34 +01:00
73c4a5d39d better color coherency with buttons 2022-01-30 19:45:09 +01:00
72e306b583 change add notification button color 2022-01-28 12:46:58 +01:00
nobohan
4d1a553474 show activity attendee (présence) in the activity list 2022-01-28 11:40:08 +01:00
ab23290599 refund extension_list_notification template: change place and content 2022-01-28 10:22:48 +01:00
feaee8a0b1 a few more implementations in twig templates 2022-01-28 10:07:34 +01:00
juminet
21d4e49fce activity: doc gen 2022-01-24 13:51:14 +00:00
c7dbaae8d6 105 worflow 2022-01-24 13:17:46 +00:00
54c2b92962 Improve notifications 2022-01-24 10:09:57 +00:00
juminet
256dab3739 person: add obele sign for dead persons 2022-01-19 11:23:51 +00:00
juminet
ad983d80d2 Issue374 documents in activity bug 2022-01-19 10:59:44 +00:00
3f5a6c6b15 Display of activity types 2022-01-16 22:18:16 +00:00
6c71cb0e80 Merge branch '232_resources_comment' into 'master'
232 resources comment

See merge request Chill-Projet/chill-bundles!276
2022-01-13 11:05:15 +00:00
e0ee817421 batch rename twig attribut 2022-01-12 21:36:12 +01:00
b679d833da display location type between parentheses for actions 2022-01-12 13:37:04 +01:00
479e4ffe64 add notification box in context person, page show activity 2022-01-10 17:08:56 +01:00
fded08aaaa include Activity in notification (ShowInNotification) 2022-01-10 16:01:22 +01:00
af6f3043ae activity list page: put item bloc in a separate include 2022-01-10 15:58:11 +01:00
8afd1ee275 Activity show page: move notify button and notification-box in post menu area 2022-01-10 15:14:50 +01:00
f76f7a1641 notification: handle activities 2022-01-04 17:40:47 +01:00
a8fe049ecd notification: add more variable in twig template 2022-01-04 17:00:31 +01:00
45b71b207e activity fix: display comment in list 2021-12-16 13:58:43 +01:00
f2117ea1cd improve activity new/edit twig template 2021-12-10 12:51:18 +01:00
57c4f2ee61 improve activity show twig template 2021-12-10 12:12:17 +01:00
95caa998e3 concernedGroups display badges as clickable onthefly modal 2021-12-10 12:09:50 +01:00
97165c8389 activity: set ACL (issue 292)
https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/292
2021-12-10 10:35:37 +01:00
2d1e8b2acd Cohérence graphique des listes d'activités et d'actions dans le contexte d'un parcours 2021-12-06 14:45:44 +00:00
55b9242690 [bugfix][activity form] check the presence of location / social issues /
persons fields
2021-11-29 21:57:29 +01:00
4854f40648 [bugfix] fix template "new" for activity 2021-11-29 21:27:17 +01:00
juminet
975fbfbdee activity: edit an activity: choose the context based on the activity, not the url parameters 2021-11-29 13:56:12 +00:00
5d9ceb5757 295 resume retouches 2021-11-29 13:48:18 +00:00
juminet
b300858bdd activity: avoid existing entities being added in Users, ThirdParties, Persons 2021-11-29 12:27:54 +00:00
nobohan
d27f085ac9 location: change display in twig 2021-11-25 15:39:30 +01:00
b81c834b5e check acl before showing button for creating activity in person/activity 2021-11-24 15:14:06 +00:00
05dda33a7a Activity: fixes in voter
* the role CREATE is now transformed to CREATE_ACCOMPANYING_COURSE or
CREATE_PERSON when the subject is, respectively, a course or a person;
* the button at the list of activities is now labeled "create"
* the role FULL give access to both role
acTIVITY_CREATE_ACCOMPANYING_COURSE and ACTIVITY_CREATE_PERSON, but not
ACTIVITY_CREATE directly.
2021-11-23 09:06:05 +01:00
4c1e416a14 Merge remote-tracking branch 'origin/master' into issue296_internal_close_accourse 2021-11-22 17:14:11 +01:00
f3792b2ed6 Merge remote-tracking branch 'origin/master' into issue294_suggestPersonInActivity 2021-11-22 14:06:27 +01:00
69384a84d1 Merge remote-tracking branch 'origin/master' into issue133_user_current_location 2021-11-22 13:43:22 +01:00
2c74e268d3 voter fixes 2021-11-22 10:19:14 +01:00
9fb29ec110 refactor search for using search by pertinence 2021-11-22 08:28:22 +00:00
nobohan
aa53df8bb0 activity: avoid adding persons|Users|Thirdparty if not allowed 2021-11-19 13:28:35 +01:00
nobohan
d0e9829a3c activity: fix links to third party view page 2021-11-19 13:28:35 +01:00
nobohan
909e2ca070 activity: delete admin_user_show in twig template because this route is not defined and should not be defined 2021-11-19 13:28:35 +01:00
193d0fb94a vue_activity: style for suggestions, add and remove items 2021-11-18 16:02:40 +01:00