0aa909f060
fix misc in activity (WIP)
2021-06-08 16:55:29 +02:00
a947634f30
remove dump
2021-06-04 19:52:03 +02:00
574b5dcbd0
simplify concernedGroups template for bloc/row include
2021-06-04 19:50:00 +02:00
c1ba892811
list activity flex-table design
2021-06-04 18:59:34 +02:00
Marc Ducobu
31468aeae0
Using select2 for reason field inside activity form
2021-06-04 15:15:28 +02:00
Marc Ducobu
e52c94aabd
Use SocialIssueRenderer->renderString for displaying socialIssues
2021-06-04 15:04:36 +02:00
Marc Ducobu
39dca2a9ca
Form for socialIssues & Actions using expanded
2021-06-04 14:48:07 +02:00
Marc Ducobu
541fe8f1ad
Removing extra line
2021-06-04 12:22:17 +02:00
Marc Ducobu
bb71b9f908
Descendants for socialActions & Issues
2021-06-04 12:22:17 +02:00
330234981c
Merge remote-tracking branch 'origin/features/activity-form--marc' into features/activity-form
2021-06-04 11:58:33 +02:00
a323e84357
concerned parties in vue component: display 3 or 4 bloc according to context
2021-06-04 11:53:50 +02:00
c33f577f5a
activity show: concerned parties are clickable links
2021-06-04 10:52:07 +02:00
4ace2fef99
concerned parties, split in activity model persons associated or not
2021-06-03 20:20:56 +02:00
Marc Ducobu
4a1ebc1c4c
Removing dump
2021-06-03 20:18:47 +02:00
Marc Ducobu
4553051271
Review load fixtures for activityType & categories
2021-06-03 20:15:40 +02:00
Marc Ducobu
743d6cd0bf
Method setX with return this (and not void)
2021-06-03 20:15:40 +02:00
Marc Ducobu
0f635ca51a
SocialAction & Issues in Activity form
2021-06-03 20:15:40 +02:00
987815471c
add concerned parties in show activity page (2 contexts)
2021-06-03 19:13:58 +02:00
32b3d74a1b
fix activity entity addPersons if person is null
2021-06-03 13:48:03 +02:00
980a305456
Merge branch 'dune-risky'
...
Conflicts:
src/Bundle/ChillActivityBundle/config/services.yaml
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
2021-06-02 16:23:45 +02:00
Marc Ducobu
c4e226d0bd
Ajout de SocialIsssue & SocialAction to ActivityType
2021-06-02 12:47:43 +02:00
cfd9f1bab1
replace call to entity by class FQDN
2021-06-02 00:46:55 +02:00
Marc Ducobu
7992f09aea
Ajout SocialAction & SocialIssues to Activity
2021-06-01 17:18:00 +02:00
abede56d68
activity vue corrections
2021-06-01 16:18:01 +02:00
9ab032c943
resolve data Transformer in ActivityType (persons/thirdparties/users)
2021-06-01 15:13:21 +02:00
741ed84918
formType transform string id in entities, wip
2021-05-28 22:59:56 +02:00
5822736f19
store action add/remove id values in hidden input fields
2021-05-28 22:29:34 +02:00
66776eed01
activity component split added persons between 'Usagers du parcours' and 'Tiers non pros.'
2021-05-28 19:27:27 +02:00
e123ee5d03
activity vue component add and remove persons (in store)
2021-05-28 17:30:11 +02:00
666c1e7ae7
replace border by box-shadox in flex-bloc and flex-table
...
We use box-shadow instead of border
to avoid to manage border double-width
when blocs are resized for small screen !
Then we can simulate border-collapse: collapse (table)
2021-05-28 12:46:04 +02:00
622c254cc4
Activity: vue DisplayPerson component logic
2021-05-28 12:14:46 +02:00
a19fd51600
serialize new activity when id's not yet defined
2021-05-28 12:13:28 +02:00
549f3a4c78
AddPersons in activity
...
* modal button dont submit all form
* addNewPersons action mutation loop ready
2021-05-27 22:53:35 +02:00
9ec2a62fb6
controller return json to vue via twig, corrections
2021-05-27 18:41:22 +02:00
65ac9a47b4
add addPersons subcomponent
2021-05-27 17:53:14 +02:00
b1d7e543fc
controller return json to vue via twig; init vue App
2021-05-27 17:36:33 +02:00
b89cffce68
add serializer to activityController
2021-05-27 16:13:22 +02:00
968e6914b2
add new webpack vue entrypoint for activity
...
+ rename existing activity.scss
+ rename webpack vue accompanyingCourse entrypoint
2021-05-27 13:29:01 +02:00
52ee8c5a9a
activity: change fields order in form
2021-05-27 13:27:40 +02:00
2c49afe549
Merge branch 'master' into features/activity-form
2021-05-27 10:44:21 +02:00
a9fb916843
fix activityBundle menuBuilder definition
2021-05-27 10:37:24 +02:00
358410cde1
Remove dead code
2021-05-26 19:44:58 +00:00
25c986cc61
fix rendering for timeline entries in center context
2021-05-26 18:10:51 +02:00
9b1a66c992
fix query in timeline in activity and person bundle
2021-05-25 09:48:19 +02:00
74541f360b
fix activity timeline using TimelineSingleQuery
2021-05-24 20:26:33 +02:00
Jean-Francois Monfort
2bae684df9
Add list of activities in AccompanyingCourse Menu
2021-05-20 17:08:47 +02:00
Jean-Francois Monfort
8fe00b4c2b
Add / Edit / Delete activity from Accompanying Course
2021-05-20 15:56:34 +02:00
c3ef8d112c
first impl for global timeline: apply on activities
2021-05-14 16:25:56 +02:00
Jean-Francois Monfort
1f838d9c5a
Fix Activity fixtures
2021-05-06 16:23:34 +02:00
Jean-Francois Monfort
c6cd785262
add Translations
2021-05-06 15:09:38 +02:00
