From a7131653c9047381f7fb27c72a19b2e2c1a38808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 17 Jun 2021 22:47:33 +0200
Subject: [PATCH 1/9] finish merge (oups) + layout of household in members
 editor app

---
 .../public/vuejs/_components/ShowAddress.vue  |   4 +-
 .../vuejs/HouseholdMembersEditor/App.vue      |  21 ++--
 .../components/Household.vue                  |  13 +-
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |   4 +-
 .../HouseholdMembersEditor/store/index.js     |  68 +++++++---
 .../vuejs/_components/Household/Household.vue | 117 ++++++++++++++++++
 6 files changed, 194 insertions(+), 33 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue
index c991b7763..d76f7a056 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/ShowAddress.vue
@@ -1,4 +1,5 @@
 <template>
+  <div class="chill_address_address chill_address_address--multiline">
    <div v-if="address.text">
       {{ address.text }}
    </div>
@@ -28,7 +29,8 @@
    </div>
    <div v-if="address.distribution">
       <span>{{ $t('distribution') }}</span>: {{ address.distribution }}
-   </div>
+    </div>
+  </div>
 </template>
 
 <script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
index 7fc138ee9..ff1cab206 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
@@ -1,13 +1,13 @@
 <template>
   <household></household>
-  <concerned></concerned>
-  <dates></dates>
-  <confirmation></confirmation>
+  <concerned v-if="hasHouseholdOrLeave"></concerned>
+  <dates v-if="showConfirm"></dates>
+  <confirmation v-if="showConfirm"></confirmation>
 </template>
 
 <script>
 
-import { mapState } from 'vuex';
+import { mapGetters } from 'vuex';
 import Concerned from './components/Concerned.vue';
 import Household from './components/Household.vue';
 import Dates from './components/Dates.vue';
@@ -22,11 +22,14 @@ export default {
     Confirmation,
   },
   computed: {
-    // for debugging purpose
-    // (not working)
-    //...mapState({
-    //  'concerned', 'household', 'positions'
-    //  })
+    ...mapGetters([
+      'hasHouseholdOrLeave',
+      'hasPersonsWellPositionnated',
+    ]),
+    showConfirm () {
+      return this.$store.getters.hasHouseholdOrLeave 
+        && this.$store.getters.hasPersonsWellPositionnated;
+    },
   }
 }
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index db9670d43..d9312cf00 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -2,11 +2,8 @@
   <h2>{{ $t('household_members_editor.household_part') }}</h2>
 
   <div v-if="hasHousehold">
-    <span v-if="isHouseholdNew">
-      {{ $t('household_members_editor.household.new_household') }}
-    </span>
-    <div v-else>
-      Ménage existant 
+    <div>
+      <household-viewer :household="household"></household-viewer>
     </div>
   </div>
   <div v-else-if="isForceLeaveWithoutHousehold">
@@ -39,16 +36,20 @@
 <script>
 
 import { mapGetters } from 'vuex';
