From 71695ed7936cf6e2adba22a857e68b8203906c7d Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 3 Nov 2021 09:31:49 +0100 Subject: [PATCH 1/2] updating changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee30b1e06..de73e3467 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,8 +18,8 @@ and this project adheres to * [3party]: fix address creation * [household members editor] finalisation of editor * [AccompanyingCourse banner]: replace translation referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/70) -* [Location]: add location system in activity and RV (calendar). User can choose in location list or create a new location. - +* [Location]: add location system in activity and RV (calendar). User can choose in location list or create a new location. +* [household]: add relationship page with dynamic data visualisation graph ## Test releases From 7d91f3bef5df0b0bc91e007721e01fbd0bdf3cd7 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 3 Nov 2021 11:30:36 +0100 Subject: [PATCH 2/2] complete relations fixtures --- .../DataFixtures/ORM/LoadRelations.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php index 2b72052c6..f433f2402 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelations.php @@ -21,15 +21,22 @@ class LoadRelations extends Fixture implements FixtureGroupInterface { $relations = [ ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fille']], - ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fils']], ['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fils']], ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fille']], + ['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fils']], + + ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Frère']], + ['title' => ['fr' => 'Soeur'], 'reverseTitle' => ['fr' => 'Soeur']], ['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Soeur']], - ['title' => ['fr' => 'Soeur'], 'reverseTitle' => ['fr' => 'Frère']], - ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Nièce']], + + ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-frère']], + ['title' => ['fr' => 'Demi-soeur'], 'reverseTitle' => ['fr' => 'Demi-soeur']], + ['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-soeur']], + ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Neveu']], ['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Nièce']], ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Neveu']], + ['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Nièce']], ]; foreach($relations as $value){ @@ -45,4 +52,4 @@ class LoadRelations extends Fixture implements FixtureGroupInterface } -} \ No newline at end of file +}