113 Commits

Author SHA1 Message Date
cd52f7e6e8 Merge branch 'fix-person-tests' into features/household 2021-05-31 21:40:24 +02:00
1410213258 Merge remote-tracking branch 'origin/master' into fix-person-tests 2021-05-31 21:17:56 +02:00
041b1dfc51 Controller action to move members of an household 2021-05-31 20:42:07 +02:00
e26e3ac67b Merge branch '59_parcours_resu_2' 2021-05-27 09:28:23 +02:00
aa473b5f70 fix errors on tests in person bundle 2021-05-26 23:25:36 +02:00
df00ac66f5 Merge remote-tracking branch 'origin/master' into fix-person-tests 2021-05-26 22:44:45 +02:00
2b12e61fbd Merge remote-tracking branch 'origin/fix-getParticipationsContainsPerson' into fix-person-tests 2021-05-26 22:38:25 +02:00
acbe93f9cf Merge remote-tracking branch 'origin/dune-risky' into fix-person-tests 2021-05-26 21:57:09 +02: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
902d8b52d3 Merge branch 'master' into 59_parcours_resu_2 2021-05-25 21:51:06 +02:00
31252461c9 load vue banner component for each page of AccompanyingCourse context
* vue css and js loaded from layout.html.twig
* rename 'show' template to 'edit' template
* overwrite js block for 'edit' template (load all component, not only banner)
2021-05-25 19:05:51 +02:00
34fcefa1bd temporary fix to allow creation on persons without centers 2021-05-21 18:31:20 +02:00
25d7fc36a4 action to create an accompanyinig period 2021-05-19 16:14:36 +02:00
22aa4afc02 action: confirm accompanying period + create workflow 2021-05-19 13:20:59 +02:00
2f9c7c38b5 fix read group on scope 2021-05-18 19:58:16 +02:00
2bdbb20154 Merge remote-tracking branch 'origin/master' into 139_demandeur 2021-05-18 17:24:09 +02:00
14bd211a5f add api endpoint for adding/remove social issue on accompanying period 2021-05-18 17:18:35 +02:00
c5b0d6e2bd Merge branch '20-use-fqdn-in-person-creation-form' into 'master'
Use FQDN in PersonCreation form

See merge request Chill-Projet/chill-bundles!52
2021-05-18 14:06:57 +00:00
Pol Dellaiera
893c38fba4 Fix collateral things. 2021-05-18 12:02:00 +02:00
Pol Dellaiera
aebeefcf80 Use repositories as services. 2021-05-18 12:02:00 +02:00
Pol Dellaiera
9b8c34a9be Symfony form: use FQDN instead of custom constant. 2021-05-18 12:00:58 +02:00
c3ef8d112c first impl for global timeline: apply on activities 2021-05-14 16:25:56 +02:00
f1d5d9840e add route for scope on participation 2021-05-13 17:44:54 +02:00
3e85529468 add route for comment + track update/creation of entities 2021-05-13 17:25:24 +02:00
05798688d0 refactore method addRemoveSomething, and add test for resources 2021-05-13 16:29:05 +02:00
87e2ac9386 handling multi types and acc-period/repositories endpoint 2021-05-13 00:54:44 +02:00
91e4d585ff add a discrimnator type on onbjects 2021-05-12 17:51:37 +02:00
4f3f16d9b0 Set requestor for accompanying period 2021-05-10 15:59:58 +02:00
52637c2919 rewrite method add participation for new period's methods 2021-05-10 13:24:57 +02:00
226f71ab2b requestor, just display datas 2021-05-07 21:37:14 +02:00
503293a359 Merge branch 'master' into '37_modal_add-persons'
# Conflicts:
#   src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
#   src/Bundle/ChillPersonBundle/chill.webpack.config.js
2021-05-07 13:35:48 +00:00
b6131379f9 Merge remote-tracking branch 'origin/master' into bootstrap-api 2021-05-06 13:20:12 +02:00
e7985ea52f customize controller for origin 2021-05-06 12:55:40 +02:00
f56dc65021 fix argument order 2021-05-06 12:55:12 +02:00
07e0692783 bootstrap api and apply on accompanying period 2021-05-06 00:14:36 +02:00
f02e33fda7 first impl for api 2021-05-05 20:33:34 +02:00
30f490959b for each selected, loop for post participation, then get response and commit state 2021-05-05 18:44:26 +02:00
4c82e65c1f Merge branch '14-correctif-creation-personne' into 'master'
Use injected EntityManager - fix property visibility.

See merge request Chill-Projet/chill-bundles!25
2021-04-28 08:36:34 +00:00
cf4d7df7ad Merge branch 'bootstrap-serializer' into 'master'
Bootstrap serializer

See merge request Chill-Projet/chill-bundles!17
2021-04-28 08:32:02 +00:00
Pol Dellaiera
5448238697 Set final keyword - remove redundant information in phpdoc. 2021-04-28 07:21:19 +02:00
Pol Dellaiera
c5250a1059 Use injected EntityManager - fix property visibility. 2021-04-27 23:07:59 +02:00
b43f43fa0b ChillPersonBundle: persist new Persons 2021-04-27 16:53:57 +02:00
66426f5102 serializer on accompanying course
Two new routes:

* `GET /{_locale}/person/api/1.0/accompanying-course/{parcours_id}/show.json`: get a json representation for a course
* `POST /{_locale}/person/api/1.0/accompanying-course/{parcours_id}/participation.json`:
add a particitipation to course. Usage:

    `curl -v --cookie "PHPSESSID=fed98aa23e40cb36e630f84155aea3bb;" -X
POST --data '{ "id": 481 }'
http://localhost:8001/fr/person/api/1.0/accompanying-course/270/participation.json`

    Will add the person with id "481" to the course.
2021-04-26 17:01:22 +02:00
a8f55e064d split personAction in sub-component 2021-04-26 11:27:46 +02:00
28e4b2abaf test vue app 2021-04-23 13:13:57 +02:00
e7df62b373 A first VueJS component, get api datas, a simple button add person
* !! composer require serializer !!
* see: http://localhost:8001/fr/parcours/861/show
2021-04-21 08:53:51 +02:00
16b155d449 init new AccompanyingCourse (parcours) section 2021-04-15 17:04:02 +02:00
8a83e8ed22 Merge branch '_8_entity_parcours' into 'master'
WIP issue8 : entity parcours

See merge request Chill-Projet/chill-bundles!8
2021-04-13 20:48:36 +00:00
34e5fbedf2 Merge branch 'features/new-phones' into 'master'
Features/new phones

See merge request Chill-Projet/chill-bundles!5
2021-04-02 12:11:20 +00:00
Jean-Francois Monfort
27c680bb03 Features/new phones 2021-04-02 12:11:20 +00:00