+import HouseholdViewer from 'ChillPersonAssets/vuejs/_components/Household/Household.vue';
 
 export default {
   name: 'Household',
+  components: {
+    HouseholdViewer,
+  },
   computed: {
     ...mapGetters([
       'hasHousehold',
       'isHouseholdNew',
     ]),
     household() {
-      return this.$store.household;
+      return this.$store.state.household;
     },
     allowHouseholdCreate() {
       return this.$store.state.allowHouseholdCreate;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 116203ba1..6e2f395c7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -23,8 +23,8 @@ const appMessages = {
       drop_persons_here: "Glissez-déposez ici les usagers pour la position \"{position}\"",
       all_positionnated: "Tous les usagers sont positionnés",
       holder: "Titulaire",
-      is_holder: "Sera titulaire",
-      is_not_holder: "Ne sera pas titulaire",
+      is_holder: "Est titulaire",
+      is_not_holder: "N'est pas titulaire",
       remove_position: "Retirer des {position}",
       remove_concerned: "Ne plus transférer",
       household_part: "Ménage de destination",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
index 32eb5b722..893fc65f0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js
@@ -19,13 +19,22 @@ const store = createStore({
   state: {
     concerned,
     household: window.household_members_editor_data.household,
-    positions: window.household_members_editor_data.positions,
+    positions: window.household_members_editor_data.positions.sort((a, b) => {
+        if (a.ordering < b.ordering) {
+          return -1;
+        }
+        if (a.ordering > b.ordering) {
+          return 1;
+        }
+        return 0;
+      }),
     startDate: new Date(),
     allowHouseholdCreate: window.household_members_editor_data.allowHouseholdCreate,
     allowHouseholdSearch: window.household_members_editor_data.allowHouseholdSearch,
     allowLeaveWithoutHousehold: window.household_members_editor_data.allowLeaveWithoutHousehold,
     forceLeaveWithoutHousehold: false,
     warnings: [],
+    errors: []
   },
   getters: {
     isHouseholdNew(state) {
@@ -34,6 +43,13 @@ const store = createStore({
     hasHousehold(state) {
       return state.household !== null;
     },
+    hasHouseholdOrLeave(state) {
+      return state.household !== null || state.forceLeaveWithoutHousehold;
+    },
+    hasPersonsWellPositionnated(state, getters) {
+      return getters.needsPositionning === false
+        || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
+    },
     persons(state) { 
       return state.concerned.map(conc => conc.person);
     },
@@ -149,7 +165,7 @@ const store = createStore({
       )
     },
     createHousehold(state) {
-      state.household = { type: 'household', members: [], address: null }
+      state.household = { type: 'household', members: [], current_address: null }
       state.forceLeaveWithoutHousehold = false;
     },
     forceLeaveWithoutHousehold(state) {
@@ -161,6 +177,11 @@ const store = createStore({
     },
     setWarnings(state, warnings) {
       state.warnings = warnings;
+      // reset errors, which should come from servers
+      state.errors.splice(0, state.errors.length);
+    },
+    setErrors(state, errors) {
+      state.errors = errors;
     },
   },
   actions: {
@@ -172,8 +193,9 @@ const store = createStore({
       commit('markPosition', { person_id, position_id });
       dispatch('computeWarnings');
     },
-    toggleHolder({ commit }, conc) {
+    toggleHolder({ commit, dispatch }, conc) {
       commit('toggleHolder', conc);
+      dispatch('computeWarnings');
     },
     removePosition({ commit, dispatch }, conc) {
       commit('removePosition', conc);
@@ -191,8 +213,9 @@ const store = createStore({
       commit('forceLeaveWithoutHousehold');
       dispatch('computeWarnings');
     },
-    setStartDate({ commit }, date) {
+    setStartDate({ commit, dispatch }, date) {
       commit('setStartDate', date);
+      dispatch('computeWarnings');
     },
     setComment({ commit }, payload) {
       commit('setComment', payload);
@@ -216,19 +239,34 @@ const store = createStore({
 
       commit('setWarnings', warnings);
     },
-    confirm({ getters, state }) {
+    confirm({ getters, state, commit }) {
       let payload = getters.buildPayload,
+        errors = [],
         person_id,
-        household_id;
-      householdMove(payload).then(household => {
-        if (household === null) {
-          person_id = getters.persons[0].id;
-          window.location.replace(`/fr/person/${person_id}/general`);
-        } else {
-          household_id = household.id;
-          // nothing to do anymore here, bye-bye !
-          window.location.replace(`/fr/person/household/${household_id}/members`);
-        }
+        household_id,
+        error
+      ;
+
+        householdMove(payload).then(household => {
+          if (household === null) {
+            person_id = getters.persons[0].id;
+            window.location.replace(`/fr/person/${person_id}/general`);
+          } else {
+            if (household.type === 'household') {
+              household_id = household.id;
+              // nothing to do anymore here, bye-bye !
+              window.location.replace(`/fr/person/household/${household_id}/members`);
+            } else {
+              // we assume the answer was 422...
+              error = household;
+              for (let i in error.violations) {
+                let e = error.violations[i];
+                errors.push(e.title); 
+              }
+
+              commit('setErrors', errors);
+            }
+          }
       });
     },
   }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
new file mode 100644
index 000000000..df421a8e8
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="chill-entity chill-entity__household">
+    <!-- identifier -->
+    <div v-if="isHouseholdNew()" class="identifier">
+      <i class="fa fa-home"></i>
+      {{ $t('new_household') }}
+    </div>
+    <div v-else class="identifier">
+      <i class="fa fa-home"></i>
+      {{ $t('household_number', { number: household.id } ) }}
+    </div>
+
+    <!-- member part --> 
+    <div v-if="hasMembers" class="members">
+      <span class="current-members">{{ $t('current_members') }}: </span>
+      <template v-for="(m, index) in current_members()" :key="m.id">
+        <person :person="m.person"></person>
+        <span v-if="index != (current_members_length() - 1)">, </span>
+      </template>
+    </div>
+    <div v-else class="members">
+      <p class="chill-no-data-statement">{{ $t('no_members_yet') }}</p>
+    </div>
+
+    <!-- address part -->
+    <div v-if="hasAddress()" class="where">
+      <i class="fa fa-where"></i>
+      <show-address :address="household.current_address"></show-address>
+    </div>
+    <div v-else class="where">
+      <i class="fa fa-where"></i>
+      <p class="chill-no-data-statement">{{ $t('no_current_address') }}</p>
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+.chill-entity__household {
+  display: grid;
+  grid-template-areas: 
+    "identifier identifier where"
+    "who        who        where"
+    ;
+  grid-template-columns:
+    auto        auto       30%
+    ;
+
+  .identifier {
+    grid-area: identifier;
+    
+    font-size: 1.3em;
+    font-weight: 700;
+    color: var(--chill-blue);
+
+  }
+  .members {
+    grid-area: who;
+
+    .current-members {
+      font-weight: 700;
+    }
+  }
+  .where {
+    grid-area: where
+  }
+
+
+}
+</style>
+
+
+
+<script>
+
+import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
+import ShowAddress from 'ChillMainAssets/vuejs/_components/ShowAddress.vue';
+
+const i18n = {
+  "messages":
+    {
+      "fr":
+      {
+        "household_number": "Ménage #{number}",
+        "current_members": "Membres actuels",
+        "no_current_address": "Sans adresse actuellement",
+        "new_household": "Nouveau ménage",
+        "no_members_yet": "Aucun membre actuellement",
+      }
+  }
+}
+;
+
+export default {
+  name: 'Household',
+  props: ['household'],
+  components: {
+    Person,
+    ShowAddress,
+  },
+  i18n,
+  methods: {
+    current_members() {
+      return this.household.members.filter(m => this.household.current_members_id.includes(m.id));
+    },
+    current_members_length() {
+      return this.household.current_members_id.length;
+    },
+    isHouseholdNew() {
+      return !Number.isInteger(this.household.id);
+    },
+    hasAddress() {
+      return this.household.current_address !== null;
+    }
+  }
+};
+
+</script>

From 9d58356b90c5ff33ddafada9dfe72cf205e18609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 17 Jun 2021 22:54:46 +0200
Subject: [PATCH 2/9] remove drag-and-drop behaviour

---
 .../components/Concerned.vue                  | 44 +++----------------
 .../vuejs/HouseholdMembersEditor/js/i18n.js   |  1 +
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index b2842de00..cacd71fd2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -21,13 +21,10 @@
       <div v-for="conc in concUnpositionned"
         class="item-bloc"
         v-bind:key="conc.person.id"
-        draggable="true"
-        @dragstart="onStartDragConcern($event, conc.person.id)"
       >
         <div class="item-row person">
           <div class="item-col box-person">
             <div>
-              <img src="~ChillMainAssets/img/draggable.svg" class="drag-icon" />
               <person :person="conc.person"></person>
             </div>
             <div v-if="conc.person.birthdate !== null">
@@ -89,21 +86,18 @@
       v-for="position in positions"
     >
       <h3>{{ position.label.fr }}</h3>
-      <div class="flex-table list-household-members">
+
+      <div v-if="concByPosition(position.id).length > 0" class="flex-table list-household-members">
         <member-details
           v-for="conc in concByPosition(position.id)"
           v-bind:key="conc.person.id"
           v-bind:conc="conc"
         >
         </member-details>
-        <div
-          class="droppable_zone"
-          @drop="onDropConcern($event, position.id)"
-          @dragover.prevent
-          @dragenter.prevent
-        >
-          {{ $t('household_members_editor.drop_persons_here', {'position': position.label.fr }) }}
-        </div>
+      </div>
+
+      <div v-else>
+        <p class="chill-no-data-statement">{{ $t('household_members_editor.concerned.no_person_in_position') }}</p>
       </div>
     </div>
   </div>
@@ -120,22 +114,6 @@ div.person {
   }
 }
 
-.drag-icon {
-  height: 1.1em;
-  margin-right: 0.5em;
-}
-
-.droppable_zone {
-  background-color: var(--chill-llight-gray);
-  color: white;
-  font-size: large;
-  text-align: center;
-  display: table-cell;
-  vertical-align: middle;
-  padding: 1em;
-  background: linear-gradient(to top, var(--chill-light-gray), 30%, var(--chill-llight-gray));
-}
-
 .move_to {
   .move_hint {
     text-align: center;
@@ -194,18 +172,8 @@ export default {
       this.$refs.addPersons.resetSearch(); // to cast child method
       modal.showModal = false;
     },
-    onStartDragConcern(evt, person_id) {
-      evt.dataTransfer.dropEffect = 'move'
-      evt.dataTransfer.effectAllowed = 'move'
-      evt.dataTransfer.setData('application/x.person', person_id)
-    },
-    onDropConcern(evt, position_id) {
-      const person_id = Number(evt.dataTransfer.getData('application/x.person'));
-      this.moveToPosition(person_id, position_id);
-    },
     moveToPosition(person_id, position_id) {
       this.$store.dispatch('markPosition', { person_id, position_id });
-
     },
     removeConcerned(conc) {
       this.$store.dispatch('removeConcerned', conc);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
index 6e2f395c7..a058a976a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/js/i18n.js
@@ -19,6 +19,7 @@ const appMessages = {
         move_to: "Déplacer vers",
         persons_to_positionnate: 'Usagers à positionner',
         persons_leaving: "Usagers quittant leurs ménages",
+        no_person_in_position: "Aucun usager ne sera ajouté à cette position",
       },
       drop_persons_here: "Glissez-déposez ici les usagers pour la position \"{position}\"",
       all_positionnated: "Tous les usagers sont positionnés",

From f1120af59e3c166108c6bb83f0baa75cd92823c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 17 Jun 2021 23:10:18 +0200
Subject: [PATCH 3/9] add 'holder' in list of persons

---
 .../vuejs/_components/Household/Household.vue | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
index df421a8e8..def7e6971 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Household/Household.vue
@@ -11,11 +11,14 @@
     </div>
 
     <!-- member part --> 
-    <div v-if="hasMembers" class="members">
+    <div v-if="hasCurrentMembers" class="members">
       <span class="current-members">{{ $t('current_members') }}: </span>
-      <template v-for="(m, index) in current_members()" :key="m.id">
+      <template v-for="(m, index) in currentMembers()" :key="m.id">
         <person :person="m.person"></person>
-        <span v-if="index != (current_members_length() - 1)">, </span>
+        <span v-if="m.holder">
+          &nbsp;<span class="badge badge-primary">{{ $t('holder') }}</span>
+        </span>
+        <span v-if="index != (currentMembersLength() - 1)">, </span>
       </template>
     </div>
     <div v-else class="members">
@@ -85,6 +88,7 @@ const i18n = {
         "no_current_address": "Sans adresse actuellement",
         "new_household": "Nouveau ménage",
         "no_members_yet": "Aucun membre actuellement",
+        "holder": "titulaire",
       }
   }
 }
@@ -99,10 +103,28 @@ export default {
   },
   i18n,
   methods: {
-    current_members() {
-      return this.household.members.filter(m => this.household.current_members_id.includes(m.id));
+    hasCurrentMembers() {
+      return this.household.current_members_id.length > 0;
     },
-    current_members_length() {
+    currentMembers() {
+      return this.household.members.filter(m => this.household.current_members_id.includes(m.id))
+        .sort((a, b) => {
+          if (a.position.ordering < b.position.ordering) {
+            return -1;  
+          }
+          if (a.position.ordering > b.position.ordering) {
+            return 1;
+          }
+          if (a.holder && !b.holder) {
+            return -1;
+          }
+          if (!a.holder && b.holder) {
+            return 1;
+          }
+          return 0;
+        });
+    },
+    currentMembersLength() {
       return this.household.current_members_id.length;
     },
     isHouseholdNew() {

From 0add7572303726691e8d508dca7cf11864447135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jun 2021 11:27:25 +0200
Subject: [PATCH 4/9] remove members page, move to summary

---
 .../Controller/HouseholdController.php        |  51 +----
 .../Menu/HouseholdMenuBuilder.php             |   7 -
 .../Household/PositionRepository.php          |  50 ++++-
 .../public/sass/person_with_period.scss       |   3 +-
 .../views/Household/summary.html.twig         | 193 +++++++++++++++---
 .../translations/messages+intl-icu.fr.yaml    |   3 +
 6 files changed, 214 insertions(+), 93 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 36d34677f..d0f93a05f 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -13,6 +13,7 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\Position;
+use Chill\PersonBundle\Repository\Household\PositionRepository;
 
 /**
  * @Route("/{_locale}/person/household")
@@ -21,12 +22,13 @@ class HouseholdController extends AbstractController
 {
     private TranslatorInterface $translator;
 
-    /**
-     * @param TranslatorInterface $translator
-     */
-    public function __construct(TranslatorInterface $translator)
+    private PositionRepository $positionRepository;
+
+    public function __construct(TranslatorInterface $translator, PositionRepository $positionRepository)
+
     {
         $this->translator = $translator;
+        $this->positionRepository = $positionRepository;
     }
     
     /**
@@ -41,9 +43,8 @@ class HouseholdController extends AbstractController
     {
         // TODO ACL
 
-        $positions = $this->getDoctrine()->getManager()
-            ->getRepository(Position::class)
-            ->findAll()
+        $positions = $this->positionRepository
+            ->findByActiveOrdered()
             ;
 
         // little performance improvement: 
@@ -58,42 +59,6 @@ class HouseholdController extends AbstractController
         );
     }
 
-    /**
-     * @Route(
-     *      "/{household_id}/members",
-     *      name="chill_person_household_members",
-     *      methods={"GET", "HEAD"}
-     *  )
-     *  @ParamConverter("household", options={"id" = "household_id"})
-     */
-    public function members(Request $request, Household $household)
-    {
-        // TODO ACL
-        $positions = $this->getDoctrine()->getManager()
-            ->getRepository(Position::class)
-            ->findAll()
-            ;
-
-        // little performance improvement: 
-        // initialize members collection, which will avoid
-        // some queries
-        $household->getMembers()->initialize();
-
-        if ($request->query->has('edit')) {
-            $form = $this->createMetadataForm($household);
-        } else {
-            $form = null;
-        }
-
-        return $this->render('@ChillPerson/Household/members.html.twig',
-            [
-                'household' => $household,
-                'positions' => $positions,
-                'form' => NULL !== $form ? $form->createView(): $form
-            ]
-        );
-    }
-
     /**
      * @Route(
      *      "/{household_id}/addresses",
diff --git a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
index 3377b6f74..367a53890 100644
--- a/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php
@@ -35,13 +35,6 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
                 'household_id' => $household->getId()
         ]])
         ->setExtras(['order' => 10]);
-
-        $menu->addChild($this->translator->trans('household.Household members'), [
-            'route' => 'chill_person_household_members',
-            'routeParameters' => [
-                'household_id' => $household->getId()
-        ]])
-        ->setExtras(['order' => 20]);
         
         $menu->addChild($this->translator->trans('household.Addresses'), [
             'route' => 'chill_person_household_addresses',
diff --git a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
index a02de20dd..58a0995d6 100644
--- a/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
@@ -7,14 +7,9 @@ use Chill\PersonBundle\Entity\Household\Position;
 //use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
 
-/**
- * @method Position|null find($id, $lockMode = null, $lockVersion = null)
- * @method Position|null findOneBy(array $criteria, array $orderBy = null)
- * @method Position[]    findAll()
- * @method Position[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-final class PositionRepository
+final class PositionRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
@@ -30,4 +25,45 @@ final class PositionRepository
     {
         return $this->repository->findAll();
     }
+
+    /**
+     * @return Position[]
+     */
+    public function findByActiveOrdered(): array
+    {
+        return $this->repository->createQueryBuilder('p')
+            ->select('p')
+            ->orderBy('p.ordering', 'ASC')
+            ->getQuery()
+            ->getResult();
+    }
+
+    /**
+     * @return Position[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    /**
+     * @return Position[]
+     */
+    public function findOneBy(array $criteria): array
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    /**
+     * @return Position
+     */
+    public function find($id)
+    {
+        return $this->repository->find($id);
+    }
+
+    public function getClassName()
+    {
+        return Position::class;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
index da37ab580..97c23c36a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
@@ -1,7 +1,6 @@
 /// complete and overwrite flex-table in chillmain.scss
 div.list-with-period,
-div.list-household-members,
-div.list-household-members--summary { 
+div.list-household-members {
 
     .chill-entity__person {
        .chill-entity__person__first-name,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 92fe1e6bc..95ac55b12 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -5,49 +5,174 @@
 {% block content %}
 <h1>{{ block('title') }}</h1>
 
-<h2>{{ 'household.Current household members'|trans }}</h2>
+<h2>{{ 'household.Current address'|trans }}</h2>
+
+{% set address = household.currentAddress %}
+
+{% if address is empty %}
+<p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
+{% else %}
+<div>
+  {{ address|chill_entity_render_box({'multiline': true}) }}
+</div>
+{% endif %}
+
+<h2>{{ 'household.Household members'|trans }}</h2>
 
 {% for p in positions %}
-{%- set members = household.currentMembersByPosition(p) %}
-{% if members|length > 0 %}
-<h3>{{ p.label|localize_translatable_string }}</h3>
+  <h3>{{ p.label|localize_translatable_string }}</h3>
 
-{% if false == p.shareHousehold %}
-<p>{{ 'household.Those members does not share address'|trans }}</p>
-{% endif %}
+  {% if false == p.shareHousehold %}
+    <p>{{ 'household.Those members does not share address'|trans }}</p>
+  {% endif %}
 
-<div class="flex-table list-household-members--summary">
-  {% for m in members %}
-  <div class="item-bloc">
-    <div class="item-row person">
-      <div class="item-col box-person">
-        <div>
-          {{ m.person|chill_entity_render_box({'addLink': true}) }}
-          {% if m.holder %}
-            <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+  {%- set members = household.currentMembersByPosition(p) %}
+  {% if members|length > 0 %}
+    <div class="flex-table list-household-members">
+      {% for m in members %}
+        <div class="item-bloc">
+          <div class="item-row person">
+            <div class="item-col box-person">
+              <div>
+                {{ m.person|chill_entity_render_box({'addLink': true}) }}
+                {% if m.holder %}
+                  <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+                {% endif %}
+              </div>
+              <div>
+                {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
+              </div>
+            </div>
+            <div class="item-col box-where">
+              <ul class="list-content fa-ul">
+                {% if m.startDate is not empty %}
+                  <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
+                {% endif %}
+                {% if m.endDate is not empty %}
+                  <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
+                {% endif %}
+              </ul>
+              <ul class="record_actions">
+                <li>
+                  <a 
+                  href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
+                  class="sc-button bt-edit" 
+                  />
+                    {{ 'household.Update membership'|trans }}
+                  </a>
+                </li>
+                <li>
+                  <a 
+                  href="{{ chill_path_add_return_path(
+                    'chill_person_household_members_editor', 
+                    {
+                      'persons': [ m.person.id ],
+                      'household': household.id
+                    } ) }}"
+                    class="sc-button" 
+                    />
+                    <i class="fa fa-arrows-h"></i>
+                    {{ 'household.Change position'|trans }}
+                  </a>
+                </li>
+                <li>
+                  <a 
+                  href="{{ chill_path_add_return_path(
+                    'chill_person_household_members_editor', 
+                    {
+                      'persons': [ m.person.id ], 
+                      'allow_leave_without_household': true 
+                    } ) }}"
+                    class="sc-button" 
+                    />
+                    <i class="fa fa-sign-out"></i>
+                    {{ 'household.Leave'|trans }}
+                  </a>
+                </li>
+              </ul>
+            </div>
+          </div>
+          {% if m.comment is not empty %}
+            <div class="item-row comment">
+              <blockquote class="chill-user-quote">
+                {{ m.comment|chill_markdown_to_html }}
+              </blockquote>
+            </div>
           {% endif %}
         </div>
-        <div>
-          {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
-        </div>
-      </div>
-      <div class="item-col box-where">
-        <ul class="list-content fa-ul">
-          {% if m.startDate is not empty %}
-            <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
-          {% endif %}
-          {% if m.endDate is not empty %}
-            <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
-          {% endif %}
-        </ul>
+      {% endfor %}
+    </div>
+  {% else %}
+  <p class="chill-no-data-statement">{{ 'household.Any persons into this position'|trans }}</p>
+  {% endif %}
+
+  {% set members = household.nonCurrentMembersByPosition(p) %}
+  {% if members|length > 0 %}
+    <p><!-- force a space after table --></p>
+    <button class="sc-button bt-green" type="button" data-toggle="collapse" data-target="#nonCurrent_{{ p.id }}" aria-expanded="false" aria-controls="collapse non current members">
+      {{ 'household.Show future or past memberships'|trans({'length': members|length}) }}
+    </button>
+
+    <div id="nonCurrent_{{ p.id }}" class="collapse">
+      <div class="flex-table list-household-members">
+        {% for m in members %}
+          <div class="item-bloc">
+            <div class="item-row person">
+              <div class="item-col box-person">
+                <div>
+                  {{ m.person|chill_entity_render_box({'addLink': true}) }}
+                  {% if m.holder %}
+                    <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>
+                  {% endif %}
+                </div>
+                <div>
+                  {{ 'Born the date'|trans({ 'gender': m.person.gender, 'birthdate': m.person.birthdate|format_date('long') }) }}
+                </div>
+              </div>
+              <div class="item-col box-where">
+                <ul class="list-content fa-ul">
+                  {% if m.startDate is not empty %}
+                    <li>{{ 'Since %date%'|trans({'%date%': m.startDate|format_date('long') }) }}</li>
+                  {% endif %}
+                  {% if m.endDate is not empty %}
+                    <li>{{ 'Until %date%'|trans({'%date%': m.endDate|format_date('long') }) }}</li>
+                  {% endif %}
+                </ul>
+                <ul class="record_actions">
+                  <li>
+                    <a 
+                    href="{{ chill_path_add_return_path('chill_person_household_member_edit', { 'id': m.id }) }}" 
+                    class="sc-button bt-edit" 
+                    />
+                      {{ 'household.Update membership'|trans }}
+                    </a>
+                  </li>
+                </ul>
+              </div>
+            </div>
+            {% if m.comment is not empty %}
+            <div class="item-row comment">
+              <blockquote class="chill-user-quote">
+                {{ m.comment|chill_markdown_to_html }}
+              </blockquote>
+            </div>
+            {% endif %}
+          </div>
+        {% endfor %}
       </div>
     </div>
-  </div>
-  {% endfor %}
-</div>
-
-{% endif %}
 
+  {% endif %}
 {% endfor %}
 
+<ul class="record_actions">
+  <li>
+    <a 
+    href="{{ chill_path_add_return_path('chill_person_household_members_editor', {'household': household.id }) }}"
+      class="sc-button bt-create">
+      {{ 'household.Add a member'|trans }}
+    </a>
+  </li>
+</ul>
+
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index dcca83c40..f0d43ea5c 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -23,6 +23,7 @@ household:
     Any persons into this position: Aucune personne n'appartient au ménage à cette position.
     Leave: Quitter le ménage
     Join: Rejoindre un ménage
+    Change position: Repositionner
     Household file: Dossier ménage
     Add a member: Ajouter un membre
     Update membership: Modifier
@@ -37,6 +38,8 @@ household:
     Current household members: Membres actuels du ménage
     Household summary: Résumé
     Addresses: Adresses
+    Current address: Adresse actuelle
+    Household does not have any address currently: Le ménage n'a pas d'adresse renseignée actuellement
     Edit household members: Modifier l'appartenance au ménage
     and x other persons: >-
         {x, plural, 

From 0e9933ca413ab0bc8862d77f41167602dc96d8e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jun 2021 11:57:27 +0200
Subject: [PATCH 5/9] improve banner

---
 .../Entity/Household/Household.php            | 37 ++++++++++++++++++-
 .../Resources/public/index.js                 |  1 +
 .../public/sass/household_banner.scss         |  5 +++
 .../views/Household/banner.html.twig          | 24 ++++++++----
 4 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/sass/household_banner.scss

diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 8cdc47b4a..c8cbccd87 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -196,6 +196,11 @@ class Household
     }
 
     public function getCurrentMembers(?\DateTimeImmutable $now = null): Collection
+    {
+        return $this->getMembers()->matching($this->buildCriteriaCurrentMembers($now));
+    }
+
+    private function buildCriteriaCurrentMembers(?\DateTimeImmutable $now = null): Criteria
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
@@ -211,7 +216,37 @@ class Household
                 $expr->gte('endDate', $date)
             ));
 
-        return $this->getMembers()->matching($criteria);
+        return $criteria;
+    }
+
+    /**
+     * @return HouseholdMember[]
+     */
+    public function getCurrentMembersOrdered(?\DateTimeImmutable $now = null): Collection
+    {
+        $members = $this->getCurrentMembers($now);
+        
+        $members->getIterator()
+            ->uasort(
+                function (HouseholdMember $a, HouseholdMember $b) {
+                    if ($a->getPosition()->getOrdering() < $b->getPosition()->getOrdering()) {
+                        return -1;
+                    }
+                    if ($a->getPosition()->getOrdering() > $b->getPosition()->getOrdering()) {
+                        return 1;
+                    }
+                    if ($a->isHolder() && !$b->isHolder()) {
+                        return 1;
+                    }
+                    if (!$a->isHolder() && $b->isHolder()) {
+                        return -1;
+                    }
+
+                    return 0;
+                }
+        );
+
+        return $members;
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/index.js b/src/Bundle/ChillPersonBundle/Resources/public/index.js
index e3563b4ff..acdc04579 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/index.js
@@ -1,2 +1,3 @@
 require('./sass/person.scss');
 require('./sass/person_with_period.scss');
+require('./sass/household_banner.scss');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/household_banner.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/household_banner.scss
new file mode 100644
index 000000000..ea584409c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/household_banner.scss
@@ -0,0 +1,5 @@
+.banner-household {
+  .current-members-explain {
+    font-weight: 700;
+  }
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index 795861529..d5131223c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -12,25 +12,35 @@
 
             <div class="grid-3" id="banner-flags"></div>
 
-            <div class="grid-3" id="banner-status"></div>
+            <div class="grid-3" id="banner-status">
+              {% set address = household.currentAddress %}
+              {% if address is empty %}
+              <p class="chill-no-data-statement">{{ 'household.Household does not have any address currently'|trans }}</p>
+              {% else %}
+              <div>
+                {{ address|chill_entity_render_box({'multiline': true, 'with_valid_from': false}) }}
+              </div>
+              {% endif %}
+            </div>
 
         </div>
     </div>
     <div class="grid-12 parent" id="header-accompanying_course-details" >
         <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
             <div id="banner-misc">
-              {%- set persons = household.getCurrentPersons() -%}
-              {%- if persons|length > 0 -%}
+              {%- set members = household.getCurrentMembersOrdered() -%}
+              {%- if members|length > 0 -%}
               <span class="current-members-explain">
               {{- 'household.Current household members'|trans }}:
               </span>
-              {%- for p in persons|slice(0, 5) -%}
-              {{- p|chill_entity_render_box({'addLink': false}) -}}
+              {%- for m in members|slice(0, 5) -%}
+              {{- m.person|chill_entity_render_box({'addLink': false}) -}}
+              {%- if m.holder %} <span class="badge badge-primary">{{ 'household.holder'|trans }}</span>{% endif -%}
               {%- if false == loop.last -%}, {% endif -%}
               {%- endfor -%}
-              {% if persons|length > 5 %}
+              {% if members|length > 5 %}
               <span class="current-members-more">
-              {{ 'household.and x other persons'|trans({'x': persons|length-5}) }}
+              {{ 'household.and x other persons'|trans({'x': members|length-5}) }}
               </span>
               {% endif %} 
               {%- endif -%}

From 7a6117a264e888efe9e80482435eb3a3226d043a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jun 2021 13:30:31 +0200
Subject: [PATCH 6/9] fix test which randomly failed

---
 .../ChillPersonBundle/Entity/Person.php       | 20 +++--
 .../HouseholdMemberControllerTest.php         | 76 ++++++++++++++++---
 2 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index dcfca54c1..7efbb3eca 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -1264,15 +1264,24 @@ class Person implements HasCenterInterface
     }
 
     public function getCurrentHousehold(?\DateTimeImmutable $at = null): ?Household
+    {
+        $participation = $this->getCurrentHouseholdParticipationShareHousehold($at);
+
+        return $participation instanceof HouseholdMember ?
+            $participation->getHousehold()
+            : null;
+    }
+
+    public function getCurrentHouseholdParticipationShareHousehold(?\DateTimeImmutable $at = null): ?HouseholdMember
     {
         $criteria = new Criteria();
         $expr = Criteria::expr();
-        $date = NULL === $at ? new \DateTimeImmutable('now') : $at;
+        $date = NULL === $at ? new \DateTimeImmutable('today') : $at;
         $datef = $date->format('Y-m-d');
 
         if (
-            NULL !== ($this->currentHouseholdAt[$datef] ?? NULL)) {
-            return $this->currentHouseholdAt[$datef];
+            NULL !== ($this->currentHouseholdParticipationAt[$datef] ?? NULL)) {
+            return $this->currentHouseholdParticipationAt[$datef];
         }
 
         $criteria
@@ -1281,7 +1290,7 @@ class Person implements HasCenterInterface
                     $expr->lte('startDate', $date),
                     $expr->orX(
                         $expr->isNull('endDate'),
-                        $expr->gte('endDate', $date)
+                        $expr->gt('endDate', $date)
                     ),
                     $expr->eq('shareHousehold', true)
                 )
@@ -1292,8 +1301,7 @@ class Person implements HasCenterInterface
             ;
 
         return $participations->count() > 0 ?
-            $this->currentHouseholdAt[$datef] = $participations->first()
-                ->getHousehold()
+            $this->currentHouseholdParticipationAt[$datef] = $participations->first()
             : null;
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
index fcaa4ae34..e2af41f89 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
@@ -61,6 +61,19 @@ class HouseholdMemberControllerTest extends WebTestCase
                 ],
             true)
         );
+        if ($client->getResponse()->getStatusCode() === 422) {
+            var_dump(\json_decode($client->getResponse()->getContent(), true));
+            var_dump($date);
+
+            $household = self::$container->get(EntityManagerInterface::class)
+                ->getRepository(Household::class)
+                ->find($householdId);
+
+            $ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
+            foreach ($ms as $m) {
+                var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
+            }
+        }
 
         $this->assertEquals(Response::HTTP_OK, 
             $client->getResponse()->getStatusCode()
@@ -111,6 +124,20 @@ class HouseholdMemberControllerTest extends WebTestCase
             true)
         );
 
+        if ($client->getResponse()->getStatusCode() === 422) {
+            var_dump(\json_decode($client->getResponse()->getContent(), true));
+            var_dump($date);
+
+            $household = self::$container->get(EntityManagerInterface::class)
+                ->getRepository(Household::class)
+                ->find($householdId);
+
+            $ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
+            foreach ($ms as $m) {
+                var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
+            }
+        }
+
         $this->assertEquals(Response::HTTP_OK, 
             $client->getResponse()->getStatusCode()
         );
@@ -168,6 +195,19 @@ class HouseholdMemberControllerTest extends WebTestCase
             true)
         );
 
+        if ($client->getResponse()->getStatusCode() === 422) {
+            var_dump(\json_decode($client->getResponse()->getContent(), true));
+            var_dump($date);
+
+            $household = self::$container->get(EntityManagerInterface::class)
+                ->getRepository(Household::class)
+                ->find($householdId);
+
+            $ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
+            foreach ($ms as $m) {
+                var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
+            }
+        }
         $this->assertEquals(Response::HTTP_OK, 
             $client->getResponse()->getStatusCode()
         );
@@ -205,19 +245,18 @@ class HouseholdMemberControllerTest extends WebTestCase
     {
         self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
+        $yesterday = new \DateTimeImmutable('yesterday');
 
         $personIds = $em->createQuery("SELECT p.id FROM ".Person::class." p ".
             "JOIN p.center c ".
-            "JOIN p.householdParticipations hp ".
             "WHERE ".
-            "c.name = :center ".
-            "AND hp.startDate < CURRENT_DATE() ".
-            "AND hp.endDate IS NULL "
+            "c.name = :center "
             )
             ->setParameter('center', "Center A")
             ->setMaxResults(100)
             ->getScalarResult()
             ;
+
         \shuffle($personIds);
 
         $household = new Household();
@@ -229,12 +268,29 @@ class HouseholdMemberControllerTest extends WebTestCase
             ->getResult()
             ;
 
-        yield [ 
-            \array_pop($personIds)['id'],
-            $household->getId(), 
-            $positions[\random_int(0, count($positions) - 1)]['id'],
-            new \DateTimeImmutable('today')
-        ];
+        $i = 0;
+        do {
+            $id = \array_pop($personIds)['id'];
+            $person = self::$container->get(EntityManagerInterface::class)
+                ->getRepository(Person::Class)
+                ->find($id);
+
+            $participation = $person->getCurrentHouseholdParticipationShareHousehold();
+
+            if (NULL !== $participation && NULL === $participation->getEndDate()
+                && $participation->getStartDate() > $yesterday) {
+                continue;
+            }
+
+            $i++;
+
+            yield [ 
+                $id,
+                $household->getId(), 
+                $positions[\random_int(0, count($positions) - 1)]['id'],
+                new \DateTimeImmutable('tomorrow')
+            ];
+        } while ($i <= 1);
     }
 
     public function provideValidDataEditMember(): \Iterator

From dc79e1a02d9997462d3092373a45006da3d4d1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jun 2021 13:31:19 +0200
Subject: [PATCH 7/9] remove test for members page

---
 .../Tests/Controller/HouseholdControllerTest.php  | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
index 33e930e23..ad7b2ed75 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
@@ -33,19 +33,6 @@ class HouseholdControllerTest extends WebTestCase
         $this->assertResponseIsSuccessful();
     }
 
-    /**
-     * @dataProvider generateValidHouseholdIds
-     */
-    public function testMembers($householdId)
-    {
-        $this->client->request(
-            Request::METHOD_GET,
-            "/fr/person/household/{$householdId}/members"
-        );
-
-        $this->assertResponseIsSuccessful();
-    }
-
     /**
      * @dataProvider generateValidHouseholdIds
      */
@@ -93,5 +80,7 @@ class HouseholdControllerTest extends WebTestCase
         \shuffle($ids);
 
         yield [ \array_pop($ids)['id'] ]; 
+        yield [ \array_pop($ids)['id'] ]; 
+        yield [ \array_pop($ids)['id'] ]; 
     }
 }

From 04ccca092b6e760956d98430c8ba111d735b5829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jun 2021 13:53:19 +0200
Subject: [PATCH 8/9] remove links to route 'household members'

---
 .../Controller/HouseholdMemberController.php  |  2 +-
 .../views/Household/Member/edit.html.twig     |  2 +-
 .../HouseholdMemberControllerTest.php         | 64 ++++---------------
 3 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
index d58972a93..89cd94ef5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
@@ -173,7 +173,7 @@ class HouseholdMemberController extends ApiController
 
             return $this->redirect(
                 $request->get('returnPath', null) ??
-                $this->generator->generate('chill_person_household_members', [ 'household_id' => 
+                $this->generator->generate('chill_person_household_summary', [ 'household_id' => 
                     $member->getHousehold()->getId() ])
                 );
         }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
index 09813c2bb..01d605d9d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/Member/edit.html.twig
@@ -12,7 +12,7 @@
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
     <a 
-      href="{{ chill_return_path_or('chill_person_household_members', { 'household_id': household.id}) }}"
+      href="{{ chill_return_path_or('chill_person_household_summary', { 'household_id': household.id}) }}"
       class="sc-button bt-cancel"
       >
       {{ 'Cancel'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
index e2af41f89..3da325a9e 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdMemberControllerTest.php
@@ -61,19 +61,6 @@ class HouseholdMemberControllerTest extends WebTestCase
                 ],
             true)
         );
-        if ($client->getResponse()->getStatusCode() === 422) {
-            var_dump(\json_decode($client->getResponse()->getContent(), true));
-            var_dump($date);
-
-            $household = self::$container->get(EntityManagerInterface::class)
-                ->getRepository(Household::class)
-                ->find($householdId);
-
-            $ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
-            foreach ($ms as $m) {
-                var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
-            }
-        }
 
         $this->assertEquals(Response::HTTP_OK, 
             $client->getResponse()->getStatusCode()
@@ -124,20 +111,6 @@ class HouseholdMemberControllerTest extends WebTestCase
             true)
         );
 
-        if ($client->getResponse()->getStatusCode() === 422) {
-            var_dump(\json_decode($client->getResponse()->getContent(), true));
-            var_dump($date);
-
-            $household = self::$container->get(EntityManagerInterface::class)
-                ->getRepository(Household::class)
-                ->find($householdId);
-
-            $ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
-            foreach ($ms as $m) {
-                var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
-            }
-        }
-
         $this->assertEquals(Response::HTTP_OK, 
             $client->getResponse()->getStatusCode()
         );
@@ -195,19 +168,6 @@ class HouseholdMemberControllerTest extends WebTestCase
             true)
         );
 
-        if ($client->getResponse()->getStatusCode() === 422) {
-            var_dump(\json_decode($client->getResponse()->getContent(), true));
-            var_dump($date);
-
-            $household = self::$container->get(EntityManagerInterface::class)
-                ->getRepository(Household::class)
-                ->find($householdId);
-
-            $ms = $household->getMembers()->filter(fn ($m) => $m->getPerson()->getId() === $personId);
-            foreach ($ms as $m) {
-                var_dump("id: {$m->getId()}, startDate: {$m->getStartDate()} endDate: {$m->getEndDate()}");
-            }
-        }
         $this->assertEquals(Response::HTTP_OK, 
             $client->getResponse()->getStatusCode()
         );
@@ -277,19 +237,21 @@ class HouseholdMemberControllerTest extends WebTestCase
 
             $participation = $person->getCurrentHouseholdParticipationShareHousehold();
 
-            if (NULL !== $participation && NULL === $participation->getEndDate()
-                && $participation->getStartDate() > $yesterday) {
-                continue;
+            if (NULL == $participation || 
+                (
+                    NULL === $participation->getEndDate()
+                    && $participation->getStartDate() <= $yesterday
+                )) {
+            
+                $i++;
+                yield [ 
+                    $id,
+                    $household->getId(), 
+                    $positions[\random_int(0, count($positions) - 1)]['id'],
+                    new \DateTimeImmutable('tomorrow')
+                ];
             }
 
-            $i++;
-
-            yield [ 
-                $id,
-                $household->getId(), 
-                $positions[\random_int(0, count($positions) - 1)]['id'],
-                new \DateTimeImmutable('tomorrow')
-            ];
         } while ($i <= 1);
     }
 

From 99337c4aa6b18bb2f2dc3ba7d06874c4d3c246bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jun 2021 14:11:02 +0200
Subject: [PATCH 9/9] add form edit metadata in summary page

---
 .../Controller/HouseholdController.php        | 12 +++-
 .../views/Household/summary.html.twig         | 59 +++++++++++++++++++
 .../Controller/HouseholdControllerTest.php    | 30 ++++++++++
 3 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
index 9b546fe68..9d647a84e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
@@ -51,10 +51,18 @@ class HouseholdController extends AbstractController
         // initialize members collection, which will avoid
         // some queries
         $household->getMembers()->initialize();
+
+        if ($request->query->has('edit')) {
+            $form = $this->createMetadataForm($household);
+        } else {
+            $form = null;
+        }
+
         return $this->render('@ChillPerson/Household/summary.html.twig',
             [
                 'household' => $household,
-                'positions' => $positions
+                'positions' => $positions,
+                'form' => NULL !== $form ? $form->createView() : null,
             ]
         );
     }
@@ -149,7 +157,7 @@ class HouseholdController extends AbstractController
 
             $this->addFlash('success', $this->translator->trans('household.data_saved'));
 
-            return $this->redirectToRoute('chill_person_household_members', [
+            return $this->redirectToRoute('chill_person_household_summary', [
                 'household_id' => $household->getId()
             ]);
         }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
index 95ac55b12..3393722c4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig
@@ -19,6 +19,60 @@
 
 <h2>{{ 'household.Household members'|trans }}</h2>
 
+{% if form is not null %}
+  {{ form_start(form) }}
+
+  {{ form_row(form.commentMembers) }}
+
+  <div id="waitingForBirthContainer">
+  {{ form_row(form.waitingForBirth) }}
+  </div>
+
+  <div id="waitingForBirthDateContainer">
+  {{ form_row(form.waitingForBirthDate) }}
+  </div>
+
+  <ul class="record_actions">
+    <li>
+      <button type="submit" class="sc-button bt-save">
+        {{ 'Save'|trans }}
+      </button>
+    </li>
+  </ul>
+
+  {{ form_end(form) }}
+{% else %}
+
+  {% if not household.commentMembers.isEmpty() %}
+      {{ household.commentMembers|chill_entity_render_box }}
+  {% endif %}
+
+  {% if household.waitingForBirth %}
+    {% if household.waitingForBirthDate is not null %}
+    {{ 'household.Expecting for birth on date'|trans({ 'date': household.waitingForBirthDate|format_date('long') }) }}
+    {% else %}
+    {{ 'household.Expecting for birth'|trans }}
+    {% endif %}
+  {% else %}
+    <p class="chill-no-data-statement">
+      {{ 'household.Any expecting birth'|trans }}
+    </p>
+  {% endif %}
+
+  <ul class="record_actions">
+    <li>
+      <a 
+        href="{{ chill_path_add_return_path('chill_person_household_summary', { 'household_id': household.id, 'edit': 1 }) }}"
+        class="sc-button bt-edit"
+        >
+        {{ 'household.Comment and expecting birth'|trans }}
+      </a>
+    </li>
+  </ul>
+
+{% endif %}
+
+
 {% for p in positions %}
   <h3>{{ p.label|localize_translatable_string }}</h3>
 
@@ -176,3 +230,8 @@
 </ul>
 
 {% endblock %}
+
+{% block js %}
+{{ encore_entry_script_tags('household_edit_metadata') }}
+{% endblock %}
+
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
index ad7b2ed75..34899af30 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php
@@ -33,6 +33,35 @@ class HouseholdControllerTest extends WebTestCase
         $this->assertResponseIsSuccessful();
     }
 
+    /**
+     * @dataProvider generateValidHouseholdIds
+     */
+    public function testEditMetadata($householdId)
+    {
+
+        $crawler = $this->client->request(
+            Request::METHOD_GET,
+            "/fr/person/household/{$householdId}/summary",
+            [
+                'edit' => true
+            ]
+        );
+
+        $this->assertResponseIsSuccessful();
+
+        $form = $crawler->selectButton('Enregistrer')
+            ->form();
+
+        $form['household[commentMembers][comment]'] = "This is a text **generated** by automatic tests";
+        $form['household[waitingForBirth]']->tick();
+        $form['household[waitingForBirthDate]'] = (new \DateTime('today'))
+            ->add(new \DateInterval('P1M'))->format('Y-m-d');
+
+        $this->client->submit($form);
+
+        $this->assertResponseRedirects("/fr/person/household/{$householdId}/summary");
+    }
+
     /**
      * @dataProvider generateValidHouseholdIds
      */
@@ -44,6 +73,7 @@ class HouseholdControllerTest extends WebTestCase
         );
 
         $this->assertResponseIsSuccessful();
+
     }
 
     /**