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
Marc Ducobu
c4e226d0bd
Ajout de SocialIsssue & SocialAction to ActivityType
2021-06-02 12:47:43 +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
e95d756e71
fix socialIssues multiselect with searchable=true option
2021-05-31 09:59:44 +02:00
992734bb72
fix banner toggleFlags regular/occasionnal 'on' style -> stronger
2021-05-31 09:54:28 +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
56242f9b5a
adapt requestor to flex-table
2021-05-27 22:55:07 +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
0a5d20b16f
Merge branch 'master' into features/activity-form
2021-05-27 11:43:37 +02:00
85dda8b680
hide flex-table test on page AccompanyingCourse history
2021-05-27 11:34:49 +02:00
2c49afe549
Merge branch 'master' into features/activity-form
2021-05-27 10:44:21 +02:00
2e1201418a
Merge branch 'fix-activity-menubuilder-definition' into 'master'
...
fix activityBundle menuBuilder definition
See merge request Chill-Projet/chill-bundles!69
2021-05-27 08:40:29 +00:00
a9fb916843
fix activityBundle menuBuilder definition
2021-05-27 10:37:24 +02:00
6631e853b4
Merge branch 'master' into features/activity-form
2021-05-27 10:08:40 +02:00
e26e3ac67b
Merge branch '59_parcours_resu_2'
2021-05-27 09:28:23 +02:00
124e36b9d4
fix declaration of entity rendering
2021-05-26 22:58:28 +02:00
6c8f1f77ff
improve flex-table and flex-box
2021-05-26 18:03:54 +02:00
3b2d4142c1
Merge branch 'master' into 'gitlab-ci-fix-initialization'
...
# Conflicts:
# phpunit.xml.dist
2021-05-26 14:33:58 +00:00
9a6bab7ba2
Update phpunit.xml.dist
2021-05-26 14:27:31 +00:00
c2bbee299c
remove tests for person bundle
2021-05-26 13:56:42 +00:00
f4db9be557
remove tests for person, which are not fixed
2021-05-26 13:43:41 +00:00
5449efdd97
Increase memory for running phpunit
2021-05-26 13:35:38 +00:00
7896d288e7
Increase memory_limit for some operations
2021-05-26 13:31:25 +00:00
b98d6fa505
launch a bash command for debugging
2021-05-26 13:25:29 +00:00
e4d1b951a3
Merge branch 'fix-missing-dependency' into 'master'
...
Fix repositories - add typing - add missing methods - remove obsolete phpdoc
See merge request Chill-Projet/chill-bundles!60
2021-05-26 13:22:25 +00:00
ae8e5bc2e3
Merge branch 'master' into 'fix-accompanying-period-opening'
...
# Conflicts:
# src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
2021-05-26 13:11:23 +00:00
9b66f7a83f
Merge branch 'fix_load_fixtures' into 'master'
...
Fix load fixtures
See merge request Chill-Projet/chill-bundles!66
2021-05-26 11:04:43 +00:00
