201 Commits

Author SHA1 Message Date
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
46ca74fc70 Merge branch 'master' into notification/completion 2022-01-10 16:11:06 +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
juminet
699dcc85de Issue344 vue multiselect i18n 2022-01-10 12:04:57 +00: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
Pol Dellaiera
8401ce2656
cs: Fix code-style (using PHPCSFixer and PHPCS). 2021-12-21 10:59:23 +01:00
d588c36308 Merge branch '327_pinned_comment' into issue321_layout_improvements_actionForm 2021-12-16 21:41:22 +01:00
45b71b207e activity fix: display comment in list 2021-12-16 13:58:43 +01:00
de790d11a8 activity/location: refactor
Refactor the way for loading locations:

* fix showing the default location
* fix when there is not thirdparty default location
* separate api queries instead of inlines;
* use the store instead of the mounted
* refactored for a possible re-use in calendar
2021-12-14 23:20:47 +01:00
3a9fac08c3 Merge remote-tracking branch 'origin/master' into issue332_location_activity 2021-12-14 19:55:16 +01:00
6e079fa771 Fix bug remove associated party in activity form 2021-12-13 19:24:03 +01:00
nobohan
82c027fe2a add the current location of the user as API point + add it in the activity location list 2021-12-13 11:04:10 +01:00
6e1340be27 Merge branch 'master' into 292_activity_acl 2021-12-13 09:21:32 +01:00
c049a0b78b Badge-thirdparty 2021-12-12 14:51:42 +00:00
683d055088 Adding an unrelated to issue to an accompanyingCourseWork 2021-12-12 13:55:22 +00: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
5b321dfb81 list-suggest: add classes to change list disposition 2021-12-09 14:34:34 +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
Pol Dellaiera
cd3be25c22
cs: Remove duplicated headers. 2021-11-30 13:54:58 +01:00
Pol Dellaiera
47c5855a21
cs: Switch to a stricter way of coding - this might break in a lot of places. 2021-11-30 13:33:18 +01:00
Pol Dellaiera
733bee06a8
cs: Enable more risky rules. 2021-11-30 12:19:29 +01:00
Pol Dellaiera
579c349e28
cs: Enable more risky rules. 2021-11-30 12:09:24 +01:00
Pol Dellaiera
a9188355c5
cs: Enable more risky rules. 2021-11-30 11:37:57 +01:00
e99b14b870 [activity] fix loading of social action in edit mode 2021-11-29 23:01:17 +01:00
7b0c7988df [activity] handle case when there is no action associated to selected
issues
2021-11-29 22:43:14 +01: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
5aa5cb3e08 location: use fetchResults for getLocations and getLocationTypes 2021-11-25 17:22:25 +01:00
nobohan
f002d48efd location: fix error when there is no defaultFor defined for locationType entities 2021-11-25 16:53:02 +01:00
nobohan
e73179688a activity: format location label for parcours location 2021-11-25 15:39:30 +01:00
nobohan
d13d42b9bf activity: group locations by type in the selector 2021-11-25 15:39:30 +01:00
nobohan
0bd0487801 activity: fix the on-the-fly POSTing of the location entity 2021-11-25 15:39:30 +01:00
nobohan
d27f085ac9 location: change display in twig 2021-11-25 15:39:30 +01:00
nobohan
c7f2717676 activity: new activity: show address in parcours location 2021-11-25 15:39:30 +01:00
nobohan
a2f6f2b5cb activity: post new location on-the-fly 2021-11-25 15:39:30 +01:00
nobohan
1b579f7930 activity: label location 2021-11-25 15:39:30 +01:00
nobohan
c1a2112d48 activity: add location from concerned person and 3rd parties in the location selector 2021-11-25 15:39:30 +01:00
nobohan
1519fcd4dd activity: add location of the accompanying course 2021-11-25 15:39:30 +01:00