3105 Commits

Author SHA1 Message Date
Jean-Francois Monfort
1f1b9c594f add ordoring field & Display Activity type by Category 2021-05-06 11:53:07 +02:00
Jean-Francois Monfort
f836114d84 Fix travelTime field 2021-05-06 10:51:17 +02:00
Jean-Francois Monfort
4fd13440c6 Modernize ActivityController 2021-05-06 10:03:49 +02:00
Jean-Francois Monfort
4d8afd53ad Form & save into DB 2021-05-06 09:36:03 +02:00
Jean-Francois Monfort
82d8556f24 Activity Form : display field according to the parameters 2021-04-29 16:35:39 +02:00
Jean-Francois Monfort
45671bda52 Merge branch 'features/activity-model' into features/activity-form 2021-04-22 16:26:59 +02:00
Jean-Francois Monfort
934eef4db4 Merge branch 'master' into features/activity-model 2021-04-22 16:13:05 +02:00
c5b21f360c Merge branch 'fix-error-show-other-phonenumber' into 'master'
Show the error message when phonenumber has a validation error on other phonenumbers

See merge request Chill-Projet/chill-bundles!16
2021-04-22 14:09:12 +00:00
Jean-Francois Monfort
31e8dea965 Add missing fields & migrations 2021-04-22 15:33:13 +02:00
Jean-Francois Monfort
05ebdefd47 Add missing fields & migrations 2021-04-22 14:47:00 +02:00
fbec64664f upgrade test app 2021-04-22 12:12:31 +02:00
6c81fe4ef2 documentation for running tests 2021-04-22 11:58:18 +02:00
520c0e0f96 show the error message when phonenumber has a validation error 2021-04-21 15:05:47 +02:00
2647d4c6a7 Merge branch 'bootstrap-tests-ci' into 'master'
Bootstrap tests and continuous integration

See merge request Chill-Projet/chill-bundles!15
2021-04-21 11:47:05 +00:00
c6a87f1286 do not commit composer.lock in library 2021-04-20 21:45:50 +02:00
d57cfe09c8 upgrade deps to chill-app 2021-04-20 21:45:22 +02:00
38cba4948b fix .gitlab-ci definition 2021-04-20 21:45:06 +02:00
d765eecb8e Merge remote-tracking branch 'origin/master' into bootstrap-tests-ci 2021-04-20 21:38:53 +02:00
a7e4900690 Add .gitlab-ci.yml 2021-04-20 15:32:41 +00:00
e98a5b88aa fix some tests in main bundle 2021-04-20 17:21:39 +02:00
1b42656e0f bootstrap to be run on root bundle 2021-04-20 17:20:57 +02:00
b2ff470720 fix container property overriding to non-static 2021-04-20 15:29:54 +02:00
e9674dd334 fixtures: really find Charline 2021-04-20 15:14:15 +02:00
0fcec73a62 Merge branch 'v8-entity-parcours-fixes' into 'master'
Fix some stuff in AccompanyingPeriod

See merge request Chill-Projet/chill-bundles!13
2021-04-20 12:53:07 +00:00
332178981a fix documentation for installation + various refernces 2021-04-19 14:36:03 +02:00
9539214d24 add some constants string to constants 2021-04-19 13:34:03 +02:00
c5b4a44ff3 AccompanyingPeriodParticipation: set cascade=persist for accompanyingPeriod
fixes : A new entity was found through the relationship 'Chill\PersonBundle\Entity\AccompanyingPeriodParticipation#accompanyingPeriod'
that was not configured t  o cascade persist operations for entity: Chill\PersonBundle\Entity\AccompanyingPeriod@0000000002b1d44a000000002510e4e2.
To solve this issue: Either explici   tly call EntityManager#persist() on this unknown entity or configure
cascade persist this association in the mapping for example @ManyToOne(..,cascade={"persist"}). If you cannot find out which entity causes the problem
implement 'Chill\PersonBundle\Entity\AccompanyingPeriod#__toString()' to get a clue.
2021-04-19 13:32:19 +02:00
b7d6d29fac AccompanyingPeriod/ClosingMotive: fix json_array deprecated 2021-04-19 13:29:17 +02:00
51e9b1fcf2 AccompanyingPeriod/Origin: set label as json 2021-04-19 13:25:13 +02:00
b490f4a82c fix migration for parcours - rename sequence for closing motive 2021-04-19 12:58:47 +02:00
Jean-Francois Monfort
c233c481b6 WIP Activity Model 2021-04-15 17:33:41 +02:00
Jean-Francois Monfort
68d9778c00 Merge branch 'features/activity-type' into features/activity-form 2021-04-15 14:46:08 +02:00
Jean-Francois Monfort
8acd852070 Fix uls 2021-04-15 14:45:52 +02:00
Jean-Francois Monfort
a9420f0339 Merge branch 'features/activity-type' into features/activity-form 2021-04-15 14:10:46 +02:00
Jean-Francois Monfort
207e5bf01d Merge branch 'master' into features/activity-type 2021-04-15 14:06:58 +02:00
Jean-Francois Monfort
cb5cf5763e ActivityType : rename some fields 2021-04-15 13:56:39 +02:00
Jean-Francois Monfort
ff450215c6 Add first step to select Activity Type 2021-04-15 13:08:30 +02:00
985f067387 fix migration namespace 2021-04-14 13:25:08 +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
cc40e7a99a fix sql migration syntax 2021-04-13 15:31:04 +02:00
Jean-Francois Monfort
dad8fd5378 ActivityType add new fields : add translations 2021-04-08 16:19:54 +02:00
Jean-Francois Monfort
37b395ee52 ActivityType add new fields 2021-04-08 16:10:04 +02:00
aa05223a4e fix translation 2021-04-02 19:22:57 +02:00
5bee607afb fix migration review: improve up and down query 2021-04-02 19:21:44 +02:00
de240b099f remove commented code in new repositories 2021-04-02 17:50:45 +02:00
36cdf4c220 Merge branch 'add-wysiwyg' into 'master'
Applique l'éditeur de texte sur plusieurs instances + rendu des "Comment Embeddable"

See merge request Chill-Projet/chill-bundles!7
2021-04-02 12:11:39 +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
Jean-Francois Monfort
580dc71218 ActivityType replace Admin Conroller with Crud system 2021-04-01 16:22:33 +02:00
Jean-Francois Monfort
24a7d7b34b new entity ActivityTypeCategory + CRUD 2021-04-01 15:44:05 +02:00