From 58f1984c7770bac5d51ee7d4b17635dd5047ffc9 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 25 Mar 2022 15:14:13 +0100
Subject: [PATCH 001/111] Add new fields to AddressReference for update
 procedure

---
 .../Entity/AddressReference.php               | 55 +++++++++++++++++++
 .../migrations/Version20220325134944.php      | 43 +++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220325134944.php

diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index a9d421fcb..fe132f883 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -33,6 +34,18 @@ class AddressReference
      */
     private string $addressCanonical = '';
 
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     * @groups({"read"})
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     * @groups({"read"})
+     */
+    private ?DateTimeImmutable $deletedAt = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -89,6 +102,22 @@ class AddressReference
      */
     private $streetNumber;
 
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     * @groups({"read"})
+     */
+    private ?DateTimeImmutable $updatedAt = null;
+
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getDeletedAt(): ?DateTimeImmutable
+    {
+        return $this->deletedAt;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -134,6 +163,25 @@ class AddressReference
         return $this->streetNumber;
     }
 
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function setCreatedAt(?DateTimeImmutable $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function setDeletedAt(?DateTimeImmutable $deletedAt): self
+    {
+        $this->deletedAt = $deletedAt;
+
+        return $this;
+    }
+
     public function setMunicipalityCode(?string $municipalityCode): self
     {
         $this->municipalityCode = $municipalityCode;
@@ -189,4 +237,11 @@ class AddressReference
 
         return $this;
     }
+
+    public function setUpdatedAt(?DateTimeImmutable $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php b/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
new file mode 100644
index 000000000..bc0382482
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add 3 fields on AddressReference.
+ */
+final class Version20220325134944 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address_reference DROP createdAt');
+        $this->addSql('ALTER TABLE chill_main_address_reference DROP deletedAt');
+        $this->addSql('ALTER TABLE chill_main_address_reference DROP updatedAt');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add 3 fields on AddressReference';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address_reference ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address_reference ADD deletedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_main_address_reference ADD updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_main_address_reference.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_address_reference.deletedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_address_reference.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+    }
+}

From c3731ae2db2a35d60fc0fd59e84ff279d42ab0f1 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 5 Apr 2022 10:21:14 +0200
Subject: [PATCH 002/111] address reference: add filtering by deletedAt

---
 .../Controller/AddressReferenceAPIController.php               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
index 1a7d8956a..1ac7a87fe 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -76,7 +76,8 @@ final class AddressReferenceAPIController extends ApiController
     protected function customizeQuery(string $action, Request $request, $qb): void
     {
         if ($request->query->has('postal_code')) {
-            $qb->where('e.postcode = :postal_code')
+            $qb->where($qb->expr()->isNull('e.deletedAt'))
+                ->andWhere('e.postcode = :postal_code')
                 ->setParameter('postal_code', $request->query->get('postal_code'));
         }
     }

From c1ec2933e589f74c32487bc1dbade2acd3e59169 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 17:08:44 +0200
Subject: [PATCH 003/111] person: create a new person: add a civility field

---
 src/Bundle/ChillPersonBundle/Form/CreationPersonType.php    | 6 ++++++
 .../Resources/views/Person/create.html.twig                 | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 2aed9df97..22fd0a12d 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickCenterType;
+use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\Type\GenderType;
@@ -55,6 +56,11 @@ final class CreationPersonType extends AbstractType
         $builder
             ->add('firstName')
             ->add('lastName')
+            ->add('civility', PickCivilityType::class, [
+                'required' => false,
+                'label' => 'Civility',
+                'placeholder' => 'choose civility',
+            ])
             ->add('gender', GenderType::class, [
                 'required' => true, 'placeholder' => null,
             ])
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 3a9083310..a5c99379f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -93,6 +93,8 @@
 
     {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
 
+    {{ form_row(form.civility, { 'label' : 'Civility'|trans }) }}
+
     {{ form_row(form.birthdate, { 'label' : 'Date of birth'|trans }) }}
 
     {{ form_row(form.phonenumber, { 'label' : 'Phonenumber'|trans }) }}

From 7a2151f23a7e550d763fbb32cc5f7fd03a6ddb73 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 18:04:36 +0200
Subject: [PATCH 004/111] AddPerson: add civility when creating a person

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  3 +-
 .../Resources/public/vuejs/_api/OnTheFly.js   |  8 ++++-
 .../public/vuejs/_components/AddPersons.vue   |  2 +-
 .../vuejs/_components/OnTheFly/Person.vue     | 30 +++++++++++++++++--
 .../Resources/public/vuejs/_js/i18n.js        |  4 +++
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 669c225dd..5949a1e56 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -210,7 +210,6 @@ export default {
          let
             type = this.type,
             data = {} ;
-
          switch (type) {
             case 'person':
                data = this.$refs.castPerson.$data.person;
@@ -238,7 +237,7 @@ export default {
                      if (typeof data.civility !== 'undefined' && null !== data.civility) {
                         data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
                      }
-                     if (typeof data.civility !== 'undefined' && null !== data.profession) {
+                     if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
                      // console.log('onthefly data', data);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
index 20ed1c8da..338094122 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
@@ -14,8 +14,13 @@ const getPersonAltNames = () =>
    fetch('/api/1.0/person/config/alt_names.json').then(response => {
       if (response.ok) { return response.json(); }
       throw Error('Error with request resource response');
-   });;
+   });
 
+const getCivilities = () =>
+   fetch('/api/1.0/main/civility.json').then(response => {
+      if (response.ok) { return response.json(); }
+      throw Error('Error with request resource response');
+   });
 
 /*
 * POST a new person
@@ -56,6 +61,7 @@ const patchPerson = (id, body) => {
 export {
    getPerson,
    getPersonAltNames,
+   getCivilities,
    postPerson,
    patchPerson
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 90505a1e2..47cae34b1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -277,7 +277,7 @@ export default {
          }
       },
       saveFormOnTheFly({ type, data }) {
-         // console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
+         console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
          if (type === 'person') {
             makeFetch('POST', '/api/1.0/person/person.json', data)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index e6fa85902..940b4de41 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -87,6 +87,20 @@
       <label>{{ $t('person.gender.title') }}</label>
    </div>
 
+   <div class="form-floating mb-3">
+      <select
+         class="form-select form-select-lg"
+         id="civility"
+         v-model="civility"
+         >
+         <option selected disabled >{{ $t('person.civility.placeholder') }}</option>
+         <option v-for="c in config.civilities" :value="c.id" :key="c.id">
+            {{ c.name.fr }}
+         </option>
+      </select>
+      <label>{{ $t('person.civility.title') }}</label>
+   </div>
+
    <div class="input-group mb-3">
       <span class="input-group-text" id="birthdate"><i class="fa fa-fw fa-birthday-cake"></i></span>
       <input type="date"
@@ -134,7 +148,7 @@
 </template>
 
 <script>
-import { getPerson, getPersonAltNames } from '../../_api/OnTheFly';
+import { getCivilities, getPerson, getPersonAltNames } from '../../_api/OnTheFly';
 import PersonRenderBox from '../Entity/PersonRenderBox.vue';
 
 export default {
@@ -151,7 +165,8 @@ export default {
             altNames: []
          },
          config: {
-            altNames: []
+            altNames: [],
+            civilities: []
          },
          errors: []
       }
@@ -171,6 +186,10 @@ export default {
          set(value) { this.person.gender = value; },
          get() { return this.person.gender; }
       },
+      civility: {
+         set(value) { this.person.civility = value; },
+         get() { return this.person.civility; }
+      },
       birthDate: {
          set(value) {
             if (this.person.birthdate) {
@@ -230,6 +249,13 @@ export default {
          .then(altNames => {
             this.config.altNames = altNames;
          });
+      getCivilities()
+         .then(civilities => {
+            if ('results' in civilities) {
+               this.config.civilities = civilities.results;
+            }
+         });
+
       if (this.action !== 'create') {
          this.loadData();
       }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index 7b6a6373d..894a506c6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -38,6 +38,10 @@ const personMessages = {
             man: "Masculin",
             neuter: "Neutre, non binaire",
             undefined: "Non renseigné"
+         },
+         civility: {
+            title: "Civilité",
+            placeholder: "Choisissez la civilité",
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"

From 7d3239d6d6f8b4581e79e9881cf477571d1a1af3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 21:37:16 +0200
Subject: [PATCH 005/111] person: fix adding civility to a person with OnTheFly
 form

---
 .../public/vuejs/_components/OnTheFly/Person.vue  |  6 +++---
 .../Normalizer/PersonJsonNormalizer.php           | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 940b4de41..96ed08f1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -87,7 +87,7 @@
       <label>{{ $t('person.gender.title') }}</label>
    </div>
 
-   <div class="form-floating mb-3">
+   <div v-if="action === 'create'" class="form-floating mb-3">
       <select
          class="form-select form-select-lg"
          id="civility"
@@ -187,8 +187,8 @@ export default {
          get() { return this.person.gender; }
       },
       civility: {
-         set(value) { this.person.civility = value; },
-         get() { return this.person.civility; }
+         set(value) { this.person.civility = {id: value}; },
+         get() { return this.person.civility ? this.person.civility.id : undefined; }
       },
       birthDate: {
          set(value) {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index 41c06e9ec..b4d4fc019 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
+use Chill\MainBundle\Repository\CivilityRepository;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
@@ -54,6 +56,8 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     private PersonRepository $repository;
 
+    private CivilityRepository $civilityRepository;
+
     private ResidentialAddressRepository $residentialAddressRepository;
 
     public function __construct(
@@ -61,12 +65,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
         PersonRepository $repository,
         CenterResolverManagerInterface $centerResolverManager,
         ResidentialAddressRepository $residentialAddressRepository,
+        CivilityRepository $civilityRepository,
         PhoneNumberHelperInterface $phoneNumberHelper /* TODO maybe not necessayr any more */
     ) {
         $this->render = $render;
         $this->repository = $repository;
         $this->centerResolverManager = $centerResolverManager;
         $this->residentialAddressRepository = $residentialAddressRepository;
+        $this->civilityRepository = $civilityRepository;
         $this->phoneNumberHelper = $phoneNumberHelper;
     }
 
@@ -101,6 +107,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'center',
             'altNames',
             'email',
+            'civility'
         ];
 
         $fields = array_filter(
@@ -176,6 +183,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
                 case 'email':
                     $person->setEmail($data[$item]);
 
+                    break;
+
+                case 'civility':
+                    //$civility = $this->denormalizer->denormalize($data[$item], Civility::class, $format, $context); // this seems the right way to do it, but this does not render a Civility object.
+                    $civility = $this->civilityRepository->findOneBy(['id' => $data[$item]['id']]);
+
+                    $person->setCivility($civility);
+
                     break;
             }
         }

From 4009f3ffda60eda7ef32aec915d8045f5218648e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 21:47:38 +0200
Subject: [PATCH 006/111] php code fix

---
 .../Serializer/Normalizer/PersonJsonNormalizer.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index b4d4fc019..f4f463118 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -50,14 +50,14 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     private CenterResolverManagerInterface $centerResolverManager;
 
+    private CivilityRepository $civilityRepository;
+
     private PhoneNumberHelperInterface $phoneNumberHelper;
 
     private ChillEntityRenderExtension $render;
 
     private PersonRepository $repository;
 
-    private CivilityRepository $civilityRepository;
-
     private ResidentialAddressRepository $residentialAddressRepository;
 
     public function __construct(
@@ -107,7 +107,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'center',
             'altNames',
             'email',
-            'civility'
+            'civility',
         ];
 
         $fields = array_filter(

From 946ae31d112342e46c137ab65f3d0f26345290a6 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 14 Apr 2022 21:47:51 +0200
Subject: [PATCH 007/111] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6ae8c947..ce3ac06b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+
 * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
 * [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
 * [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);

From ae45f5f40bbbc1243e689396d3445c953c628285 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 15 Apr 2022 11:11:41 +0200
Subject: [PATCH 008/111] person: add address when creating a person

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  7 ++++
 .../public/vuejs/_components/AddPersons.vue   |  1 +
 .../vuejs/_components/OnTheFly/Person.vue     | 34 +++++++++++++++++--
 .../Resources/public/vuejs/_js/i18n.js        |  3 ++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 5949a1e56..b080cc52d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -240,6 +240,13 @@ export default {
                      if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
+                     if (null !== data.addressId) {
+                        console.log(data)
+                        //TODO make a good address object
+                        // attach the addressId
+                        // test if this condition is safe
+
+                     }
                      // console.log('onthefly data', data);
                   }
                } else {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 47cae34b1..66fe64579 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -278,6 +278,7 @@ export default {
       },
       saveFormOnTheFly({ type, data }) {
          console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
+         //TODO: create a household if address in data.
          if (type === 'person') {
             makeFetch('POST', '/api/1.0/person/person.json', data)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 96ed08f1d..d7ab79c0a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -138,6 +138,16 @@
          aria-describedby="email" />
    </div>
 
+   <div v-if="action === 'create'" class="form-floating mb-3">
+      <add-address
+         :context="addAddress.context"
+         :options="addAddress.options"
+         :addressChangedCallback="submitNewAddress"
+         ref="addAddress">
+      </add-address>
+   </div>
+
+
    <div class="alert alert-warning" v-if="errors.length">
       <ul>
          <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
@@ -150,24 +160,41 @@
 <script>
 import { getCivilities, getPerson, getPersonAltNames } from '../../_api/OnTheFly';
 import PersonRenderBox from '../Entity/PersonRenderBox.vue';
+import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 
 export default {
    name: "OnTheFlyPerson",
    props: ['id', 'type', 'action', 'query'],
    //emits: ['createAction'],
    components: {
-      PersonRenderBox
+      PersonRenderBox,
+      AddAddress
    },
    data() {
       return {
          person: {
             type: 'person',
-            altNames: []
+            altNames: [],
+            addressId: null
          },
          config: {
             altNames: [],
             civilities: []
          },
+         addAddress: {
+            options: {
+               button: {
+                  text:  { create: 'person.address.create_address' },
+                  size: 'btn-sm'
+               },
+               title: { create: 'person.address.create_address' },
+            },
+            context: {
+               target: {}, // boilerplate for getting the address id
+               edit: false,
+               addressId: null
+            }
+         },
          errors: []
       }
    },
@@ -299,6 +326,9 @@ export default {
                this.person.firstName = queryItem;
                break;
          }
+      },
+      submitNewAddress(payload) {
+         this.person.addressId = payload.addressId;
       }
    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index 894a506c6..ff8d7e07e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -42,6 +42,9 @@ const personMessages = {
          civility: {
             title: "Civilité",
             placeholder: "Choisissez la civilité",
+         },
+         address: {
+            create_address: "Ajouter une adresse"
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"

From bea019e9bc0d09331bb0cc2c1b19e99bc9e29514 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 15 Apr 2022 12:23:16 +0200
Subject: [PATCH 009/111] household: API endpoint for posting a household

---
 .../ChillPersonExtension.php                  |  1 +
 .../ChillPersonBundle/chill.api.specs.yaml    | 28 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 6d2bf6d18..230ee5475 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -555,6 +555,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_HEAD => true,
+                                Request::METHOD_POST => true,
                             ],
                         ],
                         'suggestHouseholdByAccompanyingPeriodParticipation' => [
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index e6fefa5df..6e015107b 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -1137,7 +1137,7 @@ paths:
         200:
           description: "OK"
         400:
-          description: "transition cannot be applyed"
+          description: "transition cannot be applied"
 
   /1.0/person/accompanying-course/{id}/confidential.json:
     post:
@@ -1327,6 +1327,28 @@ paths:
       responses:
         200:
           description: "ok"
+    post:
+      tags:
+        - household
+      requestBody:
+        description: "A household"
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Household"
+      summary: Post a new household
+      responses:
+        401:
+          description: "Unauthorized"
+        404:
+          description: "Not found"
+        200:
+          description: "OK"
+        422:
+          description: "Unprocessable entity (validation errors)"
+        400:
+          description: "transition cannot be applied"
 
   /1.0/person/household/{id}.json:
     get:
@@ -1507,7 +1529,7 @@ paths:
         422:
           description: "Unprocessable entity (validation errors)"
         400:
-          description: "transition cannot be applyed"
+          description: "transition cannot be applied"
 
   /1.0/person/household/{id}/address.json:
     post:
@@ -1543,7 +1565,7 @@ paths:
         422:
           description: "Unprocessable entity (validation errors)"
         400:
-          description: "transition cannot be applyed"
+          description: "transition cannot be applied"
 
   /1.0/person/social/social-action.json:
     get:

From 57ed90a6969cdcd27f645cb34122895023daeed0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 15 Apr 2022 13:41:47 +0200
Subject: [PATCH 010/111] person: post an address when creating a person

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  7 --
 .../public/vuejs/_components/AddPersons.vue   | 79 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index b080cc52d..5949a1e56 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -240,13 +240,6 @@ export default {
                      if (typeof data.profession !== 'undefined' && null !== data.profession) {
                         data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
                      }
-                     if (null !== data.addressId) {
-                        console.log(data)
-                        //TODO make a good address object
-                        // attach the addressId
-                        // test if this condition is safe
-
-                     }
                      // console.log('onthefly data', data);
                   }
                } else {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 66fe64579..5e57ae93d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -278,12 +278,82 @@ export default {
       },
       saveFormOnTheFly({ type, data }) {
          console.log('saveFormOnTheFly from addPersons, type', type, ', data', data);
-         //TODO: create a household if address in data.
          if (type === 'person') {
+
             makeFetch('POST', '/api/1.0/person/person.json', data)
-               .then(response => {
-                  this.newPriorSuggestion(response);
+               .then(responsePerson => {
+
+                  this.newPriorSuggestion(responsePerson);
                   this.$refs.onTheFly.closeModal();
+
+                  if (null !== data.addressId) {
+                     const household = {
+                        'type': 'household'
+                     };
+                     const address = {
+                        'type': 'address',
+                        'id': data.addressId
+                     };
+                     makeFetch('POST', '/api/1.0/person/household.json', household)
+                        .then(responseHousehold => {
+                           console.log(responseHousehold);
+
+                           const member = {
+                              'concerned': [
+                                 {
+                                    'person': {
+                                       'type': 'person',
+                                       'id': responsePerson.id
+                                    },
+                                    "position": {
+                                       "type": "household_position",
+                                       "id": 4 //TODO, which position?
+                                    },
+                                 }
+                              ],
+                              'destination': {
+                                 'type': 'household',
+                                 'id': responseHousehold.id
+                              }
+                           };
+                           console.log(member);
+                           makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
+                              .then(response => {
+                                 console.log(response);
+                                 makeFetch('POST', `/api/1.0/person/household/${responseHousehold.id}/address.json`, address)
+                                    .then(response => {
+                                       console.log(response);
+                                    })
+                                    .catch((error) => {
+                                       if (error.name === 'ValidationException') {
+                                          for (let v of error.violations) {
+                                             this.$toast.open({message: v });
+                                          }
+                                       } else {
+                                          this.$toast.open({message: 'An error occurred'});
+                                       }
+                                    });
+                              })
+                              .catch((error) => {
+                                 if (error.name === 'ValidationException') {
+                                    for (let v of error.violations) {
+                                       this.$toast.open({message: v });
+                                    }
+                                 } else {
+                                    this.$toast.open({message: 'An error occurred'});
+                                 }
+                              });
+                        })
+                        .catch((error) => {
+                           if (error.name === 'ValidationException') {
+                              for (let v of error.violations) {
+                                 this.$toast.open({message: v });
+                              }
+                           } else {
+                              this.$toast.open({message: 'An error occurred'});
+                           }
+                        });
+                  }
                })
                .catch((error) => {
                   if (error.name === 'ValidationException') {
@@ -293,7 +363,8 @@ export default {
                   } else {
                      this.$toast.open({message: 'An error occurred'});
                   }
-               })
+               });
+
          }
          else if (type === 'thirdparty') {
             makeFetch('POST', '/api/1.0/thirdparty/thirdparty.json', data)

From 355c5cf8fd52ec96ebc472c08538c5ba2093463e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 09:54:42 +0200
Subject: [PATCH 011/111] person: add address when creating person in
 AddPerson: fix POSTing household

---
 .../public/vuejs/_components/AddPersons.vue   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 5e57ae93d..3c1cd52b1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -291,13 +291,10 @@ export default {
                         'type': 'household'
                      };
                      const address = {
-                        'type': 'address',
                         'id': data.addressId
                      };
                      makeFetch('POST', '/api/1.0/person/household.json', household)
                         .then(responseHousehold => {
-                           console.log(responseHousehold);
-
                            const member = {
                               'concerned': [
                                  {
@@ -305,25 +302,27 @@ export default {
                                        'type': 'person',
                                        'id': responsePerson.id
                                     },
-                                    "position": {
+                                    'position': {
                                        "type": "household_position",
                                        "id": 4 //TODO, which position?
                                     },
+                                    'start_date': {
+                                       'datetime': `${new Date().toISOString().split('T')[0]}T00:00:00+02:00`
+                                    },
+                                    'holder': false, //TODO true or false?
+                                    'comment': null
                                  }
                               ],
                               'destination': {
                                  'type': 'household',
                                  'id': responseHousehold.id
-                              }
+                              },
+                              'composition': null
                            };
-                           console.log(member);
                            makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
-                              .then(response => {
-                                 console.log(response);
+                              .then(_response => {
                                  makeFetch('POST', `/api/1.0/person/household/${responseHousehold.id}/address.json`, address)
-                                    .then(response => {
-                                       console.log(response);
-                                    })
+                                    .then(_response => {})
                                     .catch((error) => {
                                        if (error.name === 'ValidationException') {
                                           for (let v of error.violations) {

From 584111b5f77dc1bb94f4d80f12199fd820375cc8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 11:39:08 +0200
Subject: [PATCH 012/111] person: Add checkobox for adding address in AddPerson

---
 .../vuejs/_components/OnTheFly/Person.vue     | 19 ++++++++++++++++++-
 .../Resources/public/vuejs/_js/i18n.js        |  3 ++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index d7ab79c0a..bb74e9361 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -138,7 +138,14 @@
          aria-describedby="email" />
    </div>
 
-   <div v-if="action === 'create'" class="form-floating mb-3">
+   <div class="input-group mb-3 form-check">
+      <input class="form-check-input"
+         type='checkbox'
+         v-model="showAddressForm"
+         name='showAddressForm'/>
+      <label class="form-check-label">{{ $t('person.address.show_address_form') }}</label>
+   </div>
+   <div v-if="action === 'create' && showAddressFormValue" class="form-floating mb-3">
       <add-address
          :context="addAddress.context"
          :options="addAddress.options"
@@ -181,6 +188,7 @@ export default {
             altNames: [],
             civilities: []
          },
+         showAddressFormValue: false,
          addAddress: {
             options: {
                button: {
@@ -241,6 +249,10 @@ export default {
          set(value) { this.person.email = value; },
          get() { return this.person.email; }
       },
+      showAddressForm: {
+         set(value) { this.showAddressFormValue = value; },
+         get() { return this.showAddressFormValue; }
+      },
       genderClass() {
          switch (this.person.gender) {
             case 'woman':
@@ -349,4 +361,9 @@ dl {
       margin-left: 1em;
    }
 }
+div.form-check {
+   label {
+      margin-left: 1rem;
+   }
+}
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index ff8d7e07e..787196860 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -44,7 +44,8 @@ const personMessages = {
             placeholder: "Choisissez la civilité",
          },
          address: {
-            create_address: "Ajouter une adresse"
+            create_address: "Ajouter une adresse",
+            show_address_form: "Créer un ménage et ajouter une adresse"
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"

From 84038c0ff20058ab5fa184b039cb3449ca4ac5f5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 13:17:40 +0200
Subject: [PATCH 013/111] person: Add checkobox for adding address in AddPerson
 - css

---
 .../Resources/public/vuejs/_components/OnTheFly/Person.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index bb74e9361..3f8fd1043 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -363,7 +363,7 @@ dl {
 }
 div.form-check {
    label {
-      margin-left: 1rem;
+      margin-left: 0.5em!important;
    }
 }
 </style>

From 4bc8da965587b6862cfa2d7b63446ca4849a84cd Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 14:56:41 +0200
Subject: [PATCH 014/111] person: create a person with address (php form)

---
 .../Controller/PersonController.php           | 21 +++++++++++++++++++
 .../Form/CreationPersonType.php               | 12 +++++++++++
 .../public/page/person/create-person.js       | 18 ++++++++++++++++
 .../Resources/views/Person/create.html.twig   | 13 ++++++++++++
 .../ChillPersonBundle/chill.webpack.config.js |  1 +
 .../translations/messages.fr.yml              |  1 +
 6 files changed, 66 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 22d3d9388..8cf0c3118 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\CreationPersonType;
 use Chill\PersonBundle\Form\PersonType;
@@ -260,6 +262,25 @@ final class PersonController extends AbstractController
                     ]);
                 }
 
+                $address = $form->get('address')->getData();
+                $addressForm = $form->get('addressForm')->getData();
+
+                if(null !== $address and $addressForm){
+
+                    $household = new Household();
+
+                    $member = new HouseholdMember();
+                    $member->setPerson($person);
+                    $member->setStartDate(new \DateTimeImmutable());
+
+                    $household->addMember($member);
+                    $household->setForceAddress($address);
+
+                    $this->em->persist($member);
+                    $this->em->persist($household);
+                    $this->em->flush();
+                }
+
                 return $this->redirectToRoute(
                     'chill_person_general_edit',
                     ['person_id' => $person->getId()]
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 22fd0a12d..ef255628e 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Form;
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
+use Chill\MainBundle\Form\Type\PickAddressType;
 use Chill\MainBundle\Form\Type\PickCenterType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
@@ -25,7 +26,9 @@ use libphonenumber\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -77,6 +80,15 @@ final class CreationPersonType extends AbstractType
             ])
             ->add('email', EmailType::class, [
                 'required' => false,
+            ])
+            ->add('addressForm', CheckboxType::class, [
+                'label' => 'Create a household and add an address',
+                'required' => false,
+                'mapped' => false
+            ])
+            ->add('address', PickAddressType::class, [
+                'required' => false,
+                'mapped' => false
             ]);
 
         if ($this->askCenters) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js
new file mode 100644
index 000000000..7e29c4530
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person/create-person.js
@@ -0,0 +1,18 @@
+import { ShowHide } from 'ShowHide';
+
+const addressForm = document.getElementById("addressForm");
+const address = document.getElementById("address");
+
+new ShowHide({
+    froms: [addressForm],
+    container: [address],
+    test: function(froms) {
+        for (let f of froms.values()) {
+            for (let input of f.querySelectorAll('input').values()) {
+                return input.checked;
+            }
+        }
+        return false;
+    },
+    event_name: 'change'
+});
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index a5c99379f..a43001ab3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -107,6 +107,13 @@
         {{ form_row(form.center) }}
     {% endif %}
 
+    <div id=addressForm>
+        {{ form_row(form.addressForm) }}
+    </div>
+    <div id=address>
+        {{ form_row(form.address) }}
+    </div>
+
     <ul class="record_actions sticky-form-buttons">
         <li class="dropdown">
             <a class="btn btn-create dropdown-toggle"
@@ -134,4 +141,10 @@
 
 {% block js %}
     {{ encore_entry_script_tags('page_suggest_names') }}
+    {{ encore_entry_script_tags('page_create_person') }}
+    {{ encore_entry_script_tags('mod_input_address') }}
 {% endblock js %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_input_address') }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index 57f2bae94..85ee83c93 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -22,4 +22,5 @@ module.exports = function(encore, entries)
     encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
     encore.addEntry('page_person_resource_showhide_input', __dirname + '/Resources/public/page/person_resource/showhide-input.js');
     encore.addEntry('page_suggest_names', __dirname + '/Resources/public/page/person/suggest-names.js');
+    encore.addEntry('page_create_person', __dirname + '/Resources/public/page/person/create-person.js');
 };
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index c6baf9513..2059b11dd 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -86,6 +86,7 @@ Civility: Civilité
 choose civility: --
 All genders: tous les genres
 Any person selected: Aucune personne sélectionnée
+Create a household and add an address: Créer un ménage et ajouter une adresse
 
 # dédoublonnage
 Old person: Doublon

From c214c2f4a4331c25310f151eae836d7ec8b67ad5 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 17:09:10 +0200
Subject: [PATCH 015/111] household: safe display of household members without
 positions

---
 .../ChillPersonBundle/Form/HouseholdMemberType.php  | 13 ++++++++-----
 .../views/Person/household_history.html.twig        |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
index 99c698c91..192142043 100644
--- a/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdMemberType.php
@@ -26,12 +26,15 @@ class HouseholdMemberType extends AbstractType
                 'input' => 'datetime_immutable',
             ]);
 
-        if (!$options['data']->getPosition()->getShareHousehold()) {
-            $builder->add('endDate', ChillDateType::class, [
-                'label' => 'household.End date',
-                'input' => 'datetime_immutable',
-            ]);
+        if (null !== $options['data']->getPosition()) {
+            if (!$options['data']->getPosition()->getShareHousehold()) {
+                $builder->add('endDate', ChillDateType::class, [
+                    'label' => 'household.End date',
+                    'input' => 'datetime_immutable',
+                ]);
+            }
         }
+
         $builder
             ->add('comment', ChillTextareaType::class, [
                 'label' => 'household.Comment',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index 1ff91de15..6f7ce0a06 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
@@ -48,7 +48,9 @@
                 </div>
                 <div class="wl-col list">
                     <p class="item">
-                        {{ p.position.label|localize_translatable_string }}
+                        {% if p.position %}
+                            {{ p.position.label|localize_translatable_string }}
+                        {% endif %}
                         {% if p.holder %}
                             <span class="fa-stack fa-holder" title="{{ 'houshold.holder'|trans|e('html_attr') }}">
                                 <i class="fa fa-circle fa-stack-1x text-success"></i>

From bad5506b986fa96792862f0687a698c7bddc18f4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Apr 2022 18:01:25 +0200
Subject: [PATCH 016/111] person: create a person with address (and household
 without position (remove required position for household member)

---
 .../Entity/Household/HouseholdMember.php      |   9 +-
 .../Household/MembersEditor.php               | 111 +++++++++---------
 .../public/vuejs/_components/AddPersons.vue   |   6 +-
 .../vuejs/_components/OnTheFly/Person.vue     |   1 +
 .../Resources/public/vuejs/_js/i18n.js        |   3 +-
 .../Resources/views/Person/create.html.twig   |   1 +
 .../Normalizer/MembersEditorNormalizer.php    |  18 ++-
 .../translations/messages.fr.yml              |   1 +
 8 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 22c33f85f..4b71ad560 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -82,14 +82,13 @@ class HouseholdMember
     /**
      * @ORM\ManyToOne(targetEntity=Position::class)
      * @Serializer\Groups({"read", "docgen:read"})
-     * @Assert\NotNull(groups={"household_memberships_created"})
      */
     private ?Position $position = null;
 
     /**
      * @ORM\Column(type="boolean", name="sharedhousehold")
      */
-    private bool $shareHousehold = false;
+    private bool $shareHousehold = true;
 
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
@@ -201,7 +200,7 @@ class HouseholdMember
         return $this;
     }
 
-    public function setPosition(Position $position): self
+    public function setPosition(?Position $position): self
     {
         if ($this->position instanceof Position) {
             throw new LogicException('The position is already set. You cannot change ' .
@@ -209,7 +208,9 @@ class HouseholdMember
         }
 
         $this->position = $position;
-        $this->shareHousehold = $position->getShareHousehold();
+        if (null !== $position){
+            $this->shareHousehold = $position->getShareHousehold();
+        }
 
         return $this;
     }
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index 1c7cbb538..01d6d7e9c 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -55,7 +55,7 @@ class MembersEditor
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function addMovement(DateTimeImmutable $date, Person $person, Position $position, ?bool $holder = false, ?string $comment = null): self
+    public function addMovement(DateTimeImmutable $date, Person $person, ?Position $position, ?bool $holder = false, ?string $comment = null): self
     {
         if (null === $this->household) {
             throw new LogicException('You must define a household first');
@@ -69,72 +69,75 @@ class MembersEditor
             ->setComment($comment);
         $this->household->addMember($membership);
 
-        if ($position->getShareHousehold()) {
-            // launch event only if moving to a "share household" position,
-            // and if the destination household is different than the previous one
-            $event = new PersonAddressMoveEvent($person);
-            $event->setNextMembership($membership);
+        if (null !== $position) {
+            if ($position->getShareHousehold()) {
+                // launch event only if moving to a "share household" position,
+                // and if the destination household is different than the previous one
+                $event = new PersonAddressMoveEvent($person);
+                $event->setNextMembership($membership);
 
-            $counter = 0;
+                $counter = 0;
 
-            foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
-                if ($participation === $membership) {
-                    continue;
+                foreach ($person->getHouseholdParticipationsShareHousehold() as $participation) {
+                    if ($participation === $membership) {
+                        continue;
+                    }
+
+                    if ($participation->getStartDate() > $membership->getStartDate()) {
+                        continue;
+                    }
+
+                    ++$counter;
+
+                    if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
+                        $participation->setEndDate($date);
+                        $this->membershipsAffected[] = $participation;
+                        $this->oldMembershipsHashes[] = spl_object_hash($participation);
+
+                        if ($participation->getHousehold() !== $this->household) {
+                            $event->setPreviousMembership($participation);
+                            $this->events[] = $event;
+                        }
+                    }
                 }
 
-                if ($participation->getStartDate() > $membership->getStartDate()) {
-                    continue;
+                // send also the event if there was no participation before
+                if (0 === $counter) {
+                    $this->events[] = $event;
                 }
 
-                ++$counter;
+                foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
+                    if ($participation->getHousehold() === $this->household
+                        && $participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate()
+                        && $participation->getStartDate() <= $membership->getStartDate()
+                    ) {
+                        $participation->setEndDate($membership->getStartDate());
+                    }
+                }
+            } else {
+                // if a members is moved to the same household than the one he belongs to,
+                // we should make it leave the household
+                if ($person->getCurrentHousehold($date) === $this->household) {
+                    $this->leaveMovement($date, $person);
+                }
 
-                if ($participation->getEndDate() === null || $participation->getEndDate() > $date) {
-                    $participation->setEndDate($date);
-                    $this->membershipsAffected[] = $participation;
-                    $this->oldMembershipsHashes[] = spl_object_hash($participation);
+                // if there are multiple belongings not sharing household, close the others
+                foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
+                    if ($participation === $membership) {
+                        continue;
+                    }
 
-                    if ($participation->getHousehold() !== $this->household) {
-                        $event->setPreviousMembership($participation);
-                        $this->events[] = $event;
+                    if ($participation->getHousehold() === $this->household
+                        && ($participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate())
+                        && $participation->getStartDate() <= $membership->getStartDate()
+                    ) {
+                        $participation->setEndDate($membership->getStartDate());
                     }
                 }
             }
-
-            // send also the event if there was no participation before
-            if (0 === $counter) {
-                $this->events[] = $event;
-            }
-
-            foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
-                if ($participation->getHousehold() === $this->household
-                    && $participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate()
-                    && $participation->getStartDate() <= $membership->getStartDate()
-                ) {
-                    $participation->setEndDate($membership->getStartDate());
-                }
-            }
-        } else {
-            // if a members is moved to the same household than the one he belongs to,
-            // we should make it leave the household
-            if ($person->getCurrentHousehold($date) === $this->household) {
-                $this->leaveMovement($date, $person);
-            }
-
-            // if there are multiple belongings not sharing household, close the others
-            foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
-                if ($participation === $membership) {
-                    continue;
-                }
-
-                if ($participation->getHousehold() === $this->household
-                    && ($participation->getEndDate() === null || $participation->getEndDate() > $membership->getStartDate())
-                    && $participation->getStartDate() <= $membership->getStartDate()
-                ) {
-                    $participation->setEndDate($membership->getStartDate());
-                }
-            }
         }
 
+
         $this->membershipsAffected[] = $membership;
         $this->persistables[] = $membership;
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 3c1cd52b1..0d50b368c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -302,14 +302,10 @@ export default {
                                        'type': 'person',
                                        'id': responsePerson.id
                                     },
-                                    'position': {
-                                       "type": "household_position",
-                                       "id": 4 //TODO, which position?
-                                    },
                                     'start_date': {
                                        'datetime': `${new Date().toISOString().split('T')[0]}T00:00:00+02:00`
                                     },
-                                    'holder': false, //TODO true or false?
+                                    'holder': false,
                                     'comment': null
                                  }
                               ],
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 3f8fd1043..27657ff46 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -146,6 +146,7 @@
       <label class="form-check-label">{{ $t('person.address.show_address_form') }}</label>
    </div>
    <div v-if="action === 'create' && showAddressFormValue" class="form-floating mb-3">
+      <p>{{ $t('person.address.warning') }}</p>
       <add-address
          :context="addAddress.context"
          :options="addAddress.options"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index 787196860..df8d05a9c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -45,7 +45,8 @@ const personMessages = {
          },
          address: {
             create_address: "Ajouter une adresse",
-            show_address_form: "Créer un ménage et ajouter une adresse"
+            show_address_form: "Créer un ménage et ajouter une adresse",
+            warning: "Un nouveau ménage va être créé. L'usager sera membre de ce ménage."
          }
       },
       error_only_one_person: "Une seule personne peut être sélectionnée !"
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index a43001ab3..e3631f119 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -111,6 +111,7 @@
         {{ form_row(form.addressForm) }}
     </div>
     <div id=address>
+        <p>{{ 'A new household will be created. The person will be member of this household.'|trans }}</p>
         {{ form_row(form.address) }}
     </div>
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index 757a0bfcb..6e1f9da6c 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -116,12 +116,18 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 $format,
                 $context
             );
-            $position = $this->denormalizer->denormalize(
-                $concerned['position'] ?? null,
-                Position::class,
-                $format,
-                $context
-            );
+
+            if (\array_key_exists('position', $concerned)) {
+                $position = $this->denormalizer->denormalize(
+                    $concerned['position'] ?? null,
+                    Position::class,
+                    $format,
+                    $context
+                );
+            } else {
+                $position = null;
+            }
+
             $startDate = $this->denormalizer->denormalize(
                 $concerned['start_date'] ?? null,
                 DateTimeImmutable::class,
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 2059b11dd..b24a5e064 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -87,6 +87,7 @@ choose civility: --
 All genders: tous les genres
 Any person selected: Aucune personne sélectionnée
 Create a household and add an address: Créer un ménage et ajouter une adresse
+A new household will be created. The person will be member of this household.: Un nouveau ménage va être créé. L'usager sera membre de ce ménage.
 
 # dédoublonnage
 Old person: Doublon

From 7a6aa6edcbee27365d8f825b344176580d296472 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 20 Apr 2022 08:51:00 +0200
Subject: [PATCH 017/111] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce3ac06b6..612a50503 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ and this project adheres to
 
 <!-- write down unreleased development here -->
 * [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
+* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
 
 * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
 * [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)

From f2c60cfd2007ed4b70ba9e0704699b5b10186acb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 20 Apr 2022 08:52:15 +0200
Subject: [PATCH 018/111] php code style fix

---
 .../ChillPersonBundle/Controller/PersonController.php     | 8 ++++----
 .../Entity/Household/HouseholdMember.php                  | 3 ++-
 src/Bundle/ChillPersonBundle/Form/CreationPersonType.php  | 5 ++---
 src/Bundle/ChillPersonBundle/Household/MembersEditor.php  | 1 -
 .../Serializer/Normalizer/MembersEditorNormalizer.php     | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 8cf0c3118..e62368efe 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -20,6 +20,7 @@ use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
@@ -33,8 +34,8 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function count;
 use function hash;
 use function implode;
@@ -265,13 +266,12 @@ final class PersonController extends AbstractController
                 $address = $form->get('address')->getData();
                 $addressForm = $form->get('addressForm')->getData();
 
-                if(null !== $address and $addressForm){
-
+                if (null !== $address && $addressForm) {
                     $household = new Household();
 
                     $member = new HouseholdMember();
                     $member->setPerson($person);
-                    $member->setStartDate(new \DateTimeImmutable());
+                    $member->setStartDate(new DateTimeImmutable());
 
                     $household->addMember($member);
                     $household->setForceAddress($address);
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index 4b71ad560..e738528c9 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -208,7 +208,8 @@ class HouseholdMember
         }
 
         $this->position = $position;
-        if (null !== $position){
+
+        if (null !== $position) {
             $this->shareHousehold = $position->getShareHousehold();
         }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index ef255628e..0d854b681 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -28,7 +28,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -84,11 +83,11 @@ final class CreationPersonType extends AbstractType
             ->add('addressForm', CheckboxType::class, [
                 'label' => 'Create a household and add an address',
                 'required' => false,
-                'mapped' => false
+                'mapped' => false,
             ])
             ->add('address', PickAddressType::class, [
                 'required' => false,
-                'mapped' => false
+                'mapped' => false,
             ]);
 
         if ($this->askCenters) {
diff --git a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
index 01d6d7e9c..8ae41a98b 100644
--- a/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+++ b/src/Bundle/ChillPersonBundle/Household/MembersEditor.php
@@ -137,7 +137,6 @@ class MembersEditor
             }
         }
 
-
         $this->membershipsAffected[] = $membership;
         $this->persistables[] = $membership;
 
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
index 6e1f9da6c..f77a8c669 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
@@ -117,7 +117,7 @@ class MembersEditorNormalizer implements DenormalizerAwareInterface, Denormalize
                 $context
             );
 
-            if (\array_key_exists('position', $concerned)) {
+            if (array_key_exists('position', $concerned)) {
                 $position = $this->denormalizer->denormalize(
                     $concerned['position'] ?? null,
                     Position::class,

From 3ed562e5d9f6a50325a54010b5c0829a8844167b Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 21 Apr 2022 18:23:47 +0200
Subject: [PATCH 019/111] person: create a person with address and attribute
 the household to the create ousehold button

---
 .../Controller/PersonController.php           | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index e62368efe..13e22cf90 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -251,18 +251,6 @@ final class PersonController extends AbstractController
                 $this->em->flush();
                 $this->lastPostDataReset();
 
-                if ($form->get('createPeriod')->isClicked()) {
-                    return $this->redirectToRoute('chill_person_accompanying_course_new', [
-                        'person_id' => [$person->getId()],
-                    ]);
-                }
-
-                if ($form->get('createHousehold')->isClicked()) {
-                    return $this->redirectToRoute('chill_person_household_members_editor', [
-                        'persons' => [$person->getId()],
-                    ]);
-                }
-
                 $address = $form->get('address')->getData();
                 $addressForm = $form->get('addressForm')->getData();
 
@@ -279,6 +267,25 @@ final class PersonController extends AbstractController
                     $this->em->persist($member);
                     $this->em->persist($household);
                     $this->em->flush();
+
+                    if ($form->get('createHousehold')->isClicked()) {
+                        return $this->redirectToRoute('chill_person_household_members_editor', [
+                            'persons' => [$person->getId()],
+                            'household' => $household->getId()
+                        ]);
+                    }
+                }
+
+                if ($form->get('createPeriod')->isClicked()) {
+                    return $this->redirectToRoute('chill_person_accompanying_course_new', [
+                        'person_id' => [$person->getId()],
+                    ]);
+                }
+
+                if ($form->get('createHousehold')->isClicked()) {
+                    return $this->redirectToRoute('chill_person_household_members_editor', [
+                        'persons' => [$person->getId()],
+                    ]);
                 }
 
                 return $this->redirectToRoute(

From b36fd57e4fd32c19a256f733f0c1fcf489db0aab Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Apr 2022 15:46:55 +0200
Subject: [PATCH 020/111] Add private comment options to activity type
 (visibility + label)

---
 .../Controller/ActivityController.php         |  2 --
 .../Entity/ActivityType.php                   | 34 +++++++++++++++++++
 .../ChillActivityBundle/Form/ActivityType.php | 10 +++---
 .../Form/ActivityTypeType.php                 |  2 +-
 .../Resources/views/Activity/show.html.twig   |  8 +++--
 .../migrations/Version20220425133027.php      | 33 ++++++++++++++++++
 .../translations/messages.fr.yml              |  2 ++
 7 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 4702e18e7..2840e3f27 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -431,8 +431,6 @@ final class ActivityController extends AbstractController
             'accompanyingPeriod' => $accompanyingPeriod,
         ]);
 
-        dump($form);
-
         if ($form->has('documents')) {
             $form->add('gendocTemplateId', HiddenType::class, [
                 'mapped' => false,
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index bdf75ed05..deb28184c 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -76,6 +76,16 @@ class ActivityType
      */
     private int $commentVisible = self::FIELD_OPTIONAL;
 
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $privateCommentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $privateCommentVisible = self::FIELD_OPTIONAL;
+
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
@@ -314,6 +324,16 @@ class ActivityType
         return $this->commentVisible;
     }
 
+    public function getPrivateCommentLabel(): string
+    {
+        return $this->privateCommentLabel;
+    }
+
+    public function getPrivateCommentVisible(): int
+    {
+        return $this->privateCommentVisible;
+    }
+
     public function getDateLabel(): string
     {
         return $this->dateLabel;
@@ -573,6 +593,20 @@ class ActivityType
         return $this;
     }
 
+    public function setPrivateCommentLabel(string $privateCommentLabel): self
+    {
+        $this->privateCommentLabel = $privateCommentLabel;
+
+        return $this;
+    }
+
+    public function setPrivateCommentVisible(int $privateCommentVisible): self
+    {
+        $this->privateCommentVisible = $privateCommentVisible;
+
+        return $this;
+    }
+
     public function setDateLabel(string $dateLabel): self
     {
         $this->dateLabel = $dateLabel;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 7ff07ba3f..0fa2fdf76 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -252,10 +252,12 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        $builder->add('privateComment', PrivateCommentType::class, [
-            'label' => 'activity.private comment',
-            'required' => false
-        ]);
+        if($activityType->isVisible('privateComment')) {
+            $builder->add('privateComment', PrivateCommentType::class, [
+                'label' => empty($activityType->getLabel('privateComment')) ? 'activity.private comment' : $activityType->getPrivateCommentLabel(),
+                'required' => false
+            ]);
+        }
 
         if ($activityType->isVisible('persons')) {
             $builder->add('persons', HiddenType::class);
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index 28947d72b..75e79fd5b 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -57,7 +57,7 @@ class ActivityTypeType extends AbstractType
         $fields = [
             'persons', 'user', 'date', 'location', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'sentReceived', 'documents',
+            'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
             'emergency', 'socialIssues', 'socialActions', 'users',
         ];
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 53817c1c4..512557491 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -146,8 +146,12 @@
                 </dd>
             {% endif %}
 
-            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.userId is same as(app.user.id) %}
-                <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.userId is same as(app.user.id) %}
+                {% if t.privateCommentLabel is not empty %}
+                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
+                {% else %}
+                    <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+                {% endif %}
                 <dd>
                     {%- if entity.privateComment.empty -%}
                         <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
new file mode 100644
index 000000000..c29f2d66e
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220425133027 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment option to activity types';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
+    }
+}
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 912f3368f..00639f46b 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -169,6 +169,8 @@ Reasons visible: Visibilité du champ Sujet
 Reasons label: Libellé du champ Sujet
 Comment visible: Visibilité du champ Commentaire
 Comment label: Libellé du champ Commentaire
+Private comment visible: Visibilité du champ Commentaire Privé
+Private comment label: Libellé du champ Commentaire Privé
 Emergency visible: Visibilité du champ Urgent
 Emergency label: Libellé du champ Urgent
 Accompanying period visible: Visibilité du champ Période d'accompagnement

From 79fa03032345aecfef21a307f4257d48191864ed Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Apr 2022 15:47:13 +0200
Subject: [PATCH 021/111] add private comment input field to edit form

---
 .../Resources/views/Activity/edit.html.twig                   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index 218dc37b0..8d9ee878c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -83,6 +83,10 @@
     {{ form_row(edit_form.comment) }}
 {% endif %}
 
+{%- if edit_form.privateComment is defined -%}
+    {{ form_row(edit_form.privateComment) }}
+{% endif %}
+
 {%- if edit_form.attendee is defined -%}
     {{ form_row(edit_form.attendee) }}
 {% endif %}

From 171cc79a4a95f9a2af927e4c72a7c5dfd081fa76 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 25 Apr 2022 15:47:51 +0200
Subject: [PATCH 022/111] Add private comment to rendez-vous

---
 .../ChillCalendarBundle/Entity/Calendar.php   | 19 +++++++++++
 .../ChillCalendarBundle/Form/CalendarType.php |  5 +++
 .../Resources/views/Calendar/edit.html.twig   |  4 +++
 .../Resources/views/Calendar/new.html.twig    |  4 +++
 .../migrations/Version20220425131140.php      | 34 +++++++++++++++++++
 .../translations/messages.fr.yml              |  3 +-
 6 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php

diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index 11104cc6a..bf425bd2d 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -70,6 +70,12 @@ class Calendar
      */
     private CommentEmbeddable $comment;
 
+    /**
+     * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="prcomment_")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private CommentEmbeddable $privateComment;
+
     /**
      * @ORM\Column(type="datetimetz_immutable")
      * @Serializer\Groups({"calendar:read"})
@@ -151,6 +157,7 @@ class Calendar
     public function __construct()
     {
         $this->comment = new CommentEmbeddable();
+        $this->privateComment = new CommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->professionals = new ArrayCollection();
         $this->invites = new ArrayCollection();
@@ -208,6 +215,11 @@ class Calendar
         return $this->comment;
     }
 
+    public function getPrivateComment(): CommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getEndDate(): ?DateTimeImmutable
     {
         return $this->endDate;
@@ -386,6 +398,13 @@ class Calendar
         return $this;
     }
 
+    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setEndDate(DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index 05dc362b4..7269b2a66 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -18,6 +18,7 @@ use Chill\CalendarBundle\Entity\Invite;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -51,6 +52,10 @@ class CalendarType extends AbstractType
             ->add('comment', CommentType::class, [
                 'required' => false,
             ])
+            ->add('privateComment', PrivateCommentType::class, [
+                'required' => false,
+                'label' => 'private comment'
+            ])
             // ->add('cancelReason', EntityType::class, [
             //     'required' => false,
             //     'class' => CancelReason::class,
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
index d67202920..b96d12c06 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig
@@ -47,6 +47,10 @@
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.sendSMS is defined -%}
     {{ form_row(form.sendSMS) }}
 {% endif %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
index 255c2641b..7841f5b46 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
@@ -43,6 +43,10 @@
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.sendSMS is defined -%}
     {{ form_row(form.sendSMS) }}
 {% endif %}
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
new file mode 100644
index 000000000..5910ca236
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220425131140 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add private comment to calendar';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_comment TEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_userId INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_comment');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_date');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_userId');
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 56ac8543c..1dbb00bb8 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -25,4 +25,5 @@ Add a new calendar: Ajouter un nouveau rendez-vous
 The calendar item has been successfully removed.: Le rendez-vous a été supprimé
 From the day: Du
 to the day: au
-Transform to activity: Transformer en échange
\ No newline at end of file
+Transform to activity: Transformer en échange
+private comment: Commentaire privé
\ No newline at end of file

From 064286aa2fb5bd3509ac9d524806c34788c14c05 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Apr 2022 09:52:00 +0200
Subject: [PATCH 023/111] private comment for action. still needs
 (de)normalization

---
 .../AccompanyingPeriodWork.php                | 20 +++++++++++
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  |  9 +++++
 .../migrations/Version20220425135900.php      | 35 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 055507162..91d85883a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -134,6 +135,12 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private string $note = '';
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="prcomment_")
+     * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
+     */
+    private CommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity=Person::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
@@ -202,6 +209,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     public function __construct()
     {
         $this->goals = new ArrayCollection();
+        $this->privateComment = new CommentEmbeddable();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
@@ -323,6 +331,11 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->note;
     }
 
+    public function getPrivateComment(): CommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getPersons(): Collection
     {
         return $this->persons;
@@ -505,6 +518,13 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
+    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setSocialAction(?SocialAction $socialAction): self
     {
         $this->socialAction = $socialAction;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index bcfa53e45..19d253f41 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -33,6 +33,15 @@
          ></ckeditor>
       </div>
 
+      <div id="private_comment" class="action-row">
+         <label class="col-form-label">{{ $t('private comment') }}</label>
+         <ckeditor
+            v-model="privateComment"
+            :editor="editor"
+            tag-name="textarea"
+         ></ckeditor>
+      </div>
+
       <div id="objectives" class="action-row">
          <div aria="hidden" class="title">
             <div><h3>{{ $t('goals_title') }}</h3></div>
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php b/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
new file mode 100644
index 000000000..8598ee432
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220425135900 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add private comment to action';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_comment TEXT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_userId INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_comment');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_date');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_userId');
+    }
+}

From 64b5de2c03b983ac0220c18abea2026794b22fae Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Apr 2022 20:19:40 +0200
Subject: [PATCH 024/111] migrations deleted

---
 .../migrations/Version20220425100208.php      | 301 ------------------
 .../migrations/Version20220425131140.php      |  34 --
 .../migrations/Version20220425135900.php      |  35 --
 3 files changed, 370 deletions(-)
 delete mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php
 delete mode 100644 src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
 delete mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php

diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php
deleted file mode 100644
index 3b8826ffb..000000000
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220425100208.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220425100208 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add private comment to activity';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        // $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_eval_doc_id_seq CASCADE');
-        // $this->addSql('DROP TABLE chill_main_address_legacy');
-        $this->addSql('ALTER TABLE activity ADD prcomment_comment TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity ADD prcomment_userId INT DEFAULT NULL');
-        // $this->addSql('ALTER INDEX idx_ac74095a550b0c53 RENAME TO IDX_AC74095AD7FA8EF0');
-        // $this->addSql('ALTER INDEX idx_55026b0cc54c8c93 RENAME TO IDX_AC74095AC54C8C93');
-        // $this->addSql('ALTER INDEX idx_55026b0c217bbb47 RENAME TO IDX_AC74095A217BBB47');
-        // $this->addSql('ALTER INDEX idx_55026b0c682b5931 RENAME TO IDX_AC74095A682B5931');
-        // $this->addSql('ALTER INDEX idx_55026b0ca76ed395 RENAME TO IDX_AC74095AA76ED395');
-        // $this->addSql('ALTER TABLE activityreason ALTER name SET NOT NULL');
-        // $this->addSql('ALTER INDEX idx_654a2fcd12469de2 RENAME TO IDX_AF82522312469DE2');
-        // $this->addSql('ALTER TABLE activityreasoncategory ALTER name SET NOT NULL');
-        // $this->addSql('DROP INDEX internal_center_geom_idx');
-        // $this->addSql('DROP INDEX chill_custom_main_address_filtering_idx');
-        // $this->addSql('ALTER TABLE chill_main_address DROP customs');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER isnoaddress DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point TYPE geometry(POINT,4326)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential SET NOT NULL');
-        // $this->addSql('DROP INDEX chill_internal_address_reference_canonicalized');
-        // $this->addSql('DROP INDEX address_refid');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point TYPE geometry(POINT,4326)');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point DROP DEFAULT');
-        // $this->addSql('CREATE INDEX address_refid ON chill_main_address_reference (refId) WHERE refid != \'\'');
-        // $this->addSql('ALTER TABLE chill_main_location ALTER active DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER active DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editablebyusers DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editablebyusers SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_main_notification ALTER addressesemails DROP DEFAULT');
-        // $this->addSql('ALTER INDEX idx_154a075fef1a9d84 RENAME TO IDX_589D51B4EF1A9D84');
-        // $this->addSql('ALTER INDEX idx_154a075fa76ed395 RENAME TO IDX_589D51B4A76ED395');
-        // $this->addSql('DROP INDEX chill_internal_postal_code_canonicalized');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center TYPE geometry(POINT,4326)');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center DROP DEFAULT');
-        // $this->addSql('CREATE INDEX search_name_code ON chill_main_postal_code (code, label)');
-        // $this->addSql('ALTER INDEX idx_a9f001fa7e6af9d4 RENAME TO IDX_D63001607E6AF9D4');
-        // $this->addSql('ALTER INDEX idx_a9f001faa76ed395 RENAME TO IDX_D6300160A76ED395');
-        // $this->addSql('ALTER INDEX idx_64a4a621504cb38d RENAME TO IDX_E260A868504CB38D');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive ALTER ordering DROP DEFAULT');
-        // $this->addSql('ALTER INDEX idx_92351ece727aca70 RENAME TO IDX_72D110E8727ACA70');
-        // $this->addSql('DROP INDEX participations_no_overlap');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ALTER startdate DROP DEFAULT');
-        // $this->addSql('DROP INDEX thirdparty_unique');
-        // $this->addSql('DROP INDEX person_unique');
-        // $this->addSql('CREATE UNIQUE INDEX thirdparty_unique ON chill_person_accompanying_period_resource (thirdparty_id, accompanyingperiod_id)');
-        // $this->addSql('CREATE UNIQUE INDEX person_unique ON chill_person_accompanying_period_resource (person_id, accompanyingperiod_id)');
-        // $this->addSql('ALTER TABLE chill_person_household DROP CONSTRAINT fk_household_comment_embeddable_user');
-        // $this->addSql('DROP INDEX IDX_BE50A270116F5FA9');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedat DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.createdAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.updatedAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('DROP INDEX household_members_not_overlaps');
-        // $this->addSql('DROP INDEX chill_custom_person_household_members_sharing_idx');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startdate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startdate DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER enddate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER enddate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.startDate IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.endDate IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('ALTER TABLE chill_person_marital_status ALTER id TYPE VARCHAR(7)');
-        // $this->addSql('DROP INDEX phonenumber_trgm_idx');
-        // $this->addSql('DROP INDEX mobilenumber_trgm_idx');
-        // $this->addSql('DROP INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin');
-        // $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
-        // $this->addSql('ALTER TABLE chill_person_person DROP cfdata_old');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER maritalstatus_id TYPE VARCHAR(7)');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE VARCHAR(35)');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER cfdata SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber TYPE VARCHAR(35)');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.phonenumber IS \'(DC2Type:phone_number)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS \'(DC2Type:phone_number)\'');
-        // $this->addSql('ALTER INDEX idx_person_center RENAME TO IDX_BF210A145932F377');
-        // $this->addSql('ALTER INDEX idx_3370d4403818da5 RENAME TO IDX_BF210A143818DA5');
-        // $this->addSql('ALTER INDEX idx_bf210a145521be40 RENAME TO IDX_BF210A14D7D03CE3');
-        // $this->addSql('ALTER INDEX idx_3370d4401c9da55 RENAME TO IDX_BF210A141C9DA55');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT FK_7201106F217BBB47');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT FK_7201106F82F1BAF4');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT FK_7201106F82F1BAF4 FOREIGN KEY (language_id) REFERENCES language (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE VARCHAR(35)');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber SET NOT NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS \'(DC2Type:phone_number)\'');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isactive DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isactive DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_9bc1fd50f5b7af75 RENAME TO IDX_B9CEBEACF5B7AF75');
-        // $this->addSql('ALTER INDEX idx_9bc1fd50dca38092 RENAME TO IDX_B9CEBEACDCA38092');
-        // $this->addSql('ALTER INDEX idx_9bc1fd508dfc48dc RENAME TO IDX_B9CEBEAC8DFC48DC');
-        // $this->addSql('ALTER INDEX idx_9bc1fd50217bbb47 RENAME TO IDX_B9CEBEAC217BBB47');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdby_id DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdat DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedat TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedat DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.createdAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.updatedAt IS \'(DC2Type:datetime_immutable)\'');
-        // $this->addSql('ALTER TABLE custom_field_long_choice_options ALTER internal_key DROP DEFAULT');
-        // $this->addSql('ALTER TABLE customfield ALTER required DROP DEFAULT');
-        // $this->addSql('ALTER TABLE customfield ALTER required SET NOT NULL');
-        // $this->addSql('ALTER INDEX idx_40fb5d6dfec418b RENAME TO IDX_7A6FDBEFEC418B');
-        // $this->addSql('ALTER INDEX idx_286dc95df53b66 RENAME TO IDX_7A48DF7F5DF53B66');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options DROP DEFAULT');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association ADD CONSTRAINT FK_981D5C95D58FA2A4 FOREIGN KEY (geographicalUnit_id) REFERENCES chill_vendee.geographical_unit (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association ADD CONSTRAINT FK_981D5C95A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER INDEX idx_a14d8f3d447bbb3b RENAME TO IDX_A14D8F3D96DF1F10');
-        // $this->addSql('ALTER TABLE permission_groups ALTER flags DROP DEFAULT');
-        // $this->addSql('DROP INDEX "primary"');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_jobs ADD PRIMARY KEY (profile_id, job_id)');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER profile_id DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER action SET NOT NULL');
-        // $this->addSql('DROP INDEX chill_custom_canonicalized_trgm_idx_gist');
-        // $this->addSql('ALTER TABLE chill_3party.third_party ALTER firstname SET NOT NULL');
-        // $this->addSql('DROP INDEX uniq_93f763ae217bbb47');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationprofessionellestartdate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationprofessionellestartdate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_vendee.vendee_person.situationProfessionelleStartDate IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('ALTER TABLE chill_vendee.vendeeperson_entourage ADD CONSTRAINT FK_4D319FFEF57537C3 FOREIGN KEY (vendeeperson_id) REFERENCES chill_vendee.vendee_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER INDEX chill_vendee.idx_1a4b602deef79338 RENAME TO IDX_DD0A4C00EEF79338');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        // $this->addSql('CREATE SCHEMA public');
-        // $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_work_eval_doc_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        // $this->addSql('CREATE TABLE chill_main_address_legacy (id INT DEFAULT NULL, postcode_id INT DEFAULT NULL, street VARCHAR(255) DEFAULT NULL, streetnumber VARCHAR(255) DEFAULT NULL, validfrom DATE DEFAULT NULL, isnoaddress BOOLEAN DEFAULT NULL, customs JSONB DEFAULT NULL, floor VARCHAR(16) DEFAULT NULL, corridor VARCHAR(16) DEFAULT NULL, steps VARCHAR(16) DEFAULT NULL, buildingname VARCHAR(255) DEFAULT NULL, flat VARCHAR(16) DEFAULT NULL, distribution VARCHAR(255) DEFAULT NULL, extra VARCHAR(255) DEFAULT NULL, validto DATE DEFAULT NULL, point VARCHAR(255) DEFAULT NULL, linkedtothirdparty_id INT DEFAULT NULL)');
-        // $this->addSql('ALTER INDEX idx_7a48df7f5df53b66 RENAME TO idx_286dc95df53b66');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT fk_7201106f217bbb47');
-        // $this->addSql('ALTER TABLE persons_spoken_languages DROP CONSTRAINT fk_7201106f82f1baf4');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT fk_7201106f217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE persons_spoken_languages ADD CONSTRAINT fk_7201106f82f1baf4 FOREIGN KEY (language_id) REFERENCES language (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options SET DEFAULT \'{}\'');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options DROP NOT NULL');
-        // $this->addSql('ALTER TABLE activityreasoncategory ALTER name DROP NOT NULL');
-        // $this->addSql('ALTER TABLE activityreason ALTER name DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_af82522312469de2 RENAME TO idx_654a2fcd12469de2');
-        // $this->addSql('ALTER INDEX idx_a14d8f3d96df1f10 RENAME TO idx_a14d8f3d447bbb3b');
-        // $this->addSql('ALTER TABLE customfield ALTER required SET DEFAULT \'false\'');
-        // $this->addSql('ALTER TABLE customfield ALTER required DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_7a6fdbefec418b RENAME TO idx_40fb5d6dfec418b');
-        // $this->addSql('ALTER TABLE custom_field_long_choice_options ALTER internal_key SET DEFAULT \'\'');
-        // $this->addSql('ALTER TABLE chill_person_marital_status ALTER id TYPE VARCHAR(10)');
-        // $this->addSql('ALTER TABLE permission_groups ALTER flags SET DEFAULT \'[]\'');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber DROP NOT NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_phone.phonenumber IS NULL');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive ALTER ordering SET DEFAULT \'0\'');
-        // $this->addSql('ALTER INDEX idx_72d110e8727aca70 RENAME TO idx_92351ece727aca70');
-        // $this->addSql('ALTER TABLE chill_person_accompanying_period_participation ALTER startDate SET DEFAULT \'1970-01-01\'');
-        // $this->addSql('CREATE INDEX participations_no_overlap ON chill_person_accompanying_period_participation (person_id, accompanyingperiod_id)');
-        // $this->addSql('ALTER TABLE chill_person_household ADD CONSTRAINT fk_household_comment_embeddable_user FOREIGN KEY (comment_members_userid) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('CREATE INDEX IDX_BE50A270116F5FA9 ON chill_person_household (comment_members_userid)');
-        // $this->addSql('ALTER TABLE chill_vendee.vendeeperson_entourage DROP CONSTRAINT FK_4D319FFEF57537C3');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER profile_id SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_action ALTER action DROP NOT NULL');
-        // $this->addSql('DROP INDEX security_profile_jobs_pkey');
-        // $this->addSql('ALTER TABLE chill_vendee.security_profile_jobs ADD PRIMARY KEY (job_id, profile_id)');
-        $this->addSql('ALTER TABLE activity DROP prcomment_comment');
-        $this->addSql('ALTER TABLE activity DROP prcomment_date');
-        $this->addSql('ALTER TABLE activity DROP prcomment_userId');
-        // $this->addSql('ALTER INDEX idx_ac74095ac54c8c93 RENAME TO idx_55026b0cc54c8c93');
-        // $this->addSql('ALTER INDEX idx_ac74095a217bbb47 RENAME TO idx_55026b0c217bbb47');
-        // $this->addSql('ALTER INDEX idx_ac74095a682b5931 RENAME TO idx_55026b0c682b5931');
-        // $this->addSql('ALTER INDEX idx_ac74095aa76ed395 RENAME TO idx_55026b0ca76ed395');
-        // $this->addSql('ALTER INDEX idx_ac74095ad7fa8ef0 RENAME TO IDX_AC74095A550B0C53');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association DROP CONSTRAINT FK_981D5C95D58FA2A4');
-        // $this->addSql('ALTER TABLE chill_vendee.geographical_unit_association DROP CONSTRAINT FK_981D5C95A76ED395');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isActive SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isActive SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ADD cfdata_old TEXT DEFAULT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER cFData DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER maritalStatus_id TYPE VARCHAR(10)');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.cfdata_old IS \'(DC2Type:array)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.mobilenumber IS NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_person.phonenumber IS NULL');
-        // $this->addSql('CREATE INDEX phonenumber_trgm_idx ON chill_person_person (phonenumber)');
-        // $this->addSql('CREATE INDEX mobilenumber_trgm_idx ON chill_person_person (mobilenumber)');
-        // $this->addSql('CREATE INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin ON chill_person_person (fullnamecanonical)');
-        // $this->addSql('CREATE INDEX fullnamecanonical_trgm_idx ON chill_person_person (center_id, fullnamecanonical)');
-        // $this->addSql('ALTER INDEX idx_bf210a141c9da55 RENAME TO idx_3370d4401c9da55');
-        // $this->addSql('ALTER INDEX idx_bf210a145932f377 RENAME TO idx_person_center');
-        // $this->addSql('ALTER INDEX idx_bf210a143818da5 RENAME TO idx_3370d4403818da5');
-        // $this->addSql('ALTER INDEX idx_bf210a14d7d03ce3 RENAME TO IDX_BF210A145521BE40');
-        // $this->addSql('DROP INDEX address_refid');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address_reference ALTER point DROP DEFAULT');
-        // $this->addSql('CREATE INDEX chill_internal_address_reference_canonicalized ON chill_main_address_reference (postcode_id, addresscanonical)');
-        // $this->addSql('CREATE INDEX address_refid ON chill_main_address_reference (refid) WHERE ((refid)::text <> \'\'::text)');
-        // $this->addSql('DROP INDEX search_name_code');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_postal_code ALTER center DROP DEFAULT');
-        // $this->addSql('CREATE INDEX chill_internal_postal_code_canonicalized ON chill_main_postal_code (canonical) WHERE (origin = 0)');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER endDate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER endDate DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startDate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_members ALTER startDate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.enddate IS NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_members.startdate IS NULL');
-        // $this->addSql('CREATE INDEX household_members_not_overlaps ON chill_person_household_members (person_id) WHERE (sharedhousehold IS TRUE)');
-        // $this->addSql('CREATE INDEX chill_custom_person_household_members_sharing_idx ON chill_person_household_members (person_id, startdate, enddate, household_id) WHERE (sharedhousehold IS TRUE)');
-        // $this->addSql('ALTER INDEX idx_589d51b4a76ed395 RENAME TO idx_154a075fa76ed395');
-        // $this->addSql('ALTER INDEX idx_589d51b4ef1a9d84 RENAME TO idx_154a075fef1a9d84');
-        // $this->addSql('DROP INDEX person_unique');
-        // $this->addSql('DROP INDEX thirdparty_unique');
-        // $this->addSql('CREATE UNIQUE INDEX person_unique ON chill_person_accompanying_period_resource (person_id, accompanyingperiod_id) WHERE (person_id IS NOT NULL)');
-        // $this->addSql('CREATE UNIQUE INDEX thirdparty_unique ON chill_person_accompanying_period_resource (thirdparty_id, accompanyingperiod_id) WHERE (thirdparty_id IS NOT NULL)');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER active SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editableByUsers SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_main_location_type ALTER editableByUsers DROP NOT NULL');
-        // $this->addSql('ALTER INDEX idx_d6300160a76ed395 RENAME TO idx_a9f001faa76ed395');
-        // $this->addSql('ALTER INDEX idx_d63001607e6af9d4 RENAME TO idx_a9f001fa7e6af9d4');
-        // $this->addSql('ALTER INDEX idx_e260a868504cb38d RENAME TO idx_64a4a621504cb38d');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdAt DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdAt SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedAt TYPE TIMESTAMP(0) WITHOUT TIME ZONE');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER updatedAt DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_resource ALTER createdBy_id SET NOT NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.createdat IS NULL');
-        // $this->addSql('COMMENT ON COLUMN chill_person_resource.updatedat IS NULL');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdAt TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER createdAt DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedAt TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_person_household_composition ALTER updatedAt DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.createdat IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('COMMENT ON COLUMN chill_person_household_composition.updatedat IS \'(DC2Type:date_immutable)\'');
-        // $this->addSql('ALTER INDEX chill_vendee.idx_dd0a4c00eef79338 RENAME TO idx_1a4b602deef79338');
-        // $this->addSql('CREATE INDEX internal_center_geom_idx ON chill_vendee.center_polygon (geom)');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationProfessionelleStartDate TYPE DATE');
-        // $this->addSql('ALTER TABLE chill_vendee.vendee_person ALTER situationProfessionelleStartDate DROP DEFAULT');
-        // $this->addSql('COMMENT ON COLUMN chill_vendee.vendee_person.situationprofessionellestartdate IS NULL');
-        // $this->addSql('CREATE UNIQUE INDEX uniq_93f763ae217bbb47 ON chill_vendee.vendee_person (person_id)');
-        // $this->addSql('ALTER INDEX idx_b9cebeac217bbb47 RENAME TO idx_9bc1fd50217bbb47');
-        // $this->addSql('ALTER INDEX idx_b9cebeacf5b7af75 RENAME TO idx_9bc1fd50f5b7af75');
-        // $this->addSql('ALTER INDEX idx_b9cebeacdca38092 RENAME TO idx_9bc1fd50dca38092');
-        // $this->addSql('ALTER INDEX idx_b9cebeac8dfc48dc RENAME TO idx_9bc1fd508dfc48dc');
-        // $this->addSql('ALTER TABLE chill_main_location ALTER active SET DEFAULT \'true\'');
-        // $this->addSql('ALTER TABLE chill_3party.third_party ALTER firstname DROP NOT NULL');
-        // $this->addSql('CREATE INDEX chill_custom_canonicalized_trgm_idx_gist ON chill_3party.third_party (canonicalized) WHERE (active IS TRUE)');
-        // $this->addSql('ALTER TABLE chill_main_notification ALTER addressesEmails SET DEFAULT \'[]\'');
-        // $this->addSql('ALTER TABLE chill_main_address ADD customs JSONB DEFAULT \'[]\'');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential SET DEFAULT \'false\'');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER confidential DROP NOT NULL');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER corridor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER flat DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER floor DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER isNoAddress SET DEFAULT \'false\'');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point TYPE VARCHAR(255)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE TEXT');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER steps DROP DEFAULT');
-        // $this->addSql('CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address (id, validfrom, validto)');
-    }
-}
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
deleted file mode 100644
index 5910ca236..000000000
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220425131140.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Calendar;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220425131140 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add private comment to calendar';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_comment TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD prcomment_userId INT DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_comment');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_date');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP prcomment_userId');
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php b/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
deleted file mode 100644
index 8598ee432..000000000
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220425135900.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Person;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220425135900 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add private comment to action';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_comment TEXT DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD prcomment_userId INT DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_comment');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_date');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP prcomment_userId');
-    }
-}

From 37a198b8605ec73b7f66d44016cabc9589304447 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Apr 2022 20:21:33 +0200
Subject: [PATCH 025/111] PrivateCommentEmbeddable created and added to
 entities + datamapper

---
 .../ChillActivityBundle/Entity/Activity.php   | 11 ++--
 .../ChillCalendarBundle/Entity/Calendar.php   | 11 ++--
 .../Embeddable/PrivateCommentEmbeddable.php   | 44 +++++++++++++++
 .../DataMapper/PrivateCommentDataMapper.php   | 54 +++++++++++++++++++
 .../Form/Type/PrivateCommentType.php          | 29 +++++-----
 .../ChillMainBundle/config/services/form.yaml |  4 ++
 .../migrations/Version20220426133048.php      | 35 ++++++++++++
 .../AccompanyingPeriodWork.php                | 11 ++--
 8 files changed, 167 insertions(+), 32 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220426133048.php

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index f7e429476..b5a58c900 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -15,6 +15,7 @@ use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
@@ -86,10 +87,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private CommentEmbeddable $comment;
 
     /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="prcomment_")
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
      * @Groups({"docgen:read"})
      */
-    private CommentEmbeddable $privateComment;
+    private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @ORM\Column(type="datetime")
@@ -197,7 +198,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         $this->reasons = new ArrayCollection();
         $this->comment = new CommentEmbeddable();
-        $this->privateComment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->documents = new ArrayCollection();
@@ -307,7 +308,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getPrivateComment(): CommentEmbeddable
+    public function getPrivateComment(): PrivateCommentEmbeddable
     {
         return $this->privateComment;
     }
@@ -536,7 +537,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
         $this->privateComment = $privateComment;
 
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index bf425bd2d..4783e70b6 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -14,6 +14,7 @@ namespace Chill\CalendarBundle\Entity;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -71,10 +72,10 @@ class Calendar
     private CommentEmbeddable $comment;
 
     /**
-     * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="prcomment_")
+     * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
      * @Serializer\Groups({"calendar:read"})
      */
-    private CommentEmbeddable $privateComment;
+    private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @ORM\Column(type="datetimetz_immutable")
@@ -157,7 +158,7 @@ class Calendar
     public function __construct()
     {
         $this->comment = new CommentEmbeddable();
-        $this->privateComment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->persons = new ArrayCollection();
         $this->professionals = new ArrayCollection();
         $this->invites = new ArrayCollection();
@@ -215,7 +216,7 @@ class Calendar
         return $this->comment;
     }
 
-    public function getPrivateComment(): CommentEmbeddable
+    public function getPrivateComment(): PrivateCommentEmbeddable
     {
         return $this->privateComment;
     }
@@ -398,7 +399,7 @@ class Calendar
         return $this;
     }
 
-    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
         $this->privateComment = $privateComment;
 
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
new file mode 100644
index 000000000..70374749c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity\Embeddable;
+
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable
+ */
+class PrivateCommentEmbeddable
+{
+    /**
+     * @ORM\Column(type="json", nullable=true)
+     */
+    private ?array $comments = [];
+
+    public function getComments(): ?array
+    {
+        return $this->comments;
+    }
+
+
+    public function getCommentForUser(User $user): string
+    {
+        return $this->comments[$user->getId()] ?? '';
+    }
+
+    public function setCommentForUser(User $user, string $content): self
+    {
+        $this->comments[$user->getId()] = $content;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
new file mode 100644
index 000000000..5d4cd08cd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form\DataMapper;
+
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\DataMapperInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Security\Core\Security;
+
+final class PrivateCommentDataMapper extends AbstractType implements DataMapperInterface
+{
+
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public function mapDataToForms($viewData, $forms)
+    {
+        if (null === $viewData) {
+            return null;
+        }
+
+        if (!$viewData instanceof PrivateCommentEmbeddable) {
+            throw new UnexpectedTypeException($viewData, PrivateCommentEmbeddable::class);
+        }
+
+        $forms = iterator_to_array($forms);
+
+        $forms['comments']->setData($viewData->getCommentForUser($this->security->getUser()));
+
+
+    }
+
+    public function mapFormsToData($forms, &$viewData)
+    {
+        $forms = iterator_to_array($forms);
+
+        $viewData->setCommentForUser($this->security->getUser(), $forms['comments']->getData());
+    }
+
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 77e1a1902..174326d86 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -12,8 +12,13 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
 use DateTime;
+
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -27,29 +32,19 @@ class PrivateCommentType extends AbstractType
 {
     protected UserInterface $user;
 
-    public function __construct(TokenStorageInterface $tokenStorage)
+    protected PrivateCommentDataMapper $dataMapper;
+
+    public function __construct(TokenStorageInterface $tokenStorage, PrivateCommentDataMapper $dataMapper)
     {
         $this->user = $tokenStorage->getToken()->getUser();
+        $this->dataMapper = $dataMapper;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('comment', ChillTextareaType::class, [
-                'disable_editor' => $options['disable_editor'],
-                'label' => $options['label'],
-            ]);
-
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
-            $data = $event->getForm()->getData();
-            $privateComment = $event->getData() ?? ['privateComment' => ''];
-
-            if (null !== $data && $data->getComment() !== $privateComment['comment']) {
-                $data->setDate(new DateTime());
-                $data->setUserId($this->user->getId());
-                $event->getForm()->setData($data);
-            }
-        });
+            ->add('comments', ChillTextareaType::class)
+            ->setDataMapper($this->dataMapper);
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
@@ -68,7 +63,7 @@ class PrivateCommentType extends AbstractType
             ->setDefined('disable_editor')
             ->setAllowedTypes('disable_editor', 'bool')
             ->setDefaults([
-                'data_class' => CommentEmbeddable::class,
+                'data_class' => PrivateCommentEmbeddable::class,
                 'disable_editor' => false,
             ]);
     }
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index f2dc7803a..407a1b6af 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -143,3 +143,7 @@ services:
     Chill\MainBundle\Form\Type\LocationFormType: ~
 
     Chill\MainBundle\Form\WorkflowStepType: ~
+
+    Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper:
+        autowire: true
+        autoconfigure: true
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
new file mode 100644
index 000000000..2f1fbab1a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220426133048 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private embeddable comment to activity, calendar and accompanyingperiod work';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 91d85883a..fd1156e01 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -136,10 +137,10 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     private string $note = '';
 
     /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="prcomment_")
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
      * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
      */
-    private CommentEmbeddable $privateComment;
+    private PrivateCommentEmbeddable $privateComment;
 
     /**
      * @ORM\ManyToMany(targetEntity=Person::class)
@@ -209,7 +210,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     public function __construct()
     {
         $this->goals = new ArrayCollection();
-        $this->privateComment = new CommentEmbeddable();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
@@ -331,7 +332,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->note;
     }
 
-    public function getPrivateComment(): CommentEmbeddable
+    public function getPrivateComment(): PrivateCommentEmbeddable
     {
         return $this->privateComment;
     }
@@ -518,7 +519,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
-    public function setPrivateComment(CommentEmbeddable $privateComment): self
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
         $this->privateComment = $privateComment;
 

From e8dcb45abbb4796ac3e8b2c7e6a0002d5e1f7cc2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:49:31 +0200
Subject: [PATCH 026/111] remove dump

---
 src/Bundle/ChillActivityBundle/Controller/ActivityController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 2840e3f27..481997355 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -366,7 +366,6 @@ final class ActivityController extends AbstractController
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            dump($activityData);
             if (array_key_exists('durationTime', $activityData)) {
                 $durationTimeInMinutes = $activityData['durationTime'];
                 $hours = floor($durationTimeInMinutes / 60);

From 3ed2b36057c5c413bee7b3b90124a5a21431a465 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:50:14 +0200
Subject: [PATCH 027/111] privateCommentType adjusted

---
 src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 174326d86..6ab166fe9 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -43,7 +43,9 @@ class PrivateCommentType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('comments', ChillTextareaType::class)
+            ->add('comments', ChillTextareaType::class, [
+                'label' => 'private comment'
+            ])
             ->setDataMapper($this->dataMapper);
     }
 

From 27ce146aa0bd695d8141bec390da0bea99b0251d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:50:32 +0200
Subject: [PATCH 028/111] Serializer made for privateComment

---
 .../PrivateCommentEmbeddableNormalizer.php    | 56 +++++++++++++++++++
 .../config/services/serializer.yaml           |  3 +
 2 files changed, 59 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
new file mode 100644
index 000000000..27e5b21f7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, DenormalizerInterface
+{
+
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
+    {
+        if (null === $data) {
+            return null;
+        }
+
+        $comment = new PrivateCommentEmbeddable();
+
+        $comment->setCommentForUser($this->security->getUser(), $data['privateComment']);
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null)
+    {
+        return $type === CommentEmbeddable::class;
+    }
+
+    public function normalize($comment, $format = null, array $contect = [])
+    {
+        return $comment->getComment();
+    }
+
+    public function supportsNormalization($data, ?string $format = null)
+    {
+        return $data instanceof CommentEmbeddable;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
index 4d8aa9954..1084dab71 100644
--- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
@@ -10,4 +10,7 @@ services:
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
+    Chill\MainBundle\Serializer\Normalizer\PrivateCommentEmbeddableNormalizer:
+        autowire: true
+        autoconfigure: true
 

From b2003c74a6488ea636dbc63623735940e7623223 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:50:53 +0200
Subject: [PATCH 029/111] renderbox for private comments (not working yet)

---
 .../Entity/PrivateCommentRender.php           | 72 +++++++++++++++++++
 .../config/services/templating.yaml           |  4 ++
 2 files changed, 76 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php

diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
new file mode 100644
index 000000000..d47cb2296
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating\Entity;
+
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Templating\EngineInterface;
+
+use function array_merge;
+
+class PrivateCommentRender extends AbstractChillEntityRender
+{
+    private EngineInterface $engine;
+
+    private Security $security;
+
+    public function __construct(
+        EngineInterface $engine,
+        Security $security
+    ) {
+        $this->engine = $engine;
+        $this->sercurity = $security;
+    }
+
+    /**
+     * @param PrivateCommentEmbeddable $entity
+     */
+    public function renderBox($entity, array $options): string
+    {
+        // default options
+        $options = array_merge([
+            'user' => [],
+            'disable_markdown' => false,
+            'limit_lines' => null,
+            'metadata' => true,
+        ], $options);
+
+        return $this->engine
+            ->render(
+                '@ChillMain/Entity/CommentEmbeddable.html.twig',
+                [
+                    'opening_box' => $this->getDefaultOpeningBox('comment-embeddable'),
+                    'closing_box' => $this->getDefaultClosingBox(),
+                    'user' => $this->security->getUser() ?? null,
+                    'comment' => $entity->getCommentForUser($this->security->getUser()),
+                    'options' => $options,
+                ]
+            );
+    }
+
+    /**
+     * @param PrivateCommentEmbeddable $entity
+     */
+    public function renderString($entity, array $options): string
+    {
+        return $entity->getCommentForUser($this->security->getUser());
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof PrivateCommentEmbeddable;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index e69700732..bd8d99786 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -41,6 +41,10 @@ services:
         tags:
             - { name: 'chill.render_entity' }
 
+    Chill\MainBundle\Templating\Entity\PrivateCommentRender:
+        tags:
+            - { name: 'chill.render_entity' }
+
     Chill\MainBundle\Templating\ChillMarkdownRenderExtension:
         tags:
             - { name: twig.extension }

From e878960da95720671bba6fc253d8e7cc07a5e56b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:51:18 +0200
Subject: [PATCH 030/111] Private comment adjusted for rendez-vous

---
 .../Resources/views/Calendar/new.html.twig    | 34 +++++++++----------
 .../translations/messages.fr.yml              |  4 +--
 .../translations/messages.fr.yml              |  1 +
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
index 7841f5b46..41adb52cc 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig
@@ -54,22 +54,22 @@
 <div id="fullCalendar"></div>
 
 <ul class="record_actions sticky-form-buttons">
-  <li class="cancel">
-    <a
-      class="btn btn-cancel"
-      {%- if context == 'person' -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
-      {%- else -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
-      {%- endif -%}
-      >
-      {{ 'Cancel'|trans|chill_return_path_label }}
-    </a>
-  </li>
-  <li>
-    <button class="btn btn-create" type="submit">
-      {{ 'Create'|trans }}
-    </button>
-  </li>
+    <li class="cancel">
+        <a
+        class="btn btn-cancel"
+        {%- if context == 'person' -%}
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'person_id': person.id } )}}"
+        {%- else -%}
+        href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
+        {%- endif -%}
+        >
+        {{ 'Cancel'|trans|chill_return_path_label }}
+        </a>
+    </li>
+    <li>
+        <button class="btn btn-create" type="submit">
+        {{ 'Create'|trans }}
+        </button>
+    </li>
 </ul>
 {{ form_end(form) }}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 1dbb00bb8..eeb12298f 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -17,7 +17,7 @@ status: Statut du rendez-vous
 calendar location: Localistion du rendez-vous
 calendar comment: Remarque sur le rendez-vous
 sendSMS: Envoi d'un SMS
-Send s m s: Envoi d'un SMS ? 
+Send s m s: Envoi d'un SMS ?
 Cancel reason: Motif d'annulation
 Add a new calendar: Ajouter un nouveau rendez-vous
 "Success : calendar item updated!": "Rendez-vous mis à jour"
@@ -26,4 +26,4 @@ The calendar item has been successfully removed.: Le rendez-vous a été supprim
 From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
-private comment: Commentaire privé
\ No newline at end of file
+private comment: Notes privé
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 452ad306c..e9a5fce4d 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -65,6 +65,7 @@ Read more: Lire la suite
 
 # comment embeddable
 No comment associated: Aucun commentaire
+private comment: Notes privé
 
 #pagination
 Previous: Précédent

From 4dc56db018a1b7173fd567c3bc71f20d772b1f5a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:51:32 +0200
Subject: [PATCH 031/111] show of activity adjusted for private comment

---
 .../Resources/views/Activity/show.html.twig   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 512557491..b6d375933 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -146,19 +146,18 @@
                 </dd>
             {% endif %}
 
-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.userId is same as(app.user.id) %}
-                {% if t.privateCommentLabel is not empty %}
-                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                {% else %}
-                    <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
-                {% endif %}
-                <dd>
-                    {%- if entity.privateComment.empty -%}
-                        <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
-                    {%- else -%}
-                        {{ entity.privateComment|chill_entity_render_box }}
-                    {%- endif -%}
-                </dd>
+            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
+                {% set userID = app.user.id %}
+                    {% if userID in entity.privateComment.comments|keys %}
+                        {% if t.privateCommentLabel is not empty %}
+                            <dt class="inline">{{ t.privateCommentLabel }}</dt>
+                        {% else %}
+                            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+                        {% endif %}
+                        <dd>
+                            {{ entity.privateComment.comments[userID]|chill_entity_render_box }}
+                        </dd>
+                    {% endif %}
             {% endif %}
 
             {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}

From c56a125a787aad92bd4b9107d65ed3bd041bac17 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 27 Apr 2022 11:52:01 +0200
Subject: [PATCH 032/111] privateComment for action (not working yet)

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 58 +++++++++++--------
 .../vuejs/AccompanyingCourseWorkEdit/store.js |  7 +++
 .../ChillPersonBundle/chill.api.specs.yaml    |  2 +
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 19d253f41..6d0123dc6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -150,12 +150,12 @@
 
          <ul class="list-unstyled">
             <li v-for="p in personsReachables" :key="p.id">
-              <div class="form-check">
-                <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2 form-check-input" :id="'person_check'+p.id">
-                <label :for="'person_check'+p.id" class="form-check-label">
-                  <person-text :person="p"></person-text>
-               </label>
-              </div>
+               <div class="form-check">
+                  <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2 form-check-input" :id="'person_check'+p.id">
+                  <label :for="'person_check'+p.id" class="form-check-label">
+                     <person-text :person="p"></person-text>
+                  </label>
+               </div>
             </li>
          </ul>
       </div>
@@ -283,18 +283,18 @@
       </div>
 
    </div>
-  <ul class="record_actions sticky-form-buttons">
-    <li>
-       <list-workflow-modal
-          :workflows="this.work.workflows"
-          :allowCreate="true"
-          relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
-          :relatedEntityId="this.work.id"
-          :workflowsAvailables="this.work.workflows_availables"
-          :preventDefaultMoveToGenerate="true"
-          @go-to-generate-workflow="goToGenerateWorkflow"
-       ></list-workflow-modal>
-    </li>
+   <ul class="record_actions sticky-form-buttons">
+      <li>
+         <list-workflow-modal
+            :workflows="this.work.workflows"
+            :allowCreate="true"
+            relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
+            :relatedEntityId="this.work.id"
+            :workflowsAvailables="this.work.workflows_availables"
+            :preventDefaultMoveToGenerate="true"
+            @go-to-generate-workflow="goToGenerateWorkflow"
+         ></list-workflow-modal>
+      </li>
 
       <li v-if="!isPosting">
          <button class="btn btn-save" @click="submit">
@@ -426,8 +426,8 @@ export default {
          },
       };
    },
-  computed: {
-    ...mapState([
+   computed: {
+      ...mapState([
          'work',
          'resultsForAction',
          'evaluationsForAction',
@@ -470,6 +470,14 @@ export default {
             this.$store.commit('setNote', v);
          }
       },
+      privateComment: {
+         get() {
+            return this.$store.state.privateComment;
+         },
+         set(v) {
+            this.$store.commit('setPrivateComment', v);
+         }
+      },
       availableForCheckGoal() {
          let pickedIds = this.$store.state.goalsPicked.map(g => g.goal.id);
 
@@ -530,12 +538,12 @@ export default {
          this.$store.commit('removeReferrer', u);
       },
       goToGenerateWorkflow({link}) {
-        console.log('save before leave to generate workflow')
-        const callback = (data) => {
-          window.location.assign(link);
-        };
+         console.log('save before leave to generate workflow')
+         const callback = (data) => {
+            window.location.assign(link);
+         };
 
-        return this.$store.dispatch('submit', callback)
+         return this.$store.dispatch('submit', callback)
             .catch(e => { console.log(e); throw e; });
       },
       submit() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 4ce0b8ebe..3b059fdcc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -17,6 +17,7 @@ const store = createStore({
     endDate: window.accompanyingCourseWork.endDate !== null ?
         ISOToDatetime(window.accompanyingCourseWork.endDate.datetime) : null,
     note: window.accompanyingCourseWork.note,
+    privateComment: window.accompanyingCourseWork.privateComment,
     goalsPicked: window.accompanyingCourseWork.goals,
     goalsForAction: [],
     resultsPicked: window.accompanyingCourseWork.results,
@@ -79,6 +80,7 @@ const store = createStore({
           datetime: datetimeToISO(state.endDate)
         },
         note: state.note,
+        privateComment: state.privateComment,
         persons: state.personsPicked.map(p => ({id: p.id, type: p.type})),
         handlingThierParty: state.handlingThirdParty === null ? null : {
           id: state.handlingThirdParty.id,
@@ -296,6 +298,9 @@ const store = createStore({
     setNote(state, note) {
       state.note = note;
     },
+    setPrivateComment(state, privateComment) {
+      state.privateComment = privateComment;
+    },
     setHandlingThirdParty(state, thirdParty) {
       state.handlingThirdParty = thirdParty;
     },
@@ -453,6 +458,8 @@ const store = createStore({
       ;
       commit('setIsPosting', true);
 
+      console.log('payload', payload);
+
       return makeFetch('PUT', url, payload)
         .then(data => {
           if (typeof(callback) !== 'undefined') {
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index e6fefa5df..b192fb2cb 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -223,6 +223,8 @@ components:
             - "accompanying_period_work"
         note:
           type: string
+        privateComment:
+          type: string
         startDate:
           $ref: "#/components/schemas/Date"
         endDate:

From 83a888a32d4fc8d33416d6ca02a4ce447b83e257 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 19:44:06 +0200
Subject: [PATCH 033/111] addAddress: can add extra info even if noAddress

---
 .../Address/components/AddAddress/AddressMore.vue      | 10 +++++-----
 .../public/vuejs/Address/components/EditPane.vue       |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
index 93a64ad19..a26478126 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
@@ -1,7 +1,7 @@
 <template>
    <h4 class="h3">{{ $t('fill_an_address') }}</h4>
    <div class="row my-3">
-      <div class="col-lg-6">
+      <div class="col-lg-6" v-if="!isNoAddress">
          <div class="form-floating my-1">
             <input class="form-control"
             type="text"
@@ -35,8 +35,8 @@
             <label for="flat">{{ $t('flat') }}</label>
          </div>
       </div>
-      <div class="col-lg-6">
-         <div class="form-floating my-1">
+      <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="buildingName"
@@ -54,7 +54,7 @@
             v-model="extra"/>
             <label for="extra">{{ $t('extra') }}</label>
          </div>
-         <div class="form-floating my-1">
+         <div class="form-floating my-1" v-if="!isNoAddress">
             <input class="form-control"
             type="text"
             name="distribution"
@@ -70,7 +70,7 @@
 <script>
 export default {
    name: "AddressMore",
-   props: ['entity'],
+   props: ['entity', 'isNoAddress'],
    computed: {
       floor: {
          set(value) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 503ca5b33..9636a173f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -75,8 +75,9 @@
          </div>
       </div>
 
-      <address-more v-if="!isNoAddress"
-         v-bind:entity="entity">
+      <address-more
+         v-bind:entity="entity"
+         v-bind:isNoAddress="isNoAddress">
       </address-more>
 
       <action-buttons v-if="insideModal === false"

From 62d59e6037a76fbf15519f1ac94607094b90e321 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 20:00:11 +0200
Subject: [PATCH 034/111] address: show address extra info even if noAddress

---
 .../Resources/views/Entity/address.html.twig           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
index 3dfc27d2f..eef84b8a2 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig
@@ -29,6 +29,11 @@
             </p>
             <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
         {% endif %}
+        {% if address.extra is not empty %}
+        <span>
+            {{ address.extra }}
+        </span>
+        {% endif %}
         <span class="noaddress">
             {{ 'address.consider homeless'|trans }}
         </span>
@@ -89,6 +94,11 @@
                 <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
             </div>
             {% endif %}
+            {% if address.extra is not empty %}
+            <div>
+                {{ address.extra }}
+            </div>
+            {% endif %}
             <div class="noaddress">
                 {{ 'address.consider homeless'|trans }}
             </div>

From 192ab02be2844138d1c130b16032928aa1b0fd3a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 20:02:26 +0200
Subject: [PATCH 035/111] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90f4c2503..554f2e350 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
+
 * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
 * [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
 * Load relationships without gender in french fixtures

From fabf23f1f029ae2d581463e3f719e26649b826cb Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 21:21:09 +0200
Subject: [PATCH 036/111] admin: add custom template for userjob edit

---
 .../DependencyInjection/ChillMainExtension.php             | 1 +
 .../ChillMainBundle/Resources/views/UserJob/edit.html.twig | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 62a3d80d8..067a910c8 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -313,6 +313,7 @@ class ChillMainExtension extends Extension implements
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/UserJob/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
new file mode 100644
index 000000000..1160220a3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
@@ -0,0 +1,7 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content -%}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock content %}

From 8d62ce46c6c2ecf887098e4d75eccb17f2cf1619 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 21:44:02 +0200
Subject: [PATCH 037/111] admin: order user job type

---
 .../ChillMainBundle/Resources/views/UserJob/index.html.twig   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
index 8f037f150..392ae79fd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -8,7 +8,7 @@
             <th>&nbsp;</th>
         {% endblock %}
         {% block table_entities_tbody %}
-            {% for entity in entities %}
+            {% for entity in entities|sort((a, b) => a.label|localize_translatable_string <=> b.label|localize_translatable_string) %}
                 <tr>
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.label|localize_translatable_string }}</td>
@@ -23,4 +23,4 @@
             {% endfor %}
         {% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock content %}
\ No newline at end of file

From 2263e7be73cc5a4bd7943e23dada873ce17c6aff Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 22:02:19 +0200
Subject: [PATCH 038/111] admin: order user job by id

---
 .../Controller/UserJobController.php          | 26 +++++++++++++++++++
 .../ChillMainExtension.php                    |  2 ++
 .../Resources/views/UserJob/index.html.twig   |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/UserJobController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobController.php b/src/Bundle/ChillMainBundle/Controller/UserJobController.php
new file mode 100644
index 000000000..0c1fd4b3d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/UserJobController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class UserJobController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 067a910c8..66b6bfd70 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Controller\CivilityApiController;
 use Chill\MainBundle\Controller\LocationController;
 use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\UserController;
+use Chill\MainBundle\Controller\UserJobController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey;
 use Chill\MainBundle\Doctrine\DQL\JsonAggregate;
@@ -299,6 +300,7 @@ class ChillMainExtension extends Extension implements
             'cruds' => [
                 [
                     'class' => UserJob::class,
+                    'controller' => UserJobController::class,
                     'name' => 'admin_user_job',
                     'base_path' => '/admin/main/user-job',
                     'base_role' => 'ROLE_ADMIN',
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
index 392ae79fd..3f48c46ac 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -8,7 +8,7 @@
             <th>&nbsp;</th>
         {% endblock %}
         {% block table_entities_tbody %}
-            {% for entity in entities|sort((a, b) => a.label|localize_translatable_string <=> b.label|localize_translatable_string) %}
+            {% for entity in entities %}
                 <tr>
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.label|localize_translatable_string }}</td>

From de362dcad70c0ab6b2f6ee8005f5cefae180b142 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 29 Apr 2022 22:04:36 +0200
Subject: [PATCH 039/111] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90f4c2503..0dd33c7cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
+
 * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
 * [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
 * Load relationships without gender in french fixtures

From 64d459466ff448bdd4fa0f74124cdff91710d995 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 2 May 2022 12:16:46 +0200
Subject: [PATCH 040/111] activity admin: translations + remove label field for
 comment on admin activity type

---
 CHANGELOG.md                                             | 2 ++
 src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php | 5 ++++-
 .../ChillActivityBundle/translations/messages.fr.yml     | 9 ++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90f4c2503..9bfee84ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
+
 * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
 * [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
 * Load relationships without gender in french fixtures
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
index 28947d72b..17d2bb914 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -57,7 +57,7 @@ class ActivityTypeType extends AbstractType
         $fields = [
             'persons', 'user', 'date', 'location', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'sentReceived', 'documents',
+            'reasons', 'sentReceived', 'documents',
             'emergency', 'socialIssues', 'socialActions', 'users',
         ];
 
@@ -69,6 +69,9 @@ class ActivityTypeType extends AbstractType
                     'empty_data' => '',
                 ]);
         }
+
+        $builder
+            ->add('commentVisible', ActivityFieldPresence::class);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 9d7fdd288..3ca4def7c 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -113,7 +113,7 @@ Activity type configuration: Configuration des categories d'activités
 Activity Reasons: Sujets d'une activité
 Activity Reasons Category: Catégories de sujet d'activités
 Activity Types Categories: Catégories des types d'activité
-Activity Presences: Presences des activités
+Activity Presences: Presences aux activités
 
 
 # Crud
@@ -124,6 +124,9 @@ crud:
   activity_type_category:
     title_new: Nouvelle catégorie de type d'activité
     title_edit: Edition d'une catégorie de type d'activité
+  activity_presence:
+    title_new: Nouvelle Présence aux activités
+    title_edit: Edition d'une Présence aux activités
 
 # activity reason admin
 ActivityReason list: Liste des sujets
@@ -145,6 +148,10 @@ ActivityReasonCategory: Catégorie de sujet d'activité
 ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée
 ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée
 
+#activity presence admin
+ActivityPresence list: Liste des Présences aux activités
+Create a new activity presence: Créer une nouvelle "Présence aux activités"
+
 # activity type type admin
 ActivityType list: Types d'activités
 Create a new activity type: Créer un nouveau type d'activité

From c629dd79cb5ec6cfabc5b2e49177b275fbaf247f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 14:01:07 +0200
Subject: [PATCH 041/111] fix serialization - deserialization

---
 .../PrivateCommentEmbeddableNormalizer.php     | 18 ++++++++++--------
 .../config/services/serializer.yaml            |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index 27e5b21f7..447b8ddf8 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -27,7 +27,7 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
         $this->security = $security;
     }
 
-    public function denormalize($data, string $type, ?string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = []): PrivateCommentEmbeddable
     {
         if (null === $data) {
             return null;
@@ -35,22 +35,24 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
 
         $comment = new PrivateCommentEmbeddable();
 
-        $comment->setCommentForUser($this->security->getUser(), $data['privateComment']);
+        $comment->setCommentForUser($this->security->getUser(), $data);
+
+        return $comment;
     }
 
-    public function supportsDenormalization($data, string $type, ?string $format = null)
+    public function supportsDenormalization($data, string $type, ?string $format = null): bool
     {
-        return $type === CommentEmbeddable::class;
+        return $type === PrivateCommentEmbeddable::class;
     }
 
-    public function normalize($comment, $format = null, array $contect = [])
+    public function normalize($comment, $format = null, array $contect = []): string
     {
-        return $comment->getComment();
+        return $comment->getCommentForUser($this->security->getUser());
     }
 
-    public function supportsNormalization($data, ?string $format = null)
+    public function supportsNormalization($data, ?string $format = null): bool
     {
-        return $data instanceof CommentEmbeddable;
+        return $data instanceof PrivateCommentEmbeddable;
     }
 
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/config/services/serializer.yaml b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
index 1084dab71..5ec936b6c 100644
--- a/src/Bundle/ChillMainBundle/config/services/serializer.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/serializer.yaml
@@ -13,4 +13,6 @@ services:
     Chill\MainBundle\Serializer\Normalizer\PrivateCommentEmbeddableNormalizer:
         autowire: true
         autoconfigure: true
+        tags:
+            - { name: 'serializer.normalizer', priority: 64 }
 

From acee0ade24dec7de24ee6e2c1c9e8d80bbeb7c93 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 14:01:41 +0200
Subject: [PATCH 042/111] add merge method

---
 .../Embeddable/PrivateCommentEmbeddable.php      | 16 ++++++++++++++++
 .../AccompanyingPeriodWork.php                   |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index 70374749c..f3e35bb1f 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -41,4 +41,20 @@ class PrivateCommentEmbeddable
 
         return $this;
     }
+
+    public function setComments($comments)
+    {
+        $this->comments = $comments;
+
+        return $this;
+    }
+
+    public function merge(PrivateCommentEmbeddable $newComment): self
+    {
+        $mergedComments = $newComment->getComments() + $this->getComments();
+
+        $this->setComments($mergedComments);
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index fd1156e01..8ea1028f8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -138,7 +138,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     * @Serializer\Groups({"read", "accompanying_period_work:edit", "docgen:read"})
+     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
      */
     private PrivateCommentEmbeddable $privateComment;
 
@@ -521,7 +521,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
 
     public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
     {
-        $this->privateComment = $privateComment;
+        $this->privateComment->merge($privateComment);
 
         return $this;
     }

From 1b6e84262ba04675984d0639ad01e0645dc988f3 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 15:27:44 +0200
Subject: [PATCH 043/111] add translation

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 6d0123dc6..ff6c46748 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -24,6 +24,15 @@
          <input v-model="endDate" type="date" class="form-control" />
       </div>
 
+      <div id="private_comment" class="action-row">
+         <label class="col-form-label">{{ $t('private_comment') }}</label>
+         <ckeditor
+            v-model="privateComment"
+            :editor="editor"
+            tag-name="textarea"
+         ></ckeditor>
+      </div>
+
       <div id="comment" class="action-row">
          <label class="col-form-label">{{ $t('comments') }}</label>
          <ckeditor
@@ -33,14 +42,6 @@
          ></ckeditor>
       </div>
 
-      <div id="private_comment" class="action-row">
-         <label class="col-form-label">{{ $t('private comment') }}</label>
-         <ckeditor
-            v-model="privateComment"
-            :editor="editor"
-            tag-name="textarea"
-         ></ckeditor>
-      </div>
 
       <div id="objectives" class="action-row">
          <div aria="hidden" class="title">
@@ -364,7 +365,8 @@ const i18n = {
          referrers: "Agents traitants",
          no_referrers: "Aucun agent traitant",
          choose_referrers: "Choisir des agents traitants",
-         remove_referrer: "Enlever l'agent"
+         remove_referrer: "Enlever l'agent",
+         private_comment: "Commentaire privé"
       }
    }
 };

From 3122098447e9c64ab7e4e6f350620d31e370931e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:29:47 +0200
Subject: [PATCH 044/111] remove privateCommentRender

---
 .../Entity/PrivateCommentRender.php           | 72 -------------------
 .../config/services/templating.yaml           |  4 --
 2 files changed, 76 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php

diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
deleted file mode 100644
index d47cb2296..000000000
--- a/src/Bundle/ChillMainBundle/Templating/Entity/PrivateCommentRender.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Templating\Entity;
-
-use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
-use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Templating\EngineInterface;
-
-use function array_merge;
-
-class PrivateCommentRender extends AbstractChillEntityRender
-{
-    private EngineInterface $engine;
-
-    private Security $security;
-
-    public function __construct(
-        EngineInterface $engine,
-        Security $security
-    ) {
-        $this->engine = $engine;
-        $this->sercurity = $security;
-    }
-
-    /**
-     * @param PrivateCommentEmbeddable $entity
-     */
-    public function renderBox($entity, array $options): string
-    {
-        // default options
-        $options = array_merge([
-            'user' => [],
-            'disable_markdown' => false,
-            'limit_lines' => null,
-            'metadata' => true,
-        ], $options);
-
-        return $this->engine
-            ->render(
-                '@ChillMain/Entity/CommentEmbeddable.html.twig',
-                [
-                    'opening_box' => $this->getDefaultOpeningBox('comment-embeddable'),
-                    'closing_box' => $this->getDefaultClosingBox(),
-                    'user' => $this->security->getUser() ?? null,
-                    'comment' => $entity->getCommentForUser($this->security->getUser()),
-                    'options' => $options,
-                ]
-            );
-    }
-
-    /**
-     * @param PrivateCommentEmbeddable $entity
-     */
-    public function renderString($entity, array $options): string
-    {
-        return $entity->getCommentForUser($this->security->getUser());
-    }
-
-    public function supports($entity, array $options): bool
-    {
-        return $entity instanceof PrivateCommentEmbeddable;
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index bd8d99786..e69700732 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -41,10 +41,6 @@ services:
         tags:
             - { name: 'chill.render_entity' }
 
-    Chill\MainBundle\Templating\Entity\PrivateCommentRender:
-        tags:
-            - { name: 'chill.render_entity' }
-
     Chill\MainBundle\Templating\ChillMarkdownRenderExtension:
         tags:
             - { name: twig.extension }

From ae624d25fce2954153c5b037b08af67b277b8d26 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:49:32 +0200
Subject: [PATCH 045/111] fix display of privateComment for action

---
 .../public/vuejs/AccompanyingCourseWorkEdit/App.vue          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index ff6c46748..fe5700f4d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -24,7 +24,7 @@
          <input v-model="endDate" type="date" class="form-control" />
       </div>
 
-      <div id="private_comment" class="action-row">
+      <div id="privateComment" class="action-row">
          <label class="col-form-label">{{ $t('private_comment') }}</label>
          <ckeditor
             v-model="privateComment"
@@ -592,6 +592,7 @@ div#workEditor {
       "title title"
       "startDate endDate"
       "comment comment"
+      "privateComment privateComment"
       "objectives objectives"
       "evaluations evaluations"
       "persons persons"
@@ -608,6 +609,8 @@ div#workEditor {
       grid-area: endDate; }
    #comment {
       grid-area: comment; }
+   #privateComment {
+      grid-area: privateComment; }
    #objectives {
       grid-area: objectives; }
    #evaluations {

From 02a8f5a863a0802668041d1dd6c43e68d651fc62 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:50:24 +0200
Subject: [PATCH 046/111] Fix display privateComment in activity

---
 .../Resources/views/Activity/show.html.twig   | 34 +++++++++++--------
 .../Resources/public/chill/chillmain.scss     |  4 +++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index b6d375933..1cb501817 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -1,4 +1,5 @@
 {%- set t = entity.type -%}
+{% set userId = app.user.id %}
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
 
 <h1>{{ "Activity"|trans }}</h1>
@@ -146,20 +147,6 @@
                 </dd>
             {% endif %}
 
-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
-                {% set userID = app.user.id %}
-                    {% if userID in entity.privateComment.comments|keys %}
-                        {% if t.privateCommentLabel is not empty %}
-                            <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                        {% else %}
-                            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
-                        {% endif %}
-                        <dd>
-                            {{ entity.privateComment.comments[userID]|chill_entity_render_box }}
-                        </dd>
-                    {% endif %}
-            {% endif %}
-
             {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
                 <dt class="inline">{{ 'Documents'|trans }}</dt>
                 <dd>
@@ -191,6 +178,25 @@
     </div>
 </div>
 
+{% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and userId in entity.privateComment.comments|keys %}
+<div class="flex-table">
+    <div class="item-bloc">
+        {% if t.privateCommentLabel is not empty %}
+            <dt class="inline">{{ t.privateCommentLabel }}</dt>
+        {% else %}
+            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+        {% endif %}
+        <dd>
+            <section class="chill-entity entity-comment-embeddable">
+                <blockquote class="chill-user-quote private-quote">
+                    {{ entity.privateComment.comments[userId] }}
+                </blockquote>
+            </section>
+        </dd>
+    </div>
+</div>
+{% endif %}
+
 <div class="notification notification-list">
     {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
     {% if notifications is not empty %}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 1750533f8..13a82a786 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -277,6 +277,10 @@ table.table-bordered {
    }
 }
 
+.private-quote {
+   border-left: 10px solid $pink;
+}
+
 /// meta-data
 div.createdBy,
 div.updatedBy,

From 0e0e0799d1d2a8950e713c678211d3b840d4376f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 2 May 2022 16:51:14 +0200
Subject: [PATCH 047/111] translation added

---
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 2a4077e1c..35c0e8b02 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -527,6 +527,8 @@ accompanying_course_work:
     Any work: Aucune action d'accompagnement
     remove: Supprimer une action d'accompagnement
     social_evaluation: Évaluation
+    private_comment: Commentaire privé
+
 
 #
 Person addresses: Adresses de résidence

From 4c99abd6d3d15d8cfc63a98c711e9c2805d3e611 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 2 May 2022 16:51:41 +0200
Subject: [PATCH 048/111] Admin: Add country and languages to the admin

---
 .../Controller/AdminController.php            |  5 ++
 .../Controller/CountryController.php          | 27 ++++++++
 .../Controller/LanguageController.php         | 27 ++++++++
 .../ChillMainExtension.php                    | 61 +++++++++++++++++--
 .../ChillMainBundle/Form/CountryType.php      | 32 ++++++++++
 .../ChillMainBundle/Form/LanguageType.php     | 32 ++++++++++
 .../views/Admin/Country/edit.html.twig        |  7 +++
 .../views/Admin/Country/index.html.twig       | 28 +++++++++
 .../views/Admin/Language/edit.html.twig       |  7 +++
 .../views/Admin/Language/index.html.twig      | 27 ++++++++
 .../views/{ => Admin}/Location/edit.html.twig |  0
 .../{ => Admin}/Location/index.html.twig      |  0
 .../views/{ => Admin}/Location/new.html.twig  |  0
 .../{ => Admin}/LocationType/edit.html.twig   |  0
 .../{ => Admin}/LocationType/index.html.twig  |  0
 .../{ => Admin}/LocationType/new.html.twig    |  0
 .../Admin/layout_language_country.html.twig   | 33 ++++++++++
 .../menu_admin_language_country.html.twig     | 20 ++++++
 .../translations/messages.fr.yml              | 18 ++++++
 19 files changed, 318 insertions(+), 6 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/CountryController.php
 create mode 100644 src/Bundle/ChillMainBundle/Controller/LanguageController.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/CountryType.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/LanguageType.php
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
 rename src/Bundle/ChillMainBundle/Resources/views/{ => Admin}/Location/edit.html.twig (100%)
 rename src/Bundle/ChillMainBundle/Resources/views/{ => Admin}/Location/index.html.twig (100%)
 rename src/Bundle/ChillMainBundle/Resources/views/{ => Admin}/Location/new.html.twig (100%)
 rename src/Bundle/ChillMainBundle/Resources/views/{ => Admin}/LocationType/edit.html.twig (100%)
 rename src/Bundle/ChillMainBundle/Resources/views/{ => Admin}/LocationType/index.html.twig (100%)
 rename src/Bundle/ChillMainBundle/Resources/views/{ => Admin}/LocationType/new.html.twig (100%)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig

diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php
index efde1ae20..2055f0f22 100644
--- a/src/Bundle/ChillMainBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php
@@ -24,6 +24,11 @@ class AdminController extends AbstractController
         return $this->render('@ChillMain/Admin/index.html.twig');
     }
 
+    public function indexLanguageCountryAction()
+    {
+        return $this->render('@ChillMain/Admin/layout_language_country.html.twig');
+    }
+
     public function indexLocationsAction()
     {
         return $this->render('@ChillMain/Admin/layout_location.html.twig');
diff --git a/src/Bundle/ChillMainBundle/Controller/CountryController.php b/src/Bundle/ChillMainBundle/Controller/CountryController.php
new file mode 100644
index 000000000..351a8d4c3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/CountryController.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class CountryController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.countryCode', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/LanguageController.php b/src/Bundle/ChillMainBundle/Controller/LanguageController.php
new file mode 100644
index 000000000..33d88ab0e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/LanguageController.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class LanguageController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 62a3d80d8..02c8589c8 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\Controller\AddressApiController;
 use Chill\MainBundle\Controller\CivilityApiController;
+use Chill\MainBundle\Controller\CountryController;
 use Chill\MainBundle\Controller\LocationController;
 use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\UserController;
@@ -30,10 +31,14 @@ use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Doctrine\Type\NativeDateIntervalType;
 use Chill\MainBundle\Doctrine\Type\PointType;
+use Chill\MainBundle\Entity\Country;
+use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\CountryType;
+use Chill\MainBundle\Form\LanguageType;
 use Chill\MainBundle\Form\LocationFormType;
 use Chill\MainBundle\Form\LocationTypeType;
 use Chill\MainBundle\Form\UserJobType;
@@ -348,15 +353,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Location/index.html.twig',
+                            'template' => '@ChillMain/Admin/Location/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Location/new.html.twig',
+                            'template' => '@ChillMain/Admin/Location/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Location/edit.html.twig',
+                            'template' => '@ChillMain/Admin/Location/edit.html.twig',
                         ],
                     ],
                 ],
@@ -370,15 +375,59 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/LocationType/index.html.twig',
+                            'template' => '@ChillMain/Admin/LocationType/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/LocationType/new.html.twig',
+                            'template' => '@ChillMain/Admin/LocationType/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/LocationType/edit.html.twig',
+                            'template' => '@ChillMain/Admin/LocationType/edit.html.twig',
+                        ],
+                    ],
+                ],
+                [
+                    'class' => Country::class,
+                    'name' => 'main_country',
+                    'base_path' => '/admin/main/country',
+                    'base_role' => 'ROLE_ADMIN',
+                    'form_class' => CountryType::class,
+                    'controller' => CountryController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Country/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Country/edit.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Country/edit.html.twig',
+                        ],
+                    ],
+                ],
+                [
+                    'class' => Language::class,
+                    'name' => 'main_language',
+                    'base_path' => '/admin/main/language',
+                    'base_role' => 'ROLE_ADMIN',
+                    'form_class' => LanguageType::class,
+                    'controller' => LanguageController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Language/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Language/edit.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Language/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Form/CountryType.php b/src/Bundle/ChillMainBundle/Form/CountryType.php
new file mode 100644
index 000000000..2eb979d85
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/CountryType.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CountryType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class, [
+                'label' => 'Name',
+                'required' => true,
+            ])
+            ->add('countryCode', TextType::class, [
+                'label' => 'Country code',
+                'required' => true,
+            ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/LanguageType.php b/src/Bundle/ChillMainBundle/Form/LanguageType.php
new file mode 100644
index 000000000..cb48d15ca
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/LanguageType.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class LanguageType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('id', TextType::class, [
+                'label' => 'Id',
+                'required' => true,
+            ])
+            ->add('name', TranslatableStringFormType::class, [
+                'label' => 'Name',
+                'required' => true,
+            ]);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig
new file mode 100644
index 000000000..1160220a3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig
@@ -0,0 +1,7 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content -%}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
new file mode 100644
index 000000000..6e1279701
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
@@ -0,0 +1,28 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>name</th>
+            <th>countryCode</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td>{{ entity.countrycode }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_main_country_edit', { 'id': entity.id}) }}" class="btn btn-sm btn-edit btn-mini"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    {% endembed %}
+{% endblock content %}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig
new file mode 100644
index 000000000..1160220a3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig
@@ -0,0 +1,7 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content -%}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
new file mode 100644
index 000000000..92e9ce8f5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
@@ -0,0 +1,27 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>name</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_main_language_edit', { 'id': entity.id}) }}" class="btn btn-sm btn-edit btn-mini"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    {% endembed %}
+{% endblock content %}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
new file mode 100644
index 000000000..b76e60861
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
@@ -0,0 +1,33 @@
+{#
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ <info@champs-libres.coop> / <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_language_country', {
+        'layout': '@ChillMain/Admin/menu_admin_language_country.html.twig',
+    }) }}
+{% endblock %}
+
+
+
+{% block layout_wvm_content %}
+    {% block admin_content %}
+        <h1>{{ 'Management of languages and countries' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig
new file mode 100644
index 000000000..e6b4fa5fe
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig
@@ -0,0 +1,20 @@
+{#
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ <info@champs-libres.coop> / <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
+{% block v_menu_title %}{{ 'Language and countries menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 452ad306c..0d164075b 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -223,6 +223,12 @@ none: aucun
 person: usager
 thirdparty: tiers
 
+
+#admin section for language and country
+Language and countries menu: Menu Langues & Pays
+Management of languages and countries: Gestion des langues & Pays
+
+
 # circles / scopes
 Choose the circle: Choisir le cercle
 Scopes: Services
@@ -344,6 +350,18 @@ crud:
   main_location:
     title_new: Nouvelle localisation
     title_edit: Modifier une localisation
+  main_language:
+    index:
+      title: Liste des langues
+      add_new: Ajouter une langue
+    title_new: Nouvelle langue
+    title_edit: Modifier une langue
+  main_country:
+    index:
+      title: Liste des pays
+      add_new: Ajouter un pays
+    title_new: Nouveau pays
+    title_edit: Modifier un pays
 
 No entities: Aucun élément
 

From 04f27cc555dff1007d4fe7b99b409c596027dead Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 3 May 2022 09:27:04 +0200
Subject: [PATCH 049/111] admin: add menu for languages and countries section

---
 .../ChillMainExtension.php                    |  5 +--
 .../views/Admin/Country/index.html.twig       |  1 +
 .../views/Admin/Country/new.html.twig         |  7 ++++
 .../views/Admin/Language/new.html.twig        |  7 ++++
 .../MenuBuilder/AdminSectionMenuBuilder.php   |  9 +++++
 .../LanguageCountryMenuBuilder.php            | 33 +++++++++++++++++++
 src/Bundle/ChillMainBundle/config/routes.yaml |  4 +++
 .../translations/messages.fr.yml              |  7 ++--
 8 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 02c8589c8..6a5ea7f5f 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -14,6 +14,7 @@ namespace Chill\MainBundle\DependencyInjection;
 use Chill\MainBundle\Controller\AddressApiController;
 use Chill\MainBundle\Controller\CivilityApiController;
 use Chill\MainBundle\Controller\CountryController;
+use Chill\MainBundle\Controller\LanguageController;
 use Chill\MainBundle\Controller\LocationController;
 use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\UserController;
@@ -401,7 +402,7 @@ class ChillMainExtension extends Extension implements
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Country/edit.html.twig',
+                            'template' => '@ChillMain/Admin/Country/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
@@ -423,7 +424,7 @@ class ChillMainExtension extends Extension implements
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Language/edit.html.twig',
+                            'template' => '@ChillMain/Admin/Language/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
index 6e1279701..67aa70fd1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
@@ -6,6 +6,7 @@
             <th>id</th>
             <th>name</th>
             <th>countryCode</th>
+            <th></th>
         {% endblock %}
         {% block table_entities_tbody %}
             {% for entity in entities %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig
new file mode 100644
index 000000000..643de1ff4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig
@@ -0,0 +1,7 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content -%}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig
new file mode 100644
index 000000000..643de1ff4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig
@@ -0,0 +1,7 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content -%}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index 9bcc80ad2..b1326a85b 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -51,6 +51,15 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
                 'order' => 205,
                 'explain' => 'Configure location and location type',
             ]);
+
+        $menu->addChild('Languages and countries', [
+            'route' => 'chill_main_admin_language_country',
+        ])
+            ->setExtras([
+                'icons' => ['key'],
+                'order' => 210,
+                'explain' => 'Configure languages and countries',
+            ]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php
new file mode 100644
index 000000000..540f1344e
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Routing\MenuBuilder;
+
+use Knp\Menu\MenuItem;
+
+class LanguageCountryMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
+{
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        $menu->addChild('Language list', [
+            'route' => 'chill_crud_main_language_index',
+        ])->setExtras(['order' => 205]);
+
+        $menu->addChild('Country list', [
+            'route' => 'chill_crud_main_country_index',
+        ])->setExtras(['order' => 206]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_language_country'];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml
index bebdf8f52..b0ee2c956 100644
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -70,6 +70,10 @@ chill_main_admin_locations:
     path: /{_locale}/admin/locations
     controller: Chill\MainBundle\Controller\AdminController::indexLocationsAction
 
+chill_main_admin_language_country:
+    path: /{_locale}/admin/language-country
+    controller: Chill\MainBundle\Controller\AdminController::indexLanguageCountryAction
+
 chill_main_search:
     path: /{_locale}/search.{_format}
     controller: Chill\MainBundle\Controller\SearchController::searchAction
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 0d164075b..8c1d981b9 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -226,8 +226,11 @@ thirdparty: tiers
 
 #admin section for language and country
 Language and countries menu: Menu Langues & Pays
-Management of languages and countries: Gestion des langues & Pays
-
+Languages and countries: Langues & Pays
+Management of languages and countries: Gestion des langues & pays
+Configure languages and countries: Configuration des langues & pays
+Language list: Liste des langues
+Country list: Liste des pays
 
 # circles / scopes
 Choose the circle: Choisir le cercle

From 98086754552a7b48c22fbcf4e819e4498e110929 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 3 May 2022 09:28:33 +0200
Subject: [PATCH 050/111] upd CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90f4c2503..e80ea1e13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
+
 * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
 * [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
 * Load relationships without gender in french fixtures

From 76af733bc3ee868f2f784312cd0c68fb25da7e33 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 3 May 2022 18:33:56 +0200
Subject: [PATCH 051/111] admin: add civility

---
 .../Controller/CivilityController.php         | 27 ++++++++++++++
 .../ChillMainExtension.php                    | 25 +++++++++++++
 .../ChillMainBundle/Form/CivilityType.php     | 36 +++++++++++++++++++
 .../views/Admin/Civility/edit.html.twig       |  7 ++++
 .../views/Admin/Civility/index.html.twig      | 33 +++++++++++++++++
 .../views/Admin/Civility/new.html.twig        |  7 ++++
 .../translations/messages.fr.yml              |  6 ++++
 7 files changed, 141 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/CivilityController.php
 create mode 100644 src/Bundle/ChillMainBundle/Form/CivilityType.php
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig

diff --git a/src/Bundle/ChillMainBundle/Controller/CivilityController.php b/src/Bundle/ChillMainBundle/Controller/CivilityController.php
new file mode 100644
index 000000000..52b16f634
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/CivilityController.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class CivilityController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.order', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 6a5ea7f5f..43d85f052 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\DependencyInjection;
 
 use Chill\MainBundle\Controller\AddressApiController;
 use Chill\MainBundle\Controller\CivilityApiController;
+use Chill\MainBundle\Controller\CivilityController;
 use Chill\MainBundle\Controller\CountryController;
 use Chill\MainBundle\Controller\LanguageController;
 use Chill\MainBundle\Controller\LocationController;
@@ -32,12 +33,14 @@ use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Doctrine\Type\NativeDateIntervalType;
 use Chill\MainBundle\Doctrine\Type\PointType;
+use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\CivilityType;
 use Chill\MainBundle\Form\CountryType;
 use Chill\MainBundle\Form\LanguageType;
 use Chill\MainBundle\Form\LocationFormType;
@@ -410,6 +413,28 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => Civility::class,
+                    'name' => 'main_civility',
+                    'base_path' => '/admin/main/civility',
+                    'base_role' => 'ROLE_ADMIN',
+                    'form_class' => CivilityType::class,
+                    'controller' => CivilityController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Civility/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Civility/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/Admin/Civility/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => Language::class,
                     'name' => 'main_language',
diff --git a/src/Bundle/ChillMainBundle/Form/CivilityType.php b/src/Bundle/ChillMainBundle/Form/CivilityType.php
new file mode 100644
index 000000000..7dc7959f5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/CivilityType.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CivilityType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class, [
+                'required' => true,
+            ])
+            ->add('abbreviation', TranslatableStringFormType::class)
+            ->add('active', ChoiceType::class, [
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false,
+                ],
+            ])
+            ->add('order', IntegerType::class);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig
new file mode 100644
index 000000000..1160220a3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig
@@ -0,0 +1,7 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content -%}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
new file mode 100644
index 000000000..278f53ba2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
@@ -0,0 +1,33 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>id</th>
+            <th>name</th>
+            <th>abbreviation</th>
+            <th>active</th>
+            <th>ordering</th>
+            <th></th>
+        {% endblock %}
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td>{{ entity.abbreviation|localize_translatable_string }}</td>
+                    <td>{{ entity.active }}</td>
+                    <td>{{ entity.order }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_main_civility_edit', { 'id': entity.id}) }}" class="btn btn-sm btn-edit btn-mini"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+    {% endembed %}
+{% endblock content %}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
new file mode 100644
index 000000000..643de1ff4
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
@@ -0,0 +1,7 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block content -%}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 8c1d981b9..f23fa7382 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -365,6 +365,12 @@ crud:
       add_new: Ajouter un pays
     title_new: Nouveau pays
     title_edit: Modifier un pays
+  main_civility:
+    index:
+      title: Liste des civilités
+      add_new: Ajouter une civilité
+    title_new: Nouvelle civilité
+    title_edit: Modifier une civilité
 
 No entities: Aucun élément
 

From 3f256ad9075eceffa6d00a332b039b463d5a1b35 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 3 May 2022 19:03:58 +0200
Subject: [PATCH 052/111] admin: update marital status

---
 .../views/Admin/Civility/new.html.twig        |  2 +-
 .../AdminMaritalStatusController.php          | 22 --------------
 .../Controller/MaritalStatusController.php    | 26 ++++++++++++++++
 .../ChillPersonExtension.php                  |  6 ++--
 .../views/MaritalStatus/edit.html.twig        | 14 ++++-----
 .../views/MaritalStatus/index.html.twig       | 30 +++++++++----------
 .../views/MaritalStatus/new.html.twig         | 12 ++++----
 .../translations/messages.fr.yml              |  2 +-
 8 files changed, 59 insertions(+), 55 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
index 643de1ff4..b16f2eeba 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php b/src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php
deleted file mode 100644
index d27ebe2e8..000000000
--- a/src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\PersonBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminMaritalStatusController.
- */
-class AdminMaritalStatusController extends CRUDController
-{
-    // for minimal cases, nothing is required here !
-}
diff --git a/src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php b/src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php
new file mode 100644
index 000000000..2297dee32
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class MaritalStatusController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 6d2bf6d18..8fc17bf2a 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -166,10 +166,10 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                 ],
                 [
                     'class' => \Chill\PersonBundle\Entity\MaritalStatus::class,
-                    'name' => 'marital_status',
-                    'base_path' => '/admin/marital-status',
+                    'name' => 'person_marital-status',
+                    'base_path' => '/admin/person/marital-status',
                     'form_class' => \Chill\PersonBundle\Form\MaritalStatusType::class,
-                    'controller' => \Chill\PersonBundle\Controller\AdminMaritalStatusController::class,
+                    'controller' => \Chill\PersonBundle\Controller\MaritalStatusController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig
index d132847f2..e61f3f7c0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig
@@ -1,12 +1,12 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_view %}{% endblock %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
index 52c9d5307..ce8202fb2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -9,19 +9,19 @@
         {% endblock %}
 
         {% block table_entities_tbody %}
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.id }}</td>
-                <td>{{ entity.name|localize_translatable_string }}</td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_marital_status_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_marital-status_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
         {% endblock %}
     {% endembed %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig
index cc6021021..52a1d140b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig
@@ -1,11 +1,11 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 70441965c..175505d88 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -372,7 +372,7 @@ crud:
             add_new: Ajouter un nouveau
         title_new: Nouveau motif de clotûre
         title_edit: Modifier le motif de clotûre
-    marital_status:
+    person_marital-status:
         index:
             title: Liste des états civils
             add_new: Ajouter un nouveau

From 784a725ce39e3772cb0c67700d0adbb5ce6aad03 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 09:34:16 +0200
Subject: [PATCH 053/111] fix translation

---
 .../ChillActivityBundle/Resources/views/Activity/show.html.twig | 2 +-
 src/Bundle/ChillActivityBundle/translations/messages.fr.yml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 1cb501817..65134a754 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -184,7 +184,7 @@
         {% if t.privateCommentLabel is not empty %}
             <dt class="inline">{{ t.privateCommentLabel }}</dt>
         {% else %}
-            <dt class="inline">{{ 'activity.private comment'|trans }}</dt>
+            <dt class="inline">{{ 'Private comment'|trans }}</dt>
         {% endif %}
         <dd>
             <section class="chill-entity entity-comment-embeddable">
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 80de45c2d..55c062a4a 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -44,6 +44,7 @@ Received: Recevoir
 by: 'Par '
 location: Lieu
 Reasons: Sujets
+Private comment: Commentaire privé
 
 
 #forms

From 416a88b93d0d921dc53c27f49a89a85d1f87ac4a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 12:30:44 +0200
Subject: [PATCH 054/111] fix form and take null cases into account

---
 src/Bundle/ChillActivityBundle/Form/ActivityType.php         | 1 +
 .../Resources/views/Activity/new.html.twig                   | 5 ++++-
 .../Entity/Embeddable/PrivateCommentEmbeddable.php           | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 7b9f24705..0fa2fdf76 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -20,6 +20,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 8e078702c..6f6e1fe53 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -81,10 +81,13 @@
 {% endif %}
 
 {%- if form.comment is defined -%}
-    {# TODO .. public and private #}
     {{ form_row(form.comment) }}
 {% endif %}
 
+{%- if form.privateComment is defined -%}
+    {{ form_row(form.privateComment) }}
+{% endif %}
+
 {%- if form.attendee is defined -%}
     {{ form_row(form.attendee) }}
 {% endif %}
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index f3e35bb1f..f7fd41cb5 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -51,7 +51,10 @@ class PrivateCommentEmbeddable
 
     public function merge(PrivateCommentEmbeddable $newComment): self
     {
-        $mergedComments = $newComment->getComments() + $this->getComments();
+
+        $currentComments = null === $this->getComments() ? [] : $this->getComments();
+
+        $mergedComments = $newComment->getComments() + $currentComments;
 
         $this->setComments($mergedComments);
 

From e19cac168b9c64d38a142eeafe2d201be4beb080 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 4 May 2022 13:00:46 +0200
Subject: [PATCH 055/111] php csfixes

---
 .../ChillActivityBundle/Entity/Activity.php   | 36 +++++-----
 .../Entity/ActivityType.php                   | 68 +++++++++----------
 .../ChillActivityBundle/Form/ActivityType.php |  4 +-
 .../migrations/Version20220425133027.php      | 21 ++++--
 .../ChillCalendarBundle/Entity/Calendar.php   | 36 +++++-----
 .../ChillCalendarBundle/Form/CalendarType.php |  2 +-
 .../Embeddable/PrivateCommentEmbeddable.php   | 28 ++++----
 .../DataMapper/PrivateCommentDataMapper.php   |  6 +-
 .../Form/Type/PrivateCommentType.php          | 12 +---
 .../PrivateCommentEmbeddableNormalizer.php    | 15 ++--
 .../migrations/Version20220426133048.php      | 23 ++++---
 .../AccompanyingPeriodWork.php                | 23 +++----
 12 files changed, 136 insertions(+), 138 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index 4b329a0a2..db0d5c7d1 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -87,12 +87,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      */
     private CommentEmbeddable $comment;
 
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     * @Groups({"docgen:read"})
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
     /**
      * @ORM\Column(type="datetime")
      * @Groups({"docgen:read"})
@@ -141,6 +135,12 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      */
     private ?Collection $persons = null;
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     * @Groups({"docgen:read"})
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
      * @Groups({"docgen:read"})
@@ -321,11 +321,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
     public function getDate(): DateTime
     {
         return $this->date;
@@ -413,6 +408,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return [];
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     public function getReasons(): Collection
     {
         return $this->reasons;
@@ -550,13 +550,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
-    {
-        $this->privateComment = $privateComment;
-
-        return $this;
-    }
-
     public function setDate(DateTime $date): self
     {
         $this->date = $date;
@@ -606,6 +599,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setReasons(?ArrayCollection $reasons): self
     {
         $this->reasons = $reasons;
diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
index deb28184c..845b31ca2 100644
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -76,16 +76,6 @@ class ActivityType
      */
     private int $commentVisible = self::FIELD_OPTIONAL;
 
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default": ""})
-     */
-    private string $privateCommentLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     */
-    private int $privateCommentVisible = self::FIELD_OPTIONAL;
-
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
@@ -177,6 +167,16 @@ class ActivityType
      */
     private int $personVisible = self::FIELD_REQUIRED;
 
+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $privateCommentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $privateCommentVisible = self::FIELD_OPTIONAL;
+
     /**
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
@@ -324,16 +324,6 @@ class ActivityType
         return $this->commentVisible;
     }
 
-    public function getPrivateCommentLabel(): string
-    {
-        return $this->privateCommentLabel;
-    }
-
-    public function getPrivateCommentVisible(): int
-    {
-        return $this->privateCommentVisible;
-    }
-
     public function getDateLabel(): string
     {
         return $this->dateLabel;
@@ -436,6 +426,16 @@ class ActivityType
         return $this->personVisible;
     }
 
+    public function getPrivateCommentLabel(): string
+    {
+        return $this->privateCommentLabel;
+    }
+
+    public function getPrivateCommentVisible(): int
+    {
+        return $this->privateCommentVisible;
+    }
+
     public function getReasonsLabel(): string
     {
         return $this->reasonsLabel;
@@ -593,20 +593,6 @@ class ActivityType
         return $this;
     }
 
-    public function setPrivateCommentLabel(string $privateCommentLabel): self
-    {
-        $this->privateCommentLabel = $privateCommentLabel;
-
-        return $this;
-    }
-
-    public function setPrivateCommentVisible(int $privateCommentVisible): self
-    {
-        $this->privateCommentVisible = $privateCommentVisible;
-
-        return $this;
-    }
-
     public function setDateLabel(string $dateLabel): self
     {
         $this->dateLabel = $dateLabel;
@@ -722,6 +708,20 @@ class ActivityType
         return $this;
     }
 
+    public function setPrivateCommentLabel(string $privateCommentLabel): self
+    {
+        $this->privateCommentLabel = $privateCommentLabel;
+
+        return $this;
+    }
+
+    public function setPrivateCommentVisible(int $privateCommentVisible): self
+    {
+        $this->privateCommentVisible = $privateCommentVisible;
+
+        return $this;
+    }
+
     public function setReasonsLabel(string $reasonsLabel): self
     {
         $this->reasonsLabel = $reasonsLabel;
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 0fa2fdf76..4361158e5 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -252,10 +252,10 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        if($activityType->isVisible('privateComment')) {
+        if ($activityType->isVisible('privateComment')) {
             $builder->add('privateComment', PrivateCommentType::class, [
                 'label' => empty($activityType->getLabel('privateComment')) ? 'activity.private comment' : $activityType->getPrivateCommentLabel(),
-                'required' => false
+                'required' => false,
             ]);
         }
 
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
index c29f2d66e..d5243b259 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -12,6 +19,13 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20220425133027 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
+        $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment option to activity types';
@@ -23,11 +37,4 @@ final class Version20220425133027 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
         $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
-        $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index 4783e70b6..c40bddb44 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -71,12 +71,6 @@ class Calendar
      */
     private CommentEmbeddable $comment;
 
-    /**
-     * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
-     * @Serializer\Groups({"calendar:read"})
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
     /**
      * @ORM\Column(type="datetimetz_immutable")
      * @Serializer\Groups({"calendar:read"})
@@ -122,6 +116,12 @@ class Calendar
      */
     private Collection $persons;
 
+    /**
+     * @ORM\Embedded(class=PrivateCommentEmbeddable::class, columnPrefix="privateComment_")
+     * @Serializer\Groups({"calendar:read"})
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(
      *     targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty",
@@ -216,11 +216,6 @@ class Calendar
         return $this->comment;
     }
 
-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
     public function getEndDate(): ?DateTimeImmutable
     {
         return $this->endDate;
@@ -291,6 +286,11 @@ class Calendar
         return [];
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     /**
      * @return Collection|ThirdParty[]
      */
@@ -399,13 +399,6 @@ class Calendar
         return $this;
     }
 
-    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
-    {
-        $this->privateComment = $privateComment;
-
-        return $this;
-    }
-
     public function setEndDate(DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
@@ -427,6 +420,13 @@ class Calendar
         return $this;
     }
 
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
+    {
+        $this->privateComment = $privateComment;
+
+        return $this;
+    }
+
     public function setSendSMS(?bool $sendSMS): self
     {
         $this->sendSMS = $sendSMS;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
index 7269b2a66..b1dccb5fd 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -54,7 +54,7 @@ class CalendarType extends AbstractType
             ])
             ->add('privateComment', PrivateCommentType::class, [
                 'required' => false,
-                'label' => 'private comment'
+                'label' => 'private comment',
             ])
             // ->add('cancelReason', EntityType::class, [
             //     'required' => false,
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index f7fd41cb5..cfca2a86c 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -24,15 +24,25 @@ class PrivateCommentEmbeddable
      */
     private ?array $comments = [];
 
+    public function getCommentForUser(User $user): string
+    {
+        return $this->comments[$user->getId()] ?? '';
+    }
+
     public function getComments(): ?array
     {
         return $this->comments;
     }
 
-
-    public function getCommentForUser(User $user): string
+    public function merge(PrivateCommentEmbeddable $newComment): self
     {
-        return $this->comments[$user->getId()] ?? '';
+        $currentComments = null === $this->getComments() ? [] : $this->getComments();
+
+        $mergedComments = $newComment->getComments() + $currentComments;
+
+        $this->setComments($mergedComments);
+
+        return $this;
     }
 
     public function setCommentForUser(User $user, string $content): self
@@ -48,16 +58,4 @@ class PrivateCommentEmbeddable
 
         return $this;
     }
-
-    public function merge(PrivateCommentEmbeddable $newComment): self
-    {
-
-        $currentComments = null === $this->getComments() ? [] : $this->getComments();
-
-        $mergedComments = $newComment->getComments() + $currentComments;
-
-        $this->setComments($mergedComments);
-
-        return $this;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
index 5d4cd08cd..2c03c59f1 100644
--- a/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
+++ b/src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
@@ -19,7 +19,6 @@ use Symfony\Component\Security\Core\Security;
 
 final class PrivateCommentDataMapper extends AbstractType implements DataMapperInterface
 {
-
     private Security $security;
 
     public function __construct(Security $security)
@@ -40,8 +39,6 @@ final class PrivateCommentDataMapper extends AbstractType implements DataMapperI
         $forms = iterator_to_array($forms);
 
         $forms['comments']->setData($viewData->getCommentForUser($this->security->getUser()));
-
-
     }
 
     public function mapFormsToData($forms, &$viewData)
@@ -50,5 +47,4 @@ final class PrivateCommentDataMapper extends AbstractType implements DataMapperI
 
         $viewData->setCommentForUser($this->security->getUser(), $forms['comments']->getData());
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 6ab166fe9..8ce33face 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -11,17 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Type;
 
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
-use DateTime;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -30,10 +24,10 @@ use Symfony\Component\Security\Core\User\UserInterface;
 
 class PrivateCommentType extends AbstractType
 {
-    protected UserInterface $user;
-
     protected PrivateCommentDataMapper $dataMapper;
 
+    protected UserInterface $user;
+
     public function __construct(TokenStorageInterface $tokenStorage, PrivateCommentDataMapper $dataMapper)
     {
         $this->user = $tokenStorage->getToken()->getUser();
@@ -44,7 +38,7 @@ class PrivateCommentType extends AbstractType
     {
         $builder
             ->add('comments', ChillTextareaType::class, [
-                'label' => 'private comment'
+                'label' => 'private comment',
             ])
             ->setDataMapper($this->dataMapper);
     }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index 447b8ddf8..a1ff7e5ba 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
@@ -19,7 +18,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, DenormalizerInterface
 {
-
     private Security $security;
 
     public function __construct(Security $security)
@@ -40,19 +38,18 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
         return $comment;
     }
 
-    public function supportsDenormalization($data, string $type, ?string $format = null): bool
-    {
-        return $type === PrivateCommentEmbeddable::class;
-    }
-
     public function normalize($comment, $format = null, array $contect = []): string
     {
         return $comment->getCommentForUser($this->security->getUser());
     }
 
+    public function supportsDenormalization($data, string $type, ?string $format = null): bool
+    {
+        return PrivateCommentEmbeddable::class === $type;
+    }
+
     public function supportsNormalization($data, ?string $format = null): bool
     {
         return $data instanceof PrivateCommentEmbeddable;
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
index 2f1fbab1a..94f866e9b 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -12,6 +19,14 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20220426133048 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private embeddable comment to activity, calendar and accompanyingperiod work';
@@ -24,12 +39,4 @@ final class Version20220426133048 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
-        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
index 8ea1028f8..9c0eade3b 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -13,7 +13,6 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
@@ -136,12 +135,6 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private string $note = '';
 
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
     /**
      * @ORM\ManyToMany(targetEntity=Person::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_person")
@@ -151,6 +144,12 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private Collection $persons;
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_referrer")
@@ -332,16 +331,16 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->note;
     }
 
-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
     public function getPersons(): Collection
     {
         return $this->persons;
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     /**
      * @return Collection|User[]
      */

From e50e68a52bf2192f4dc7ce98dafd0cc2d27c2ad7 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 4 May 2022 14:09:10 +0200
Subject: [PATCH 056/111] admin: add missing data_class option to form types

---
 .../ChillMainBundle/Controller/CivilityController.php |  1 -
 .../ChillMainBundle/Controller/CountryController.php  |  1 -
 .../ChillMainBundle/Controller/LanguageController.php |  1 -
 src/Bundle/ChillMainBundle/Form/CivilityType.php      | 11 ++++++++++-
 src/Bundle/ChillMainBundle/Form/CountryType.php       | 11 ++++++++++-
 src/Bundle/ChillMainBundle/Form/LanguageType.php      | 11 ++++++++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/CivilityController.php b/src/Bundle/ChillMainBundle/Controller/CivilityController.php
index 52b16f634..afda9cc64 100644
--- a/src/Bundle/ChillMainBundle/Controller/CivilityController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CivilityController.php
@@ -23,5 +23,4 @@ class CivilityController extends CRUDController
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/CountryController.php b/src/Bundle/ChillMainBundle/Controller/CountryController.php
index 351a8d4c3..fe56f3c13 100644
--- a/src/Bundle/ChillMainBundle/Controller/CountryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CountryController.php
@@ -23,5 +23,4 @@ class CountryController extends CRUDController
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/LanguageController.php b/src/Bundle/ChillMainBundle/Controller/LanguageController.php
index 33d88ab0e..4612a3728 100644
--- a/src/Bundle/ChillMainBundle/Controller/LanguageController.php
+++ b/src/Bundle/ChillMainBundle/Controller/LanguageController.php
@@ -23,5 +23,4 @@ class LanguageController extends CRUDController
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
-
 }
diff --git a/src/Bundle/ChillMainBundle/Form/CivilityType.php b/src/Bundle/ChillMainBundle/Form/CivilityType.php
index 7dc7959f5..96469b216 100644
--- a/src/Bundle/ChillMainBundle/Form/CivilityType.php
+++ b/src/Bundle/ChillMainBundle/Form/CivilityType.php
@@ -11,14 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CivilityType extends \Symfony\Component\Form\AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
@@ -33,4 +35,11 @@ class CivilityType extends \Symfony\Component\Form\AbstractType
             ])
             ->add('order', IntegerType::class);
     }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => Civility::class,
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/CountryType.php b/src/Bundle/ChillMainBundle/Form/CountryType.php
index 2eb979d85..a1792b0b6 100644
--- a/src/Bundle/ChillMainBundle/Form/CountryType.php
+++ b/src/Bundle/ChillMainBundle/Form/CountryType.php
@@ -11,13 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class CountryType extends \Symfony\Component\Form\AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
@@ -29,4 +31,11 @@ class CountryType extends \Symfony\Component\Form\AbstractType
                 'required' => true,
             ]);
     }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => Country::class,
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Form/LanguageType.php b/src/Bundle/ChillMainBundle/Form/LanguageType.php
index cb48d15ca..0c4f036de 100644
--- a/src/Bundle/ChillMainBundle/Form/LanguageType.php
+++ b/src/Bundle/ChillMainBundle/Form/LanguageType.php
@@ -11,13 +11,15 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class LanguageType extends \Symfony\Component\Form\AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('id', TextType::class, [
@@ -29,4 +31,11 @@ class LanguageType extends \Symfony\Component\Form\AbstractType
                 'required' => true,
             ]);
     }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => Language::class,
+        ]);
+    }
 }

From 16d74eaa0c75d49eec564a16bf8fcc209cdb1f84 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 4 May 2022 17:34:44 +0200
Subject: [PATCH 057/111] admin: reorganize twig templates and admin menu

---
 .../Controller/AdminController.php            | 15 ----
 .../Resources/public/chill/chillmain.scss     |  5 +-
 .../views/Admin/Civility/index.html.twig      | 12 ++-
 .../views/Admin/Language/index.html.twig      | 13 +++-
 .../Resources/views/Admin/index.html.twig     |  4 -
 .../Resources/views/Admin/layout.html.twig    |  7 --
 .../Admin/layoutWithVerticalMenu.html.twig    |  7 +-
 .../Admin/layout_language_country.html.twig   | 33 ---------
 .../views/Admin/layout_location.html.twig     | 33 ---------
 .../views/Admin/layout_permissions.html.twig  | 31 --------
 .../views/Admin/menu_admin_index.html.twig    | 18 -----
 .../menu_admin_language_country.html.twig     | 20 -----
 .../views/Admin/menu_admin_location.html.twig | 20 -----
 .../Admin/menu_admin_permissions.html.twig    | 20 -----
 .../views/Admin/menu_admin_section.html.twig  | 67 +++++++----------
 .../views/CRUD/Admin/index.html.twig          | 11 ++-
 .../MenuBuilder/AdminSectionMenuBuilder.php   | 74 +++++++++++++------
 .../LanguageCountryMenuBuilder.php            | 33 ---------
 .../MenuBuilder/LocationMenuBuilder.php       | 33 ---------
 .../MenuBuilder/PermissionMenuBuilder.php     | 47 ------------
 src/Bundle/ChillMainBundle/config/routes.yaml | 11 ---
 .../translations/messages.fr.yml              |  1 +
 22 files changed, 112 insertions(+), 403 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/layout_location.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_index.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_location.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_permissions.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php
 delete mode 100644 src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
 delete mode 100644 src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php

diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php
index 2055f0f22..de4420f68 100644
--- a/src/Bundle/ChillMainBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php
@@ -23,19 +23,4 @@ class AdminController extends AbstractController
     {
         return $this->render('@ChillMain/Admin/index.html.twig');
     }
-
-    public function indexLanguageCountryAction()
-    {
-        return $this->render('@ChillMain/Admin/layout_language_country.html.twig');
-    }
-
-    public function indexLocationsAction()
-    {
-        return $this->render('@ChillMain/Admin/layout_location.html.twig');
-    }
-
-    public function indexPermissionsAction()
-    {
-        return $this->render('@ChillMain/Admin/layout_permissions.html.twig');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index e4cdcb10c..94bc520cb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -179,7 +179,7 @@ div.banner {
 div.vertical-menu {
    border-radius: 0;
    margin-top: 0.5rem;
-   a.list-group-item {
+   a.list-group-item, div.list-group-item {
       background-color: $chill-yellow;
       border: 0;
       margin-bottom: 0.25rem;
@@ -187,6 +187,9 @@ div.vertical-menu {
          background-color: tint-color($chill-yellow, 20%)
       }
    }
+   div.list-group-item-header {
+      text-transform: uppercase;
+   }
 }
 
 footer.footer {
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
index 278f53ba2..9d28d3339 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
@@ -1,6 +1,7 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
@@ -28,6 +29,11 @@
                 </tr>
             {% endfor %}
         {% endblock %}
-    {% endembed %}
-{% endblock content %}
 
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
index 92e9ce8f5..21d2afca9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
@@ -1,12 +1,13 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
             <th>name</th>
             <th>&nbsp;</th>
         {% endblock %}
+
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
@@ -22,6 +23,12 @@
                 </tr>
             {% endfor %}
         {% endblock %}
-    {% endembed %}
-{% endblock content %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig
index 11d5cc3c9..ba17f1d84 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig
@@ -8,8 +8,4 @@
 
     <p>{{ 'Welcome to the admin section !'|trans }}</p>
 
-    {{ chill_menu('admin_index', {
-        'layout': '@ChillMain/Admin/menu_admin_index.html.twig'
-    }) }}
-
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
index 0107bba4e..01ba8ca58 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout.html.twig
@@ -1,12 +1,5 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
-{% block navigation_search_bar %}{% endblock %}
-{% block navigation_section_menu %}
-	{{ chill_menu('admin_section', {
-	   	'layout': '@ChillMain/Menu/admin.html.twig',
-	}) }}
-{% endblock %}
-
 {% block content %}
     {% block admin_content %}<!-- block content empty -->
         <div class="container-fluid">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
index 9a57b9067..900a794b6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
@@ -1,14 +1,13 @@
 {% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
-{% block navigation_search_bar %}{% endblock %}
-{% block navigation_section_menu %}
-	{{ chill_menu('admin_section', {
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_section', {
 	   	'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
 	}) }}
 {% endblock %}
 
 {% block layout_wvm_content %}
     {% block admin_content %}
-        <!-- block admin content emty -->
+        <!-- block admin content empty -->
     {% endblock %}
 {% endblock  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
deleted file mode 100644
index b76e60861..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_language_country.html.twig
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
-
-{% block vertical_menu_content %}
-    {{ chill_menu('admin_language_country', {
-        'layout': '@ChillMain/Admin/menu_admin_language_country.html.twig',
-    }) }}
-{% endblock %}
-
-
-
-{% block layout_wvm_content %}
-    {% block admin_content %}
-        <h1>{{ 'Management of languages and countries' |trans }}</h1>
-    {% endblock %}
-{% endblock  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_location.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_location.html.twig
deleted file mode 100644
index fc0708af9..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_location.html.twig
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
-
-{% block vertical_menu_content %}
-    {{ chill_menu('admin_location', {
-        'layout': '@ChillMain/Admin/menu_admin_location.html.twig',
-    }) }}
-{% endblock %}
-
-
-
-{% block layout_wvm_content %}
-    {% block admin_content %}
-        <h1>{{ 'Management of location' |trans }}</h1>
-    {% endblock %}
-{% endblock  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
deleted file mode 100644
index 55883069f..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layout_permissions.html.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
-
-{% block vertical_menu_content %}
-    {{ chill_menu('admin_permissions', {
-        'layout': '@ChillMain/Admin/menu_admin_permissions.html.twig',
-    }) }}
-{% endblock %}
-
-{% block layout_wvm_content %}
-    {% block admin_content %}<!-- block content empty -->
-        <h1>{{ 'Permissions management of your chill installation' |trans }}</h1>
-    {% endblock %}
-{% endblock  %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_index.html.twig
deleted file mode 100644
index b766b6440..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_index.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="{{ 'menu-' ~ menus.name }}">
-    <ul>
-        {% for menu in menus %}
-            <li>
-                <a class=""
-                   href="{{ menu.uri }}">
-                    <h3>{{ menu.label|trans }}</h3>
-
-                    {% if menu.extras.explain is defined %}
-                        <div class="" >
-                            {{ menu.extras.explain|trans }}
-                        </div>
-                    {% endif %}
-                </a>
-            </li>
-        {% endfor %}
-    </ul>
-</div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig
deleted file mode 100644
index e6b4fa5fe..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_language_country.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Language and countries menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_location.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_location.html.twig
deleted file mode 100644
index b4112ff60..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_location.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Location Menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_permissions.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_permissions.html.twig
deleted file mode 100644
index 77032edca..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_permissions.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Permissions Menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
index 7fabd0ae9..d0c777a4e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
@@ -1,41 +1,28 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
+<div class="list-group vertical-menu">
+    {% for menu in menus %}
+        {% if 'header' in menu.extras %}
+            <div class="list-group-item list-group-item-action {% if 'class' in menu.attributes|keys %}{{ menu.attributes['class'] }}{% endif %}">
+                {{ menu.label|trans }}
+                {% apply spaceless %}
+                    {% if menu.extras.icons is defined %}
+                    {% for icon in menu.extras.icons %}
+                        <span><i class="fa fa-{{ icon }}"></i></span>
+                    {% endfor %}
+                    {% endif %}
+                {% endapply %}
+            </div>
+        {% else %}
+            <a href="{{ menu.uri }}" class="list-group-item list-group-item-action {% if 'class' in menu.attributes|keys %}{{ menu.attributes['class'] }}{% endif %}">
+                {{ menu.label|trans }}
+                {% apply spaceless %}
+                    {% if menu.extras.icons is defined %}
+                    {% for icon in menu.extras.icons %}
+                        <span><i class="fa fa-{{ icon }}"></i></span>
+                    {% endfor %}
+                    {% endif %}
+                {% endapply %}
+            </a>
+        {% endif %}
 
-<li class="nav-link2">
-    <div class="li-content">
-        <a href="{{ path('chill_main_admin_central') }}" class="more">Admin Sections</a>
-    </div>
-    <ul class="submenu width-15-em" style="padding-left: 0; padding-right: 0;  background-color:transparent;">
-        {% for menu in menus %}
-            <li style="display:block; background-color: #333333; padding-left:1.5em; border-bottom:1px; border-bottom: 1px solid #FFF;padding-top:0; padding-bottom:0;">
-                <div style="margin-bottom:2px;">
-                        <div style="font-family: 'Open Sans'; font-weight:300; font-size: 0.75em; text-align:left; height: 46px; display:inline-block;  width: calc(100% - 5em - 1px); vertical-align:top;">
-                            <a href="{{ menu.uri }}">{{ menu.label|trans }}</a>
-                        </div>
-                        <div style="background-color: #333333;  text-align:center;width: 2em; margin-left:-0.15em; font-size:1.5em; color:#FFF; height: 46px; display:inline-block; vertical-align:top;float:right">{% apply spaceless %}
-                            {% if menu.extras.icons is defined %}
-                            {% for icon in menu.extras.icons %}
-                                <i class="fa fa-{{ icon }}"></i> 
-                            {% endfor %}
-                            {% endif %}
-                        {% endapply %}</div>
-                </div>
-            </li>
-        {% endfor %}
-    </ul>
-</li>
+    {% endfor %}
+</div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
index 1dc0acc81..d410abcea 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/Admin/index.html.twig
@@ -1,8 +1,13 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index b1326a85b..b21f83846 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -34,32 +34,58 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Users and permissions', [
-            'route' => 'chill_main_admin_permissions',
-        ])
-            ->setExtras([
-                'icons' => ['key'],
-                'order' => 200,
-                'explain' => 'Configure permissions for users',
-            ]);
+        $menu->addChild('Users and permissions')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 100, 'header' => true]);
 
-        $menu->addChild('Location and location type', [
-            'route' => 'chill_main_admin_locations',
-        ])
-            ->setExtras([
-                'icons' => ['key'],
-                'order' => 205,
-                'explain' => 'Configure location and location type',
-            ]);
+        $menu->addChild('Center list', [
+            'route' => 'admin_center',
+        ])->setExtras(['order' => 110]);
+
+        $menu->addChild('List circles', [
+            'route' => 'admin_scope',
+        ])->setExtras(['order' => 120]);
+
+        $menu->addChild('Permissions group list', [
+            'route' => 'admin_permissionsgroup',
+        ])->setExtras(['order' => 130]);
+
+        $menu->addChild('crud.admin_user.index.title', [
+            'route' => 'chill_crud_admin_user_index',
+        ])->setExtras(['order' => 140]);
+
+        $menu->addChild('User jobs', [
+            'route' => 'chill_crud_admin_user_job_index',
+        ])->setExtras(['order' => 150]);
+
+
+
+        $menu->addChild('Languages and countries')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 200, 'header' => 'true']);
+
+        $menu->addChild('Language list', [
+            'route' => 'chill_crud_main_language_index',
+        ])->setExtras(['order' => 210]);
+
+        $menu->addChild('Country list', [
+            'route' => 'chill_crud_main_country_index',
+        ])->setExtras(['order' => 220]);
+
+
+
+        $menu->addChild('Location and location type')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 300, 'header' => 'true']);
+
+        $menu->addChild('Location type list', [
+            'route' => 'chill_crud_main_location_type_index',
+        ])->setExtras(['order' => 310]);
+
+        $menu->addChild('Location list', [
+            'route' => 'chill_crud_main_location_index',
+        ])->setExtras(['order' => 320]);
 
-        $menu->addChild('Languages and countries', [
-            'route' => 'chill_main_admin_language_country',
-        ])
-            ->setExtras([
-                'icons' => ['key'],
-                'order' => 210,
-                'explain' => 'Configure languages and countries',
-            ]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php
deleted file mode 100644
index 540f1344e..000000000
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LanguageCountryMenuBuilder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Routing\MenuBuilder;
-
-use Knp\Menu\MenuItem;
-
-class LanguageCountryMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
-{
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        $menu->addChild('Language list', [
-            'route' => 'chill_crud_main_language_index',
-        ])->setExtras(['order' => 205]);
-
-        $menu->addChild('Country list', [
-            'route' => 'chill_crud_main_country_index',
-        ])->setExtras(['order' => 206]);
-    }
-
-    public static function getMenuIds(): array
-    {
-        return ['admin_language_country'];
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
deleted file mode 100644
index da1ce479b..000000000
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/LocationMenuBuilder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Routing\MenuBuilder;
-
-use Knp\Menu\MenuItem;
-
-class LocationMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
-{
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        $menu->addChild('Location type list', [
-            'route' => 'chill_crud_main_location_type_index',
-        ])->setExtras(['order' => 205]);
-
-        $menu->addChild('Location list', [
-            'route' => 'chill_crud_main_location_index',
-        ])->setExtras(['order' => 206]);
-    }
-
-    public static function getMenuIds(): array
-    {
-        return ['admin_location'];
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php
deleted file mode 100644
index 6fab6b635..000000000
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/PermissionMenuBuilder.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Routing\MenuBuilder;
-
-use Knp\Menu\MenuItem;
-
-class PermissionMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
-{
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        $menu->addChild('Permissions group list', [
-            'route' => 'admin_permissionsgroup',
-        ])->setExtras([
-            'order' => 300,
-        ]);
-
-        $menu->addChild('crud.admin_user.index.title', [
-            'route' => 'chill_crud_admin_user_index',
-        ])->setExtras(['order' => 400]);
-
-        $menu->addChild('List circles', [
-            'route' => 'admin_scope',
-        ])->setExtras(['order' => 200]);
-
-        $menu->addChild('Center list', [
-            'route' => 'admin_center',
-        ])->setExtras(['order' => 100]);
-
-        $menu->addChild('User jobs', [
-            'route' => 'chill_crud_admin_user_job_index',
-        ])->setExtras(['order' => 150]);
-    }
-
-    public static function getMenuIds(): array
-    {
-        return ['admin_permissions'];
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml
index b0ee2c956..d25f2aaff 100644
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -62,17 +62,6 @@ chill_main_homepage:
 #                 order: 0
 #                 label: Main admin menu
 #
-chill_main_admin_permissions:
-    path: /{_locale}/admin/permissions
-    controller: Chill\MainBundle\Controller\AdminController::indexPermissionsAction
-
-chill_main_admin_locations:
-    path: /{_locale}/admin/locations
-    controller: Chill\MainBundle\Controller\AdminController::indexLocationsAction
-
-chill_main_admin_language_country:
-    path: /{_locale}/admin/language-country
-    controller: Chill\MainBundle\Controller\AdminController::indexLanguageCountryAction
 
 chill_main_search:
     path: /{_locale}/search.{_format}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index f23fa7382..e679db535 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -120,6 +120,7 @@ Main admin menu: Menu d'administration principal
 Actions: Actions
 Users and permissions: Utilisateurs et permissions
 Location and location type: Localisations et types de localisation
+Back to the admin: Retour
 
 #permissions
 Permissions Menu: Gestion des droits

From ab90f72c7e8b924ec0309a7d51d8bad3b44b9f8a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 07:13:53 +0200
Subject: [PATCH 058/111] update conventions

---
 CONVENTIONS.md | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/CONVENTIONS.md b/CONVENTIONS.md
index 5b9da225e..f1892e244 100644
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -2,7 +2,14 @@
 
 en cours de rédaction
 
+## Translations
 
+
+Par bundle, toutes les traductions des pages twig se trouvent dans un seul fichier `translations/messages.fr.yaml`.
+
+## Emplacement des fichiers
+
+Les controllers, form type & templates twig sont placés à la racine des dossiers `Controller`, `Form` & `Ressources/views`, respectivement. Pour les pages Admin, on ne les mets plus dans des sous-dossiers Admin.
 ## Assets: nommage des entrypoints
 
 Trois types d'entrypoint:
@@ -146,19 +153,20 @@ Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhai
 
 Les routes sont nommées de cette manière:
 
-`chill_bundle_entite_action`
+`chill_(api|crud)_bundle_(api)_entite_action`
 
 1. d'abord chill_ (pour tous les modules chill)
-2. ensuite une string qui est identique, par bundle
-3. si le point est un point d'api (json), alors ajouter la string `api`
-4. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
-5. ensuite une action (`list`, `view`, `edit`, `new`, ...)
+2. ensuite `crud` ou `api`, optionnel, automatiquement ajouté si la route est générée par la configuration
+3. ensuite une string qui indique le bundle (`main`, `person`, `activity`, ...)
+4. ensuite, `api`, si la route est une route d'api.
+5. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
+6. ensuite une action (`list`, `view`, `edit`, `new`, ...)
 
-Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
+Le fait d'indiquer `api` en quatrième position permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
 
 Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.
 
-### URL
+### Nommage des URL
 
 Les URL respectent également une convention:
 
@@ -219,6 +227,14 @@ Les éléments suivants devraient se trouver dans la liste:
 
 Ces éléments peuvent être entrecoupés de l'identifiant d'une entité. Dans ce cas, cet identifiant se place juste après l'entité auquel il se rapporte.
 
+#### Pour les URL de l'espace Admin
+
+Même conventions que dans les autres pages html de l'application, **mais `admin` est ajouté en deuxième position**. Soit:
+
+
+`/{_locale}/admin/bundle/entity/{id}/action`
+
+
 ## Règles UI chill
 
 ### Titre des pages

From b09d92eae8f9fdf50843e7c162f593d3436b0349 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 08:03:20 +0200
Subject: [PATCH 059/111] admin: reorganise files according to conventions

---
 .../ChillMainExtension.php                    | 30 ++++++------
 .../views/Admin/Location/edit.html.twig       | 39 ----------------
 .../views/Admin/Location/new.html.twig        | 39 ----------------
 .../views/Admin/LocationType/edit.html.twig   | 14 ------
 .../views/Admin/LocationType/new.html.twig    | 11 -----
 .../views/{Admin => }/Civility/edit.html.twig |  8 +++-
 .../{Admin => }/Civility/index.html.twig      | 17 ++++---
 .../Language => Civility}/new.html.twig       |  8 +++-
 .../Language => Country}/edit.html.twig       |  8 +++-
 .../views/{Admin => }/Country/index.html.twig | 17 +++++--
 .../views/{Admin => }/Country/new.html.twig   |  8 +++-
 .../Country => Language}/edit.html.twig       |  8 +++-
 .../{Admin => }/Language/index.html.twig      |  2 +-
 .../Civility => Language}/new.html.twig       |  8 +++-
 .../Resources/views/Location/edit.html.twig   | 39 ++++++++++++++++
 .../{Admin => }/Location/index.html.twig      | 45 ++++++++----------
 .../Resources/views/Location/new.html.twig    | 39 ++++++++++++++++
 .../views/LocationType/edit.html.twig         | 11 +++++
 .../{Admin => }/LocationType/index.html.twig  | 46 ++++++++-----------
 .../views/LocationType/new.html.twig          | 11 +++++
 .../MenuBuilder/AdminSectionMenuBuilder.php   |  4 +-
 .../ChillMainBundle/translations/admin.fr.yml |  4 --
 .../translations/messages.fr.yml              | 11 ++++-
 23 files changed, 225 insertions(+), 202 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin => }/Civility/edit.html.twig (57%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin => }/Civility/index.html.twig (77%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin/Language => Civility}/new.html.twig (57%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin/Language => Country}/edit.html.twig (57%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin => }/Country/index.html.twig (71%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin => }/Country/new.html.twig (57%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin/Country => Language}/edit.html.twig (57%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin => }/Language/index.html.twig (96%)
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin/Civility => Language}/new.html.twig (57%)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin => }/Location/index.html.twig (57%)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig
 rename src/Bundle/ChillMainBundle/Resources/views/{Admin => }/LocationType/index.html.twig (60%)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/translations/admin.fr.yml

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 43d85f052..0c974b637 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -357,15 +357,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Location/index.html.twig',
+                            'template' => '@ChillMain/Location/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Location/new.html.twig',
+                            'template' => '@ChillMain/Location/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Location/edit.html.twig',
+                            'template' => '@ChillMain/Location/edit.html.twig',
                         ],
                     ],
                 ],
@@ -379,15 +379,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/LocationType/index.html.twig',
+                            'template' => '@ChillMain/LocationType/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/LocationType/new.html.twig',
+                            'template' => '@ChillMain/LocationType/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/LocationType/edit.html.twig',
+                            'template' => '@ChillMain/LocationType/edit.html.twig',
                         ],
                     ],
                 ],
@@ -401,15 +401,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Country/index.html.twig',
+                            'template' => '@ChillMain/Country/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Country/new.html.twig',
+                            'template' => '@ChillMain/Country/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Country/edit.html.twig',
+                            'template' => '@ChillMain/Country/edit.html.twig',
                         ],
                     ],
                 ],
@@ -423,15 +423,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Civility/index.html.twig',
+                            'template' => '@ChillMain/Civility/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Civility/new.html.twig',
+                            'template' => '@ChillMain/Civility/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Civility/edit.html.twig',
+                            'template' => '@ChillMain/Civility/edit.html.twig',
                         ],
                     ],
                 ],
@@ -445,15 +445,15 @@ class ChillMainExtension extends Extension implements
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Language/index.html.twig',
+                            'template' => '@ChillMain/Language/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Language/new.html.twig',
+                            'template' => '@ChillMain/Language/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillMain/Admin/Language/edit.html.twig',
+                            'template' => '@ChillMain/Language/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig
deleted file mode 100644
index d34d6968f..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/edit.html.twig
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-
-    {% block crud_content_form_rows %}
-      
-        {{ form_row(form.locationType) }}
-
-        <div class="location-form-address">
-        {{ form_row(form.address) }}
-        </div>
-
-        {{ form_row(form.name) }}
-
-        <div class="location-form-contact">
-        {{ form_row(form.phonenumber1) }}
-        {{ form_row(form.phonenumber2) }}
-        {{ form_row(form.email) }}
-        </div>
-
-    {% endblock crud_content_form_rows %}
-
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_input_address') }}
-    {{ encore_entry_script_tags('page_location') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_input_address') }}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig
deleted file mode 100644
index ba25a05e0..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/new.html.twig
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-
-    {% block crud_content_form_rows %}
-      
-        {{ form_row(form.locationType) }}
-
-        <div class="location-form-address">
-        {{ form_row(form.address) }}
-        </div>
-
-        {{ form_row(form.name) }}
-
-        <div class="location-form-contact">
-        {{ form_row(form.phonenumber1) }}
-        {{ form_row(form.phonenumber2) }}
-        {{ form_row(form.email) }}
-        </div>
-
-    {% endblock crud_content_form_rows %}
-
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('mod_input_address') }}
-    {{ encore_entry_script_tags('page_location') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('mod_input_address') }}
-{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig
deleted file mode 100644
index ad0a38f73..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/edit.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{# {% as we are in the admin layout, we override the admin content with the CRUD content %} #}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {# we do not have "view" page. We empty the corresponding block #}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig
deleted file mode 100644
index 0781272a1..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/new.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Civility/edit.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Civility/edit.html.twig
index 1160220a3..4d55c480c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Civility/edit.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Civility/index.html.twig
similarity index 77%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Civility/index.html.twig
index 9d28d3339..60a9c0c63 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Civility/index.html.twig
@@ -1,14 +1,13 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>name</th>
-            <th>abbreviation</th>
-            <th>active</th>
-            <th>ordering</th>
+            <th>{{ 'name'|trans }}</th>
+            <th>{{ 'abbreviation'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
+            <th>{{ 'ordering'|trans }}</th>
             <th></th>
         {% endblock %}
         {% block table_entities_tbody %}
@@ -17,7 +16,13 @@
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.name|localize_translatable_string }}</td>
                     <td>{{ entity.abbreviation|localize_translatable_string }}</td>
-                    <td>{{ entity.active }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
                     <td>{{ entity.order }}</td>
                     <td>
                         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Civility/new.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Civility/new.html.twig
index 643de1ff4..7c204dddd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Civility/new.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Country/edit.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Country/edit.html.twig
index 1160220a3..4d55c480c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Country/edit.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Country/index.html.twig
similarity index 71%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Country/index.html.twig
index 67aa70fd1..3a52e9383 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Country/index.html.twig
@@ -1,11 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>name</th>
-            <th>countryCode</th>
+            <th>{{ 'name'|trans }}</th>
+            <th>{{ 'Country code'|trans }}</th>
             <th></th>
         {% endblock %}
         {% block table_entities_tbody %}
@@ -24,6 +24,13 @@
                 </tr>
             {% endfor %}
         {% endblock %}
-    {% endembed %}
-{% endblock content %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+
+    {% endembed %}
+{% endblock admin_content %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Country/new.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Country/new.html.twig
index 643de1ff4..7c204dddd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Country/new.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Language/edit.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Language/edit.html.twig
index 1160220a3..4d55c480c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Country/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Language/edit.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content -%}
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Language/index.html.twig
similarity index 96%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Language/index.html.twig
index 21d2afca9..bfc57c0d1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Language/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Language/index.html.twig
@@ -4,7 +4,7 @@
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>name</th>
+            <th>{{ 'Name'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Language/new.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Language/new.html.twig
index b16f2eeba..7c204dddd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Civility/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Language/new.html.twig
@@ -1,7 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig
new file mode 100644
index 000000000..ac6beb235
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/edit.html.twig
@@ -0,0 +1,39 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+
+            {{ form_row(form.locationType) }}
+
+            <div class="location-form-address">
+            {{ form_row(form.address) }}
+            </div>
+
+            {{ form_row(form.name) }}
+
+            <div class="location-form-contact">
+            {{ form_row(form.phonenumber1) }}
+            {{ form_row(form.phonenumber2) }}
+            {{ form_row(form.email) }}
+            </div>
+
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_input_address') }}
+    {{ encore_entry_script_tags('page_location') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_input_address') }}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
similarity index 57%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
index aa883c603..913a975cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Location/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/index.html.twig
@@ -1,20 +1,16 @@
-{% extends "@ChillMain/Admin/layout_location.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
-	<h1>{{ 'Location list'|trans }}</h1>
-
-	<table class="records_list table table-bordered border-dark">
-		<thead>
-			<tr>
-                <th>{{ 'Name'|trans }}</th>
-				<th>{{ 'Phonenumber1'|trans }}</th>
-				<th>{{ 'Phonenumber2'|trans }}</th>
-				<th>{{ 'Email'|trans }}</th>
-				<th>{{ 'Address'|trans }}</th>
-				<th>{{ 'Active'|trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
+	{% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+			<th>{{ 'Name'|trans }}</th>
+			<th>{{ 'Phonenumber1'|trans }}</th>
+			<th>{{ 'Phonenumber2'|trans }}</th>
+			<th>{{ 'Email'|trans }}</th>
+			<th>{{ 'Address'|trans }}</th>
+			<th>{{ 'Active'|trans }}</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
 			{% for entity in entities %}
 			    <tr>
                     <td>{{ entity.name }}</td>
@@ -44,17 +40,12 @@
 					</td>
 				</tr>
 			{% endfor %}
-		</tbody>
-	</table>
+        {% endblock %}
 
-    {{ chill_pagination(paginator) }}
-
-	<ul class="record_actions">
-		<li>
-			<a href="{{ path('chill_crud_main_location_new') }}" class="btn btn-create">
-				{{ 'Create a new location'|trans }}
-			</a>
-		</li>
-	</ul>
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
 {% endblock %}
-
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig
new file mode 100644
index 000000000..493ad6f71
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Location/new.html.twig
@@ -0,0 +1,39 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+
+            {{ form_row(form.locationType) }}
+
+            <div class="location-form-address">
+            {{ form_row(form.address) }}
+            </div>
+
+            {{ form_row(form.name) }}
+
+            <div class="location-form-contact">
+            {{ form_row(form.phonenumber1) }}
+            {{ form_row(form.phonenumber2) }}
+            {{ form_row(form.email) }}
+            </div>
+
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_input_address') }}
+    {{ encore_entry_script_tags('page_location') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_input_address') }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig
new file mode 100644
index 000000000..4d55c480c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
similarity index 60%
rename from src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig
rename to src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
index 22cb6de44..16b31dd77 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/LocationType/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/index.html.twig
@@ -1,21 +1,17 @@
-{% extends "@ChillMain/Admin/layout_location.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
-	<h1>{{ 'Location type list'|trans }}</h1>
-
-	<table class="records_list table table-bordered border-dark">
-		<thead>
-			<tr>
-                <th>{{ 'Title'|trans }}</th>
-				<th>{{ 'Available for users'|trans }}</th>
-				<th>{{ 'Editable by users'|trans }}</th>
-				<th>{{ 'Address required'|trans }}</th>
-				<th>{{ 'Contact data'|trans }}</th>
-				<th>{{ 'Active'|trans }}</th>
-				<th>{{ 'Default for'|trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
+	{% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+			<th>{{ 'Title'|trans }}</th>
+			<th>{{ 'Available for users'|trans }}</th>
+			<th>{{ 'Editable by users'|trans }}</th>
+			<th>{{ 'Address required'|trans }}</th>
+			<th>{{ 'Contact data'|trans }}</th>
+			<th>{{ 'Active'|trans }}</th>
+			<th>{{ 'Default for'|trans }}</th>
+        {% endblock %}
+        {% block table_entities_tbody %}
 			{% for entity in entities %}
 				<tr>
                     <td>{{ entity.title | localize_translatable_string }}</td>
@@ -52,14 +48,12 @@
 					</td>
 				</tr>
 			{% endfor %}
-		</tbody>
-	</table>
+     {% endblock %}
 
-	<ul class="record_actions">
-		<li>
-			<a href="{{ path('chill_crud_main_location_type_new') }}" class="btn btn-create">
-				{{ 'Create a new location type'|trans }}
-			</a>
-		</li>
-	</ul>
-{% endblock %}
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig
new file mode 100644
index 000000000..7c204dddd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/LocationType/new.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index b21f83846..cfbc2a78d 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -62,7 +62,7 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
 
         $menu->addChild('Languages and countries')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 200, 'header' => 'true']);
+            ->setExtras(['order' => 200, 'header' => true]);
 
         $menu->addChild('Language list', [
             'route' => 'chill_crud_main_language_index',
@@ -76,7 +76,7 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
 
         $menu->addChild('Location and location type')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 300, 'header' => 'true']);
+            ->setExtras(['order' => 300, 'header' => true]);
 
         $menu->addChild('Location type list', [
             'route' => 'chill_crud_main_location_type_index',
diff --git a/src/Bundle/ChillMainBundle/translations/admin.fr.yml b/src/Bundle/ChillMainBundle/translations/admin.fr.yml
deleted file mode 100644
index c2d522a12..000000000
--- a/src/Bundle/ChillMainBundle/translations/admin.fr.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-welcome_message_raw: |
-    <p>Dans l'interface d'administration, vous pouvez configurer votre instance selon vos besoins.</p>
-
-
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e679db535..cd76aed98 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -120,7 +120,7 @@ Main admin menu: Menu d'administration principal
 Actions: Actions
 Users and permissions: Utilisateurs et permissions
 Location and location type: Localisations et types de localisation
-Back to the admin: Retour
+Back to the admin: Menu d'administration
 
 #permissions
 Permissions Menu: Gestion des droits
@@ -224,6 +224,8 @@ none: aucun
 person: usager
 thirdparty: tiers
 
+#admin section for civility
+abbreviation: abbréviation
 
 #admin section for language and country
 Language and countries menu: Menu Langues & Pays
@@ -232,6 +234,7 @@ Management of languages and countries: Gestion des langues & pays
 Configure languages and countries: Configuration des langues & pays
 Language list: Liste des langues
 Country list: Liste des pays
+Country code: Code du pays
 
 # circles / scopes
 Choose the circle: Choisir le cercle
@@ -349,9 +352,15 @@ crud:
     title_new: Nouveau métier
     title_edit: Modifier un métier
   main_location_type:
+    index:
+      title: Liste des types de localisations
+      add_new: Ajouter un type de localisation
     title_new: Nouveau type de localisation
     title_edit: Modifier un type de localisation
   main_location:
+    index:
+      title: Liste des localisations
+      add_new: Ajouter une localisation
     title_new: Nouvelle localisation
     title_edit: Modifier une localisation
   main_language:

From ba495def7e3d7f9d0666259b8f1c1586c6a13ba0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 09:47:17 +0200
Subject: [PATCH 060/111] admin: refactor templates and delete some show pages
 for Center, Scope, User, UserJob, PermissionsGroup

---
 .../Controller/CenterController.php           |  2 +-
 .../Controller/ScopeController.php            |  2 +-
 .../ChillMainExtension.php                    |  2 +
 .../Resources/views/Center/edit.html.twig     | 16 ++--
 .../Resources/views/Center/index.html.twig    | 28 ++++---
 .../Resources/views/Center/new.html.twig      | 16 ++--
 .../Resources/views/Center/show.html.twig     | 29 -------
 .../views/PermissionsGroup/edit.html.twig     | 76 +++++++++----------
 .../views/PermissionsGroup/index.html.twig    | 27 ++++---
 .../views/PermissionsGroup/new.html.twig      | 16 ++--
 .../views/PermissionsGroup/show.html.twig     | 23 +++---
 .../Resources/views/Scope/edit.html.twig      | 20 ++---
 .../Resources/views/Scope/index.html.twig     | 28 ++++---
 .../Resources/views/Scope/new.html.twig       | 18 ++---
 .../Resources/views/Scope/show.html.twig      | 29 -------
 .../Resources/views/User/edit.html.twig       |  2 +-
 .../views/User/edit_password.html.twig        |  2 +-
 .../Resources/views/User/index.html.twig      |  7 +-
 .../Resources/views/User/new.html.twig        |  4 +-
 .../Resources/views/User/show.html.twig       | 10 +--
 .../Resources/views/UserJob/edit.html.twig    | 11 +++
 .../Resources/views/UserJob/index.html.twig   | 22 +++++-
 .../Resources/views/UserJob/new.html.twig     | 11 +++
 .../MenuBuilder/AdminSectionMenuBuilder.php   |  5 --
 .../ChillMainBundle/config/routes/center.yaml |  4 -
 .../ChillMainBundle/config/routes/scope.yaml  |  4 -
 .../translations/messages.fr.yml              | 21 +++--
 27 files changed, 207 insertions(+), 228 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig

diff --git a/src/Bundle/ChillMainBundle/Controller/CenterController.php b/src/Bundle/ChillMainBundle/Controller/CenterController.php
index 729f2b243..005fa4a01 100644
--- a/src/Bundle/ChillMainBundle/Controller/CenterController.php
+++ b/src/Bundle/ChillMainBundle/Controller/CenterController.php
@@ -36,7 +36,7 @@ class CenterController extends AbstractController
             $em->persist($center);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_center_show', ['id' => $center->getId()]));
+            return $this->redirect($this->generateUrl('admin_center'));
         }
 
         return $this->render('@ChillMain/Center/new.html.twig', [
diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
index 74ebc73a7..5dc85d201 100644
--- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php
@@ -36,7 +36,7 @@ class ScopeController extends AbstractController
             $em->persist($scope);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('admin_scope_show', ['id' => $scope->getId()]));
+            return $this->redirect($this->generateUrl('admin_scope'));
         }
 
         return $this->render('@ChillMain/Scope/new.html.twig', [
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 0c974b637..a62ca88f3 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -319,9 +319,11 @@ class ChillMainExtension extends Extension implements
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/UserJob/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/UserJob/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
index d2018e2d3..30bea2d6e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Center edit'|trans }}{% endblock %}
 
@@ -10,11 +10,11 @@
     {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_center') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
index 5ebd271b5..d6d4bb4cd 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Center list'|trans }}{% endblock %}
 
@@ -15,27 +15,25 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td><a href="{{ path('admin_center_show', { 'id': entity.id }) }}">{{ entity.name }}</a></td>
+                <td>{{ entity.name }}</td>
                 <td>
-                <ul>
-                    <li>
-                        <a href="{{ path('admin_center_show', { 'id': entity.id }) }}">{{ 'show'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
-                    </li>
-                </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
+                        </li>
+                    </ul>
                 </td>
             </tr>
         {% endfor %}
         </tbody>
     </table>
 
-        <ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
-            <a href="{{ path('admin_center_new') }}">
-                {{ 'Create a new center'|trans }}
-            </a>
+            <a href="{{ path('admin_center_new') }}" class="btn btn-create">{{ 'Create a new center'|trans }}</a>
         </li>
     </ul>
-    {% endblock %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
index b100d0b8b..ef614722b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Center/new.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Center creation'|trans }}{% endblock %}
 
@@ -10,11 +10,11 @@
     {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_center') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_center') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig
deleted file mode 100644
index b471fa2d1..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Center/show.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
-
-{% block title %}{{ 'Centre %name%'|trans({ '%name%': entity.name }) }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Centre %name%'|trans({ '%name%': entity.name }) }}</h1>
-
-    <table class="record_properties">
-        <tbody>
-            <tr>
-                <th>{{ 'Name'|trans }}</th>
-                <td>{{ entity.name }}</td>
-            </tr>
-        </tbody>
-    </table>
-
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_center') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('admin_center_edit', { 'id': entity.id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
-    </li>
-</ul>
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
index 9054176d7..f61c8f2c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
@@ -1,12 +1,12 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}{% endblock %}
 
 {% block admin_content -%}
     <h1>{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}</h1>
-    
+
     <h2>{{ 'Details'|trans }}</h2>
-    
+
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
     {% if edit_form.flags is defined %}
@@ -14,28 +14,28 @@
     {% endif %}
     {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
-    
+
     <h2>{{ 'Grant those permissions'|trans }} :</h2>
-    
+
     {%- if entity.getRoleScopes|length > 0 -%}
     {% for title, role_scopes in role_scopes_sorted %}
-    
+
     <h3>{{ title|default("Unclassified")|trans }}</h3>
-    
+
     <table class="striped rounded">
         <thead>
             <tr>
                 <th>{{ 'Role'|trans }}</th>
                 <th>{{ 'Circle'|trans }}</th>
                 <th>{{ 'Actions'|trans }}</th>
-            </tr>            
+            </tr>
         </thead>
         <tbody>
-    
+
     {% for role_scope in role_scopes %}
         <tr>
             <td>
-                <span class="role_scope role">{{ role_scope.role|trans }}</span> 
+                <span class="role_scope role">{{ role_scope.role|trans }}</span>
                 {% if expanded_roles[role_scope.role]|length > 1 %}
                         <br/>
                         <small>{{ 'Which implies'|trans }}&nbsp;: {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %}</small>
@@ -56,40 +56,40 @@
                 {{ form_end(delete_role_scopes_form[role_scope.id]) }}
             </td>
         </tr>
-        
+
     {% endfor %}
         </tbody>
     </table>
     {% endfor %}
-    
+
     {%- else -%}
         <p>{{ 'This group does not provide any permission'|trans }}</p>
     {%- endif -%}
-    
-    <h2>{{ 'Grant new permissions'|trans }}</h2>
-    
-    {{ form_start(add_role_scopes_form) }}
-    {{ form_errors(add_role_scopes_form) }}
-    {{ form_row(add_role_scopes_form.composed_role_scope.role) }}
-    {{ form_row(add_role_scopes_form.composed_role_scope.scope) }}
-    
-    <ul class="record_actions">
-        <li>
-            {{ form_row(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
-        </li>
-        <li>
-            <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-see">{{ 'Cancel'|trans }}</a>
-        </li>
-        <li>
-            <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
-                {{ 'Back to the list'|trans }}
-            </a>
-        </li>
-    </ul>
-    
-    
-    {{ form_end(add_role_scopes_form) }}
 
-    
-        
+    <div class="mt-5">
+        <h2>{{ 'Grant new permissions'|trans }}</h2>
+
+        {{ form_start(add_role_scopes_form) }}
+        {{ form_errors(add_role_scopes_form) }}
+        {{ form_row(add_role_scopes_form.composed_role_scope.role) }}
+        {{ form_row(add_role_scopes_form.composed_role_scope.scope) }}
+
+        <ul class="record_actions">
+            <li>
+                {{ form_row(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
+            </li>
+            <li>
+                <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-cancel">{{ 'Cancel'|trans }}</a>
+            </li>
+            <li>
+                <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
+                    {{ 'Back to the list'|trans }}
+                </a>
+            </li>
+        </ul>
+
+        {{ form_end(add_role_scopes_form) }}
+    </div>
+
+
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
index cc3cabc48..1b35e9799 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Permissions group list'|trans }}{% endblock %}
 
@@ -15,27 +15,30 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td><a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}">{{ entity.name }}</a></td>
+                <td>{{ entity.name }}</td>
                 <td>
-                <ul class="record_actions">
-                    <li>
-                        <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-see">{{ 'See'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
-                    </li>
-                </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('admin_permissionsgroup_show', { 'id': entity.id }) }}" class="btn btn-show">{{ 'Show'|trans }}</a>
+                        </li>
+                        <li>
+                            <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
+                        </li>
+                    </ul>
                 </td>
             </tr>
         {% endfor %}
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
             <a href="{{ path('admin_permissionsgroup_new') }}" class="btn btn-create">
                 {{ 'Create a new permissions group'| trans }}
             </a>
         </li>
     </ul>
-    {% endblock %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
index 76474f220..921db8e6d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/new.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'New permission group'|trans }}{% endblock %}
 
@@ -13,11 +13,11 @@
     {{ form_row(form.submit, { 'attr': { 'class': 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_permissionsgroup') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_permissionsgroup') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
index b94b5204d..fbbe6245b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}{% endblock %}
 
@@ -13,9 +13,9 @@
             </tr>
         </tbody>
     </table>
-    {% if role_scopes_sorted|length > 0 %}        
+    {% if role_scopes_sorted|length > 0 %}
     <h2>{{ 'Grant those permissions'|trans }}&nbsp;:</h2>
-    
+
     {% for title, role_scopes in role_scopes_sorted %}
     <h3>{{ title|default('Unclassified')|trans }}</h3>
     <table class="striped rounded">
@@ -23,14 +23,14 @@
             <tr>
                 <th>{{ 'Role'|trans }}</th>
                 <th>{{ 'Circle'|trans }}</th>
-            </tr>            
+            </tr>
         </thead>
         <tbody>
-            
+
             {% for role_scope in role_scopes %}
             <tr>
                 <td>
-                    {{ role_scope.role|trans }} 
+                    {{ role_scope.role|trans }}
                     {% if expanded_roles[role_scope.role]|length > 1 %}
                         <br/>
                         <small>{{ 'Which implies'|trans }}&nbsp;: {% for role in expanded_roles[role_scope.role] %}{{ role|trans }}{% if not loop.last %}, {% endif %}{% endfor %}</small>
@@ -47,16 +47,17 @@
         </tbody>
     </table>
     {% endfor %}
-        
+
     {% else %}
-        
-        <p>{{ 'This group does not provide any permission'|trans }}. 
+        <p>{{ 'This group does not provide any permission'|trans }}.
             <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}">
-                {{ 'add permissions'|trans|capitalize }}</a></p>
+                {{ 'add permissions'|trans|capitalize }}
+            </a>
+        </p>
     {% endif %}
 
     <ul class="record_actions">
-        
+
         <li>
             <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">
                {{ 'Edit'|trans }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
index 2f1098761..6330f2b26 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/edit.html.twig
@@ -1,20 +1,20 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Circle edit'|trans }}{% endblock %}
 
-{% block admin_content -%}
+{% block admin_content %}
     <h1>{{ 'Circle edit'|trans }}</h1>
-    
+
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
     {{ form_row(edit_form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(edit_form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_scope') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_scope') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
index 5167b9d07..444ba2cc5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'List circles'|trans }}{% endblock %}
 
@@ -15,27 +15,25 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td><a href="{{ path('admin_scope_show', { 'id': entity.id }) }}">{{ entity.name|localize_translatable_string }}</a></td>
+                <td>{{ entity.name|localize_translatable_string }}</td>
                 <td>
-                <ul>
-                    <li>
-                        <a href="{{ path('admin_scope_show', { 'id': entity.id }) }}">{{ 'show'|trans }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
-                    </li>
-                </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans }}</a>
+                        </li>
+                    </ul>
                 </td>
             </tr>
         {% endfor %}
         </tbody>
     </table>
 
-        <ul>
+     <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
-            <a href="{{ path('admin_scope_new') }}">
-                {{ 'Create a new circle'|trans }}
-            </a>
+            <a href="{{ path('admin_scope_new') }}" class="btn btn-create">{{ 'Create a new circle'|trans }}</a>
         </li>
     </ul>
-    {% endblock %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
index 0807e6088..56eb110d0 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Scope/new.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Circle creation'|trans }}{% endblock %}
 
-{% block admin_content -%}
+{% block admin_content %}
     <h1>{{ 'Circle creation'|trans }}</h1>
 
     {{ form_start(form) }}
@@ -10,11 +10,11 @@
     {{ form_row(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } } ) }}
     {{ form_end(form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_scope') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('admin_scope') }}" class="btn btn-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig
deleted file mode 100644
index 57c573368..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Scope/show.html.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
-
-{% block title %}{{ 'Circle'|trans }}{% endblock %}
-
-{% block admin_content -%}
-    <h1>{{ 'Circle'|trans }}</h1>
-
-    <table class="record_properties">
-        <tbody>
-            <tr>
-                <th>{{ 'Name'|trans }}</th>
-                <td>{{ entity.name|localize_translatable_string }}</td>
-            </tr>
-        </tbody>
-    </table>
-
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_scope') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('admin_scope_edit', { 'id': entity.id }) }}">
-            {{ 'Edit'| trans }}
-        </a>
-    </li>
-</ul>
-{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
index 0ea1d529c..0fa376b34 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content -%}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
index c26f6cf24..c1972c211 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit_password.html.twig
@@ -1,4 +1,4 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Edit password for %username%'|trans( { '%username%': entity.username } ) }}{% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 83a82f140..46fb7aa29 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
-{% block admin_content -%}
+{% block admin_content %}
 
     <h1>{{"Users"|trans}}</h1>
     {% for entity in entities %}
@@ -60,6 +60,9 @@
     {{ chill_pagination(paginator) }}
 
     <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
             <a href="{{ path('chill_crud_admin_user_new') }}" class="btn btn-create">{{ 'Create'|trans }}</a>
         </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
index f0757b25d..bba2a8583 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/new.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillMain/Admin/Permission/layout_crud_permission_index.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
-{% block admin_content -%}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig
index ebf390dea..e03392e10 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/show.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'User %username%'|trans({ '%username%': entity.username }) }}{% endblock %}
 
-{% block admin_content -%}
+{% block admin_content %}
     <h1>{{ 'User %username%'|trans({ '%username%': entity.username }) }}</h1>
 
     <table class="record_properties">
@@ -23,9 +23,9 @@
             </tr>
         </tbody>
     </table>
-                
+
     <h2>{{ 'Permissions granted'|trans }}</h2>
-    
+
     {% if entity.groupcenters|length > 0 %}
     <table>
             <thead>
@@ -52,7 +52,7 @@
         {% endfor %}
         </tbody>
     </table>
-    
+
     {% else %}
         <p>{{ 'Any permissions granted to this user'|trans }}.
             <a href="{{ path('admin_user_edit', { 'id': entity.id }) }}">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
new file mode 100644
index 000000000..4d55c480c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
index 8f037f150..3d56265dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -1,10 +1,11 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>id</th>
-            <th>label</th>
+            <th>{{ 'label'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
         {% block table_entities_tbody %}
@@ -12,6 +13,13 @@
                 <tr>
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
                     <td>
                         <ul class="record_actions">
                             <li>
@@ -20,7 +28,13 @@
                         </ul>
                     </td>
                 </tr>
-            {% endfor %}
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
         {% endblock %}
     {% endembed %}
-{% endblock content %}
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig
new file mode 100644
index 000000000..7c204dddd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/new.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index cfbc2a78d..2225fdd0e 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -58,8 +58,6 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_admin_user_job_index',
         ])->setExtras(['order' => 150]);
 
-
-
         $menu->addChild('Languages and countries')
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 200, 'header' => true]);
@@ -72,8 +70,6 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_main_country_index',
         ])->setExtras(['order' => 220]);
 
-
-
         $menu->addChild('Location and location type')
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 300, 'header' => true]);
@@ -85,7 +81,6 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild('Location list', [
             'route' => 'chill_crud_main_location_index',
         ])->setExtras(['order' => 320]);
-
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillMainBundle/config/routes/center.yaml b/src/Bundle/ChillMainBundle/config/routes/center.yaml
index 9dc322bc1..c0bef7695 100644
--- a/src/Bundle/ChillMainBundle/config/routes/center.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes/center.yaml
@@ -2,10 +2,6 @@ admin_center:
     path:     /
     controller: Chill\MainBundle\Controller\CenterController::indexAction
 
-admin_center_show:
-    path:     /{id}/show
-    controller: Chill\MainBundle\Controller\CenterController::showAction
-
 admin_center_new:
     path:     /new
     controller: Chill\MainBundle\Controller\CenterController::newAction
diff --git a/src/Bundle/ChillMainBundle/config/routes/scope.yaml b/src/Bundle/ChillMainBundle/config/routes/scope.yaml
index c7ea32718..167aa401c 100644
--- a/src/Bundle/ChillMainBundle/config/routes/scope.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes/scope.yaml
@@ -2,10 +2,6 @@ admin_scope:
     path:     /
     controller: Chill\MainBundle\Controller\ScopeController::indexAction
 
-admin_scope_show:
-    path:     /{id}/show
-    controller: Chill\MainBundle\Controller\ScopeController::showAction
-
 admin_scope_new:
     path:     /new
     controller: Chill\MainBundle\Controller\ScopeController::newAction
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index cd76aed98..b16e1433b 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -121,6 +121,9 @@ Actions: Actions
 Users and permissions: Utilisateurs et permissions
 Location and location type: Localisations et types de localisation
 Back to the admin: Menu d'administration
+"Administration interface": Interface d'administration
+Welcome to the admin section !: >
+  Bienvenue dans l'interface d'administration !
 
 #permissions
 Permissions Menu: Gestion des droits
@@ -130,11 +133,6 @@ Permissions management of your chill installation: Gestion des permissions de vo
 Location Menu: Localisations et types de localisation
 Management of location: Gestion des localisations et types de localisation
 
-#admin section
-"Administration interface": Interface d'administration
-Welcome to the admin section !: >
-  Bienvenue dans l'interface d'administration !
-
 #admin section for center's administration
 Create a new center: Créer un nouveau centre
 Center list: Liste des centres
@@ -150,7 +148,7 @@ Permission group "%name%": Groupe de permissions "%name%"
 Grant those permissions: Attribue ces permissions
 Which implies: Ce qui implique
 Permission group: Groupe de permissions
-Permissionsgroup: Group de permissions
+Permissionsgroup: Groupe de permissions
 New permission group: Nouveau groupe de permissions
 PermissionsGroup "%name%" edit: Modification du groupe de permission '%name%'
 Role: Rôle
@@ -159,6 +157,7 @@ Add permission: Ajouter les permissions
 This group does not provide any permission: Ce groupe n'attribue aucune permission
 The role '%role%' has been removed: Le rôle "%role%" a été enlevé de ce groupe de permission
 The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le cercle "%scope%" a été enlevé de ce groupe de permission
+Unclassified: Non classifié
 
 #admin section for users
 User edit: Modification d'un utilisateur
@@ -182,6 +181,14 @@ Change password: Changer le mot de passe
 Back to the user edition: Retour au formulaire d'édition
 Password successfully updated!: Mot de passe mis à jour
 Flags: Drapeaux
+Main location: Localisation principale
+Main scope: Cercle
+Main center: Centre
+user job: Métier de l'utilisateur
+Choose a main center: Choisir un centre
+Choose a main scope: Choisir un cercle
+choose a job: Choisir un métier
+choose a location: Choisir une localisation
 
 # admin section for users jobs
 User jobs: Métiers
@@ -345,6 +352,8 @@ crud:
     index:
       title: Utilisateurs
       add_new: Créer
+    title_edit: Modifier un utilisateur
+    title_new: Créer un utilisateur
   admin_user_job:
     index:
       title: Métiers

From 47f47ac01775daedda2e9127393e3d867e48e5c1 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 10:11:12 +0200
Subject: [PATCH 061/111] admin: delete obsolet country controller

---
 .../Controller/AdminCountryCRUDController.php  | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php b/src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php
deleted file mode 100644
index a0447a1c7..000000000
--- a/src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-class AdminCountryCRUDController extends CRUDController
-{
-}

From 10aa727fb33f72d047df5b5bd047d5ee2984107a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 10:39:20 +0200
Subject: [PATCH 062/111] admin: reorganise person admin menu + fix marital
 status admin

---
 .../MenuBuilder/AdminSectionMenuBuilder.php   | 24 +++++++++----------
 .../Controller/AdminController.php            | 10 --------
 .../Menu/AdminMenuBuilder.php                 | 13 +++++-----
 .../views/MaritalStatus/edit.html.twig        |  5 ++--
 .../views/MaritalStatus/index.html.twig       | 10 ++++++--
 .../views/MaritalStatus/new.html.twig         |  5 ++--
 .../ChillPersonBundle/config/routes.yaml      |  4 ----
 7 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
index 2225fdd0e..6347794a8 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
@@ -36,51 +36,51 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
 
         $menu->addChild('Users and permissions')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 100, 'header' => true]);
+            ->setExtras(['order' => 1000, 'header' => true]);
 
         $menu->addChild('Center list', [
             'route' => 'admin_center',
-        ])->setExtras(['order' => 110]);
+        ])->setExtras(['order' => 1010]);
 
         $menu->addChild('List circles', [
             'route' => 'admin_scope',
-        ])->setExtras(['order' => 120]);
+        ])->setExtras(['order' => 1020]);
 
         $menu->addChild('Permissions group list', [
             'route' => 'admin_permissionsgroup',
-        ])->setExtras(['order' => 130]);
+        ])->setExtras(['order' => 1030]);
 
         $menu->addChild('crud.admin_user.index.title', [
             'route' => 'chill_crud_admin_user_index',
-        ])->setExtras(['order' => 140]);
+        ])->setExtras(['order' => 1040]);
 
         $menu->addChild('User jobs', [
             'route' => 'chill_crud_admin_user_job_index',
-        ])->setExtras(['order' => 150]);
+        ])->setExtras(['order' => 1050]);
 
         $menu->addChild('Languages and countries')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 200, 'header' => true]);
+            ->setExtras(['order' => 1200, 'header' => true]);
 
         $menu->addChild('Language list', [
             'route' => 'chill_crud_main_language_index',
-        ])->setExtras(['order' => 210]);
+        ])->setExtras(['order' => 1210]);
 
         $menu->addChild('Country list', [
             'route' => 'chill_crud_main_country_index',
-        ])->setExtras(['order' => 220]);
+        ])->setExtras(['order' => 1220]);
 
         $menu->addChild('Location and location type')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 300, 'header' => true]);
+            ->setExtras(['order' => 1300, 'header' => true]);
 
         $menu->addChild('Location type list', [
             'route' => 'chill_crud_main_location_type_index',
-        ])->setExtras(['order' => 310]);
+        ])->setExtras(['order' => 1310]);
 
         $menu->addChild('Location list', [
             'route' => 'chill_crud_main_location_index',
-        ])->setExtras(['order' => 320]);
+        ])->setExtras(['order' => 1320]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index 9d16bdc13..813f36983 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -18,16 +18,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
  */
 class AdminController extends AbstractController
 {
-    /**
-     * @param $_locale
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function indexAction($_locale)
-    {
-        return $this->render('ChillPersonBundle:Admin:layout.html.twig', []);
-    }
-
     /**
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
index 25996f7bf..6004bb1cb 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
@@ -33,12 +33,13 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Person', [
-            'route' => 'chill_person_admin',
-        ])
-            ->setExtras([
-                'order' => 20,
-            ]);
+        $menu->addChild('Person')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 2000, 'header' => true]);
+
+        $menu->addChild('Marital status', [
+            'route' => 'chill_crud_person_marital-status_index',
+        ])->setExtras(['order' => 2010]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig
index e61f3f7c0..28678bf6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig
@@ -4,9 +4,8 @@
     {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-        {% block content_form_actions_view %}{% endblock %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock %}
\ No newline at end of file
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
index ce8202fb2..a7aca2235 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -21,7 +21,13 @@
                         </ul>
                     </td>
                 </tr>
-            {% endfor %}
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
         {% endblock %}
     {% endembed %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig
index 52a1d140b..3a28dd85f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig
@@ -4,8 +4,9 @@
     {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
-{% endblock %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index bec2af134..5d17d6ffe 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -96,10 +96,6 @@ chill_person_timeline:
     path: /{_locale}/person/{person_id}/timeline
     controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
 
-chill_person_admin:
-    path: "/{_locale}/admin/person"
-    controller: Chill\PersonBundle\Controller\AdminController::indexAction
-
 chill_person_duplicate_view:
     path: /{_locale}/person/{person_id}/duplicate/view
     controller: Chill\PersonBundle\Controller\PersonDuplicateController::viewAction

From 5daf09334baf75cd5b62cba171ad2132fbb12816 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 12:07:45 +0200
Subject: [PATCH 063/111] admin: admin section for social work related
 entities: SocialIssue, SocialAction, Goal, Result, Evaluation

---
 .../SocialWork/AdminEvaluationController.php  | 22 ------------
 .../SocialWork/AdminGoalController.php        | 22 ------------
 .../SocialWork/AdminResultController.php      | 22 ------------
 .../AdminSocialActionController.php           | 22 ------------
 .../SocialWork/AdminSocialIssueController.php | 22 ------------
 .../SocialWork/EvaluationController.php       | 26 ++++++++++++++
 .../Controller/SocialWork/GoalController.php  | 26 ++++++++++++++
 .../SocialWork/ResultController.php           | 26 ++++++++++++++
 .../SocialWork/SocialActionController.php     | 26 ++++++++++++++
 .../SocialWork/SocialIssueController.php      | 26 ++++++++++++++
 .../ChillPersonExtension.php                  | 10 +++---
 .../Entity/SocialWork/Evaluation.php          |  4 +--
 .../Entity/SocialWork/Result.php              |  2 +-
 .../Form/SocialWork/EvaluationType.php        | 12 +++++--
 .../Form/SocialWork/GoalType.php              |  8 ++---
 .../Form/SocialWork/ResultType.php            | 11 +++---
 .../Form/SocialWork/SocialActionType.php      | 15 ++++----
 .../Form/SocialWork/SocialIssueType.php       |  8 ++---
 .../Menu/AdminMenuBuilder.php                 | 30 +++++++++++++++-
 .../SocialWork/Evaluation/index.html.twig     | 36 +++++++++++--------
 .../views/SocialWork/Goal/index.html.twig     | 12 +++++--
 .../views/SocialWork/Result/index.html.twig   | 12 +++++--
 .../SocialWork/SocialAction/index.html.twig   | 12 +++++--
 .../SocialWork/SocialIssue/index.html.twig    | 12 +++++--
 .../Resources/views/SocialWork/edit.html.twig | 15 ++++----
 .../Resources/views/SocialWork/new.html.twig  | 16 +++++----
 .../translations/messages.fr.yml              | 27 +++++++++++---
 27 files changed, 290 insertions(+), 192 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php
 delete mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php
 delete mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php
 delete mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php
 delete mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php

diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php
deleted file mode 100644
index 8105066e9..000000000
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminEvaluationController extends CRUDController
-{
-}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php
deleted file mode 100644
index 149d3c372..000000000
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminGoalController extends CRUDController
-{
-}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php
deleted file mode 100644
index 98ea9592a..000000000
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminResultController extends CRUDController
-{
-}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php
deleted file mode 100644
index c254f8178..000000000
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminSocialActionController extends CRUDController
-{
-}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php
deleted file mode 100644
index f783ab182..000000000
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminSocialIssueController extends CRUDController
-{
-}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php
new file mode 100644
index 000000000..2cf672c35
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class EvaluationController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php
new file mode 100644
index 000000000..38bd13267
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class GoalController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php
new file mode 100644
index 000000000..f2d9a1d4d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class ResultController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
new file mode 100644
index 000000000..ccb657da7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class SocialActionController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
new file mode 100644
index 000000000..5531d1e4b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class SocialIssueController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 8fc17bf2a..8dad7e6ff 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -190,7 +190,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_issue',
                     'base_path' => '/admin/social-work/social-issue',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialIssueType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialIssueController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\SocialIssueController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -211,7 +211,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_action',
                     'base_path' => '/admin/social-work/social-action',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialActionType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialActionController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\SocialActionController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -232,7 +232,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_goal',
                     'base_path' => '/admin/social-work/goal',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\GoalType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminGoalController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\GoalController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -253,7 +253,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_result',
                     'base_path' => '/admin/social-work/result',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\ResultType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminResultController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\ResultController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -274,7 +274,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_evaluation',
                     'base_path' => '/admin/social-work/evaluation',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\EvaluationType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminEvaluationController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\EvaluationController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
index 9349c335e..e9c7496ff 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
@@ -121,14 +121,14 @@ class Evaluation
         return $this;
     }
 
-    public function setDelay(DateInterval $delay): self
+    public function setDelay(?DateInterval $delay): self
     {
         $this->delay = $delay;
 
         return $this;
     }
 
-    public function setNotificationDelay(DateInterval $notificationDelay): self
+    public function setNotificationDelay(?DateInterval $notificationDelay): self
     {
         $this->notificationDelay = $notificationDelay;
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
index b4a9b6aa2..e147ec9d8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
@@ -45,7 +45,7 @@ class Result
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private DateTime $desactivationDate;
+    private ?DateTime $desactivationDate;
 
     /**
      * @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
index 0c6bb0d32..bbe82b59f 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\DateIntervalType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
@@ -39,9 +40,14 @@ class EvaluationType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
-            ->add('delay')
-
-            ->add('notificationDelay');
+            ->add('delay', DateIntervalType::class, [
+                'label' => 'evaluation.delay',
+                'required' => false,
+            ])
+            ->add('notificationDelay', DateIntervalType::class, [
+                'label' => 'evaluation.notificationDelay',
+                'required' => false,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index 4ea0a5e70..f1005d696 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -11,13 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -52,11 +52,9 @@ class GoalType extends AbstractType
                 },
             ])
 
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+            ->add('desactivationDate', ChillDateType::class, [
                 'required' => false,
+                'label' => 'goal.desactivationDate',
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
index a0219aaf3..b8a130950 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php
@@ -11,11 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Result;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -40,13 +40,10 @@ class ResultType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
-            ->add('accompanyingPeriodWorks')
-            ->add('accompanyingPeriodWorkGoals')
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+
+            ->add('desactivationDate', ChillDateType::class, [
                 'required' => false,
+                'label' => 'goal.desactivationDate',
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
index 1f1ae0810..c476a899f 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
@@ -11,13 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\DateIntervalType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -44,6 +45,7 @@ class SocialActionType extends AbstractType
             ])
             ->add('issue', EntityType::class, [
                 'class' => SocialIssue::class,
+                'label' => 'socialAction.socialIssue',
                 'choice_label' => function (SocialIssue $issue) {
                     return $this->translatableStringHelper->localize($issue->getTitle());
                 },
@@ -55,12 +57,13 @@ class SocialActionType extends AbstractType
                     return $this->translatableStringHelper->localize($issue->getTitle());
                 },
             ])
-            ->add('defaultNotificationDelay')
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+            ->add('defaultNotificationDelay', DateIntervalType::class, [
+                'label' => 'socialAction.defaultNotificationDelay',
                 'required' => false,
+            ])
+            ->add('desactivationDate', ChillDateType::class, [
+                'required' => false,
+                'label' => 'goal.desactivationDate',
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
index 0058b1e51..5cbe4a0c2 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
@@ -11,12 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -41,10 +41,8 @@ class SocialIssueType extends AbstractType
                 'required' => false,
                 'choice_label' => fn (SocialIssue $issue): ?string => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+            ->add('desactivationDate', ChillDateType::class, [
+                'label' => 'goal.desactivationDate',
                 'required' => false,
             ]);
     }
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
index 6004bb1cb..9aa1ae749 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
@@ -37,9 +37,37 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 2000, 'header' => true]);
 
+        $menu->addChild('Civility', [
+            'route' => 'chill_crud_main_civility_index',
+        ])->setExtras(['order' => 2010]);
+
         $menu->addChild('Marital status', [
             'route' => 'chill_crud_person_marital-status_index',
-        ])->setExtras(['order' => 2010]);
+        ])->setExtras(['order' => 2020]);
+
+        $menu->addChild('person_admin.social_work')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 3000, 'header' => true]);
+
+        $menu->addChild('person_admin.social_action', [
+            'route' => 'chill_crud_social_action_index',
+        ])->setExtras(['order' => 3001]);
+
+        $menu->addChild('person_admin.social_issue', [
+            'route' => 'chill_crud_social_issue_index',
+        ])->setExtras(['order' => 3002]);
+
+        $menu->addChild('person_admin.social_goal', [
+            'route' => 'chill_crud_social_goal_index',
+        ])->setExtras(['order' => 3010]);
+
+        $menu->addChild('person_admin.social_evaluation', [
+            'route' => 'chill_crud_social_evaluation_index',
+        ])->setExtras(['order' => 3020]);
+
+        $menu->addChild('person_admin.social_result', [
+            'route' => 'chill_crud_social_result_index',
+        ])->setExtras(['order' => 3030]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig
index 186b2f3ec..0adc82788 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -9,19 +9,25 @@
         {% endblock %}
 
         {% block table_entities_tbody %}
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.id }}</td>
-                <td>{{ entity.title|localize_translatable_string }}</td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_evaluation_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.title|localize_translatable_string }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_social_evaluation_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
         {% endblock %}
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
index aa7c239ba..3bcff2b11 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -16,12 +16,18 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_goal_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_goal_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig
index f1081aebe..a815628ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -16,12 +16,18 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
index 4c1d5a59d..0497ee199 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -16,12 +16,18 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_action_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_action_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
index 44627852e..3a08ab850 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -16,12 +16,18 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_issue_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_issue_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/edit.html.twig
index 0ae8754fe..28678bf6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/edit.html.twig
@@ -1,12 +1,11 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/new.html.twig
index cc6021021..592ec2723 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/new.html.twig
@@ -1,11 +1,13 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
+
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 175505d88..4407671e7 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -387,23 +387,39 @@ crud:
     social_action:
         index:
             title: Liste des actions d'accompagnements
-            add_new: Ajouter une nouvelle action d'accompagnements
-        title_new: Nouvelle action d'accompagnements
-        title_edit: Modifier l'action d'accompagnements
+            add_new: Ajouter une nouvelle action d'accompagnement
+        title_new: Nouvelle action d'accompagnement
+        title_edit: Modifier l'action d'accompagnement
         title_link: Voir l'action d'accompagnement
+    social_evaluation:
+        index:
+            title: Liste des évaluations
+            add_new: Ajouter une nouvelle évaluation
+        title_new: Nouvelle évaluation
+        title_edit: Modifier l'évaluation
     social_goal:
         index:
             title: Liste des objectifs d'action d'accompagnements
-            add_new: Ajouter un nouvel objectif d'action d'accompagnements
+            add_new: Ajouter un nouvel objectif d'action d'accompagnement
         title_new: Nouvel objectif
         title_edit: Modifier l'objectif
     social_result:
         index:
             title: Liste des résultats d'action d'accompagnements
-            add_new: Ajouter un nouveau résultat d'action d'accompagnements
+            add_new: Ajouter un nouveau résultat d'action d'accompagnement
         title_new: Nouveau résultat
         title_edit: Modifier le résultat
 
+evaluation:
+    delay: Délai
+    notificationDelay: Délai de notification
+
+goal:
+   desactivationDate: Date de désactivation
+
+socialAction:
+    defaultNotificationDelay: Délai de notification par défaut
+    socialIssue: Problématique sociale
 
 # specific to closing motive
 closing_motive:
@@ -427,6 +443,7 @@ person_admin:
     social_goal: Buts
     social_result: Résultats
     social_evaluation: Évaluations
+    social_work: Accompagnement social
 
 # specific to accompanying period
 accompanying_period:

From 2fbdd169df9de567c414f63193efcd8d94b1e3ab Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 14:37:56 +0200
Subject: [PATCH 064/111] admin: add AccompanyingPeriod Origin and
 closingMotive

---
 ...roller.php => ClosingMotiveController.php} |  4 +-
 .../Controller/OriginController.php           | 26 ++++++++
 .../ChillPersonExtension.php                  | 27 +++++++-
 .../ChillPersonBundle/Form/OriginType.php     | 39 +++++++++++
 .../Menu/AdminMenuBuilder.php                 | 25 +++++--
 .../views/ClosingMotive/edit.html.twig        | 15 ++---
 .../views/ClosingMotive/index.html.twig       | 10 ++-
 .../views/ClosingMotive/new.html.twig         | 15 +++--
 .../Resources/views/Origin/edit.html.twig     | 11 ++++
 .../Resources/views/Origin/index.html.twig    | 35 ++++++++++
 .../Resources/views/Origin/new.html.twig      | 12 ++++
 .../ChillPersonBundle/config/routes.yaml      | 66 -------------------
 .../translations/messages.fr.yml              | 11 ++++
 13 files changed, 202 insertions(+), 94 deletions(-)
 rename src/Bundle/ChillPersonBundle/Controller/{AdminClosingMotiveController.php => ClosingMotiveController.php} (93%)
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/OriginController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Form/OriginType.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Origin/edit.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Origin/index.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Origin/new.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
similarity index 93%
rename from src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php
rename to src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
index 9eee2c4a0..cf1436b99 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
@@ -16,10 +16,10 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AdminClosingMotiveController
+ * Class ClosingMotiveController
  * Controller for closing motives.
  */
-class AdminClosingMotiveController extends CRUDController
+class ClosingMotiveController extends CRUDController
 {
     /**
      * @param \Chill\MainBundle\CRUD\Controller\string|string $action
diff --git a/src/Bundle/ChillPersonBundle/Controller/OriginController.php b/src/Bundle/ChillPersonBundle/Controller/OriginController.php
new file mode 100644
index 000000000..b7caae3be
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/OriginController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class OriginController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 8dad7e6ff..b29d79e8e 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -146,13 +146,13 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                 [
                     'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive::class,
                     'name' => 'closing_motive',
-                    'base_path' => '/admin/closing-motive',
+                    'base_path' => '/admin/person/closing-motive',
                     'form_class' => \Chill\PersonBundle\Form\ClosingMotiveType::class,
-                    'controller' => \Chill\PersonBundle\Controller\AdminClosingMotiveController::class,
+                    'controller' => \Chill\PersonBundle\Controller\ClosingMotiveController::class,
                     'actions' => [
                         'index' => [
-                            'template' => '@ChillPerson/ClosingMotive/index.html.twig',
                             'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/ClosingMotive/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
@@ -164,6 +164,27 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Origin::class,
+                    'name' => 'origin',
+                    'base_path' => '/admin/person/origin',
+                    'form_class' => \Chill\PersonBundle\Form\OriginType::class,
+                    'controller' => \Chill\PersonBundle\Controller\OriginController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Origin/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Origin/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Origin/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\MaritalStatus::class,
                     'name' => 'person_marital-status',
diff --git a/src/Bundle/ChillPersonBundle/Form/OriginType.php b/src/Bundle/ChillPersonBundle/Form/OriginType.php
new file mode 100644
index 000000000..a9897de25
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/OriginType.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class OriginType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class)
+            ->add('noActiveAfter', ChillDateType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'label' => 'origin.noActiveAfter'
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Origin::class);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
index 9aa1ae749..1e563df86 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
@@ -45,29 +45,42 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_person_marital-status_index',
         ])->setExtras(['order' => 2020]);
 
+
+        $menu->addChild('person_admin.accompanying_period')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 2100, 'header' => true]);
+
+        $menu->addChild('person_admin.closing motives', [
+            'route' => 'chill_crud_closing_motive_index',
+        ])->setExtras(['order' => 2110]);
+
+        $menu->addChild('person_admin.origin', [
+            'route' => 'chill_crud_origin_index',
+        ])->setExtras(['order' => 2110]);
+
         $menu->addChild('person_admin.social_work')
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 3000, 'header' => true]);
+            ->setExtras(['order' => 2200, 'header' => true]);
 
         $menu->addChild('person_admin.social_action', [
             'route' => 'chill_crud_social_action_index',
-        ])->setExtras(['order' => 3001]);
+        ])->setExtras(['order' => 2201]);
 
         $menu->addChild('person_admin.social_issue', [
             'route' => 'chill_crud_social_issue_index',
-        ])->setExtras(['order' => 3002]);
+        ])->setExtras(['order' => 2202]);
 
         $menu->addChild('person_admin.social_goal', [
             'route' => 'chill_crud_social_goal_index',
-        ])->setExtras(['order' => 3010]);
+        ])->setExtras(['order' => 2210]);
 
         $menu->addChild('person_admin.social_evaluation', [
             'route' => 'chill_crud_social_evaluation_index',
-        ])->setExtras(['order' => 3020]);
+        ])->setExtras(['order' => 2220]);
 
         $menu->addChild('person_admin.social_result', [
             'route' => 'chill_crud_social_result_index',
-        ])->setExtras(['order' => 3030]);
+        ])->setExtras(['order' => 2230]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/edit.html.twig
index d132847f2..28678bf6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/edit.html.twig
@@ -1,12 +1,11 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
\ No newline at end of file
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig
index bdddd6782..6d37a8732 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Ordering'|trans }}</th>
@@ -36,5 +36,11 @@
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/new.html.twig
index cc6021021..3a28dd85f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/new.html.twig
@@ -1,11 +1,12 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Origin/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Origin/edit.html.twig
new file mode 100644
index 000000000..28678bf6d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Origin/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Origin/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Origin/index.html.twig
new file mode 100644
index 000000000..22ec63f09
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Origin/index.html.twig
@@ -0,0 +1,35 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'origin.noActiveAfter'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+        {% for entity in entities %}
+            <tr>
+                <td>{{ entity.id }}</td>
+                <td>{{ entity.label|localize_translatable_string }}</td>
+                <td>{% if entity.noActiveAfter %}{{ entity.noActiveAfter|date('Y-m-d') }}{% endif %}</td>
+                <td>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_crud_origin_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                        </li>
+                    </ul>
+                </td>
+            </tr>
+        {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Origin/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Origin/new.html.twig
new file mode 100644
index 000000000..3a28dd85f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Origin/new.html.twig
@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index 5d17d6ffe..d437a34d6 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -125,72 +125,6 @@ chill_person_admin_redirect_to_admin_index:
                 order: 0
                 label: Main admin menu
 
-chill_person_closingmotive_admin:
-    path:     /{_locale}/admin/closing-motive
-    controller: cscrud_closing_motive_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 90
-                label: 'person_admin.closing motives'
-
-chill_person_maritalstatus_admin:
-    path:     /{_locale}/admin/marital-status
-    controller: cscrud_marital_status_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 120
-                label: 'person_admin.marital status'
-
-chill_person_socialissue_admin:
-    path:     /{_locale}/admin/social-work/social-issue
-    controller: cscrud_social_issue_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 150
-                label: 'person_admin.social_issue'
-
-chill_person_socialaction_admin:
-    path:     /{_locale}/admin/social-work/social-action
-    controller: cscrud_social_action_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 160
-                label: 'person_admin.social_action'
-
-
-chill_person_social_evaluation_admin:
-    path:     /{_locale}/admin/social-work/evaluation
-    controller: cscrud_social_evaluation_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 170
-                label: 'person_admin.social_evaluation'
-
-chill_person_social_goal_admin:
-    path:     /{_locale}/admin/social-work/goal
-    controller: cscrud_social_goal_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 180
-                label: 'person_admin.social_goal'
-
-chill_person_social_result_admin:
-    path:     /{_locale}/admin/social-work/result
-    controller: cscrud_social_result_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 190
-                label: 'person_admin.social_result'
-
-
-
 chill_person_controllers:
     resource: "@ChillPersonBundle/Controller"
     type: annotation
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 4407671e7..92718d1f5 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -372,6 +372,12 @@ crud:
             add_new: Ajouter un nouveau
         title_new: Nouveau motif de clotûre
         title_edit: Modifier le motif de clotûre
+    origin:
+        index:
+            title: Liste des origines de parcours
+            add_new: Ajouter une nouvelle
+        title_new: Nouvelle origine
+        title_edit: Modifier l'origine
     person_marital-status:
         index:
             title: Liste des états civils
@@ -410,6 +416,9 @@ crud:
         title_new: Nouveau résultat
         title_edit: Modifier le résultat
 
+origin:
+   noActiveAfter: désactivé après
+
 evaluation:
     delay: Délai
     notificationDelay: Délai de notification
@@ -428,12 +437,14 @@ closing_motive:
 
 Configuration of person bundle: Configuration du module "Personnes"
 person_admin:
+    accompanying_period: Parcours d'accompagnement
     What would you like to configure ?: Que souhaitez-vous configurer ?
     closing motives: Motifs de clotûre
     closing motives list: Liste des motifs de clotûre
     closing motive explanation: >
         Les motifs de clotûre donnent des indications sur la fermeture
         d'une période d'accompagnement.
+    origin: Origines
     marital status: États civils
     marital status list: Liste des états civils
     marital status explanation: >

From 9ce7f10415dbddbf46bd0b17dc713087bf005124 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 15:20:47 +0200
Subject: [PATCH 065/111] admin: add personresourcekind in the admin

---
 .../PersonResourceKindController.php          | 26 ++++++++++++
 .../ChillPersonExtension.php                  | 21 ++++++++++
 .../Form/PersonResourceKindType.php           | 40 ++++++++++++++++++
 .../Menu/AdminMenuBuilder.php                 |  5 +++
 .../views/PersonResourceKind/edit.html.twig   | 11 +++++
 .../views/PersonResourceKind/index.html.twig  | 41 +++++++++++++++++++
 .../views/PersonResourceKind/new.html.twig    | 12 ++++++
 .../translations/messages.fr.yml              |  8 ++++
 8 files changed, 164 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/edit.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/index.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/new.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php
new file mode 100644
index 000000000..ca3047a97
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class PersonResourceKindController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index b29d79e8e..3d88fac22 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -206,6 +206,27 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Person\PersonResourceKind::class,
+                    'name' => 'person_resource-kind',
+                    'base_path' => '/admin/person/resource-kind',
+                    'form_class' => \Chill\PersonBundle\Form\PersonResourceKindType::class,
+                    'controller' => \Chill\PersonBundle\Controller\PersonResourceKindController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/PersonResourceKind/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/PersonResourceKind/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/PersonResourceKind/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class,
                     'name' => 'social_issue',
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
new file mode 100644
index 000000000..060c7628c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\Person\PersonResourceKind;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class PersonResourceKindType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class)
+            ->add('isActive', ChoiceType::class, [
+                    'choices' => [
+                        'Active' => true,
+                        'Inactive' => false,
+                    ],
+                ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', PersonResourceKind::class);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
index 1e563df86..af47d4544 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
@@ -45,6 +45,11 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_person_marital-status_index',
         ])->setExtras(['order' => 2020]);
 
+        $menu->addChild('person_admin.person_resource_kind', [
+            'route' => 'chill_crud_person_resource-kind_index',
+        ])->setExtras(['order' => 2030]);
+
+
 
         $menu->addChild('person_admin.accompanying_period')
             ->setAttribute('class', 'list-group-item-header')
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/edit.html.twig
new file mode 100644
index 000000000..28678bf6d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/index.html.twig
new file mode 100644
index 000000000..51105d0ff
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/index.html.twig
@@ -0,0 +1,41 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+        {% for entity in entities %}
+            <tr>
+                <td>{{ entity.id }}</td>
+                <td>{{ entity.title|localize_translatable_string }}</td>
+                <td style="text-align:center;">
+                    {%- if entity.isActive -%}
+                        <i class="fa fa-check-square-o"></i>
+                    {%- else -%}
+                        <i class="fa fa-square-o"></i>
+                    {%- endif -%}
+				</td>
+                <td>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_crud_person_resource-kind_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                        </li>
+                    </ul>
+                </td>
+            </tr>
+        {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/new.html.twig
new file mode 100644
index 000000000..3a28dd85f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/new.html.twig
@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 92718d1f5..209a955d8 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -384,6 +384,12 @@ crud:
             add_new: Ajouter un nouveau
         title_new: Nouvel état civil
         title_edit: Modifier l'état civil
+    person_resource-kind:
+        index:
+            title: Types de personnes-ressources
+            add_new: Ajouter un nouveau
+        title_new: Nouveau type de personne-ressource
+        title_edit: Modifier le type de personne-ressource
     social_issue:
         index:
             title: Liste des problématiques sociales
@@ -449,6 +455,7 @@ person_admin:
     marital status list: Liste des états civils
     marital status explanation: >
         Configurer la liste des états civils.
+    person_resource_kind: Type de personne ressource
     social_issue: Problématiques sociales
     social_action: Actions d'accompagnement
     social_goal: Buts
@@ -456,6 +463,7 @@ person_admin:
     social_evaluation: Évaluations
     social_work: Accompagnement social
 
+
 # specific to accompanying period
 accompanying_period:
     dates: Période

From 7907e4a050a482f19244a06ebeb05603bb36dac8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Thu, 5 May 2022 18:31:08 +0200
Subject: [PATCH 066/111] admin: add household position and relation admin

---
 .../HouseholdPositionController.php           | 26 ++++++++++
 .../Controller/RelationController.php         | 26 ++++++++++
 .../ChillPersonExtension.php                  | 42 ++++++++++++++++
 .../Form/HouseholdPositionType.php            | 47 ++++++++++++++++++
 .../ChillPersonBundle/Form/OriginType.php     |  2 +-
 .../Form/PersonResourceKindType.php           | 10 ++--
 .../ChillPersonBundle/Form/RelationType.php   | 42 ++++++++++++++++
 .../Menu/AdminMenuBuilder.php                 | 38 ++++++++------
 .../views/HouseholdPosition/edit.html.twig    | 11 +++++
 .../views/HouseholdPosition/index.html.twig   | 49 +++++++++++++++++++
 .../views/HouseholdPosition/new.html.twig     | 12 +++++
 .../Resources/views/Relation/edit.html.twig   | 11 +++++
 .../Resources/views/Relation/index.html.twig  | 41 ++++++++++++++++
 .../Resources/views/Relation/new.html.twig    | 12 +++++
 .../translations/messages.fr.yml              | 22 ++++++++-
 15 files changed, 370 insertions(+), 21 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/RelationController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php
 create mode 100644 src/Bundle/ChillPersonBundle/Form/RelationType.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/edit.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/index.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/new.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Relation/edit.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Relation/index.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Relation/new.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php
new file mode 100644
index 000000000..781c264b5
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class HouseholdPositionController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/RelationController.php b/src/Bundle/ChillPersonBundle/Controller/RelationController.php
new file mode 100644
index 000000000..8f0c7fa44
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/RelationController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class RelationController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 3d88fac22..950715a2b 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -206,6 +206,48 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Household\Position::class,
+                    'name' => 'person_household_position',
+                    'base_path' => '/admin/person/household/position',
+                    'form_class' => \Chill\PersonBundle\Form\HouseholdPositionType::class,
+                    'controller' => \Chill\PersonBundle\Controller\HouseholdPositionController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdPosition/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdPosition/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdPosition/edit.html.twig',
+                        ],
+                    ],
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Relationships\Relation::class,
+                    'name' => 'person_relation',
+                    'base_path' => '/admin/person/relation',
+                    'form_class' => \Chill\PersonBundle\Form\RelationType::class,
+                    'controller' => \Chill\PersonBundle\Controller\RelationController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Relation/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Relation/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Relation/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\Person\PersonResourceKind::class,
                     'name' => 'person_resource-kind',
diff --git a/src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php b/src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php
new file mode 100644
index 000000000..ebd0ac966
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\Household\Position;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class HouseholdPositionType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class)
+            ->add('allowHolder', CheckboxType::class, [
+                'required' => false,
+                'label' => 'household.allowHolder',
+            ])
+            ->add('shareHousehold', CheckboxType::class, [
+                'required' => false,
+                'label' => 'household.shareHousehold',
+            ])
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 5,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Position::class);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Form/OriginType.php b/src/Bundle/ChillPersonBundle/Form/OriginType.php
index a9897de25..e3c08b359 100644
--- a/src/Bundle/ChillPersonBundle/Form/OriginType.php
+++ b/src/Bundle/ChillPersonBundle/Form/OriginType.php
@@ -27,7 +27,7 @@ class OriginType extends AbstractType
             ->add('noActiveAfter', ChillDateType::class, [
                 'required' => false,
                 'input' => 'datetime_immutable',
-                'label' => 'origin.noActiveAfter'
+                'label' => 'origin.noActiveAfter',
             ]);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
index 060c7628c..8e050cbce 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php
@@ -25,11 +25,11 @@ class PersonResourceKindType extends AbstractType
         $builder
             ->add('title', TranslatableStringFormType::class)
             ->add('isActive', ChoiceType::class, [
-                    'choices' => [
-                        'Active' => true,
-                        'Inactive' => false,
-                    ],
-                ]);
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false,
+                ],
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillPersonBundle/Form/RelationType.php b/src/Bundle/ChillPersonBundle/Form/RelationType.php
new file mode 100644
index 000000000..e1887115f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/RelationType.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class RelationType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class, [
+                'label' => 'relation.title',
+            ])
+            ->add('reverseTitle', TranslatableStringFormType::class, [
+                'label' => 'relation.reverseTitle',
+            ])
+            ->add('isActive', CheckboxType::class, [
+                'required' => false,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Relation::class);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
index af47d4544..ad343feda 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
@@ -49,43 +49,53 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_person_resource-kind_index',
         ])->setExtras(['order' => 2030]);
 
-
-
-        $menu->addChild('person_admin.accompanying_period')
+        $menu->addChild('Household')
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 2100, 'header' => true]);
 
-        $menu->addChild('person_admin.closing motives', [
-            'route' => 'chill_crud_closing_motive_index',
+        $menu->addChild('Position', [
+            'route' => 'chill_crud_person_household_position_index',
         ])->setExtras(['order' => 2110]);
 
-        $menu->addChild('person_admin.origin', [
-            'route' => 'chill_crud_origin_index',
-        ])->setExtras(['order' => 2110]);
+        $menu->addChild('person_admin.relation', [
+            'route' => 'chill_crud_person_relation_index',
+        ])->setExtras(['order' => 2120]);
 
-        $menu->addChild('person_admin.social_work')
+        $menu->addChild('person_admin.accompanying_period')
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 2200, 'header' => true]);
 
+        $menu->addChild('person_admin.closing motives', [
+            'route' => 'chill_crud_closing_motive_index',
+        ])->setExtras(['order' => 2210]);
+
+        $menu->addChild('person_admin.origin', [
+            'route' => 'chill_crud_origin_index',
+        ])->setExtras(['order' => 2210]);
+
+        $menu->addChild('person_admin.social_work')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 2300, 'header' => true]);
+
         $menu->addChild('person_admin.social_action', [
             'route' => 'chill_crud_social_action_index',
-        ])->setExtras(['order' => 2201]);
+        ])->setExtras(['order' => 2301]);
 
         $menu->addChild('person_admin.social_issue', [
             'route' => 'chill_crud_social_issue_index',
-        ])->setExtras(['order' => 2202]);
+        ])->setExtras(['order' => 2302]);
 
         $menu->addChild('person_admin.social_goal', [
             'route' => 'chill_crud_social_goal_index',
-        ])->setExtras(['order' => 2210]);
+        ])->setExtras(['order' => 2310]);
 
         $menu->addChild('person_admin.social_evaluation', [
             'route' => 'chill_crud_social_evaluation_index',
-        ])->setExtras(['order' => 2220]);
+        ])->setExtras(['order' => 2320]);
 
         $menu->addChild('person_admin.social_result', [
             'route' => 'chill_crud_social_result_index',
-        ])->setExtras(['order' => 2230]);
+        ])->setExtras(['order' => 2330]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/edit.html.twig
new file mode 100644
index 000000000..28678bf6d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/index.html.twig
new file mode 100644
index 000000000..d1d716434
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/index.html.twig
@@ -0,0 +1,49 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'household.allowHolder'|trans }}</th>
+            <th>{{ 'household.shareHousehold'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.allowHolder -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td style="text-align:center;">
+						{%- if entity.shareHousehold -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_household_position_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/new.html.twig
new file mode 100644
index 000000000..3a28dd85f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/new.html.twig
@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Relation/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Relation/edit.html.twig
new file mode 100644
index 000000000..28678bf6d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Relation/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Relation/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Relation/index.html.twig
new file mode 100644
index 000000000..d7634e63e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Relation/index.html.twig
@@ -0,0 +1,41 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.title|localize_translatable_string }} - {{ entity.reverseTitle|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.isActive -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_relation_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Relation/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Relation/new.html.twig
new file mode 100644
index 000000000..3a28dd85f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Relation/new.html.twig
@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 209a955d8..ea22a2793 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -390,6 +390,18 @@ crud:
             add_new: Ajouter un nouveau
         title_new: Nouveau type de personne-ressource
         title_edit: Modifier le type de personne-ressource
+    person_household_position:
+        index:
+            title: Position
+            add_new: Ajouter un nouveau
+        title_new: Nouvelle position
+        title_edit: Modifier la position
+    person_relation:
+        index:
+            title: Relations de filiations
+            add_new: Ajouter un nouveau
+        title_new: Nouvelle relation de filiation
+        title_edit: Modifier la relation de filiation
     social_issue:
         index:
             title: Liste des problématiques sociales
@@ -436,6 +448,14 @@ socialAction:
     defaultNotificationDelay: Délai de notification par défaut
     socialIssue: Problématique sociale
 
+household:
+    allowHolder: Peut être titulaire
+    shareHousehold: Peut être partagé
+
+relation:
+    title: Premier membre
+    reverseTitle: Deuxième membre
+
 # specific to closing motive
 closing_motive:
     any parent: Aucun parent
@@ -462,7 +482,7 @@ person_admin:
     social_result: Résultats
     social_evaluation: Évaluations
     social_work: Accompagnement social
-
+    relation: Relations de filiations
 
 # specific to accompanying period
 accompanying_period:

From 6abbf9bf216f479483ca5d7230c77d621c05e168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 6 May 2022 11:43:05 +0200
Subject: [PATCH 067/111] improves create a person with address

* validation: must have an address when 'create a form' is checked;
* minor improvements
---
 .../Resources/views/layout.html.twig          | 48 ++++++++++---------
 .../Controller/PersonController.php           |  4 +-
 .../Entity/Household/HouseholdMember.php      |  4 +-
 .../Form/CreationPersonType.php               | 22 +++++++++
 .../Resources/views/Person/create.html.twig   |  3 +-
 .../translations/validators.fr.yml            |  5 +-
 6 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index c11422a1b..f59e0aaff 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -36,33 +36,35 @@
 
                 {# Flash messages ! #}
                 {% if app.session.flashbag.keys()|length > 0 %}
-                <div class="col-8 mb-5 flash_message">
+                    <div class="row justify-content-center">
+                        <div class="col-10 mb-5 flash_message">
+
+                            {% for flashMessage in app.session.flashbag.get('success') %}
+                                <div class="alert alert-success flash_message">
+                                    <span>{{ flashMessage|raw }}</span>
+                                </div>
+                            {% endfor %}
+
+                            {% for flashMessage in app.session.flashbag.get('error') %}
+                                <div class="alert alert-danger flash_message">
+                                    <span>{{ flashMessage|raw }}</span>
+                                </div>
+                            {% endfor %}
+
+                            {% for flashMessage in app.session.flashbag.get('notice') %}
+                                <div class="alert alert-warning flash_message">
+                                    <span>{{ flashMessage|raw }}</span>
+                                </div>
+                            {% endfor %}
 
-                    {% for flashMessage in app.session.flashbag.get('success') %}
-                        <div class="alert alert-success flash_message">
-                            <span>{{ flashMessage|raw }}</span>
                         </div>
-                    {% endfor %}
-
-                    {% for flashMessage in app.session.flashbag.get('error') %}
-                        <div class="alert alert-danger flash_message">
-                            <span>{{ flashMessage|raw }}</span>
-                        </div>
-                    {% endfor %}
-
-                    {% for flashMessage in app.session.flashbag.get('notice') %}
-                        <div class="alert alert-warning flash_message">
-                            <span>{{ flashMessage|raw }}</span>
-                        </div>
-                    {% endfor %}
-
-                </div>
+                    </div>
                 {% endif %}
 
                 {% block content %}
                     <div class="col-8 main_search">
                         <h2>{{ 'Search'|trans }}</h2>
-    
+
                         <form action="{{ path('chill_main_search') }}" method="get">
                             <input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
                             <center>
@@ -75,11 +77,11 @@
                             </center>
                         </form>
                     </div>
-    
+
                     {#  DISABLED {{  chill_widget('homepage', {} ) }} #}
-                    
+
                     {% include '@ChillMain/Homepage/index.html.twig' %}
-                    
+
                 {% endblock %}
 
             </div>
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index ca5de4ef0..a4a29216c 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -252,7 +252,7 @@ final class PersonController extends AbstractController
                 $this->lastPostDataReset();
 
                 $address = $form->get('address')->getData();
-                $addressForm = $form->get('addressForm')->getData();
+                $addressForm = (bool) $form->get('addressForm')->getData();
 
                 if (null !== $address && $addressForm) {
                     $household = new Household();
@@ -271,7 +271,7 @@ final class PersonController extends AbstractController
                     if ($form->get('createHousehold')->isClicked()) {
                         return $this->redirectToRoute('chill_person_household_members_editor', [
                             'persons' => [$person->getId()],
-                            'household' => $household->getId()
+                            'household' => $household->getId(),
                         ]);
                     }
                 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
index e738528c9..2de526ee6 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
@@ -35,7 +35,7 @@ class HouseholdMember
     /**
      * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
      * @Serializer\Groups({"read", "docgen:read"})
-     * @Assert\GreaterThan(
+     * @Assert\GreaterThanOrEqual(
      *     propertyPath="startDate",
      *     message="household_membership.The end date must be after start date",
      *     groups={"household_memberships"}
@@ -202,7 +202,7 @@ class HouseholdMember
 
     public function setPosition(?Position $position): self
     {
-        if ($this->position instanceof Position) {
+        if ($this->position instanceof Position && $this->position !== $position) {
             throw new LogicException('The position is already set. You cannot change ' .
                 'a position of a membership');
         }
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 0d854b681..124db26eb 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form;
 
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
@@ -30,6 +31,8 @@ use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 final class CreationPersonType extends AbstractType
 {
@@ -84,10 +87,12 @@ final class CreationPersonType extends AbstractType
                 'label' => 'Create a household and add an address',
                 'required' => false,
                 'mapped' => false,
+                'help' => 'A new household will be created. The person will be member of this household.',
             ])
             ->add('address', PickAddressType::class, [
                 'required' => false,
                 'mapped' => false,
+                'label' => false,
             ]);
 
         if ($this->askCenters) {
@@ -114,6 +119,9 @@ final class CreationPersonType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => Person::class,
+            'constraints' => [
+                new Callback([$this, 'validateCheckedAddress']),
+            ],
         ]);
     }
 
@@ -124,4 +132,18 @@ final class CreationPersonType extends AbstractType
     {
         return self::NAME;
     }
+
+    public function validateCheckedAddress($data, ExecutionContextInterface $context, $payload): void
+    {
+        /** @var bool $addressFrom */
+        $addressFrom = $context->getObject()->get('addressForm')->getData();
+        /** @var ?Address $address */
+        $address = $context->getObject()->get('address')->getData();
+
+        if ($addressFrom && null === $address) {
+            $context->buildViolation('person_creation.If you want to create an household, an address is required')
+                ->atPath('addressForm')
+                ->addViolation();
+        }
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index e3631f119..03bece4d5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -111,7 +111,6 @@
         {{ form_row(form.addressForm) }}
     </div>
     <div id=address>
-        <p>{{ 'A new household will be created. The person will be member of this household.'|trans }}</p>
         {{ form_row(form.address) }}
     </div>
 
@@ -148,4 +147,4 @@
 
 {% block css %}
     {{ encore_entry_link_tags('mod_input_address') }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
index b2bc549d7..c9c8d8648 100644
--- a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
@@ -65,4 +65,7 @@ The person where the course is located must be associated to the course. Change
 
 #relationship
 relationship:
-    duplicate: Une relation de filiation existe déjà entre ces 2 personnes
\ No newline at end of file
+    duplicate: Une relation de filiation existe déjà entre ces 2 personnes
+
+person_creation:
+    If you want to create an household, an address is required: Pour la création d'un ménage, une adresse est requise

From 6c246a0d38aba73dc363f39134fb4e3dfb35028f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 6 May 2022 12:54:01 +0200
Subject: [PATCH 068/111] allow to edit civility in onTheFly

---
 .../public/vuejs/OnTheFly/components/OnTheFly.vue        | 1 +
 .../components/PersonsAssociated/ParticipationItem.vue   | 1 +
 .../components/Resources/ResourceItem.vue                | 1 +
 .../Resources/public/vuejs/_components/AddPersons.vue    | 3 ++-
 .../public/vuejs/_components/OnTheFly/Person.vue         | 6 +++---
 .../Serializer/Normalizer/PersonJsonNormalizer.php       | 9 ++-------
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 5949a1e56..e3991fe2f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -213,6 +213,7 @@ export default {
          switch (type) {
             case 'person':
                data = this.$refs.castPerson.$data.person;
+               console.log('person data are', data);
                break;
 
             case 'thirdparty':
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 1a1a7e26e..ff8aef961 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -123,6 +123,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
+            body.civility = payload.data.civility;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index df2bd0c35..605ab6443 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -150,6 +150,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
+            body.civility = payload.data.civility;
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 0d50b368c..f84fc2e1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -303,6 +303,7 @@ export default {
                                        'id': responsePerson.id
                                     },
                                     'start_date': {
+                                       // TODO: use date.js methods (low priority)
                                        'datetime': `${new Date().toISOString().split('T')[0]}T00:00:00+02:00`
                                     },
                                     'holder': false,
@@ -315,7 +316,7 @@ export default {
                               },
                               'composition': null
                            };
-                           makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
+                           return makeFetch('POST', '/api/1.0/person/household/members/move.json', member)
                               .then(_response => {
                                  makeFetch('POST', `/api/1.0/person/household/${responseHousehold.id}/address.json`, address)
                                     .then(_response => {})
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 27657ff46..5a8708cc3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -87,7 +87,7 @@
       <label>{{ $t('person.gender.title') }}</label>
    </div>
 
-   <div v-if="action === 'create'" class="form-floating mb-3">
+   <div class="form-floating mb-3">
       <select
          class="form-select form-select-lg"
          id="civility"
@@ -223,8 +223,8 @@ export default {
          get() { return this.person.gender; }
       },
       civility: {
-         set(value) { this.person.civility = {id: value}; },
-         get() { return this.person.civility ? this.person.civility.id : undefined; }
+         set(value) { this.person.civility = {id: value, type: 'chill_main_civility'}; },
+         get() { return this.person.civility ? this.person.civility.id : null; }
       },
       birthDate: {
          set(value) {
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index f4f463118..6149eff9e 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -14,7 +14,6 @@ namespace Chill\PersonBundle\Serializer\Normalizer;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
-use Chill\MainBundle\Repository\CivilityRepository;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
@@ -50,8 +49,6 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
 
     private CenterResolverManagerInterface $centerResolverManager;
 
-    private CivilityRepository $civilityRepository;
-
     private PhoneNumberHelperInterface $phoneNumberHelper;
 
     private ChillEntityRenderExtension $render;
@@ -65,14 +62,12 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
         PersonRepository $repository,
         CenterResolverManagerInterface $centerResolverManager,
         ResidentialAddressRepository $residentialAddressRepository,
-        CivilityRepository $civilityRepository,
         PhoneNumberHelperInterface $phoneNumberHelper /* TODO maybe not necessayr any more */
     ) {
         $this->render = $render;
         $this->repository = $repository;
         $this->centerResolverManager = $centerResolverManager;
         $this->residentialAddressRepository = $residentialAddressRepository;
-        $this->civilityRepository = $civilityRepository;
         $this->phoneNumberHelper = $phoneNumberHelper;
     }
 
@@ -186,8 +181,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
                     break;
 
                 case 'civility':
-                    //$civility = $this->denormalizer->denormalize($data[$item], Civility::class, $format, $context); // this seems the right way to do it, but this does not render a Civility object.
-                    $civility = $this->civilityRepository->findOneBy(['id' => $data[$item]['id']]);
+                    $civility = $this->denormalizer->denormalize($data[$item], Civility::class, $format, []);
 
                     $person->setCivility($civility);
 
@@ -227,6 +221,7 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'mobilenumber' => $this->normalizer->normalize($person->getMobilenumber(), $format, $context),
             'email' => $person->getEmail(),
             'gender' => $person->getGender(),
+            'civility' => $this->normalizer->normalize($person->getCivility(), $format, $context),
         ];
 
         if (in_array('minimal', $groups, true) && 1 === count($groups)) {

From 31d076d49b1c6fb69a28642cdfe8a7b6023f0641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 6 May 2022 15:22:10 +0200
Subject: [PATCH 069/111] fix search on address: do not take deleted one into
 account

---
 .../Entity/AddressReference.php               |  2 +-
 .../Repository/AddressReferenceRepository.php | 13 ++++---
 .../migrations/Version20220325134944.php      |  6 +++
 .../migrations/Version20220506131307.php      | 37 +++++++++++++++++++
 4 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220506131307.php

diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
index fe132f883..fc4339fe0 100644
--- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php
+++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_main_address_reference", indexes={
- *     @ORM\Index(name="address_refid", columns={"refId"}, options={"where": "refid != ''"})
+ *     @ORM\Index(name="address_refid", columns={"refId"})
  * })
  * @ORM\HasLifecycleCallbacks
  */
diff --git a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
index 9cbad91c9..8a0755902 100644
--- a/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php
@@ -130,12 +130,13 @@ final class AddressReferenceRepository implements ObjectRepository
 
         $query
             ->setFromClause('chill_main_address_reference cma')
-            ->andWhereClause('postcode_id = ?', [$postalCode->getId()]);
+            ->andWhereClause('postcode_id = ?', [$postalCode->getId()])
+            ->andWhereClause('deletedAt IS NULL', []);
 
         $pertinenceClause = ['STRICT_WORD_SIMILARITY(addresscanonical, UNACCENT(?))'];
         $pertinenceArgs = [$pattern];
-        $orWhere = ['addresscanonical %>> UNACCENT(?)'];
-        $orWhereArgs = [$pattern];
+        $andWhere = [];
+        $andWhereArgs = [];
 
         foreach (explode(' ', $pattern) as $part) {
             $part = trim($part);
@@ -144,8 +145,8 @@ final class AddressReferenceRepository implements ObjectRepository
                 continue;
             }
 
-            $orWhere[] = "addresscanonical LIKE '%' || UNACCENT(LOWER(?)) || '%'";
-            $orWhereArgs[] = $part;
+            $andWhere[] = "(addresscanonical LIKE '%' || UNACCENT(LOWER(?)) || '%')";
+            $andWhereArgs[] = $part;
             $pertinenceClause[] =
                 "(EXISTS (SELECT 1 FROM unnest(string_to_array(addresscanonical, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(?)))))::int";
             $pertinenceClause[] =
@@ -154,7 +155,7 @@ final class AddressReferenceRepository implements ObjectRepository
         }
         $query
             ->setSelectPertinence(implode(' + ', $pertinenceClause), $pertinenceArgs)
-            ->andWhereClause(implode(' OR ', $orWhere), $orWhereArgs);
+            ->andWhereClause(implode(' AND ', $andWhere), $andWhereArgs);
 
         return $query;
     }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php b/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
index bc0382482..58a20d220 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220325134944.php
@@ -24,6 +24,10 @@ final class Version20220325134944 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_main_address_reference DROP createdAt');
         $this->addSql('ALTER TABLE chill_main_address_reference DROP deletedAt');
         $this->addSql('ALTER TABLE chill_main_address_reference DROP updatedAt');
+        $this->addSql('DROP INDEX address_refid');
+        $this->addSql('create index address_refid
+                on chill_main_address_reference (refid)
+                where ((refid)::text <> \'\'::text)');
     }
 
     public function getDescription(): string
@@ -39,5 +43,7 @@ final class Version20220325134944 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_main_address_reference.createdAt IS \'(DC2Type:datetime_immutable)\'');
         $this->addSql('COMMENT ON COLUMN chill_main_address_reference.deletedAt IS \'(DC2Type:datetime_immutable)\'');
         $this->addSql('COMMENT ON COLUMN chill_main_address_reference.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('DROP INDEX address_refid');
+        $this->addSql('CREATE INDEX address_refid ON chill_main_address_reference (refId)');
     }
 }
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220506131307.php b/src/Bundle/ChillMainBundle/migrations/Version20220506131307.php
new file mode 100644
index 000000000..f3360d94a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220506131307.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220506131307 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX chill_internal_address_reference_canonicalized');
+        $this->addSql('create index chill_internal_address_reference_canonicalized
+            on chill_main_address_reference using gist (postcode_id, addresscanonical gist_trgm_ops);');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Adapt search index on address reference canonicalized';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX chill_internal_address_reference_canonicalized');
+        $this->addSql('create index chill_internal_address_reference_canonicalized
+            on chill_main_address_reference using gist (postcode_id, addresscanonical gist_trgm_ops) WHERE deletedat IS NULL;');
+    }
+}

From a4f2d47c4619e490917a99c4192e540682e3ae6e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 6 May 2022 15:25:49 +0200
Subject: [PATCH 070/111] admin: add CancelReason admin

---
 .../Controller/CancelReasonController.php     | 26 ++++++++++
 .../ChillCalendarExtension.php                | 24 +++++++++
 .../Form/CancelReasonType.php                 | 39 +++++++++++++++
 .../Menu/AdminMenuBuilder.php                 | 49 +++++++++++++++++++
 .../views/CancelReason/edit.html.twig         | 11 +++++
 .../views/CancelReason/index.html.twig        | 43 ++++++++++++++++
 .../views/CancelReason/new.html.twig          | 12 +++++
 .../translations/messages.fr.yml              | 13 ++++-
 8 files changed, 215 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/edit.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/new.html.twig

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php b/src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php
new file mode 100644
index 000000000..3be2a8f93
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Controller/CancelReasonController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class CancelReasonController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index d0a5c3d94..5c4b6918a 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\DependencyInjection;
 
+use Chill\CalendarBundle\Entity\CancelReason;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -47,6 +48,29 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
     protected function prependCruds(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('chill_main', [
+            'cruds' => [
+                [
+                    'class' => \Chill\CalendarBundle\Entity\CancelReason::class,
+                    'name' => 'calendar_cancel-reason',
+                    'base_path' => '/admin/calendar/cancel-reason',
+                    'form_class' => \Chill\CalendarBundle\Form\CancelReasonType::class,
+                    'controller' => \Chill\CalendarBundle\Controller\CancelReasonController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillCalendar/CancelReason/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillCalendar/CancelReason/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillCalendar/CancelReason/edit.html.twig',
+                        ],
+                    ],
+                ],
+            ],
             'apis' => [
                 [
                     'controller' => \Chill\CalendarBundle\Controller\CalendarRangeAPIController::class,
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
new file mode 100644
index 000000000..be1b4e809
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\CalendarBundle\Form;
+
+use Chill\CalendarBundle\Entity\CancelReason;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CancelReasonType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class)
+            ->add('active', CheckboxType::class, [
+                'required' => false,
+            ])
+            ->add('canceledBy', TextType::class);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', CancelReason::class);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
new file mode 100644
index 000000000..972f92ed6
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\CalendarBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Calendar')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 6000, 'header' => true]);
+
+        $menu->addChild('Cancel reason', [
+            'route' => 'chill_crud_calendar_cancel-reason_index',
+        ])->setExtras(['order' => 6010]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section'];
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/edit.html.twig
new file mode 100644
index 000000000..28678bf6d
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
new file mode 100644
index 000000000..0668d8db5
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
@@ -0,0 +1,43 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Name'|trans }}</th>
+            <th>{{ 'canceledBy'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td>{{ entity.canceledBy }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_calendar_cancel-reason_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/new.html.twig
new file mode 100644
index 000000000..3a28dd85f
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/new.html.twig
@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 56ac8543c..5833eba43 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -17,7 +17,7 @@ status: Statut du rendez-vous
 calendar location: Localistion du rendez-vous
 calendar comment: Remarque sur le rendez-vous
 sendSMS: Envoi d'un SMS
-Send s m s: Envoi d'un SMS ? 
+Send s m s: Envoi d'un SMS ?
 Cancel reason: Motif d'annulation
 Add a new calendar: Ajouter un nouveau rendez-vous
 "Success : calendar item updated!": "Rendez-vous mis à jour"
@@ -25,4 +25,13 @@ Add a new calendar: Ajouter un nouveau rendez-vous
 The calendar item has been successfully removed.: Le rendez-vous a été supprimé
 From the day: Du
 to the day: au
-Transform to activity: Transformer en échange
\ No newline at end of file
+Transform to activity: Transformer en échange
+canceledBy: supprimé par
+
+crud:
+    calendar_cancel-reason:
+        index:
+            title: Liste des motifs d'annulation
+            add_new: Ajouter un nouveau
+        title_new: Nouveau motif d'annulation
+        title_edit: Modifier le motif d'annulation
\ No newline at end of file

From 7cefce8305ee295feae987991f3411861e4d7563 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 6 May 2022 15:51:29 +0200
Subject: [PATCH 071/111] admin: add ThirdParty admin

---
 .../ThirdPartyCategoryController.php          | 26 ++++++++++
 .../ChillThirdPartyExtension.php              | 24 +++++++++
 .../Form/ThirdPartyCategoryType.php           | 37 ++++++++++++++
 .../Menu/AdminMenuBuilder.php                 | 49 +++++++++++++++++++
 .../views/ThirdPartyCategory/edit.html.twig   | 11 +++++
 .../views/ThirdPartyCategory/index.html.twig  | 41 ++++++++++++++++
 .../views/ThirdPartyCategory/new.html.twig    | 12 +++++
 .../config/services/menu.yaml                 |  6 +++
 .../translations/messages.fr.yml              | 12 ++++-
 9 files changed, 216 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/edit.html.twig
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/index.html.twig
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/new.html.twig

diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php
new file mode 100644
index 000000000..1e0bcc508
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyCategoryController.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class ThirdPartyCategoryController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
index d2023fae5..03a3daf5f 100644
--- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/ChillThirdPartyExtension.php
@@ -11,8 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\ThirdPartyBundle\DependencyInjection;
 
+use Chill\ThirdPartyBundle\Controller\ThirdPartyCategoryController;
 use Chill\ThirdPartyBundle\Controller\ThirdPartyController;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
+use Chill\ThirdPartyBundle\Form\ThirdPartyCategoryType;
 use Chill\ThirdPartyBundle\Form\ThirdPartyType;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use Symfony\Component\Config\FileLocator;
@@ -100,6 +103,27 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
                         ],
                     ],
                 ],
+                [
+                    'class' => ThirdPartyCategory::class,
+                    'name' => 'thirdparty_thirdparty-category',
+                    'base_path' => '/admin/thirdparty/thirdparty-category',
+                    'form_class' => ThirdPartyCategoryType::class,
+                    'controller' => ThirdPartyCategoryController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillThirdParty/ThirdPartyCategory/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillThirdParty/ThirdPartyCategory/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillThirdParty/ThirdPartyCategory/edit.html.twig',
+                        ],
+                    ],
+                ],
             ],
             'apis' => [
                 [
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php
new file mode 100644
index 000000000..ec1152710
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Form/ThirdPartyCategoryType.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class ThirdPartyCategoryType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class)
+            ->add('active', CheckboxType::class, [
+                'required' => false,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', ThirdPartyCategory::class);
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
new file mode 100644
index 000000000..ec44d8339
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Third party')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 3000, 'header' => true]);
+
+        $menu->addChild('Third party category', [
+            'route' => 'chill_crud_thirdparty_thirdparty-category_index',
+        ])->setExtras(['order' => 3010]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section'];
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/edit.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/edit.html.twig
new file mode 100644
index 000000000..28678bf6d
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/edit.html.twig
@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/index.html.twig
new file mode 100644
index 000000000..c70688404
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/index.html.twig
@@ -0,0 +1,41 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Name'|trans }}</th>
+            <th>{{ 'active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.active -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_thirdparty_thirdparty-category_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/new.html.twig
new file mode 100644
index 000000000..3a28dd85f
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdPartyCategory/new.html.twig
@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+
diff --git a/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml b/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml
index 4b6ffd83f..cacd1124b 100644
--- a/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/config/services/menu.yaml
@@ -1,4 +1,10 @@
 services:
+    Chill\ThirdPartyBundle\Menu\:
+        autowire: true
+        autoconfigure: true
+        resource: '../../Menu/'
+        tags: ['chill.menu_builder']
+
     Chill\ThirdPartyBundle\Menu\MenuBuilder:
         arguments:
             $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index e1962b94a..8c2a9d856 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -76,6 +76,10 @@ The party is visible in those centers: Le tiers est visible dans ces centres
 The party is not visible in any center: Le tiers n'est associé à aucun centre
 No third parties: Aucun tiers
 
+Thirdparty handling: Tiers traitant
+Thirdparty workers: Tiers intervenants
+Third party category: Catégories de tiers
+
 # ROLES
 CHILL_3PARTY_3PARTY_CREATE: Ajouter un Tiers
 CHILL_3PARTY_3PARTY_SHOW:  Voir un Tiers
@@ -86,6 +90,10 @@ crud:
     3party_3party:
         index:
             add_new: Créer
+    thirdparty_thirdparty-category:
+        index:
+            title: Liste des catégories de tiers
+            add_new: Ajouter une nouvelle
+        title_new: Nouvelle catégorie de tiers
+        title_edit: Modifier la catégorie de tiers
 
-Thirdparty handling: Tiers traitant
-Thirdparty workers: Tiers intervenants

From 24794c12851f9c4e513d1861e649010a3f3c35ba Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 6 May 2022 16:28:37 +0200
Subject: [PATCH 072/111] admin: document category menu

---
 .../Menu/AdminMenuBuilder.php                 | 49 +++++++++++++++++++
 .../views/DocumentCategory/edit.html.twig     | 18 +------
 .../views/DocumentCategory/index.html.twig    | 18 +------
 .../views/DocumentCategory/new.html.twig      | 18 +------
 .../views/DocumentCategory/show.html.twig     | 18 +------
 .../ChillDocStoreBundle/config/routes.yaml    |  7 +--
 .../config/services/menu.yaml                 |  4 +-
 7 files changed, 57 insertions(+), 75 deletions(-)
 create mode 100644 src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php

diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
new file mode 100644
index 000000000..ce86d7c19
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocStoreBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Documents')
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 4000, 'header' => true]);
+
+        $menu->addChild('Document category list', [
+            'route' => 'chill_docstore_category_admin',
+        ])->setExtras(['order' => 4010]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section'];
+    }
+}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
index 2b8f82c0b..b3bcd154b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2018, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "ChillDocStoreBundle:Admin:layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Document category edit'|trans }}{% endblock title %}
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
index 1c19ab64c..ccb49b315 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2018, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "ChillDocStoreBundle:Admin:layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Document category list' | trans }}{% endblock title %}
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
index ea8685762..9b7badf36 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2018, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "ChillDocStoreBundle:Admin:layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Create new document category' | trans }}{% endblock title %}
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
index 89930df34..30a7d856b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2018, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "ChillDocStoreBundle:Admin:layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'Document category show'|trans }}{% endblock title %}
 
diff --git a/src/Bundle/ChillDocStoreBundle/config/routes.yaml b/src/Bundle/ChillDocStoreBundle/config/routes.yaml
index 5821aafa5..7f04ebadb 100644
--- a/src/Bundle/ChillDocStoreBundle/config/routes.yaml
+++ b/src/Bundle/ChillDocStoreBundle/config/routes.yaml
@@ -24,9 +24,4 @@ chill_docstore_admin_redirect_to_admin_index:
 
 chill_docstore_category_admin:
     path:     /{_locale}/admin/document/category
-    controller: Chill\DocStoreBundle\Controller\DocumentCategoryController::indexAction
-    options:
-        menus:
-            admin_docstore:
-                order: 90
-                label: "Documents categories"
\ No newline at end of file
+    controller: Chill\DocStoreBundle\Controller\DocumentCategoryController::indexAction
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml b/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml
index db16aef77..f0f1b3630 100644
--- a/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillDocStoreBundle/config/services/menu.yaml
@@ -1,4 +1,6 @@
 services:
-    Chill\DocStoreBundle\Menu\MenuBuilder:
+    Chill\DocStoreBundle\Menu\:
         autowire: true
         autoconfigure: true
+        resource: '../../Menu/'
+        tags: ['chill.menu_builder']

From 3a115744fe4a19880d7b5676b8497b9eff8e4fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 6 May 2022 17:14:05 +0200
Subject: [PATCH 073/111] add index to search postal code by reference

---
 .../ChillMainBundle/Entity/PostalCode.php     |  9 ++---
 .../migrations/Version20220506145935.php      | 33 +++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220506145935.php

diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index 484a9e322..4569915b4 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -21,10 +21,11 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * @ORM\Entity
  * @ORM\Table(
  *     name="chill_main_postal_code",
- *     indexes={@ORM\Index(
- *         name="search_name_code",
- *         columns={"code", "label"}
- *     )})
+ *     indexes={
+ *         @ORM\Index(name="search_name_code", columns={"code", "label"}),
+ *         @ORM\Index(name="search_by_reference_code", colums={"code", "refpostalcodeid"})
+ *     })
+ *
  *     @ORM\HasLifecycleCallbacks
  */
 class PostalCode
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220506145935.php b/src/Bundle/ChillMainBundle/migrations/Version20220506145935.php
new file mode 100644
index 000000000..9df382214
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220506145935.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220506145935 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX search_by_reference_code');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Add index to search postal code by references';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE INDEX search_by_reference_code ON chill_main_postal_code (code, refpostalcodeid)');
+    }
+}

From 6453de32ecd84dce723edeeab20afdc8fd500705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 6 May 2022 17:29:03 +0200
Subject: [PATCH 074/111] fix typo

---
 src/Bundle/ChillMainBundle/Entity/PostalCode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
index 4569915b4..4b79f58e8 100644
--- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php
+++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php
@@ -23,7 +23,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *     name="chill_main_postal_code",
  *     indexes={
  *         @ORM\Index(name="search_name_code", columns={"code", "label"}),
- *         @ORM\Index(name="search_by_reference_code", colums={"code", "refpostalcodeid"})
+ *         @ORM\Index(name="search_by_reference_code", columns={"code", "refpostalcodeid"})
  *     })
  *
  *     @ORM\HasLifecycleCallbacks

From 63bfd25acb9592bdd350aaf5887b822a9446a84c Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 9 May 2022 15:14:37 +0200
Subject: [PATCH 075/111] admin: homepage + style menu

---
 .../Resources/public/chill/chillmain.scss     | 17 ++++++-
 .../Resources/views/Admin/index.html.twig     |  3 --
 .../Admin/layoutWithVerticalMenu.html.twig    | 50 +++++++++++++++----
 3 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index 94bc520cb..bb4b1dcf2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -189,6 +189,7 @@ div.vertical-menu {
    }
    div.list-group-item-header {
       text-transform: uppercase;
+      font-weight: bold;
    }
 }
 
@@ -213,6 +214,20 @@ footer.footer {
    }
 }
 
+/*
+ *    ADMIN STYLES
+ */
+
+ div.admin {
+   flex-direction: row-reverse;
+   div.vertical-menu {
+      font-size: 0.9em;
+      .list-group-item {
+         padding: 0.3rem 0.7rem;
+      }
+   }
+ }
+
 /*
  *    GENERIC MAIN STYLES
  *    miscellaneous
@@ -220,7 +235,7 @@ footer.footer {
 
 /// titles
 h1, h2,
-.h1, .h2  {
+.h1, .h2 {
    font-weight: $headings-font-weight + 100;
 }
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig
index ba17f1d84..057fe5639 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/index.html.twig
@@ -1,8 +1,5 @@
 {% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
-{% block vertical_menu_content %}
-{% endblock %}
-
 {% block admin_content %}
     <h1>{{ 'Administration interface'|trans }}</h1>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
index 900a794b6..bdb26bc2b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
@@ -1,13 +1,43 @@
-{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
-{% block vertical_menu_content %}
-    {{ chill_menu('admin_section', {
-	   	'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
-	}) }}
+{% block sublayout_content %}
+    <div class="row admin">
+        <div class="col-md-9 my-5">
+
+            {# Flash messages ! #}
+            {% if app.session.flashbag.keys()|length > 0 %}
+            <div class="row justify-content-center mb-5">
+
+                {% for flashMessage in app.session.flashbag.get('success') %}
+                    <div class="col-8 alert alert-success flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
+
+                {% for flashMessage in app.session.flashbag.get('error') %}
+                    <div class="col-8 alert alert-danger flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
+
+                {% for flashMessage in app.session.flashbag.get('notice') %}
+                    <div class="col-8 alert alert-warning flash_message">
+                        <span>{{ flashMessage|raw }}</span>
+                    </div>
+                {% endfor %}
+
+            </div>
+            {% endif %}
+
+            {% block admin_content %}
+                <!-- block admin content empty -->
+            {% endblock %}
+        </div>
+        <div class="col-md-3">
+                {{ chill_menu('admin_section', {
+                    'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+                }) }}
+        </div>
+    </div>
 {% endblock %}
 
-{% block layout_wvm_content %}
-    {% block admin_content %}
-        <!-- block admin content empty -->
-    {% endblock %}
-{% endblock  %}

From 0f319a100331450387d464300a0c66dedebd234d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 9 May 2022 16:22:17 +0200
Subject: [PATCH 076/111] admin: reorganising activity menu and submenus

---
 .../Menu/AdminMenuBuilder.php                 | 44 +++++++++++--------
 .../views/ActivityPresence/edit.html.twig     |  6 +--
 .../views/ActivityPresence/index.html.twig    |  2 +-
 .../views/ActivityPresence/new.html.twig      | 12 ++---
 .../views/ActivityReason/edit.html.twig       | 18 +-------
 .../views/ActivityReason/index.html.twig      | 24 +++-------
 .../views/ActivityReason/new.html.twig        | 18 +-------
 .../views/ActivityReason/show.html.twig       | 18 +-------
 .../ActivityReasonCategory/edit.html.twig     | 18 +-------
 .../ActivityReasonCategory/index.html.twig    | 18 +-------
 .../ActivityReasonCategory/new.html.twig      | 18 +-------
 .../ActivityReasonCategory/show.html.twig     | 18 +-------
 .../views/ActivityType/edit.html.twig         |  4 +-
 .../views/ActivityType/index.html.twig        | 18 +-------
 .../views/ActivityType/new.html.twig          |  4 +-
 .../views/ActivityTypeCategory/edit.html.twig | 14 +++---
 .../ActivityTypeCategory/index.html.twig      |  2 +-
 .../views/ActivityTypeCategory/new.html.twig  | 12 ++---
 .../views/Admin/layout_activity.html.twig     |  2 +-
 .../views/Admin/menu_activity.html.twig       | 18 --------
 .../ChillActivityBundle/config/routes.yaml    | 28 +-----------
 .../config/routes/activityreason.yaml         |  5 ---
 .../config/routes/activityreasoncategory.yaml |  5 ---
 .../ChillCalendarExtension.php                |  1 -
 .../Admin/layoutWithVerticalMenu.html.twig    |  3 +-
 25 files changed, 71 insertions(+), 259 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
index 13c3b3e6a..72f938c88 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -15,8 +15,6 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
     private Security $security;
@@ -32,23 +30,31 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
-            $menu->addChild('Activities', [
-                'route' => 'chill_admin_activity_index',
-            ])
-                ->setExtras([
-                    'order' => 2000,
-                    'explain' => 'Activity configuration',
-                ]);
-        } else {
-            $menu
-                ->addChild('Activities', [
-                    'route' => 'chill_admin_activity_index',
-                ])
-                ->setExtras([
-                    'order' => '60',
-                ]);
-        }
+        $menu->addChild('Activities', [
+            'route' => 'chill_activity_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 5000, 'header' => true]);
+
+        $menu->addChild('Activity Reasons', [
+            'route' => 'chill_activity_activityreason',
+        ])->setExtras(['order' => 5010]);
+
+        $menu->addChild('Activity Reasons Category', [
+            'route' => 'chill_activity_activityreasoncategory',
+        ])->setExtras(['order' => 5020]);
+
+        $menu->addChild('Activity type', [
+            'route' => 'chill_activity_type_admin',
+        ])->setExtras(['order' => 5030]);
+
+        $menu->addChild('Activity Presences', [
+            'route' => 'chill_crud_activity_presence_index',
+        ])->setExtras(['order' => 5040]);
+
+        $menu->addChild('Activity Types Categories', [
+            'route' => 'chill_activity_type_category_admin',
+        ])->setExtras(['order' => 5050]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig
index 16cf893e8..194aa8eea 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/edit.html.twig
@@ -1,10 +1,10 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
 {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
     {% block content_form_actions_view %}{% endblock %}
     {% block content_form_actions_save_and_show %}{% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
index b3d1ec9f2..954b7c653 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityPresence list'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig
index c95711529..00ebd2938 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/new.html.twig
@@ -1,11 +1,11 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
index 60089fa6f..04bb46ca2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason edit'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
index 0dff9b5c4..7d9e5f71d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason list'|trans }}</h1>
@@ -45,7 +29,11 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class='cancel'>
+            <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+        </li>
         <li>
             <a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
                 {{ 'Create a new activity reason'|trans }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
index 16d8553d1..9d078ec9a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason creation'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
index db846bd73..eda4b787b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
index 516c42f0b..f3b6e49c6 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory edit'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
index 213b3a88f..2d8a9560a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory list'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
index d8f737001..3fb81c1b4 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory creation'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
index 7277e4ced..33b8c611b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig
index dacee767c..3a60d3e9c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig
@@ -1,10 +1,10 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_view %}{% endblock %}
         {% block content_form_actions_save_and_show %}{% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
index 91e8ebb0e..65ba0e18f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
@@ -1,20 +1,4 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityType list'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig
index d7ac89752..00ebd2938 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/new.html.twig
@@ -1,10 +1,10 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig
index 16cf893e8..3a60d3e9c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/edit.html.twig
@@ -1,12 +1,12 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_view %}{% endblock %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
index 9d04eb6d0..d3a030f50 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityTypeCategory list'|trans }}</h1>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig
index c95711529..00ebd2938 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/new.html.twig
@@ -1,11 +1,11 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
index 940389ca1..4b51457f6 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
@@ -1,5 +1,5 @@
 {#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  <info@champs-libres.coop> / <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
index 8c4ec5e69..0a9f7386a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
@@ -1,20 +1,2 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
 {% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
 {% block v_menu_title %}{{ 'Activity configuration menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillActivityBundle/config/routes.yaml b/src/Bundle/ChillActivityBundle/config/routes.yaml
index 5403529ae..d20f47013 100644
--- a/src/Bundle/ChillActivityBundle/config/routes.yaml
+++ b/src/Bundle/ChillActivityBundle/config/routes.yaml
@@ -10,48 +10,22 @@ chill_activity_activityreasoncategory:
     resource: "@ChillActivityBundle/config/routes/activityreasoncategory.yaml"
     prefix:   /
 
-chill_admin_activity_index:
+chill_activity_admin_index:
     path:     /{_locale}/admin/activity
     controller: Chill\ActivityBundle\Controller\AdminController::indexActivityAction
-    options:
-        menus:
-            admin_section:
-                label: Activities
-                order: 2000
-                icons: [tag]
 
 chill_admin_activity_redirect_to_admin_index:
     path:     /{_locale}/admin/activity_redirect_to_main
     controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
-    options:
-        menus:
-            admin_activity:
-                order: 0
-                label: Main admin menu
 
 chill_activity_type_admin:
     path:     /{_locale}/admin/activity/type
     controller: cscrud_activity_type_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2020
-                label: 'Activity Types'
 
 chill_activity_type_category_admin:
     path:     /{_locale}/admin/activity/type_category
     controller: cscrud_activity_type_category_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2999
-                label: 'Activity Types Categories'
 
 chill_activity_presence_admin:
     path:     /{_locale}/admin/activity/presence
     controller: cscrud_activity_presence_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2021
-                label: 'Activity Presences'
diff --git a/src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml b/src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml
index 0fddb0685..59473d9f0 100644
--- a/src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml
+++ b/src/Bundle/ChillActivityBundle/config/routes/activityreason.yaml
@@ -1,11 +1,6 @@
 chill_activity_activityreason:
     path:     /{_locale}/admin/activityreason/
     controller: Chill\ActivityBundle\Controller\ActivityReasonController::indexAction
-    options:
-        menus:
-            admin_activity: 
-                order: 2000
-                label: "Activity Reasons"
 
 chill_activity_activityreason_show:
     path:     /{_locale}/admin/activityreason/{id}/show
diff --git a/src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml b/src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml
index 5de9d3f34..1487a1e24 100644
--- a/src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml
+++ b/src/Bundle/ChillActivityBundle/config/routes/activityreasoncategory.yaml
@@ -1,11 +1,6 @@
 chill_activity_activityreasoncategory:
     path:     /{_locale}/admin/activityreasoncategory/
     controller: Chill\ActivityBundle\Controller\ActivityReasonCategoryController::indexAction
-    options:
-        menus:
-            admin_activity: 
-                order: 2010
-                label: "Activity Reasons Category"
 
 chill_activity_activityreasoncategory_show:
     path:     /{_locale}/admin/activityreasoncategory/{id}/show
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index 5c4b6918a..165365597 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\DependencyInjection;
 
-use Chill\CalendarBundle\Entity\CancelReason;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
index bdb26bc2b..75494473a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/layoutWithVerticalMenu.html.twig
@@ -34,10 +34,11 @@
             {% endblock %}
         </div>
         <div class="col-md-3">
+            {% block vertical_menu_content %}
                 {{ chill_menu('admin_section', {
                     'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
                 }) }}
+            {% endblock %}
         </div>
     </div>
 {% endblock %}
-

From fd67f327aed95ccc88af8d7f174468122791ed78 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 9 May 2022 16:30:20 +0200
Subject: [PATCH 077/111] admin menu: simplify header style

---
 .../Resources/public/chill/chillmain.scss          |  4 ++--
 .../views/Admin/menu_admin_section.html.twig       | 14 --------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
index bb4b1dcf2..99376088e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
@@ -179,7 +179,7 @@ div.banner {
 div.vertical-menu {
    border-radius: 0;
    margin-top: 0.5rem;
-   a.list-group-item, div.list-group-item {
+   a.list-group-item {
       background-color: $chill-yellow;
       border: 0;
       margin-bottom: 0.25rem;
@@ -187,7 +187,7 @@ div.vertical-menu {
          background-color: tint-color($chill-yellow, 20%)
       }
    }
-   div.list-group-item-header {
+   a.list-group-item-header {
       text-transform: uppercase;
       font-weight: bold;
    }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
index d0c777a4e..aed61f9c1 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/menu_admin_section.html.twig
@@ -1,17 +1,5 @@
 <div class="list-group vertical-menu">
     {% for menu in menus %}
-        {% if 'header' in menu.extras %}
-            <div class="list-group-item list-group-item-action {% if 'class' in menu.attributes|keys %}{{ menu.attributes['class'] }}{% endif %}">
-                {{ menu.label|trans }}
-                {% apply spaceless %}
-                    {% if menu.extras.icons is defined %}
-                    {% for icon in menu.extras.icons %}
-                        <span><i class="fa fa-{{ icon }}"></i></span>
-                    {% endfor %}
-                    {% endif %}
-                {% endapply %}
-            </div>
-        {% else %}
             <a href="{{ menu.uri }}" class="list-group-item list-group-item-action {% if 'class' in menu.attributes|keys %}{{ menu.attributes['class'] }}{% endif %}">
                 {{ menu.label|trans }}
                 {% apply spaceless %}
@@ -22,7 +10,5 @@
                     {% endif %}
                 {% endapply %}
             </a>
-        {% endif %}
-
     {% endfor %}
 </div>

From 3f399296c80db3a8969621846382c891e12b4ea2 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 9 May 2022 16:53:22 +0200
Subject: [PATCH 078/111] admin: admin section for calendar

---
 .../Controller/AdminController.php            | 29 +++++++++++++++++++
 .../Menu/AdminMenuBuilder.php                 |  6 ++--
 .../Resources/views/Admin/index.html.twig     | 13 +++++++++
 .../views/Admin/menu_calendar.html.twig       |  2 ++
 .../translations/messages.fr.yml              |  1 +
 5 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/Controller/AdminController.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig

diff --git a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
new file mode 100644
index 000000000..88d78d229
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\CalendarBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
+
+class AdminController extends AbstractController
+{
+    /**
+     * Calendar admin
+     *
+     * @Route("/{_locale}/admin/calendar", name="chill_calendar_admin_index")
+     */
+    public function indexAdminAction()
+    {
+        return $this->render('ChillCalendarBundle:Admin:index.html.twig');
+    }
+
+}
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
index 972f92ed6..ad5d96d9a 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
@@ -33,7 +33,9 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Calendar')
+        $menu->addChild('Calendar', [
+            'route' => 'chill_calendar_admin_index',
+        ])
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 6000, 'header' => true]);
 
@@ -44,6 +46,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
 
     public static function getMenuIds(): array
     {
-        return ['admin_section'];
+        return ['admin_section', 'admin_calendar'];
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig
new file mode 100644
index 000000000..a721a31a0
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_calendar', {
+        'layout': '@ChillCalendar/Admin/menu_calendar.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Calendar configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig
new file mode 100644
index 000000000..52338e6fe
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig
@@ -0,0 +1,2 @@
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
+{% block v_menu_title %}{{ 'Calendar configuration'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 5833eba43..d0a65c5e4 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -27,6 +27,7 @@ From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
 canceledBy: supprimé par
+Calendar configuration: Gestion des rendez-vous
 
 crud:
     calendar_cancel-reason:

From 1c04a873c0407b288dc5781513f475ee273e7b23 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 9 May 2022 17:07:36 +0200
Subject: [PATCH 079/111] admin: admin section for docstore

---
 .../Menu/AdminMenuBuilder.php                  |  6 ++++--
 .../Resources/views/Admin/layout.html.twig     | 18 ------------------
 .../views/DocumentCategory/edit.html.twig      |  2 +-
 .../views/DocumentCategory/index.html.twig     |  2 +-
 .../views/DocumentCategory/new.html.twig       |  2 +-
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
index ce86d7c19..f955b1d2e 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
@@ -33,7 +33,9 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Documents')
+        $menu->addChild('Documents', [
+            'route' => 'chill_docstore_admin',
+        ])
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 4000, 'header' => true]);
 
@@ -44,6 +46,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
 
     public static function getMenuIds(): array
     {
-        return ['admin_section'];
+        return ['admin_section', 'admin_docstore'];
     }
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
index 03be4e6b9..a9860a20d 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
@@ -1,21 +1,3 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
 {% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
 {% block vertical_menu_content %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
index b3bcd154b..42f98596e 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
@@ -11,7 +11,7 @@
 
     {{ form_start(form) }}
     {{ form_widget(form) }}
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('document_category_index') }}" class="btn btn-cancel">
                 {{ 'Back to the category list' | trans }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
index ccb49b315..5731f57f5 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
@@ -38,7 +38,7 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('document_category_new') }}" class="btn btn-create">{{ 'Create new category' | trans }}</a>
         </li>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
index 9b7badf36..cf1be4fdf 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
@@ -11,7 +11,7 @@
 
     {{ form_start(form) }}
     {{ form_widget(form) }}
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('document_category_index') }}" class="btn btn-cancel">
                 {{ 'Back to the category list' | trans }}

From 1a764025e1b92151c00f611f9933fa9d83360ce6 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 9 May 2022 17:14:25 +0200
Subject: [PATCH 080/111] admin: admin section for thirdparty

---
 .../Controller/AdminController.php            | 29 +++++++++++++++++++
 .../Menu/AdminMenuBuilder.php                 |  6 ++--
 .../Resources/views/Admin/index.html.twig     | 13 +++++++++
 .../Resources/views/Admin/menu.html.twig      |  2 ++
 .../translations/messages.fr.yml              |  2 ++
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig

diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
new file mode 100644
index 000000000..031227159
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ThirdPartyBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
+
+class AdminController extends AbstractController
+{
+    /**
+     * ThirdParty admin
+     *
+     * @Route("/{_locale}/admin/thirdparty", name="chill_thirdparty_admin_index")
+     */
+    public function indexAdminAction()
+    {
+        return $this->render('ChillThirdPartyBundle:Admin:index.html.twig');
+    }
+
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
index ec44d8339..170cc3918 100644
--- a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
@@ -33,7 +33,9 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Third party')
+        $menu->addChild('Third party', [
+            'route' => 'chill_thirdparty_admin_index',
+        ])
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 3000, 'header' => true]);
 
@@ -44,6 +46,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
 
     public static function getMenuIds(): array
     {
-        return ['admin_section'];
+        return ['admin_section', 'admin_thirdparty'];
     }
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig
new file mode 100644
index 000000000..4511d722e
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_thirdparty', {
+        'layout': '@ChillThirdParty/Admin/menu.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Third party configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig
new file mode 100644
index 000000000..3a534b81f
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig
@@ -0,0 +1,2 @@
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
+{% block v_menu_title %}{{ 'Third party configuration'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 8c2a9d856..0ea68c8e8 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -80,6 +80,8 @@ Thirdparty handling: Tiers traitant
 Thirdparty workers: Tiers intervenants
 Third party category: Catégories de tiers
 
+Third party configuration: Gestion des tiers
+
 # ROLES
 CHILL_3PARTY_3PARTY_CREATE: Ajouter un Tiers
 CHILL_3PARTY_3PARTY_SHOW:  Voir un Tiers

From 0f735c5749bf6da3cbf5146e7206e70cc12102fe Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 08:44:29 +0200
Subject: [PATCH 081/111] admin sections for person bundle

---
 .../Controller/AdminController.php            | 33 ++++++++++
 .../AdminAccompanyingCourseMenuBuilder.php    | 56 +++++++++++++++++
 .../Menu/AdminHouseholdMenuBuilder.php        | 56 +++++++++++++++++
 .../Menu/AdminPersonMenuBuilder.php           | 60 +++++++++++++++++++
 ...der.php => AdminSocialWorkMenuBuilder.php} | 48 ++-------------
 .../Admin/indexAccompanyingCourse.html.twig   | 13 ++++
 .../views/Admin/indexHousehold.html.twig      | 13 ++++
 .../views/Admin/indexPerson.html.twig         | 13 ++++
 .../views/Admin/indexSocialWork.html.twig     | 13 ++++
 .../views/Admin/menuPerson.html.twig          |  2 +
 10 files changed, 264 insertions(+), 43 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
 create mode 100644 src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
 create mode 100644 src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
 rename src/Bundle/ChillPersonBundle/Menu/{AdminMenuBuilder.php => AdminSocialWorkMenuBuilder.php} (51%)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index 813f36983..c05902e18 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Class AdminController.
@@ -25,4 +26,36 @@ class AdminController extends AbstractController
     {
         return $this->redirectToRoute('chill_main_admin_central');
     }
+
+    /**
+     * @Route("/{_locale}/admin/accompanying-course", name="chill_accompanying-course_admin_index")
+     */
+    public function indexAccompanyingCourseAdminAction()
+    {
+        return $this->render('ChillPersonBundle:Admin:indexAccompanyingCourse.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/household", name="chill_household_admin_index")
+     */
+    public function indexHouseholdAdminAction()
+    {
+        return $this->render('ChillPersonBundle:Admin:indexHousehold.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/person", name="chill_person_admin_index")
+     */
+    public function indexPersonAdminAction()
+    {
+        return $this->render('ChillPersonBundle:Admin:indexPerson.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/social-work", name="chill_social-work_admin_index")
+     */
+    public function indexSocialWorkAdminAction()
+    {
+        return $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
new file mode 100644
index 000000000..079751842
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('person_admin.accompanying_period', [
+            'route' => 'chill_accompanying-course_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 2200, 'header' => true]);
+
+        $menu->addChild('person_admin.closing motives', [
+            'route' => 'chill_crud_closing_motive_index',
+        ])->setExtras(['order' => 2210]);
+
+        $menu->addChild('person_admin.origin', [
+            'route' => 'chill_crud_origin_index',
+        ])->setExtras(['order' => 2210]);
+
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_accompanying_course'];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
new file mode 100644
index 000000000..2c8cd9c3f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Household', [
+            'route' => 'chill_household_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 2100, 'header' => true]);
+
+        $menu->addChild('Position', [
+            'route' => 'chill_crud_person_household_position_index',
+        ])->setExtras(['order' => 2110]);
+
+        $menu->addChild('person_admin.relation', [
+            'route' => 'chill_crud_person_relation_index',
+        ])->setExtras(['order' => 2120]);
+
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_household'];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
new file mode 100644
index 000000000..a218c06e0
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Person', [
+            'route' => 'chill_person_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 2000, 'header' => true]);
+
+        $menu->addChild('Civility', [
+            'route' => 'chill_crud_main_civility_index',
+        ])->setExtras(['order' => 2010]);
+
+        $menu->addChild('Marital status', [
+            'route' => 'chill_crud_person_marital-status_index',
+        ])->setExtras(['order' => 2020]);
+
+        $menu->addChild('person_admin.person_resource_kind', [
+            'route' => 'chill_crud_person_resource-kind_index',
+        ])->setExtras(['order' => 2030]);
+
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_person'];
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
similarity index 51%
rename from src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
rename to src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
index ad343feda..560b9e275 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
-class AdminMenuBuilder implements LocalMenuBuilderInterface
+class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
      * @var AuthorizationCheckerInterface
@@ -33,47 +33,9 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Person')
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2000, 'header' => true]);
-
-        $menu->addChild('Civility', [
-            'route' => 'chill_crud_main_civility_index',
-        ])->setExtras(['order' => 2010]);
-
-        $menu->addChild('Marital status', [
-            'route' => 'chill_crud_person_marital-status_index',
-        ])->setExtras(['order' => 2020]);
-
-        $menu->addChild('person_admin.person_resource_kind', [
-            'route' => 'chill_crud_person_resource-kind_index',
-        ])->setExtras(['order' => 2030]);
-
-        $menu->addChild('Household')
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2100, 'header' => true]);
-
-        $menu->addChild('Position', [
-            'route' => 'chill_crud_person_household_position_index',
-        ])->setExtras(['order' => 2110]);
-
-        $menu->addChild('person_admin.relation', [
-            'route' => 'chill_crud_person_relation_index',
-        ])->setExtras(['order' => 2120]);
-
-        $menu->addChild('person_admin.accompanying_period')
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2200, 'header' => true]);
-
-        $menu->addChild('person_admin.closing motives', [
-            'route' => 'chill_crud_closing_motive_index',
-        ])->setExtras(['order' => 2210]);
-
-        $menu->addChild('person_admin.origin', [
-            'route' => 'chill_crud_origin_index',
-        ])->setExtras(['order' => 2210]);
-
-        $menu->addChild('person_admin.social_work')
+        $menu->addChild('person_admin.social_work', [
+            'route' => 'chill_social-work_admin_index',
+        ])
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 2300, 'header' => true]);
 
@@ -100,6 +62,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
 
     public static function getMenuIds(): array
     {
-        return ['admin_section'];
+        return ['admin_section', 'admin_social_work'];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig
new file mode 100644
index 000000000..7b1ab3a95
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_accompanying_course', {
+        'layout': '@ChillPerson/Admin/menu.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Accompanying course configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig
new file mode 100644
index 000000000..66bf63a7e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_household', {
+        'layout': '@ChillPerson/Admin/menu.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Household configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig
new file mode 100644
index 000000000..98fe28d53
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_person', {
+        'layout': '@ChillPerson/Admin/menu.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Person configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig
new file mode 100644
index 000000000..a16f49f94
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_social_work', {
+        'layout': '@ChillPerson/Admin/menu.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Social work configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig
new file mode 100644
index 000000000..3a534b81f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig
@@ -0,0 +1,2 @@
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
+{% block v_menu_title %}{{ 'Third party configuration'|trans }}{% endblock %}
\ No newline at end of file

From c9b3bab50809df5626fbf72cf159bccae18bc3aa Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 10:14:30 +0200
Subject: [PATCH 082/111] admin sections for main bundle

---
 .../views/Admin/layout_activity.html.twig     |  2 +-
 .../views/Admin/menu_activity.html.twig       |  2 -
 .../Resources/views/Admin/index.html.twig     |  2 +-
 .../views/Admin/menu_calendar.html.twig       |  2 -
 .../Resources/views/Admin/layout.html.twig    |  2 +-
 .../Resources/views/Admin/menu.html.twig      | 21 -------
 .../Controller/AdminController.php            | 24 ++++++++
 .../layout_crud_permission_index.html.twig    |  8 ---
 .../views/Admin/indexLanguage.html.twig       | 13 +++++
 .../views/Admin/indexLocation.html.twig       | 13 +++++
 .../Resources/views/Admin/indexUser.html.twig | 13 +++++
 .../MenuBuilder/AdminLanguageMenuBuilder.php  | 56 +++++++++++++++++++
 .../MenuBuilder/AdminLocationMenuBuilder.php  | 56 +++++++++++++++++++
 ...nuBuilder.php => AdminUserMenuBuilder.php} | 32 ++---------
 .../ChillMainBundle/config/services/menu.yaml |  6 --
 .../Admin/indexAccompanyingCourse.html.twig   |  2 +-
 .../views/Admin/indexHousehold.html.twig      |  2 +-
 .../views/Admin/indexPerson.html.twig         |  2 +-
 .../views/Admin/indexSocialWork.html.twig     |  2 +-
 .../views/Admin/menuPerson.html.twig          |  2 -
 .../config/services/menu.yaml                 |  6 --
 .../Resources/views/Admin/index.html.twig     |  2 +-
 .../Resources/views/Admin/menu.html.twig      |  2 -
 23 files changed, 188 insertions(+), 84 deletions(-)
 delete mode 100644 src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
 delete mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig
 delete mode 100644 src/Bundle/ChillDocStoreBundle/Resources/views/Admin/menu.html.twig
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/Permission/layout_crud_permission_index.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/indexLanguage.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/indexLocation.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Admin/indexUser.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
 create mode 100644 src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
 rename src/Bundle/ChillMainBundle/Routing/MenuBuilder/{AdminSectionMenuBuilder.php => AdminUserMenuBuilder.php} (62%)
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
index 4b51457f6..4705ed4ce 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
@@ -20,7 +20,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_activity', {
-        'layout': '@ChillActivity/Admin/menu_activity.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
deleted file mode 100644
index 0a9f7386a..000000000
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/menu_activity.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Activity configuration menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig
index a721a31a0..1c1e7a5f8 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Admin/index.html.twig
@@ -2,7 +2,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_calendar', {
-        'layout': '@ChillCalendar/Admin/menu_calendar.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig
deleted file mode 100644
index 52338e6fe..000000000
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Admin/menu_calendar.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Calendar configuration'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
index a9860a20d..293f4b1a5 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/layout.html.twig
@@ -2,7 +2,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_docstore', {
-        'layout': '@ChillDocStore/Admin/menu.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/menu.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/menu.html.twig
deleted file mode 100644
index 319abc6f1..000000000
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Admin/menu.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Documents configuration'|trans }}{% endblock %}
-
diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php
index de4420f68..ce2fc7cdc 100644
--- a/src/Bundle/ChillMainBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php
@@ -23,4 +23,28 @@ class AdminController extends AbstractController
     {
         return $this->render('@ChillMain/Admin/index.html.twig');
     }
+
+    /**
+     * @Route("/{_locale}/admin/user", name="chill_main_user_admin")
+     */
+    public function indexUserAction()
+    {
+        return $this->render('@ChillMain/Admin/indexUser.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/language", name="chill_main_language_admin")
+     */
+    public function indexLanguageAction()
+    {
+        return $this->render('@ChillMain/Admin/indexLanguage.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/location", name="chill_main_location_admin")
+     */
+    public function indexLocationAction()
+    {
+        return $this->render('@ChillMain/Admin/indexLocation.html.twig');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/Permission/layout_crud_permission_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/Permission/layout_crud_permission_index.html.twig
deleted file mode 100644
index 76c1e2338..000000000
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/Permission/layout_crud_permission_index.html.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
-
-{% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
-
-{% block content %}
-{% embed '@ChillMain/CRUD/_index.html.twig' %}
-{% endembed %}
-{% endblock content %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/indexLanguage.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexLanguage.html.twig
new file mode 100644
index 000000000..6c7655686
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexLanguage.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_language', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Language configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/indexLocation.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexLocation.html.twig
new file mode 100644
index 000000000..aaafc28b0
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexLocation.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_location', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Location configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/indexUser.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexUser.html.twig
new file mode 100644
index 000000000..5e0cdaaa3
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexUser.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_user', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'User configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
new file mode 100644
index 000000000..525d79b80
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Routing\MenuBuilder;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminLanguageMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        // all the entries below must have ROLE_ADMIN permissions
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Languages and countries', [
+            'route' => 'chill_main_language_admin',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 1200, 'header' => true]);
+
+        $menu->addChild('Language list', [
+            'route' => 'chill_crud_main_language_index',
+        ])->setExtras(['order' => 1210]);
+
+        $menu->addChild('Country list', [
+            'route' => 'chill_crud_main_country_index',
+        ])->setExtras(['order' => 1220]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_language'];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
new file mode 100644
index 000000000..95b9a7ff8
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Routing\MenuBuilder;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminLocationMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        // all the entries below must have ROLE_ADMIN permissions
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Location and location type', [
+            'route' => 'chill_main_location_admin',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 1300, 'header' => true]);
+
+        $menu->addChild('Location type list', [
+            'route' => 'chill_crud_main_location_type_index',
+        ])->setExtras(['order' => 1310]);
+
+        $menu->addChild('Location list', [
+            'route' => 'chill_crud_main_location_index',
+        ])->setExtras(['order' => 1320]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_location'];
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
similarity index 62%
rename from src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
rename to src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index 6347794a8..5f7e5fc23 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminSectionMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
-class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
+class AdminUserMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
      * @var AuthorizationCheckerInterface
@@ -34,7 +34,9 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Users and permissions')
+        $menu->addChild('Users and permissions', [
+            'route' => 'chill_main_user_admin',
+        ])
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras(['order' => 1000, 'header' => true]);
 
@@ -57,34 +59,10 @@ class AdminSectionMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild('User jobs', [
             'route' => 'chill_crud_admin_user_job_index',
         ])->setExtras(['order' => 1050]);
-
-        $menu->addChild('Languages and countries')
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1200, 'header' => true]);
-
-        $menu->addChild('Language list', [
-            'route' => 'chill_crud_main_language_index',
-        ])->setExtras(['order' => 1210]);
-
-        $menu->addChild('Country list', [
-            'route' => 'chill_crud_main_country_index',
-        ])->setExtras(['order' => 1220]);
-
-        $menu->addChild('Location and location type')
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1300, 'header' => true]);
-
-        $menu->addChild('Location type list', [
-            'route' => 'chill_crud_main_location_type_index',
-        ])->setExtras(['order' => 1310]);
-
-        $menu->addChild('Location list', [
-            'route' => 'chill_crud_main_location_index',
-        ])->setExtras(['order' => 1320]);
     }
 
     public static function getMenuIds(): array
     {
-        return ['admin_section', 'admin_index'];
+        return ['admin_section', 'admin_user'];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/config/services/menu.yaml b/src/Bundle/ChillMainBundle/config/services/menu.yaml
index 1a66153f8..a4eab4e77 100644
--- a/src/Bundle/ChillMainBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/menu.yaml
@@ -17,9 +17,3 @@ services:
         autoconfigure: true
         tags:
             - { name: 'chill.menu_builder' }
-
-    Chill\MainBundle\Routing\MenuBuilder\AdminSectionMenuBuilder:
-        arguments:
-            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-        tags:
-            - { name: 'chill.menu_builder' }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig
index 7b1ab3a95..34bf00c10 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig
@@ -2,7 +2,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_accompanying_course', {
-        'layout': '@ChillPerson/Admin/menu.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig
index 66bf63a7e..1ac12d28f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig
@@ -2,7 +2,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_household', {
-        'layout': '@ChillPerson/Admin/menu.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig
index 98fe28d53..584703de8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig
@@ -2,7 +2,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_person', {
-        'layout': '@ChillPerson/Admin/menu.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig
index a16f49f94..4cdd83bd8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig
@@ -2,7 +2,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_social_work', {
-        'layout': '@ChillPerson/Admin/menu.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig
deleted file mode 100644
index 3a534b81f..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/views/Admin/menuPerson.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Third party configuration'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/config/services/menu.yaml b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
index a9f566466..198f5fe99 100644
--- a/src/Bundle/ChillPersonBundle/config/services/menu.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/menu.yaml
@@ -12,12 +12,6 @@ services:
               #        tags:
               #            - { name: 'chill.menu_builder' }
               #
-              #    Chill\PersonBundle\Menu\AdminMenuBuilder:
-              #        arguments:
-              #            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-              #        tags:
-              #            - { name: 'chill.menu_builder' }
-              #
     Chill\PersonBundle\Menu\PersonMenuBuilder:
         autowire: true
         autoconfigure: true
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig
index 4511d722e..60f39ddeb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/index.html.twig
@@ -2,7 +2,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_thirdparty', {
-        'layout': '@ChillThirdParty/Admin/menu.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig'
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig
deleted file mode 100644
index 3a534b81f..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Admin/menu.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Third party configuration'|trans }}{% endblock %}
\ No newline at end of file

From 0e8b73638f3f73c11b71e0f77867d34bd01daad8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 10:40:06 +0200
Subject: [PATCH 083/111] admin for aside activity

---
 .../src/Controller/AdminController.php        | 30 ++++++++++++++++++
 .../src/Menu/AdminMenuBuilder.php             | 31 +++++++++----------
 ...sideactivity.html.twig => index.html.twig} |  4 ++-
 .../asideActivityCategory/edit.html.twig      |  4 +--
 .../asideActivityCategory/index.html.twig     |  9 ++++--
 .../views/asideActivityCategory/new.html.twig |  4 +--
 6 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
 rename src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/{layout_asideactivity.html.twig => index.html.twig} (71%)

diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
new file mode 100644
index 000000000..70d295027
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\AsideActivityBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * Class AdminController.
+ */
+class AdminController extends AbstractController
+{
+    /**
+     * @Route("/{_locale}/admin/aside-activity", name="chill_aside_activity_admin")
+     */
+    public function indexAdminAction()
+    {
+        return $this->render('ChillAsideActivityBundle:Admin:index.html.twig');
+    }
+
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
index 4fa2c2c96..e58d98fc2 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
@@ -32,27 +32,26 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
             return;
         }
 
-        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
-            $menu->addChild('Aside activities', [
+        $menu->addChild('Aside activities', [
+            'route' => 'chill_aside_activity_admin',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras([
+                'order' => 7000,
+                'header' => true,
+                'explain' => 'Aside activity type configuration',
+            ]);
+        $menu
+            ->addChild('Aside activity categories', [
                 'route' => 'chill_crud_aside_activity_category_index',
             ])
-                ->setExtras([
-                    'order' => 900,
-                    'explain' => 'Aside activity type configuration',
-                ]);
-        } else {
-            $menu
-                ->addChild('Aside activity categories', [
-                    'route' => 'chill_crud_aside_activity_category_index',
-                ])
-                ->setExtras([
-                    'order' => '50',
-                ]);
-        }
+            ->setExtras([
+                'order' => 7010,
+            ]);
     }
 
     public static function getMenuIds(): array
     {
-        return ['admin_index', 'admin_section', 'admin_aside_activity'];
+        return ['admin_section', 'admin_aside_activity'];
     }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/index.html.twig
similarity index 71%
rename from src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
rename to src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/index.html.twig
index c328d2030..8325c0ed6 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/index.html.twig
@@ -1,7 +1,9 @@
 {% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
 {% block vertical_menu_content %}
-	{{ chill_menu('admin_aside_activity') }}
+	{{ chill_menu('admin_aside_activity', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
 {% endblock %}
 
 {% block layout_wvm_content %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig
index 3fb6fb612..3a60d3e9c 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig
@@ -1,10 +1,10 @@
-{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block content_form_actions_view %}{% endblock %}
         {% block content_form_actions_save_and_show %}{% endblock %}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
index 00dc1d3ea..741ff7dc9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig
@@ -1,7 +1,10 @@
-{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+
+{% block title %}{{ 'Aside Activity Type List'|trans }}{% endblock title %}
 
 {% block admin_content %}
-	<h1>{{ 'Aside Activity Type List'|trans }}</h1>
+
+    <h1>{{ 'Aside Activity Type List'|trans }}</h1>
 
 	<table class="records_list table table-bordered border-dark">
 		<thead>
@@ -36,7 +39,7 @@
 		</tbody>
 	</table>
 
-	<ul class="record_actions">
+	<ul class="record_actions sticky-form-buttons">
 		<li>
 			<a href="{{ path('chill_crud_aside_activity_category_new') }}" class="btn btn-create">
 				{{ 'Create a new aside activity type'|trans }}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig
index 3c8ded234..00ebd2938 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig
@@ -1,10 +1,10 @@
-{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
     {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
         {% block content_form_actions_save_and_show %}{% endblock %}
     {% endembed %}

From be27df1fd566d0d7baec6aac47a6bb9ef4ef1320 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 11:46:17 +0200
Subject: [PATCH 084/111] admin: remove obsolet header => true tag + php code
 fix

---
 .../Menu/AdminMenuBuilder.php                    |  2 +-
 .../src/Controller/AdminController.php           |  1 -
 .../src/Menu/AdminMenuBuilder.php                |  3 ---
 .../Controller/AdminController.php               |  3 +--
 .../Menu/AdminMenuBuilder.php                    |  2 +-
 .../Menu/AdminMenuBuilder.php                    |  2 +-
 .../Controller/AdminController.php               | 16 ++++++++--------
 .../MenuBuilder/AdminLanguageMenuBuilder.php     |  2 +-
 .../MenuBuilder/AdminLocationMenuBuilder.php     |  2 +-
 .../Routing/MenuBuilder/AdminUserMenuBuilder.php |  2 +-
 .../Controller/AdminController.php               | 16 ++++++++--------
 .../Menu/AdminAccompanyingCourseMenuBuilder.php  |  3 +--
 .../Menu/AdminHouseholdMenuBuilder.php           |  3 +--
 .../Menu/AdminPersonMenuBuilder.php              |  3 +--
 .../Menu/AdminSocialWorkMenuBuilder.php          |  2 +-
 .../Controller/AdminController.php               |  5 ++---
 .../Menu/AdminMenuBuilder.php                    |  2 +-
 17 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
index 72f938c88..79abbbcce 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -34,7 +34,7 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_activity_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 5000, 'header' => true]);
+            ->setExtras(['order' => 5000]);
 
         $menu->addChild('Activity Reasons', [
             'route' => 'chill_activity_activityreason',
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
index 70d295027..ae463d240 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
@@ -26,5 +26,4 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillAsideActivityBundle:Admin:index.html.twig');
     }
-
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
index e58d98fc2..30b587a7e 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
@@ -14,8 +14,6 @@ namespace Chill\AsideActivityBundle\Menu;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 
-use function in_array;
-
 final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuilderInterface
 {
     private Security $security;
@@ -38,7 +36,6 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 7000,
-                'header' => true,
                 'explain' => 'Aside activity type configuration',
             ]);
         $menu
diff --git a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
index 88d78d229..9b9195b82 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
@@ -17,7 +17,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class AdminController extends AbstractController
 {
     /**
-     * Calendar admin
+     * Calendar admin.
      *
      * @Route("/{_locale}/admin/calendar", name="chill_calendar_admin_index")
      */
@@ -25,5 +25,4 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillCalendarBundle:Admin:index.html.twig');
     }
-
 }
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
index ad5d96d9a..d86d0062a 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
@@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_calendar_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 6000, 'header' => true]);
+            ->setExtras(['order' => 6000]);
 
         $menu->addChild('Cancel reason', [
             'route' => 'chill_crud_calendar_cancel-reason_index',
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
index f955b1d2e..c90239f70 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
@@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_docstore_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 4000, 'header' => true]);
+            ->setExtras(['order' => 4000]);
 
         $menu->addChild('Document category list', [
             'route' => 'chill_docstore_category_admin',
diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php
index ce2fc7cdc..56eac11e4 100644
--- a/src/Bundle/ChillMainBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php
@@ -24,14 +24,6 @@ class AdminController extends AbstractController
         return $this->render('@ChillMain/Admin/index.html.twig');
     }
 
-    /**
-     * @Route("/{_locale}/admin/user", name="chill_main_user_admin")
-     */
-    public function indexUserAction()
-    {
-        return $this->render('@ChillMain/Admin/indexUser.html.twig');
-    }
-
     /**
      * @Route("/{_locale}/admin/language", name="chill_main_language_admin")
      */
@@ -47,4 +39,12 @@ class AdminController extends AbstractController
     {
         return $this->render('@ChillMain/Admin/indexLocation.html.twig');
     }
+
+    /**
+     * @Route("/{_locale}/admin/user", name="chill_main_user_admin")
+     */
+    public function indexUserAction()
+    {
+        return $this->render('@ChillMain/Admin/indexUser.html.twig');
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
index 525d79b80..138e63730 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
@@ -38,7 +38,7 @@ class AdminLanguageMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_main_language_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1200, 'header' => true]);
+            ->setExtras(['order' => 1200]);
 
         $menu->addChild('Language list', [
             'route' => 'chill_crud_main_language_index',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
index 95b9a7ff8..972504658 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
@@ -38,7 +38,7 @@ class AdminLocationMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_main_location_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1300, 'header' => true]);
+            ->setExtras(['order' => 1300]);
 
         $menu->addChild('Location type list', [
             'route' => 'chill_crud_main_location_type_index',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index 5f7e5fc23..3145b0342 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -38,7 +38,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_main_user_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1000, 'header' => true]);
+            ->setExtras(['order' => 1000]);
 
         $menu->addChild('Center list', [
             'route' => 'admin_center',
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index c05902e18..b59cbc4a5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -19,14 +19,6 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class AdminController extends AbstractController
 {
-    /**
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    public function redirectToAdminIndexAction()
-    {
-        return $this->redirectToRoute('chill_main_admin_central');
-    }
-
     /**
      * @Route("/{_locale}/admin/accompanying-course", name="chill_accompanying-course_admin_index")
      */
@@ -58,4 +50,12 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig');
     }
+
+    /**
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function redirectToAdminIndexAction()
+    {
+        return $this->redirectToRoute('chill_main_admin_central');
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
index 079751842..a049b2045 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
@@ -37,7 +37,7 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_accompanying-course_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2200, 'header' => true]);
+            ->setExtras(['order' => 2200]);
 
         $menu->addChild('person_admin.closing motives', [
             'route' => 'chill_crud_closing_motive_index',
@@ -46,7 +46,6 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild('person_admin.origin', [
             'route' => 'chill_crud_origin_index',
         ])->setExtras(['order' => 2210]);
-
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
index 2c8cd9c3f..50a894b5b 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
@@ -37,7 +37,7 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_household_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2100, 'header' => true]);
+            ->setExtras(['order' => 2100]);
 
         $menu->addChild('Position', [
             'route' => 'chill_crud_person_household_position_index',
@@ -46,7 +46,6 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild('person_admin.relation', [
             'route' => 'chill_crud_person_relation_index',
         ])->setExtras(['order' => 2120]);
-
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
index a218c06e0..94dd3897a 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
@@ -37,7 +37,7 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_person_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2000, 'header' => true]);
+            ->setExtras(['order' => 2000]);
 
         $menu->addChild('Civility', [
             'route' => 'chill_crud_main_civility_index',
@@ -50,7 +50,6 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
         $menu->addChild('person_admin.person_resource_kind', [
             'route' => 'chill_crud_person_resource-kind_index',
         ])->setExtras(['order' => 2030]);
-
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
index 560b9e275..a2e30b7a4 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
@@ -37,7 +37,7 @@ class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_social-work_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2300, 'header' => true]);
+            ->setExtras(['order' => 2300]);
 
         $menu->addChild('person_admin.social_action', [
             'route' => 'chill_crud_social_action_index',
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
index 031227159..187ce3d8d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
@@ -17,7 +17,7 @@ use Symfony\Component\Routing\Annotation\Route;
 class AdminController extends AbstractController
 {
     /**
-     * ThirdParty admin
+     * ThirdParty admin.
      *
      * @Route("/{_locale}/admin/thirdparty", name="chill_thirdparty_admin_index")
      */
@@ -25,5 +25,4 @@ class AdminController extends AbstractController
     {
         return $this->render('ChillThirdPartyBundle:Admin:index.html.twig');
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
index 170cc3918..0da9c95e0 100644
--- a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
@@ -37,7 +37,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_thirdparty_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 3000, 'header' => true]);
+            ->setExtras(['order' => 3000]);
 
         $menu->addChild('Third party category', [
             'route' => 'chill_crud_thirdparty_thirdparty-category_index',

From cb1bbe940f2f30f6f99686b4c4a9872f1d35a45d Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 13:55:33 +0200
Subject: [PATCH 085/111] admin: docgen admin

---
 .../AdminDocGeneratorTemplateController.php     |  2 +-
 .../ChillDocGeneratorExtension.php              |  6 +++---
 .../Menu/AdminMenuBuilder.php                   | 17 ++++++++---------
 .../Resources/views/Admin/layout.html.twig      |  4 ----
 .../DocGeneratorTemplate/edit.html.twig         |  4 ++--
 .../DocGeneratorTemplate/index.html.twig        | 10 ++++++++--
 .../DocGeneratorTemplate/new.html.twig          |  4 ++--
 .../DocGeneratorTemplate/pick-context.html.twig |  4 ++--
 .../translations/messages.fr.yml                |  2 +-
 9 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig
 rename src/Bundle/ChillDocGeneratorBundle/Resources/views/{Admin => }/DocGeneratorTemplate/edit.html.twig (88%)
 rename src/Bundle/ChillDocGeneratorBundle/Resources/views/{Admin => }/DocGeneratorTemplate/index.html.twig (85%)
 rename src/Bundle/ChillDocGeneratorBundle/Resources/views/{Admin => }/DocGeneratorTemplate/new.html.twig (87%)
 rename src/Bundle/ChillDocGeneratorBundle/Resources/views/{Admin => }/DocGeneratorTemplate/pick-context.html.twig (89%)

diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
index c92aff527..296829455 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
@@ -68,7 +68,7 @@ class AdminDocGeneratorTemplateController extends CRUDController
     {
         $this->denyAccessUnlessGranted('ROLE_ADMIN');
 
-        return $this->render('ChillDocGeneratorBundle:Admin/DocGeneratorTemplate:pick-context.html.twig', [
+        return $this->render('@ChillDocGenerator/DocGeneratorTemplate/pick-context.html.twig', [
             'contexts' => $this->contextManager->getContexts(),
         ]);
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
index 9712ffac8..b57cbe72b 100644
--- a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
+++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php
@@ -56,16 +56,16 @@ class ChillDocGeneratorExtension extends Extension implements PrependExtensionIn
                     'controller' => \Chill\DocGeneratorBundle\Controller\AdminDocGeneratorTemplateController::class,
                     'actions' => [
                         'index' => [
-                            'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/index.html.twig',
+                            'template' => '@ChillDocGenerator/DocGeneratorTemplate/index.html.twig',
                             'role' => 'ROLE_ADMIN',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/new.html.twig',
+                            'template' => '@ChillDocGenerator/DocGeneratorTemplate/new.html.twig',
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/edit.html.twig',
+                            'template' => '@ChillDocGenerator/DocGeneratorTemplate/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
index d88f0c122..675cd9e90 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
@@ -33,19 +33,18 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->security->isGranted('ROLE_ADMIN')) {
-            if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
-                $menu->addChild($this->translator->trans('docgen.Document generation'), [
-                    'route' => 'chill_crud_docgen_template_index',
-                ])->setExtras([
-                    'order' => 350,
-                    'explain' => 'docgen.Manage templates and document generation',
-                ]);
-            }
+
+            $menu->addChild($this->translator->trans('docgen.Document generation'), [
+                'route' => 'chill_crud_docgen_template_index',
+            ])->setExtras([
+                'order' => 4020,
+                'explain' => 'docgen.Manage templates and document generation',
+            ]);
         }
     }
 
     public static function getMenuIds(): array
     {
-        return ['admin_index', 'admin_section', 'docgen_admin'];
+        return ['admin_section', 'admin_docstore'];
     }
 }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig
deleted file mode 100644
index 6e7c9387c..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/layout.html.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
-
-{% block vertical_menu_content %}
-{% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/edit.html.twig
similarity index 88%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/edit.html.twig
index 93b08f688..0b88e2672 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/edit.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/edit.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title 'docgen.Edit template'|trans %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
 
         {% block crud_content_header %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
similarity index 85%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
index 436f816c2..73527edb3 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
@@ -1,6 +1,6 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th></th>
@@ -34,5 +34,11 @@
                 </tr>
             {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/new.html.twig
similarity index 87%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/new.html.twig
index fe4991ffa..459b5ee0f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/new.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/new.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title 'docgen.New template'|trans %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
 
         {% block crud_content_header %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/pick-context.html.twig
similarity index 89%
rename from src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig
rename to src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/pick-context.html.twig
index 5e3ff2049..c2f4a9a95 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/pick-context.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/pick-context.html.twig
@@ -1,8 +1,8 @@
-{% extends '@ChillDocGenerator/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title 'docgen.Pick template context'|trans %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
 <div class="col-md-10 col-xxl">
 
     <h1>{{ block('title') }}</h1>
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
index a06852b8a..b60a7d60e 100644
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -8,7 +8,7 @@ docgen:
     New template: Nouveau modèle
     Edit template: Modifier modèle
     test generate: Tester la génération
-    With context: 'Avec le contexte :'
+    With context %name%: 'Avec le contexte "%name%"'
 
 
 crud:

From fde1d563c2a5db6b24cfa595e37e7ab93ac095f6 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 14:36:10 +0200
Subject: [PATCH 086/111] admin custom fields integration

---
 .../Menu/AdminMenuBuilder.php                 |  2 +-
 .../ChillCustomFieldsExtension.php            |  1 +
 .../Menu/AdminMenuBuilder.php                 | 55 +++++++++++++++++++
 .../Resources/views/Admin/layout.html.twig    | 20 +------
 .../Resources/views/Admin/menu.html.twig      | 20 -------
 .../views/CustomField/edit.html.twig          |  2 +-
 .../Resources/views/CustomField/new.html.twig |  4 +-
 .../views/CustomField/show.html.twig          |  2 +-
 .../views/CustomFieldsGroup/edit.html.twig    |  2 +-
 .../views/CustomFieldsGroup/index.html.twig   |  2 +-
 .../views/CustomFieldsGroup/new.html.twig     |  2 +-
 .../views/CustomFieldsGroup/show.html.twig    |  6 +-
 .../config/routes/customfield.yaml            |  6 --
 .../config/routes/customfieldsgroup.yaml      |  5 --
 .../config/services/menu.yaml                 |  7 +++
 .../translations/messages.fr.yml              |  5 +-
 16 files changed, 78 insertions(+), 63 deletions(-)
 create mode 100644 src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
 delete mode 100644 src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/menu.html.twig
 create mode 100644 src/Bundle/ChillCustomFieldsBundle/config/services/menu.yaml

diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
index 79abbbcce..a2abc59ae 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -59,6 +59,6 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
 
     public static function getMenuIds(): array
     {
-        return ['admin_index', 'admin_section', 'admin_activity'];
+        return ['admin_section', 'admin_activity'];
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
index 98e22d1ef..9c9ca7872 100644
--- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
+++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php
@@ -34,6 +34,7 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
         $loader->load('services/fixtures.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/command.yaml');
+        $loader->load('services/menu.yaml');
 
         //add at least a blank array at 'customizable_entities' options
         //$customizable_entities = (isset($config['customizables_entities'])
diff --git a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
new file mode 100644
index 000000000..2e2d11f6f
--- /dev/null
+++ b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\CustomFieldsBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Custom fields', [
+            'route' => 'customfield_section',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras(['order' => 4500]);
+
+        $menu->addChild('Custom fields group', [
+            'route' => 'customfield_section',
+        ])->setExtras(['order' => 4510]);
+
+        $menu->addChild('Custom fields group', [
+            'route' => 'customfieldsgroup',
+        ])->setExtras(['order' => 4520]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_custom_fields'];
+    }
+}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig
index 3e12173fc..46f100848 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/layout.html.twig
@@ -1,26 +1,8 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
 {% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_custom_fields', {
-        'layout': '@ChillCustomFields/Admin/menu.html.twig',
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
     }) }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/menu.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/menu.html.twig
deleted file mode 100644
index 5bef800fc..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/Admin/menu.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}{{ 'Custom fields configuration menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig
index 17180762b..26ee56a64 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillCustomFields/Admin/layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'CustomField edit'|trans }}{% endblock title %}
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig
index b45aaa5c1..987f3f5d9 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillCustomFields/Admin/layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'CustomField creation'|trans }}{% endblock title %}
 
@@ -39,7 +39,7 @@
     {% endif %}
     {{ form_row(form.submit, {'attr': { 'class': 'btn btn-create' } } ) }}
     {{ form_end(form) }}
-    
+
     <ul class="record_actions">
     <li>
         {% if entity.customFieldsGroup is not null %}
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/show.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/show.html.twig
index 33f1a0f79..acf66ecc3 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/show.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/show.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillCustomFields/Admin/layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>CustomField</h1>
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig
index 2760ba9a0..0cb190531 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillCustomFields/Admin/layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'CustomFieldsGroup edit'|trans }}{% endblock %}
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
index 8ca67a721..2b3bb634f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillCustomFields/Admin/layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'CustomFieldsGroup list'|trans }}{% endblock %}
 
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig
index fe5f91734..16cf10581 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillCustomFields/Admin/layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block admin_content %}
     <h1>{{ 'CustomFieldsGroup creation'|trans }}</h1>
diff --git a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig
index 38d819ab2..fe211e3f7 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig
+++ b/src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillCustomFields/Admin/layout.html.twig" %}
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
 
 {% block title %}{{ 'CustomFieldsGroup details'|trans }}{% endblock %}
 
@@ -62,9 +62,9 @@
             </a>
         </li>
     </ul>
-    
+
     <h2>{{ 'Fields associated with this group'|trans }}</h2>
-    
+
     {%- if entity.customFields|length > 0 -%}
     <table>
         <thead>
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfield.yaml b/src/Bundle/ChillCustomFieldsBundle/config/routes/customfield.yaml
index 1265e1e7d..a000b2a3a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfield.yaml
+++ b/src/Bundle/ChillCustomFieldsBundle/config/routes/customfield.yaml
@@ -1,12 +1,6 @@
 customfield_section:
     path:     /{_locale}/admin/customfield/
     defaults: { _controller: "ChillCustomFieldsBundle:Admin:index" }
-    options:
-        menus:
-            admin_section:
-                order: 1000
-                label: "Custom fields configuration"
-                icons: ['asterisk']
 
 customfield_new:
     path:     /{_locale}/admin/customfield/new
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml b/src/Bundle/ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml
index 9150c5349..9c34f8d44 100644
--- a/src/Bundle/ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml
+++ b/src/Bundle/ChillCustomFieldsBundle/config/routes/customfieldsgroup.yaml
@@ -1,11 +1,6 @@
 customfieldsgroup:
     path:     /{_locale}/admin/customfieldsgroup/
     defaults: { _controller: "ChillCustomFieldsBundle:CustomFieldsGroup:index" }
-    options:
-        menus:
-            admin_custom_fields:
-                order: 1010
-                label: "CustomFields Groups"
 
 customfieldsgroup_show:
     path:     /{_locale}/admin/customfieldsgroup/{id}/show
diff --git a/src/Bundle/ChillCustomFieldsBundle/config/services/menu.yaml b/src/Bundle/ChillCustomFieldsBundle/config/services/menu.yaml
new file mode 100644
index 000000000..5c6e80734
--- /dev/null
+++ b/src/Bundle/ChillCustomFieldsBundle/config/services/menu.yaml
@@ -0,0 +1,7 @@
+services:
+    Chill\CustomFieldsBundle\Menu\:
+        autowire: true
+        autoconfigure: true
+        resource: '../../Menu/'
+        tags: ['chill.menu_builder']
+
diff --git a/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml b/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml
index 446176c51..31463fccb 100644
--- a/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml
@@ -37,16 +37,17 @@ CustomFields List: Liste des champs personnalisés
 CustomFields Groups: Groupe de champs personnalisés
 
 #customfield administration
+Custom fields: Champs personnalisés
 CustomField edit: Modification d'un champ personnalisé
 CustomField creation: Nouveau champ personnalisé
 General informations: Informations générales
 Options: Options
-Custom fields group: Groupe de champ personnalisé
+Custom fields group: Groupe de champs personnalisés
 Ordering: Ordre d'apparition
 Required field: Champs requis
 An answer is required: Une réponse est requise
 Any answer is required: Aucune réponse n'est requise
-Back to the group: Retour au groupe de champs personnalisé
+Back to the group: Retour au groupe de champs personnalisés
 Slug: Identifiant textuel
 The custom field has been created: Le champ personnalisé est créé
 The custom field form contains errors: Le formulaire contient des erreurs

From f4652adbc2c6cbecfe1cb533a426c46e5a905937 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 15:21:29 +0200
Subject: [PATCH 087/111] admin: add fa icons to menu section title

---
 src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php    | 5 ++++-
 src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php    | 5 ++++-
 .../ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php       | 5 ++++-
 src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php    | 5 ++++-
 .../Routing/MenuBuilder/AdminLanguageMenuBuilder.php        | 6 ++++--
 .../Routing/MenuBuilder/AdminLocationMenuBuilder.php        | 5 ++++-
 .../Routing/MenuBuilder/AdminUserMenuBuilder.php            | 5 ++++-
 .../Menu/AdminAccompanyingCourseMenuBuilder.php             | 5 ++++-
 .../ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php    | 5 ++++-
 .../ChillPersonBundle/Menu/AdminPersonMenuBuilder.php       | 5 ++++-
 .../ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php   | 5 ++++-
 src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php  | 5 ++++-
 12 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
index a2abc59ae..1d887fead 100644
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -34,7 +34,10 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_activity_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 5000]);
+            ->setExtras([
+                'order' => 5000,
+                'icons' => ['exchange'],
+            ]);
 
         $menu->addChild('Activity Reasons', [
             'route' => 'chill_activity_activityreason',
diff --git a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
index d86d0062a..961bab778 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AdminMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_calendar_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 6000]);
+            ->setExtras([
+                'order' => 6000,
+                'icons' => ['calendar'],
+            ]);
 
         $menu->addChild('Cancel reason', [
             'route' => 'chill_crud_calendar_cancel-reason_index',
diff --git a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
index 2e2d11f6f..e3d19e68b 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'customfield_section',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 4500]);
+            ->setExtras([
+                'order' => 4500,
+                'icons' => ['plus']
+            ]);
 
         $menu->addChild('Custom fields group', [
             'route' => 'customfield_section',
diff --git a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
index c90239f70..cdae0136b 100644
--- a/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocStoreBundle/Menu/AdminMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_docstore_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 4000]);
+            ->setExtras([
+                'order' => 4000,
+                'icons' => ['file-pdf-o'],
+            ]);
 
         $menu->addChild('Document category list', [
             'route' => 'chill_docstore_category_admin',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
index 138e63730..022339568 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLanguageMenuBuilder.php
@@ -38,8 +38,10 @@ class AdminLanguageMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_main_language_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1200]);
-
+            ->setExtras([
+                'order' => 1200,
+                'icons' => ['globe-w'],
+            ]);
         $menu->addChild('Language list', [
             'route' => 'chill_crud_main_language_index',
         ])->setExtras(['order' => 1210]);
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
index 972504658..bb4910ca6 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminLocationMenuBuilder.php
@@ -38,7 +38,10 @@ class AdminLocationMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_main_location_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1300]);
+            ->setExtras([
+                'order' => 1300,
+                'icons' => ['map-marker'],
+            ]);
 
         $menu->addChild('Location type list', [
             'route' => 'chill_crud_main_location_type_index',
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index 3145b0342..7b3399503 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -38,7 +38,10 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_main_user_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 1000]);
+            ->setExtras([
+                'order' => 1000,
+                'icons' => ['key'],
+            ]);
 
         $menu->addChild('Center list', [
             'route' => 'admin_center',
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
index a049b2045..eb83d8471 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_accompanying-course_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2200]);
+            ->setExtras([
+                'order' => 2200,
+                'icons' => ['road'],
+            ]);
 
         $menu->addChild('person_admin.closing motives', [
             'route' => 'chill_crud_closing_motive_index',
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
index 50a894b5b..e68059e1d 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_household_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2100]);
+            ->setExtras([
+                'order' => 2100,
+                'icons' => ['home'],
+            ]);
 
         $menu->addChild('Position', [
             'route' => 'chill_crud_person_household_position_index',
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
index 94dd3897a..683f4e7b6 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_person_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2000]);
+            ->setExtras([
+                'order' => 2000,
+                'icons' => ['child'],
+            ]);
 
         $menu->addChild('Civility', [
             'route' => 'chill_crud_main_civility_index',
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
index a2e30b7a4..a7244ac15 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_social-work_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 2300]);
+            ->setExtras([
+                'order' => 2300,
+                'icons' => ['handshake-o'],
+            ]);
 
         $menu->addChild('person_admin.social_action', [
             'route' => 'chill_crud_social_action_index',
diff --git a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
index 0da9c95e0..545f1db15 100644
--- a/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillThirdPartyBundle/Menu/AdminMenuBuilder.php
@@ -37,7 +37,10 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_thirdparty_admin_index',
         ])
             ->setAttribute('class', 'list-group-item-header')
-            ->setExtras(['order' => 3000]);
+            ->setExtras([
+                'order' => 3000,
+                'icons' => ['male'],
+            ]);
 
         $menu->addChild('Third party category', [
             'route' => 'chill_crud_thirdparty_thirdparty-category_index',

From b7ed658f965de2d2070dc6a37633673180f5c55e Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 17:01:09 +0200
Subject: [PATCH 088/111] admin: fix new document category

---
 .../Controller/DocumentCategoryController.php        | 12 +++++++++---
 .../Form/DocumentCategoryType.php                    |  4 ++--
 .../Repository/DocumentCategoryRepository.php        | 11 -----------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
index a15854509..4daa9fe28 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
@@ -102,10 +102,18 @@ class DocumentCategoryController extends AbstractController
     public function new(Request $request): Response
     {
         $em = $this->getDoctrine()->getManager();
+
+        $nextId = $em
+            ->createQuery(
+                'SELECT MAX(c.idInsideBundle) + 1 FROM ChillDocStoreBundle:DocumentCategory c'
+            )
+            ->getSingleResult();
+
         $documentCategory = new DocumentCategory(
             ChillDocStoreBundle::class,
-            $em->getRepository(DocumentCategory::class)->nextIdInsideBundle()
+            reset($nextId)
         );
+
         $documentCategory
             ->setDocumentClass(PersonDocument::class);
 
@@ -120,8 +128,6 @@ class DocumentCategoryController extends AbstractController
             return $this->redirectToRoute('document_category_index');
         }
 
-        $documentCategory->setBundleId(ChillDocStoreBundle::class);
-
         return $this->render('ChillDocStoreBundle:DocumentCategory:new.html.twig', [
             'document_category' => $documentCategory,
             'form' => $form->createView(),
diff --git a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
index 97265f2dc..62c63fe1f 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/DocumentCategoryType.php
@@ -37,13 +37,13 @@ class DocumentCategoryType extends AbstractType
         $builder
             ->add('bundleId', ChoiceType::class, [
                 'choices' => $this->chillBundlesFlipped,
-                'disabled' => true,
+                'disabled' => false,
             ])
             ->add('idInsideBundle', null, [
                 'disabled' => true,
             ])
             ->add('documentClass', null, [
-                'disabled' => true,
+                'disabled' => false,
             ]) // cahcerh par default PersonDocument
             ->add('name', TranslatableStringFormType::class);
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
index f930e8ece..e91cdad9a 100644
--- a/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
@@ -61,15 +61,4 @@ class DocumentCategoryRepository implements ObjectRepository
     {
         return DocumentCategory::class;
     }
-
-    public function nextIdInsideBundle()
-    {
-        $array_res = $this->em
-            ->createQuery(
-                'SELECT MAX(c.idInsideBundle) + 1 FROM ChillDocStoreBundle:DocumentCategory c'
-            )
-            ->getSingleResult();
-
-        return reset($array_res);
-    }
 }

From f449dcbda1466d7725a4c57f696c6bb8d74b8e69 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 10 May 2022 18:06:29 +0200
Subject: [PATCH 089/111] admin: refine social work admin form

---
 .../Controller/UserController.php             | 48 ++++++++++++++++++-
 .../Resources/views/User/index.html.twig      |  3 ++
 .../ChillPersonExtension.php                  |  4 +-
 .../SocialWork/Evaluation/index.html.twig     | 28 +++++++++++
 .../views/SocialWork/Goal/index.html.twig     | 12 +++++
 .../SocialWork/SocialAction/edit.html.twig    | 22 +++++++++
 .../SocialWork/SocialAction/index.html.twig   | 26 ++++++++++
 .../SocialWork/SocialIssue/edit.html.twig     | 22 +++++++++
 .../SocialWork/SocialIssue/index.html.twig    | 12 +++++
 .../translations/messages.fr.yml              |  4 ++
 10 files changed, 178 insertions(+), 3 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/edit.html.twig

diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 61895eaa9..127519013 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -19,8 +19,11 @@ use Chill\MainBundle\Form\UserCurrentLocationType;
 use Chill\MainBundle\Form\UserPasswordType;
 use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
+use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
@@ -41,14 +44,57 @@ class UserController extends CRUDController
 
     private ValidatorInterface $validator;
 
+    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
+
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
-        UserPasswordEncoderInterface $passwordEncoder
+        UserPasswordEncoderInterface $passwordEncoder,
+        FilterOrderHelperFactoryInterface $filterOrderHelperFactory
     ) {
         $this->logger = $chillLogger;
         $this->validator = $validator;
         $this->passwordEncoder = $passwordEncoder;
+        $this->filterOrderHelperFactory = $filterOrderHelperFactory;
+    }
+
+
+    // public function index(Request $request)
+    // {
+    //     dump($request);
+
+    //     //$filterOrder = $this->buildFilterOrderHelper('index', $request);
+    //     return parent::indexEntityAction('index', $request);
+    // }
+
+    // protected function buildFilterOrderHelper($action, $request): FilterOrderHelper
+    // {
+    //     $filter_order = $this->filterOrderHelperFactory
+    //         ->create(self::class)
+    //         ->addSearchBox(['name'])
+    //         ->build();
+    //     dump($filter_order);
+    //     return $filter_order;
+    // }
+
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['label'])
+            ->build();
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (null === $filterOrder) {
+            throw new LogicException('filterOrder should not be null');
+        }
+        dump($filterOrder);
+        $count = parent::countEntities($action, $request, $filterOrder);
+
+        dump($count);
+        return $count;
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 46fb7aa29..bab54d56e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -3,6 +3,9 @@
 {% block admin_content %}
 
     <h1>{{"Users"|trans}}</h1>
+
+    {{ filter_order|chill_render_filter_order_helper }}
+
     {% for entity in entities %}
     <div class="flex-table">
         <div class="item-bloc">
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index 950715a2b..faf37b92c 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -286,7 +286,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                            'template' => '@ChillPerson/SocialWork/SocialIssue/edit.html.twig',
                         ],
                     ],
                 ],
@@ -307,7 +307,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                            'template' => '@ChillPerson/SocialWork/SocialAction/edit.html.twig',
                         ],
                     ],
                 ],
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig
index 0adc82788..556065e42 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig
@@ -5,6 +5,8 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'evaluation.delay'|trans }}</th>
+            <th>{{ 'evaluation.notificationDelay'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -13,6 +15,32 @@
                 <tr>
                     <td>{{ entity.id }}</td>
                     <td>{{ entity.title|localize_translatable_string }}</td>
+                    <td>
+                    {% if entity.delay is not null %}
+                        {% if entity.delay.d > 0 %}
+                            {{ entity.delay.d  }} {{'days'|trans}}
+                        {% endif %}
+                        {% if entity.delay.m > 0 %}
+                            {{ entity.delay.m  }} {{'months'|trans}}
+                        {% endif %}
+                        {% if entity.delay.y > 0 %}
+                            {{ entity.delay.y  }} {{'years'|trans}}
+                        {% endif %}
+                    {% endif %}
+                    </td>
+                    <td>
+                    {% if entity.notificationDelay is not null %}
+                        {% if entity.notificationDelay.d > 0 %}
+                            {{ entity.notificationDelay.d  }} {{'days'|trans}}
+                        {% endif %}
+                        {% if entity.notificationDelay.m > 0 %}
+                            {{ entity.notificationDelay.m  }} {{'months'|trans}}
+                        {% endif %}
+                        {% if entity.notificationDelay.y > 0 %}
+                            {{ entity.notificationDelay.y  }} {{'years'|trans}}
+                        {% endif %}
+                    {% endif %}
+                    </td>
                     <td>
                         <ul class="record_actions">
                             <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
index 3bcff2b11..31db795be 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
@@ -5,6 +5,8 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Social actions'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -13,6 +15,16 @@
             <tr>
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>
+                {% for sa in entity.socialActions %}
+                   {{ sa.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
+                {% endfor %}
+                </td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
new file mode 100644
index 000000000..ffad69128
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
@@ -0,0 +1,22 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+            {% for f in form %}
+                {% if f.vars.name == 'parent' %}
+                    {{ form_row(f, { 'attr':{'disabled':'disabled'}}) }}
+                {% else %}
+                    {{ form_row(f) }}
+                {% endif %}
+            {% endfor %}
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
index 0497ee199..acfce6ee6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
@@ -5,6 +5,9 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Parent'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
+            <th>{{ 'socialAction.defaultNotificationDelay'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -13,6 +16,29 @@
             <tr>
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>
+                {% if entity.parent is not null %}
+                    {{ entity.parent.title|localize_translatable_string }}
+                {% endif %}
+                </td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
+                <td>
+                {% if entity.defaultNotificationDelay is not null %}
+                    {% if entity.defaultNotificationDelay.d > 0 %}
+                        {{ entity.defaultNotificationDelay.d  }} {{'days'|trans}}
+                    {% endif %}
+                    {% if entity.defaultNotificationDelay.m > 0 %}
+                        {{ entity.defaultNotificationDelay.m  }} {{'months'|trans}}
+                    {% endif %}
+                    {% if entity.defaultNotificationDelay.y > 0 %}
+                        {{ entity.defaultNotificationDelay.y  }} {{'years'|trans}}
+                    {% endif %}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/edit.html.twig
new file mode 100644
index 000000000..ffad69128
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/edit.html.twig
@@ -0,0 +1,22 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+            {% for f in form %}
+                {% if f.vars.name == 'parent' %}
+                    {{ form_row(f, { 'attr':{'disabled':'disabled'}}) }}
+                {% else %}
+                    {{ form_row(f) }}
+                {% endif %}
+            {% endfor %}
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
index 3a08ab850..4682a5464 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
@@ -5,6 +5,8 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Parent'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -13,6 +15,16 @@
             <tr>
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>
+                {% if entity.parent is not null %}
+                    {{ entity.parent.title|localize_translatable_string }}
+                {% endif %}
+                </td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index ea22a2793..9e3409dfc 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -456,6 +456,10 @@ relation:
     title: Premier membre
     reverseTitle: Deuxième membre
 
+days: jours
+months: mois
+years: années
+
 # specific to closing motive
 closing_motive:
     any parent: Aucun parent

From 97fd9c557c83ba98bf5ca89c8859ed2948e46895 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 11 May 2022 10:06:44 +0200
Subject: [PATCH 090/111] admin: tentative to add filterOrder (cleaning)

---
 .../Controller/UserController.php             | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 127519013..ea2e187bd 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -59,25 +59,7 @@ class UserController extends CRUDController
     }
 
 
-    // public function index(Request $request)
-    // {
-    //     dump($request);
-
-    //     //$filterOrder = $this->buildFilterOrderHelper('index', $request);
-    //     return parent::indexEntityAction('index', $request);
-    // }
-
-    // protected function buildFilterOrderHelper($action, $request): FilterOrderHelper
-    // {
-    //     $filter_order = $this->filterOrderHelperFactory
-    //         ->create(self::class)
-    //         ->addSearchBox(['name'])
-    //         ->build();
-    //     dump($filter_order);
-    //     return $filter_order;
-    // }
-
-    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+   protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
     {
         return $this->getFilterOrderHelperFactory()
             ->create(self::class)
@@ -90,10 +72,8 @@ class UserController extends CRUDController
         if (null === $filterOrder) {
             throw new LogicException('filterOrder should not be null');
         }
-        dump($filterOrder);
         $count = parent::countEntities($action, $request, $filterOrder);
 
-        dump($count);
         return $count;
     }
 

From 629dbb913785b5120af5d15bf3452aaf29432b1a Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 11 May 2022 11:30:08 +0200
Subject: [PATCH 091/111] admin: missing translations and css class

---
 .../views/ActivityPresence/index.html.twig    |  2 +-
 .../views/ActivityReason/edit.html.twig       |  2 +-
 .../views/ActivityReason/new.html.twig        |  2 +-
 .../views/ActivityReason/show.html.twig       |  2 +-
 .../ActivityReasonCategory/edit.html.twig     |  2 +-
 .../ActivityReasonCategory/index.html.twig    |  2 +-
 .../ActivityReasonCategory/new.html.twig      |  2 +-
 .../ActivityReasonCategory/show.html.twig     |  2 +-
 .../views/ActivityType/index.html.twig        |  2 +-
 .../ActivityTypeCategory/index.html.twig      |  2 +-
 .../src/translations/messages.fr.yml          |  3 +-
 .../translations/messages.fr.yml              |  1 +
 .../Menu/AdminMenuBuilder.php                 |  2 +-
 .../translations/messages.fr.yml              |  1 +
 .../Menu/AdminMenuBuilder.php                 |  3 --
 .../translations/messages.fr.yml              |  2 +
 .../views/DocumentCategory/new.html.twig      |  2 +-
 .../translations/messages.fr.yml              |  1 +
 .../Controller/UserController.php             | 42 +++++++++----------
 .../views/PermissionsGroup/edit.html.twig     |  2 +-
 .../views/PermissionsGroup/show.html.twig     |  2 +-
 .../translations/messages.fr.yml              |  5 ++-
 .../views/SocialWork/Result/index.html.twig   |  6 +++
 .../translations/messages.fr.yml              |  8 +++-
 24 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
index 954b7c653..87fa4221c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
@@ -34,7 +34,7 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
                 {{ 'Create a new activity presence'|trans }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
index 04bb46ca2..09ab25f7a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
@@ -8,7 +8,7 @@
     {{ form_row(edit_form.active) }}
     {{ form_row(edit_form.category) }}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
index 9d078ec9a..7509ed651 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
@@ -8,7 +8,7 @@
     {{ form_row(form.active) }}
     {{ form_row(form.category) }}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
index eda4b787b..d15da7e9b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
@@ -22,7 +22,7 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
index f3b6e49c6..8c588d7f8 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
@@ -7,7 +7,7 @@
     {{ form_row(edit_form.name) }}
     {{ form_row(edit_form.active) }}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
index 2d8a9560a..473059124 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
@@ -30,7 +30,7 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
                 {{ 'Create a new activity category reason'|trans }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
index 3fb81c1b4..82a000968 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
@@ -7,7 +7,7 @@
     {{ form_row(form.name) }}
     {{ form_row(form.active) }}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
index 33b8c611b..1edca9838 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
@@ -21,7 +21,7 @@
             </tr>
         </tbody>
     </table>
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
                 {{ 'Back to the list'|trans }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
index 65ba0e18f..b494ab7aa 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
@@ -34,7 +34,7 @@
         </tbody>
     </table>
 
-        <ul class="record_actions">
+        <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
                 {{ 'Create a new activity type'|trans }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
index d3a030f50..c87e52c64 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
@@ -34,7 +34,7 @@
         </tbody>
     </table>
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
                 {{ 'Create a new activity type category'|trans }}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 6d219626d..0a7be1fcd 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -38,7 +38,7 @@ crud:
     confirm_message_delete: Êtes-vous sûr de vouloir supprimer cette activité annexe?
   aside_activity_category:
     title_new: Nouvelle catégorie d'activité annexe
-    title_edit: Edition d'une catégorie de type d'activité
+    title_edit: Édition d'une catégorie de type d'activité
 
 #forms
 Create a new aside activity type: Nouvelle categorie d'activité annexe
@@ -165,3 +165,4 @@ Phonecall: "Appel téléphonique"
 Aside activities: Activités annexes
 Aside activity types: Types d'activités annexes
 Aside activity type configuration: Configuration des categories d'activités annexes
+Aside activity configuration: Configuration des activités annexes
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index d0a65c5e4..aafa26622 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -27,6 +27,7 @@ From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
 canceledBy: supprimé par
+Canceled by: supprimé par
 Calendar configuration: Gestion des rendez-vous
 
 crud:
diff --git a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
index e3d19e68b..71d0d6275 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Menu/AdminMenuBuilder.php
@@ -39,7 +39,7 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 4500,
-                'icons' => ['plus']
+                'icons' => ['plus'],
             ]);
 
         $menu->addChild('Custom fields group', [
diff --git a/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml b/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml
index 31463fccb..6e20d3f60 100644
--- a/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCustomFieldsBundle/translations/messages.fr.yml
@@ -38,6 +38,7 @@ CustomFields Groups: Groupe de champs personnalisés
 
 #customfield administration
 Custom fields: Champs personnalisés
+CustomFields configuration: Gestion des champs personnalisés
 CustomField edit: Modification d'un champ personnalisé
 CustomField creation: Nouveau champ personnalisé
 General informations: Informations générales
diff --git a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
index 675cd9e90..5eed2ae9f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Menu/AdminMenuBuilder.php
@@ -16,8 +16,6 @@ use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function in_array;
-
 class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
     private Security $security;
@@ -33,7 +31,6 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if ($this->security->isGranted('ROLE_ADMIN')) {
-
             $menu->addChild($this->translator->trans('docgen.Document generation'), [
                 'route' => 'chill_crud_docgen_template_index',
             ])->setExtras([
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
index b60a7d60e..bf37ff838 100644
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -18,3 +18,5 @@ crud:
             add_new: Créer
 
 
+Show data instead of generating: Montrer les données au lieu de générer le document
+Template file: Fichier modèle
\ No newline at end of file
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
index cf1be4fdf..f670609e9 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
@@ -18,7 +18,7 @@
             </a>
         </li>
         <li>
-            <button class="btn btn-new">{{ button_label|default('New')|trans }}</button>
+            <button class="btn btn-new">{{ button_label|default('Create')|trans }}</button>
         </li>
     </ul>
     {{ form_end(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
index 009f4d987..17326b299 100644
--- a/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml
@@ -59,6 +59,7 @@ Document class: Classe de document
 no records found:
 Create new category: Créer une nouvelle catégorie
 Back to the category list: Retour à la liste
+Create new DocumentCategory: Créer une nouvelle catégorie de document
 
 # WOPI EDIT
 online_edit_document: Éditer en ligne
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index ea2e187bd..af4c3b6ad 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -21,9 +21,9 @@ use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
+use LogicException;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
-use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
@@ -38,14 +38,14 @@ class UserController extends CRUDController
 {
     public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
+    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
+
     private LoggerInterface $logger;
 
     private UserPasswordEncoderInterface $passwordEncoder;
 
     private ValidatorInterface $validator;
 
-    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
-
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
@@ -58,25 +58,6 @@ class UserController extends CRUDController
         $this->filterOrderHelperFactory = $filterOrderHelperFactory;
     }
 
-
-   protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
-    {
-        return $this->getFilterOrderHelperFactory()
-            ->create(self::class)
-            ->addSearchBox(['label'])
-            ->build();
-    }
-
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
-    {
-        if (null === $filterOrder) {
-            throw new LogicException('filterOrder should not be null');
-        }
-        $count = parent::countEntities($action, $request, $filterOrder);
-
-        return $count;
-    }
-
     /**
      * @Route("/{_locale}/admin/main/user/{uid}/add_link_groupcenter",
      * name="admin_user_add_groupcenter")
@@ -241,6 +222,23 @@ class UserController extends CRUDController
         ]);
     }
 
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['label'])
+            ->build();
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (null === $filterOrder) {
+            throw new LogicException('filterOrder should not be null');
+        }
+
+        return parent::countEntities($action, $request, $filterOrder);
+    }
+
     protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
     {
         // for "new", add special config
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
index f61c8f2c8..0f854f7ed 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig
@@ -74,7 +74,7 @@
         {{ form_row(add_role_scopes_form.composed_role_scope.role) }}
         {{ form_row(add_role_scopes_form.composed_role_scope.scope) }}
 
-        <ul class="record_actions">
+        <ul class="record_actions sticky-form-buttons">
             <li>
                 {{ form_row(add_role_scopes_form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
             </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
index fbbe6245b..eb93c4968 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
@@ -56,7 +56,7 @@
         </p>
     {% endif %}
 
-    <ul class="record_actions">
+    <ul class="record_actions sticky-form-buttons">
 
         <li>
             <a href="{{ path('admin_permissionsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index b16e1433b..34ca5d7c9 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -160,6 +160,7 @@ The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le
 Unclassified: Non classifié
 
 #admin section for users
+User configuration: Gestion des utilisateurs
 User edit: Modification d'un utilisateur
 User'status: Statut de l'utilisateur
 Disabled, the user is not allowed to login: Désactivé, l'utilisateur n'est pas autorisé à se connecter
@@ -225,7 +226,7 @@ Location list: Liste des localisations
 Location type: Type de localisation
 Phonenumber1: Numéro de téléphone
 Phonenumber2: Autre numéro de téléphone
-Configure location and location type: Configuration des localisations
+Location configuration: Configuration des localisations
 Default for: Type de localisation par défaut pour
 none: aucun
 person: usager
@@ -238,7 +239,7 @@ abbreviation: abbréviation
 Language and countries menu: Menu Langues & Pays
 Languages and countries: Langues & Pays
 Management of languages and countries: Gestion des langues & pays
-Configure languages and countries: Configuration des langues & pays
+Language configuration: Configuration des langues & pays
 Language list: Liste des langues
 Country list: Liste des pays
 Country code: Code du pays
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig
index a815628ba..da9e71bc5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig
@@ -5,6 +5,7 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -13,6 +14,11 @@
             <tr>
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 9e3409dfc..0ec2d7275 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -465,6 +465,7 @@ closing_motive:
     any parent: Aucun parent
     new child: Nouvel enfant
 
+Person configuration: Configuration du module "Personnes"
 Configuration of person bundle: Configuration du module "Personnes"
 person_admin:
     accompanying_period: Parcours d'accompagnement
@@ -482,7 +483,7 @@ person_admin:
     person_resource_kind: Type de personne ressource
     social_issue: Problématiques sociales
     social_action: Actions d'accompagnement
-    social_goal: Buts
+    social_goal: Objectifs
     social_result: Résultats
     social_evaluation: Évaluations
     social_work: Accompagnement social
@@ -528,7 +529,9 @@ accompanying_course:
     comment is unpinned: Le commentaire est désépinglé
 show: Montrer
 hide: Masquer
-closed periods: parcours clôturer
+closed periods: parcours clôturés
+Accompanying course configuration: Gestion des parcours d'accompagnement
+Social work configuration: Gestion des actions d'accompagnement social
 
 # Accompanying Course comments
 Accompanying Course Comment: Commentaire
@@ -565,6 +568,7 @@ Budget: Budget
 The composition has been successfully removed.: La composition a été supprimée.
 edit address valid from: Modifier la date du déménagement
 Edit household address valid from: Modifier la date du déménagement
+Household configuration: Gestion des ménages
 
 
 # accompanying course work

From fa458c54ecd2981586bd2e953e2566b463c8777c Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 11 May 2022 11:50:17 +0200
Subject: [PATCH 092/111] admin: adapt social work form type and templates

---
 .../Form/SocialWork/GoalType.php              | 10 ++++++
 .../Form/SocialWork/SocialActionType.php      | 31 +++++++++++++++++++
 .../views/SocialWork/Goal/index.html.twig     |  6 ++++
 .../SocialWork/SocialAction/edit.html.twig    |  2 +-
 .../SocialWork/SocialAction/index.html.twig   | 24 ++++++++++++++
 .../translations/messages.fr.yml              |  1 +
 6 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
index f1005d696..45a43897d 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -52,6 +53,15 @@ class GoalType extends AbstractType
                 },
             ])
 
+            ->add('results', EntityType::class, [
+                'class' => Result::class,
+                'required' => false,
+                'multiple' => true,
+                'choice_label' => function (Result $r) {
+                    return $this->translatableStringHelper->localize($r->getTitle());
+                },
+            ])
+
             ->add('desactivationDate', ChillDateType::class, [
                 'required' => false,
                 'label' => 'goal.desactivationDate',
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
index c476a899f..f6d93bc42 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
@@ -15,6 +15,9 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\DateIntervalType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -57,6 +60,34 @@ class SocialActionType extends AbstractType
                     return $this->translatableStringHelper->localize($issue->getTitle());
                 },
             ])
+
+            ->add('results', EntityType::class, [
+                'class' => Result::class,
+                'required' => false,
+                'multiple' => true,
+                'choice_label' => function (Result $r) {
+                    return $this->translatableStringHelper->localize($r->getTitle());
+                },
+            ])
+
+            ->add('goals', EntityType::class, [
+                'class' => Goal::class,
+                'required' => false,
+                'multiple' => true,
+                'choice_label' => function (Goal $g) {
+                    return $this->translatableStringHelper->localize($g->getTitle());
+                },
+            ])
+
+            ->add('evaluations', EntityType::class, [
+                'class' => Evaluation::class,
+                'required' => false,
+                'multiple' => true,
+                'choice_label' => function (Evaluation $e) {
+                    return $this->translatableStringHelper->localize($e->getTitle());
+                },
+            ])
+
             ->add('defaultNotificationDelay', DateIntervalType::class, [
                 'label' => 'socialAction.defaultNotificationDelay',
                 'required' => false,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
index 31db795be..20f944595 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig
@@ -6,6 +6,7 @@
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
             <th>{{ 'Social actions'|trans }}</th>
+            <th>{{ 'goal.results'|trans }}</th>
             <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
@@ -21,6 +22,11 @@
                 {% endfor %}
                 </td>
                 <td>
+                {% for sa in entity.results %}
+                   {{ sa.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
+                {% endfor %}
+                </td>
+                <td>
                 {% if entity.desactivationDate is not null %}
                     {{ entity.desactivationDate|date('Y-m-d') }}
                 {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
index ffad69128..49d6635df 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig
@@ -9,7 +9,7 @@
 
         {% block crud_content_form_rows %}
             {% for f in form %}
-                {% if f.vars.name == 'parent' %}
+                {% if f.vars.name == 'parent' or f.vars.name == 'issue' %}
                     {{ form_row(f, { 'attr':{'disabled':'disabled'}}) }}
                 {% else %}
                     {{ form_row(f) }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
index acfce6ee6..e2e21fca8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
@@ -6,6 +6,10 @@
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
             <th>{{ 'Parent'|trans }}</th>
+            <th>{{ 'Social issue'|trans }}</th>
+            <th>{{ 'Results'|trans }}</th>
+            <th>{{ 'Goals'|trans }}</th>
+            <th>{{ 'Evaluations'|trans }}</th>
             <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>{{ 'socialAction.defaultNotificationDelay'|trans }}</th>
             <th>&nbsp;</th>
@@ -22,6 +26,26 @@
                 {% endif %}
                 </td>
                 <td>
+                {% for e in entity.issue %}
+                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
+                {% endfor %}
+                </td>
+                <td>
+                {% for e in entity.results %}
+                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
+                {% endfor %}
+                </td>
+                <td>
+                {% for e in entity.goals %}
+                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
+                {% endfor %}
+                </td>
+                <td>
+                {% for e in entity.evaluations %}
+                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
+                {% endfor %}
+                </td>
+                <td>
                 {% if entity.desactivationDate is not null %}
                     {{ entity.desactivationDate|date('Y-m-d') }}
                 {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 0ec2d7275..e95960248 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -443,6 +443,7 @@ evaluation:
 
 goal:
    desactivationDate: Date de désactivation
+   results: Résultats
 
 socialAction:
     defaultNotificationDelay: Délai de notification par défaut

From f44b9ca05bc24c6aa0487e93b6ab97cc42c18d5b Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 11 May 2022 12:03:38 +0200
Subject: [PATCH 093/111] admin: fix error when creating document category

---
 src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
index 55850b157..884447599 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
@@ -100,4 +100,11 @@ class DocumentCategory
 
         return $this;
     }
+
+    public function setBundleId($id): self
+    {
+        $this->bundleId = $id;
+
+        return $this;
+    }
 }

From 05088b596430e829977f8fa377744993816667d4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 11 May 2022 12:14:46 +0200
Subject: [PATCH 094/111] upd CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4afdffe7a..e43212b4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
 * [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
 * [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
 * [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)

From 6481f6a4c1de376766f930732622fcb7979304a3 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 11 May 2022 17:04:17 +0200
Subject: [PATCH 095/111] quick fix: safer way to add civility to body before
 PATCHing (AddPerson)

---
 .../components/PersonsAssociated/ParticipationItem.vue          | 2 +-
 .../AccompanyingCourse/components/Resources/ResourceItem.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index ff8aef961..2ed7de430 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -123,7 +123,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
-            body.civility = payload.data.civility;
+            if (payload.data.civility !== null) { body.civility = payload.data.civility; }
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 605ab6443..4f02c075b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -150,7 +150,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
-            body.civility = payload.data.civility;
+            if (payload.data.civility !== null) { body.civility = payload.data.civility; }
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {

From 49b1ca13f2dbce452209d9b2d9bc3c96499c7be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 11 May 2022 19:25:07 +0200
Subject: [PATCH 096/111] OnTheFly: fix error when updating person without
 changing civility

---
 .../components/PersonsAssociated/ParticipationItem.vue          | 2 +-
 .../AccompanyingCourse/components/Resources/ResourceItem.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 2ed7de430..b5ee21caa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -123,7 +123,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
-            if (payload.data.civility !== null) { body.civility = payload.data.civility; }
+            if (payload.data.civility !== null) { body.civility = {id: payload.data.civility.id, type: payload.data.civility.type }; }
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 4f02c075b..140a0e8b4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -150,7 +150,7 @@ export default {
             body.email = payload.data.email;
             body.altNames = payload.data.altNames;
             body.gender = payload.data.gender;
-            if (payload.data.civility !== null) { body.civility = payload.data.civility; }
+            if (payload.data.civility !== null) { body.civility = {id: payload.data.civility.id, type: payload.data.civility.type}; }
 
             makeFetch('PATCH', `/api/1.0/person/person/${payload.data.id}.json`, body)
                .then(response => {

From 58fce9999d78563676c9519bd1dd9bed38216459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 11 May 2022 19:29:12 +0200
Subject: [PATCH 097/111] OnTheFly: do not show 'create adress and household'
 on edit action

---
 .../Resources/public/vuejs/_components/OnTheFly/Person.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 5a8708cc3..732297bda 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -138,7 +138,7 @@
          aria-describedby="email" />
    </div>
 
-   <div class="input-group mb-3 form-check">
+   <div v-if="action === 'create'" class="input-group mb-3 form-check">
       <input class="form-check-input"
          type='checkbox'
          v-model="showAddressForm"

From b98f4e2d7672d6d84f902250377e21146fcd24c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 11 May 2022 19:39:36 +0200
Subject: [PATCH 098/111] fix construction of BadRequestHttpException

---
 .../Controller/AccompanyingCourseApiController.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
index 21db6b00c..d1730d977 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
@@ -247,7 +247,7 @@ final class AccompanyingCourseApiController extends ApiController
             }
 
             if (null === $requestor) {
-                throw new BadRequestHttpException('Could not find any person or thirdparty', 0, null);
+                throw new BadRequestHttpException('Could not find any person or thirdparty');
             }
 
             $accompanyingPeriod->setRequestor($requestor);

From 3fb3df9db15dcd621f84cfd57d6ef215160f1a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 11 May 2022 19:40:28 +0200
Subject: [PATCH 099/111] remove not necessary debug log

---
 .../Security/Authorization/AccompanyingCourseDocumentVoter.php  | 2 --
 src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
index 88e701fcf..35fde9b28 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php
@@ -85,8 +85,6 @@ class AccompanyingCourseDocumentVoter extends AbstractChillVoter implements Prov
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        $this->logger->debug(sprintf('Voting from %s class', self::class));
-
         if (!$token->getUser() instanceof User) {
             return false;
         }
diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
index 06953a107..1038ac42f 100644
--- a/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
+++ b/src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
@@ -99,8 +99,6 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
     {
-        $this->logger->debug(sprintf('Voting from %s class', self::class));
-
         if (!$token->getUser() instanceof User) {
             return false;
         }

From 52dd08e08807322428e772fa75f4682ae2f258dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 May 2022 14:51:02 +0200
Subject: [PATCH 100/111] add default attributes for user

---
 src/Bundle/ChillMainBundle/Entity/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 76fd7196d..ad4888d58 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -45,7 +45,7 @@ class User implements AdvancedUserInterface
      *
      * @ORM\Column(type="json", nullable=true)
      */
-    private array $attributes;
+    private array $attributes = [];
 
     /**
      * @ORM\ManyToOne(targetEntity=Location::class)

From a9df9f4880186dc7d03c07da14cfce111d1452fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 May 2022 15:36:20 +0200
Subject: [PATCH 101/111] add ordering on some social work + minor improves

---
 .../SocialWork/SocialActionController.php     |  2 +-
 .../SocialWork/SocialIssueController.php      |  2 +-
 .../Form/SocialWork/SocialActionType.php      |  9 +++-
 .../Form/SocialWork/SocialIssueType.php       |  5 ++
 .../AdminAccompanyingCourseMenuBuilder.php    |  2 +-
 .../SocialWork/SocialAction/index.html.twig   | 48 ++-----------------
 .../SocialWork/SocialIssue/index.html.twig    |  8 ++--
 .../translations/messages.fr.yml              |  2 +-
 8 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
index ccb657da7..47cc246bd 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php
@@ -19,7 +19,7 @@ class SocialActionController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        $query->addOrderBy('e.id', 'ASC');
+        $query->addOrderBy('e.ordering', 'ASC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
index 5531d1e4b..57dd38e80 100644
--- a/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php
@@ -19,7 +19,7 @@ class SocialIssueController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        $query->addOrderBy('e.id', 'ASC');
+        $query->addOrderBy('e.ordering', 'ASC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
index f6d93bc42..77c94fa9d 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php
@@ -22,6 +22,7 @@ use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -60,11 +61,15 @@ class SocialActionType extends AbstractType
                     return $this->translatableStringHelper->localize($issue->getTitle());
                 },
             ])
-
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 6,
+            ])
             ->add('results', EntityType::class, [
                 'class' => Result::class,
                 'required' => false,
                 'multiple' => true,
+                'attr' => ['class' => 'select2'],
                 'choice_label' => function (Result $r) {
                     return $this->translatableStringHelper->localize($r->getTitle());
                 },
@@ -74,6 +79,7 @@ class SocialActionType extends AbstractType
                 'class' => Goal::class,
                 'required' => false,
                 'multiple' => true,
+                'attr' => ['class' => 'select2'],
                 'choice_label' => function (Goal $g) {
                     return $this->translatableStringHelper->localize($g->getTitle());
                 },
@@ -83,6 +89,7 @@ class SocialActionType extends AbstractType
                 'class' => Evaluation::class,
                 'required' => false,
                 'multiple' => true,
+                'attr' => ['class' => 'select2'],
                 'choice_label' => function (Evaluation $e) {
                     return $this->translatableStringHelper->localize($e->getTitle());
                 },
diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
index 5cbe4a0c2..5aa76fbc6 100644
--- a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
+++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -41,6 +42,10 @@ class SocialIssueType extends AbstractType
                 'required' => false,
                 'choice_label' => fn (SocialIssue $issue): ?string => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 6,
+            ])
             ->add('desactivationDate', ChillDateType::class, [
                 'label' => 'goal.desactivationDate',
                 'required' => false,
diff --git a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
index eb83d8471..afd9f9484 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php
@@ -39,7 +39,7 @@ class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
                 'order' => 2200,
-                'icons' => ['road'],
+                'icons' => ['random'],
             ]);
 
         $menu->addChild('person_admin.closing motives', [
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
index e2e21fca8..d159c7193 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig
@@ -5,13 +5,9 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
-            <th>{{ 'Parent'|trans }}</th>
             <th>{{ 'Social issue'|trans }}</th>
-            <th>{{ 'Results'|trans }}</th>
-            <th>{{ 'Goals'|trans }}</th>
-            <th>{{ 'Evaluations'|trans }}</th>
+            <th>{{ 'Ordering'|trans }}</th>
             <th>{{ 'goal.desactivationDate'|trans }}</th>
-            <th>{{ 'socialAction.defaultNotificationDelay'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -19,50 +15,14 @@
         {% for entity in entities %}
             <tr>
                 <td>{{ entity.id }}</td>
-                <td>{{ entity.title|localize_translatable_string }}</td>
-                <td>
-                {% if entity.parent is not null %}
-                    {{ entity.parent.title|localize_translatable_string }}
-                {% endif %}
-                </td>
-                <td>
-                {% for e in entity.issue %}
-                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
-                {% endfor %}
-                </td>
-                <td>
-                {% for e in entity.results %}
-                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
-                {% endfor %}
-                </td>
-                <td>
-                {% for e in entity.goals %}
-                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
-                {% endfor %}
-                </td>
-                <td>
-                {% for e in entity.evaluations %}
-                   {{ e.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
-                {% endfor %}
-                </td>
+                <td>{{ entity|chill_entity_render_box }}</td>
+                <td>{{ entity.issue|chill_entity_render_box }}</td>
+                <td>{{ entity.ordering }}</td>
                 <td>
                 {% if entity.desactivationDate is not null %}
                     {{ entity.desactivationDate|date('Y-m-d') }}
                 {% endif %}
                 </td>
-                <td>
-                {% if entity.defaultNotificationDelay is not null %}
-                    {% if entity.defaultNotificationDelay.d > 0 %}
-                        {{ entity.defaultNotificationDelay.d  }} {{'days'|trans}}
-                    {% endif %}
-                    {% if entity.defaultNotificationDelay.m > 0 %}
-                        {{ entity.defaultNotificationDelay.m  }} {{'months'|trans}}
-                    {% endif %}
-                    {% if entity.defaultNotificationDelay.y > 0 %}
-                        {{ entity.defaultNotificationDelay.y  }} {{'years'|trans}}
-                    {% endif %}
-                {% endif %}
-                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
index 4682a5464..60cd9f4a5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig
@@ -5,7 +5,7 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
-            <th>{{ 'Parent'|trans }}</th>
+            <th>{{ 'Ordering'|trans }}</th>
             <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
@@ -14,12 +14,10 @@
         {% for entity in entities %}
             <tr>
                 <td>{{ entity.id }}</td>
-                <td>{{ entity.title|localize_translatable_string }}</td>
                 <td>
-                {% if entity.parent is not null %}
-                    {{ entity.parent.title|localize_translatable_string }}
-                {% endif %}
+                    {{ entity|chill_entity_render_box }}
                 </td>
+                <td>{{ entity.ordering }}</td>
                 <td>
                 {% if entity.desactivationDate is not null %}
                     {{ entity.desactivationDate|date('Y-m-d') }}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index b6e386ed8..c2c27f58a 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -462,7 +462,7 @@ socialAction:
 
 household:
     allowHolder: Peut être titulaire
-    shareHousehold: Peut être partagé
+    shareHousehold: Membre du ménage
 
 relation:
     title: Premier membre

From aec01df20225dcac630c4bb7a8ca16086509268e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 May 2022 16:00:34 +0200
Subject: [PATCH 102/111] admin users: filter by name or email

---
 .../Controller/UserController.php             | 57 ++++++++++++++-----
 .../Repository/UserRepository.php             | 23 ++++++--
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index af4c3b6ad..484d878ea 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -19,6 +19,7 @@ use Chill\MainBundle\Form\UserCurrentLocationType;
 use Chill\MainBundle\Form\UserPasswordType;
 use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
 use LogicException;
@@ -38,24 +39,62 @@ class UserController extends CRUDController
 {
     public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
-    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
 
     private LoggerInterface $logger;
 
     private UserPasswordEncoderInterface $passwordEncoder;
 
+    private UserRepository $userRepository;
+
     private ValidatorInterface $validator;
 
+
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
         UserPasswordEncoderInterface $passwordEncoder,
-        FilterOrderHelperFactoryInterface $filterOrderHelperFactory
+        UserRepository $userRepository
     ) {
         $this->logger = $chillLogger;
+        $this->userRepository = $userRepository;
         $this->validator = $validator;
         $this->passwordEncoder = $passwordEncoder;
-        $this->filterOrderHelperFactory = $filterOrderHelperFactory;
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        if (null === $filterOrder->getQueryString()) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        return $this->userRepository->countByUsernameOrEmail($filterOrder->getQueryString());
+    }
+
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null
+    ) {
+        if (0 === $totalItems) {
+            return [];
+        }
+
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        if (null === $filterOrder->getQueryString()) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        return $this->userRepository->findByUsernameOrEmail($filterOrder->getQueryString(), ['usernameCanonical' => 'ASC'],
+            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
     }
 
     /**
@@ -230,15 +269,6 @@ class UserController extends CRUDController
             ->build();
     }
 
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
-    {
-        if (null === $filterOrder) {
-            throw new LogicException('filterOrder should not be null');
-        }
-
-        return parent::countEntities($action, $request, $filterOrder);
-    }
-
     protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
     {
         // for "new", add special config
@@ -288,7 +318,8 @@ class UserController extends CRUDController
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        $query->addOrderBy('e.usernameCanonical', 'ASC');
+        $query
+            ->addOrderBy('e.usernameCanonical', 'ASC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index fc3a6e187..79ab5fc3d 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -83,10 +83,24 @@ final class UserRepository implements ObjectRepository
         return $this->findBy(['enabled' => true], $orderBy, $limit, $offset);
     }
 
-    public function findByUsernameOrEmail(string $pattern)
+    public function findByUsernameOrEmail(string $pattern, ?array $orderBy = [], ?int $limit = null, ?int $offset = null): array
     {
         $qb = $this->queryByUsernameOrEmail($pattern);
 
+        $qb->select('u');
+
+        if (null !== $limit) {
+            $qb->setMaxResults($limit);
+        }
+
+        if (null !== $offset) {
+            $qb->setFirstResult($offset);
+        }
+
+        foreach ($orderBy as $field => $order) {
+            $qb->addOrderBy('u.'.$field, $order);
+        }
+
         return $qb->getQuery()->getResult();
     }
 
@@ -164,13 +178,14 @@ final class UserRepository implements ObjectRepository
 
     private function queryByUsernameOrEmail(string $pattern): QueryBuilder
     {
-        $qb = $this->entityManager->createQueryBuilder('u');
+        $qb = $this->entityManager->createQueryBuilder()->from(User::class, 'u');
 
         $searchByPattern = $qb->expr()->orX();
 
         $searchByPattern
-            ->add($qb->expr()->eq('u.usernameCanonical', 'LOWER(UNACCENT(:pattern))'))
-            ->add($qb->expr()->eq('u.emailCanonical', 'LOWER(UNACCENT(:pattern))'));
+            ->add($qb->expr()->like('u.usernameCanonical', 'CONCAT(\'%\', LOWER(UNACCENT(:pattern)),  \'%\')'))
+            ->add($qb->expr()->like('u.emailCanonical', 'CONCAT(\'%\', LOWER(UNACCENT(:pattern)), \'%\')'));
+
 
         $qb
             ->where($searchByPattern)

From 2a5bb282107ac7dd3588ada4acc7f37d797ee23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 May 2022 16:05:08 +0200
Subject: [PATCH 103/111] fix typo in tests

---
 .../ChillMainBundle/Tests/Controller/CenterControllerTest.php   | 2 +-
 .../ChillMainBundle/Tests/Controller/ScopeControllerTest.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
index b5bb012a2..e10879760 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/CenterControllerTest.php
@@ -53,7 +53,7 @@ final class CenterControllerTest extends WebTestCase
         );
 
         // Edit the entity
-        $crawler = $client->click($crawler->selectLink('Modifier')->link());
+        $crawler = $client->click($crawler->selectLink('modifier')->link());
 
         $form = $crawler->selectButton('Mettre à jour')->form([
             'chill_mainbundle_center[name]' => 'Foo',
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
index 806153220..8530308e3 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
@@ -61,7 +61,7 @@ final class ScopeControllerTest extends WebTestCase
         );
 
         // Edit the entity
-        $crawler = $client->click($crawler->selectLink('Modifier')->link());
+        $crawler = $client->click($crawler->selectLink('modifier')->link());
 
         $form = $crawler->selectButton('Mettre à jour')->form([
             'chill_mainbundle_scope[name][fr]' => 'Foo',

From 89a700ff61bbb596d196a0820449716de2e665eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 May 2022 16:05:38 +0200
Subject: [PATCH 104/111] fix cs

---
 .../Entity/DocumentCategory.php               | 14 ++--
 .../Controller/UserController.php             | 80 +++++++++----------
 .../Repository/UserRepository.php             |  3 +-
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
index 884447599..69af75f42 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
@@ -87,6 +87,13 @@ class DocumentCategory
         return $this->name;
     }
 
+    public function setBundleId($id): self
+    {
+        $this->bundleId = $id;
+
+        return $this;
+    }
+
     public function setDocumentClass($documentClass): self
     {
         $this->documentClass = $documentClass;
@@ -100,11 +107,4 @@ class DocumentCategory
 
         return $this;
     }
-
-    public function setBundleId($id): self
-    {
-        $this->bundleId = $id;
-
-        return $this;
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php
index 484d878ea..068bd9f73 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserController.php
@@ -21,8 +21,6 @@ use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
-use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
-use LogicException;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -39,7 +37,6 @@ class UserController extends CRUDController
 {
     public const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
-
     private LoggerInterface $logger;
 
     private UserPasswordEncoderInterface $passwordEncoder;
@@ -48,7 +45,6 @@ class UserController extends CRUDController
 
     private ValidatorInterface $validator;
 
-
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
@@ -61,42 +57,6 @@ class UserController extends CRUDController
         $this->passwordEncoder = $passwordEncoder;
     }
 
-    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
-    {
-        if (!$filterOrder instanceof FilterOrderHelper) {
-            return parent::countEntities($action, $request, $filterOrder);
-        }
-
-        if (null === $filterOrder->getQueryString()) {
-            return parent::countEntities($action, $request, $filterOrder);
-        }
-
-        return $this->userRepository->countByUsernameOrEmail($filterOrder->getQueryString());
-    }
-
-    protected function getQueryResult(
-        string $action,
-        Request $request,
-        int $totalItems,
-        PaginatorInterface $paginator,
-        ?FilterOrderHelper $filterOrder = null
-    ) {
-        if (0 === $totalItems) {
-            return [];
-        }
-
-        if (!$filterOrder instanceof FilterOrderHelper) {
-            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
-        }
-
-        if (null === $filterOrder->getQueryString()) {
-            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
-        }
-
-        return $this->userRepository->findByUsernameOrEmail($filterOrder->getQueryString(), ['usernameCanonical' => 'ASC'],
-            $paginator->getItemsPerPage(), $paginator->getCurrentPageFirstItemNumber());
-    }
-
     /**
      * @Route("/{_locale}/admin/main/user/{uid}/add_link_groupcenter",
      * name="admin_user_add_groupcenter")
@@ -269,6 +229,19 @@ class UserController extends CRUDController
             ->build();
     }
 
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        if (null === $filterOrder->getQueryString()) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        return $this->userRepository->countByUsernameOrEmail($filterOrder->getQueryString());
+    }
+
     protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
     {
         // for "new", add special config
@@ -304,6 +277,33 @@ class UserController extends CRUDController
         return parent::generateTemplateParameter($action, $entity, $request, $defaultTemplateParameters);
     }
 
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null
+    ) {
+        if (0 === $totalItems) {
+            return [];
+        }
+
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        if (null === $filterOrder->getQueryString()) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        return $this->userRepository->findByUsernameOrEmail(
+            $filterOrder->getQueryString(),
+            ['usernameCanonical' => 'ASC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+    }
+
     protected function onPrePersist(string $action, $entity, FormInterface $form, Request $request)
     {
         // for "new", encode the password
diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
index 79ab5fc3d..7b7d5d2ab 100644
--- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php
@@ -98,7 +98,7 @@ final class UserRepository implements ObjectRepository
         }
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy('u.'.$field, $order);
+            $qb->addOrderBy('u.' . $field, $order);
         }
 
         return $qb->getQuery()->getResult();
@@ -186,7 +186,6 @@ final class UserRepository implements ObjectRepository
             ->add($qb->expr()->like('u.usernameCanonical', 'CONCAT(\'%\', LOWER(UNACCENT(:pattern)),  \'%\')'))
             ->add($qb->expr()->like('u.emailCanonical', 'CONCAT(\'%\', LOWER(UNACCENT(:pattern)), \'%\')'));
 
-
         $qb
             ->where($searchByPattern)
             ->setParameter('pattern', $pattern);

From bb18082c3a34e96c37ba33e26f08e6cfc2b7641a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 May 2022 16:07:33 +0200
Subject: [PATCH 105/111] fix type hinting

---
 .../ChillPersonBundle/Controller/ClosingMotiveController.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
index cf1436b99..8e9b9d14d 100644
--- a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php
@@ -22,7 +22,7 @@ use Symfony\Component\HttpFoundation\Request;
 class ClosingMotiveController extends CRUDController
 {
     /**
-     * @param \Chill\MainBundle\CRUD\Controller\string|string $action
+     * @param string $action
      */
     protected function createEntity($action, Request $request): object
     {

From 9dd463882c0f168197f2259043eafe68f605b496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 May 2022 17:23:10 +0200
Subject: [PATCH 106/111] fix dfault in db for user::attributes

---
 .../migrations/Version20220513151853.php      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220513151853.php

diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
new file mode 100644
index 000000000..31319ce1b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220513151853 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'set default on attributes';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('update users set attributes = \'[]\'::json where attributes IS NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+
+    }
+}

From 354c37ade252ca9cbac32d4a98c2fc6e0eb00a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 16 May 2022 15:28:05 +0200
Subject: [PATCH 107/111] fix issue when loading category

---
 src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index 41dc73154..3df9f261f 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\DocStoreBundle\Form;
 
 use Chill\DocStoreBundle\Entity\Document;
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
@@ -63,7 +64,7 @@ class PersonDocumentType extends AbstractType
             ->add('date', ChillDateType::class)
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
-                'class' => 'ChillDocStoreBundle:DocumentCategory',
+                'class' => DocumentCategory::class,
                 'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.documentClass = :docClass')

From 01f1605cb86b19a5af2c09341ff803fc31d4750c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 14:30:05 +0200
Subject: [PATCH 108/111] change indent of js files

---
 .editorconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index fe115d4c0..d51908caf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,3 +18,10 @@ max_line_length = 80
 
 [COMMIT_EDITMSG]
 max_line_length = 0
+<<<<<<< Updated upstream
+=======
+
+[*.{js, vue, ts}]
+indent_size = 2
+indent_style = space
+>>>>>>> Stashed changes

From 014c460eefbb325dc24288ca69868ebffd05e723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 15:39:32 +0200
Subject: [PATCH 109/111] improvements on private comments

---
 .../ChillActivityBundle/Form/ActivityType.php |  2 +-
 .../Resources/views/Activity/show.html.twig   | 34 +++++++--------
 .../migrations/Version20220425133027.php      |  5 ---
 .../migrations/Version20220527124438.php      | 26 ++++++++++++
 .../migrations/Version20220527124558.php      | 26 ++++++++++++
 .../translations/messages.fr.yml              |  1 -
 .../Embeddable/PrivateCommentEmbeddable.php   | 13 ++++--
 .../Form/Type/PrivateCommentType.php          | 10 ++---
 .../Resources/views/Form/fields.html.twig     | 17 ++++++++
 .../migrations/Version20220426133048.php      | 42 -------------------
 .../translations/messages.fr.yml              |  2 +-
 .../migrations/Version20220527124737.php      | 26 ++++++++++++
 12 files changed, 125 insertions(+), 79 deletions(-)
 create mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
 create mode 100644 src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
 delete mode 100644 src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php

diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 4361158e5..4c767cd54 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -254,7 +254,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('privateComment')) {
             $builder->add('privateComment', PrivateCommentType::class, [
-                'label' => empty($activityType->getLabel('privateComment')) ? 'activity.private comment' : $activityType->getPrivateCommentLabel(),
+                'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
                 'required' => false,
             ]);
         }
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 65134a754..8b47f4de2 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -147,6 +147,21 @@
                 </dd>
             {% endif %}
 
+            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.hasCommentForUser(app.user) %}
+                {% if t.privateCommentLabel is not empty %}
+                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
+                {% else %}
+                    <dt class="inline">{{ 'Private comment'|trans }}</dt>
+                {% endif %}
+                <dd>
+                    <section class="chill-entity entity-comment-embeddable">
+                        <blockquote class="chill-user-quote private-quote">
+                            {{ entity.privateComment.comments[userId] }}
+                        </blockquote>
+                    </section>
+                </dd>
+            {% endif %}
+
             {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
                 <dt class="inline">{{ 'Documents'|trans }}</dt>
                 <dd>
@@ -178,25 +193,6 @@
     </div>
 </div>
 
-{% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and userId in entity.privateComment.comments|keys %}
-<div class="flex-table">
-    <div class="item-bloc">
-        {% if t.privateCommentLabel is not empty %}
-            <dt class="inline">{{ t.privateCommentLabel }}</dt>
-        {% else %}
-            <dt class="inline">{{ 'Private comment'|trans }}</dt>
-        {% endif %}
-        <dd>
-            <section class="chill-entity entity-comment-embeddable">
-                <blockquote class="chill-user-quote private-quote">
-                    {{ entity.privateComment.comments[userId] }}
-                </blockquote>
-            </section>
-        </dd>
-    </div>
-</div>
-{% endif %}
-
 <div class="notification notification-list">
     {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
     {% if notifications is not empty %}
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
index d5243b259..4a829f18c 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220425133027.php
@@ -14,14 +14,10 @@ namespace Chill\Migrations\Activity;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
 final class Version20220425133027 extends AbstractMigration
 {
     public function down(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE activitytype DROP privateCommentLabel');
         $this->addSql('ALTER TABLE activitytype DROP privateCommentVisible');
     }
@@ -33,7 +29,6 @@ final class Version20220425133027 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('ALTER TABLE activitytype ADD privateCommentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
         $this->addSql('ALTER TABLE activitytype ADD privateCommentVisible SMALLINT DEFAULT 1 NOT NULL');
     }
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
new file mode 100644
index 000000000..1ccf3f0b3
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124438 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment to activity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
new file mode 100644
index 000000000..17c53a004
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124558 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment to calendar';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index eeb12298f..b7aa2e128 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -26,4 +26,3 @@ The calendar item has been successfully removed.: Le rendez-vous a été supprim
 From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
-private comment: Notes privé
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index cfca2a86c..e27e906c0 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -20,15 +20,22 @@ use Doctrine\ORM\Mapping as ORM;
 class PrivateCommentEmbeddable
 {
     /**
-     * @ORM\Column(type="json", nullable=true)
+     * @ORM\Column(type="json", nullable=false, options={"default": "{}"})
+     * @var array<int, string>
      */
-    private ?array $comments = [];
+    private array $comments = [];
 
     public function getCommentForUser(User $user): string
     {
         return $this->comments[$user->getId()] ?? '';
     }
 
+    public function hasCommentForUser(User $user): bool
+    {
+        return array_key_exists($user->getId(), $this->comments)
+            && "" !== $this->comments[$user->getId()];
+    }
+
     public function getComments(): ?array
     {
         return $this->comments;
@@ -47,7 +54,7 @@ class PrivateCommentEmbeddable
 
     public function setCommentForUser(User $user, string $content): self
     {
-        $this->comments[$user->getId()] = $content;
+        $this->comments[$user->getId()] = trim($content);
 
         return $this;
     }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
index 8ce33face..d4c0d1611 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php
@@ -38,19 +38,15 @@ class PrivateCommentType extends AbstractType
     {
         $builder
             ->add('comments', ChillTextareaType::class, [
-                'label' => 'private comment',
+                'disable_editor' => $options['disable_editor'],
+                'label' => false,
             ])
             ->setDataMapper($this->dataMapper);
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars = array_replace(
-            $view->vars,
-            [
-                'hideLabel' => true,
-            ]
-        );
+        $view->vars['hideLabel'] = true;
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 1da384920..f45f91692 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -198,6 +198,23 @@
     {% endfor %}
 {% endblock %}
 
+
+{% block private_comment_row %}
+    {{ form_label(form) }}
+    {{ form_row(form) }}
+{% endblock %}
+
+{% block private_comment_widget %}
+    {% for entry in form %}
+        {{ form_widget(entry) }}
+    {% endfor %}
+{% endblock %}
+
+{% block comment_row %}
+    {{ form_label(form) }}
+    {{ form_row(form) }}
+{% endblock %}
+
 {% block comment_widget %}
     {% for entry in form %}
         {{ form_widget(entry) }}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php b/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
deleted file mode 100644
index 94f866e9b..000000000
--- a/src/Bundle/ChillMainBundle/migrations/Version20220426133048.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Main;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20220426133048 extends AbstractMigration
-{
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
-        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
-    }
-
-    public function getDescription(): string
-    {
-        return 'add private embeddable comment to activity, calendar and accompanyingperiod work';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT NULL');
-    }
-}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index e9a5fce4d..db441af6e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -65,7 +65,7 @@ Read more: Lire la suite
 
 # comment embeddable
 No comment associated: Aucun commentaire
-private comment: Notes privé
+private comment: Notes privées
 
 #pagination
 Previous: Précédent
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
new file mode 100644
index 000000000..b8f5b1dde
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124737 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'add private comment on accompanying period work';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+    }
+}

From 5e5a8555782a4c9abc1eb5dddada107685109452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 15:48:50 +0200
Subject: [PATCH 110/111] fix cs

---
 .../migrations/Version20220527124438.php        | 17 ++++++++++++-----
 .../migrations/Version20220527124558.php        | 17 ++++++++++++-----
 .../Embeddable/PrivateCommentEmbeddable.php     | 14 ++++++++------
 .../migrations/Version20220513151853.php        | 16 +++++++++++-----
 .../migrations/Version20220527124737.php        | 17 ++++++++++++-----
 5 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
index 1ccf3f0b3..2661edf4b 100644
--- a/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20220527124438.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Activity;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220527124438 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment to activity';
@@ -18,9 +30,4 @@ final class Version20220527124438 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE activity ADD privateComment_comments JSON DEFAULT \'{}\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_person_accompanying_period_work DROP privateComment_comments');
-    }
 }
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
index 17c53a004..39c4cb7c3 100644
--- a/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20220527124558.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Calendar;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220527124558 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment to calendar';
@@ -18,9 +30,4 @@ final class Version20220527124558 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD privateComment_comments JSON DEFAULT NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP privateComment_comments');
-    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
index e27e906c0..09a35324e 100644
--- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
+++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php
@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Entity\Embeddable;
 
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
+use function array_key_exists;
 
 /**
  * @ORM\Embeddable
@@ -21,6 +22,7 @@ class PrivateCommentEmbeddable
 {
     /**
      * @ORM\Column(type="json", nullable=false, options={"default": "{}"})
+     *
      * @var array<int, string>
      */
     private array $comments = [];
@@ -30,17 +32,17 @@ class PrivateCommentEmbeddable
         return $this->comments[$user->getId()] ?? '';
     }
 
-    public function hasCommentForUser(User $user): bool
-    {
-        return array_key_exists($user->getId(), $this->comments)
-            && "" !== $this->comments[$user->getId()];
-    }
-
     public function getComments(): ?array
     {
         return $this->comments;
     }
 
+    public function hasCommentForUser(User $user): bool
+    {
+        return array_key_exists($user->getId(), $this->comments)
+            && '' !== $this->comments[$user->getId()];
+    }
+
     public function merge(PrivateCommentEmbeddable $newComment): self
     {
         $currentComments = null === $this->getComments() ? [] : $this->getComments();
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
index 31319ce1b..ec99ce2ba 100644
--- a/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20220513151853.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Main;
@@ -9,6 +16,10 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220513151853 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+    }
+
     public function getDescription(): string
     {
         return 'set default on attributes';
@@ -18,9 +29,4 @@ final class Version20220513151853 extends AbstractMigration
     {
         $this->addSql('update users set attributes = \'[]\'::json where attributes IS NULL');
     }
-
-    public function down(Schema $schema): void
-    {
-
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
index b8f5b1dde..75b598db3 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\Migrations\Person;
@@ -9,6 +16,11 @@ use Doctrine\Migrations\AbstractMigration;
 
 final class Version20220527124737 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+    }
+
     public function getDescription(): string
     {
         return 'add private comment on accompanying period work';
@@ -18,9 +30,4 @@ final class Version20220527124737 extends AbstractMigration
     {
         $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT \'{}\'');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
-    }
 }

From f3800ff38fa0e1a8a812ac7aa561970b09eaa368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 15:58:51 +0200
Subject: [PATCH 111/111] fix issue with null comment and set correct variable
 name in signature

---
 .../PrivateCommentEmbeddableNormalizer.php           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
index a1ff7e5ba..fc5853c17 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
@@ -27,20 +27,20 @@ class PrivateCommentEmbeddableNormalizer implements NormalizerInterface, Denorma
 
     public function denormalize($data, string $type, ?string $format = null, array $context = []): PrivateCommentEmbeddable
     {
-        if (null === $data) {
-            return null;
-        }
-
         $comment = new PrivateCommentEmbeddable();
 
+        if (null === $data) {
+            return $comment;
+        }
+
         $comment->setCommentForUser($this->security->getUser(), $data);
 
         return $comment;
     }
 
-    public function normalize($comment, $format = null, array $contect = []): string
+    public function normalize($object, $format = null, array $context = []): string
     {
-        return $comment->getCommentForUser($this->security->getUser());
+        return $object->getCommentForUser($this->security->getUser());
     }
 
     public function supportsDenormalization($data, string $type, ?string $format = null): bool