Merge remote-tracking branch 'origin/master' into issue_mes_parcours

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -42,10 +42,16 @@ class Address
      */
     private $buildingName;
 
+    /**
+     * @ORM\Column(type="boolean")
+     * @Groups({"write"})
+     */
+    private bool $confidential = false;
+
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $corridor;
@@ -78,7 +84,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $flat;
@@ -86,7 +92,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $floor;
@@ -143,7 +149,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $steps;
@@ -192,6 +198,7 @@ class Address
         return (new Address())
             ->setAddressReference($original->getAddressReference())
             ->setBuildingName($original->getBuildingName())
+            ->setConfidential($original->getConfidential())
             ->setCorridor($original->getCorridor())
             ->setCustoms($original->getCustoms())
             ->setDistribution($original->getDistribution())
@@ -229,6 +236,11 @@ class Address
         return $this->buildingName;
     }
 
+    public function getConfidential(): bool
+    {
+        return $this->confidential;
+    }
+
     public function getCorridor(): ?string
     {
         return $this->corridor;
@@ -369,6 +381,13 @@ class Address
         return $this;
     }
 
+    public function setConfidential(bool $confidential): self
+    {
+        $this->confidential = $confidential;
+
+        return $this;
+    }
+
     public function setCorridor(?string $corridor): self
     {
         $this->corridor = $corridor;

src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php

@@ -20,10 +20,9 @@ use Doctrine\ORM\Mapping as ORM;
 class CommentEmbeddable
 {
     /**
-     * @var string
      * @ORM\Column(type="text", nullable=true)
      */
-    private $comment;
+    private ?string $comment = null;
 
     /**
      * @var DateTime
@@ -39,10 +38,7 @@ class CommentEmbeddable
      */
     private $userId;
 
-    /**
-     * @return string
-     */
-    public function getComment()
+    public function getComment(): ?string
     {
         return $this->comment;
     }
@@ -68,9 +64,6 @@ class CommentEmbeddable
         return empty($this->getComment());
     }
 
-    /**
-     * @param string $comment
-     */
     public function setComment(?string $comment)
     {
         $this->comment = $comment;

src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php

@@ -0,0 +1,166 @@
+<?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;
+
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Repository\ResidentialAddressRepository;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class)
+ * @ORM\Table(name="chill_main_residential_address")
+ */
+class ResidentialAddress
+{
+    /**
+     * @ORM\ManyToOne(targetEntity=Address::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Address $address = null;
+
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="residentialAddressComment_")
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Person $hostPerson = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?ThirdParty $hostThirdParty = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private Person $person;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private ?DateTimeImmutable $startDate = null;
+
+    public function __construct()
+    {
+        $this->comment = new CommentEmbeddable();
+    }
+
+    public function getAddress(): ?Address
+    {
+        return $this->address;
+    }
+
+    public function getComment(): CommentEmbeddable
+    {
+        return $this->comment;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getHostPerson(): ?Person
+    {
+        return $this->hostPerson;
+    }
+
+    public function getHostThirdParty(): ?ThirdParty
+    {
+        return $this->hostThirdParty;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function setAddress(?Address $address): self
+    {
+        $this->address = $address;
+
+        return $this;
+    }
+
+    public function setComment(CommentEmbeddable $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function setEndDate(?DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setHostPerson(?Person $hostPerson): self
+    {
+        $this->hostPerson = $hostPerson;
+
+        return $this;
+    }
+
+    public function setHostThirdParty(?ThirdParty $hostThirdParty): self
+    {
+        $this->hostThirdParty = $hostThirdParty;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setStartDate(DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -37,6 +37,7 @@ use function count;
 class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
     /**

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php

@@ -24,6 +24,7 @@ use Doctrine\ORM\Mapping as ORM;
 class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
+
     use TrackUpdateTrait;
 
     /**

src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php

@@ -0,0 +1,73 @@
+<?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\Type;
+
+use Chill\MainBundle\Entity\ResidentialAddress;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
+use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class ResidentialAddressType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('startDate', DateType::class, [
+                'required' => true,
+                'input' => 'datetime_immutable',
+                'widget' => 'single_text',
+            ])
+            ->add('endDate', DateType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'widget' => 'single_text',
+            ])
+            ->add('comment', CommentType::class, [
+                'required' => false,
+            ]);
+
+        if ('person' === $options['kind']) {
+            $builder
+                ->add('hostPerson', PickPersonDynamicType::class, [
+                    'label' => 'Person',
+                ]);
+        }
+
+        if ('thirdparty' === $options['kind']) {
+            $builder
+                ->add('hostThirdParty', PickThirdpartyDynamicType::class, [
+                    'label' => 'Third party',
+                ]);
+        }
+
+        if ('address' === $options['kind']) {
+            $builder
+                ->add('address', PickAddressType::class, [
+                    'required' => false,
+                    'label' => 'Address',
+                    'use_valid_from' => false,
+                    'use_valid_to' => false,
+                ]);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ResidentialAddress::class,
+            'kind' => null,
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php

@@ -0,0 +1,59 @@
+<?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\Repository;
+
+use Chill\MainBundle\Entity\ResidentialAddress;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @method ResidentialAddress|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ResidentialAddress|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ResidentialAddress[]    findAll()
+ * @method ResidentialAddress[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class ResidentialAddressRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ResidentialAddress::class);
+    }
+
+    // /**
+    //  * @return ResidentialAddress[] Returns an array of ResidentialAddress objects
+    //  */
+    /*
+    public function findByExampleField($value)
+    {
+        return $this->createQueryBuilder('r')
+            ->andWhere('r.exampleField = :val')
+            ->setParameter('val', $value)
+            ->orderBy('r.id', 'ASC')
+            ->setMaxResults(10)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+     */
+
+    /*
+    public function findOneBySomeField($value): ?ResidentialAddress
+    {
+        return $this->createQueryBuilder('r')
+            ->andWhere('r.exampleField = :val')
+            ->setParameter('val', $value)
+            ->getQuery()
+            ->getOneOrNullResult()
+        ;
+    }
+     */
+}

src/Bundle/ChillMainBundle/Resources/public/module/blur/index.js

@@ -1,21 +1,19 @@
 require('./blur.scss');
 
-var toggleBlur =  function(e){
-
-    var btn = e.target;
-
-    btn.previousElementSibling.classList.toggle("blur");
-    btn.classList.toggle("fa-eye");
-    btn.classList.toggle("fa-eye-slash");
-
-}
-
-var infos = document.getElementsByClassName("confidential");
-for(var i=0; i < infos.length; i++){
-    infos[i].insertAdjacentHTML('beforeend', '<i class="fa fa-eye toggle" aria-hidden="true"></i>');
-}
-
-var toggles = document.getElementsByClassName("toggle");
-for(var i=0; i < toggles.length; i++){
-    toggles[i].addEventListener("click", toggleBlur);
-}
+document.querySelectorAll('.confidential').forEach(function (el) {
+    let i = document.createElement('i');
+    const classes = ['fa', 'fa-eye', 'toggle'];
+    i.classList.add(...classes);
+    el.appendChild(i);
+    const toggleBlur = function(e) {
+        for (let child of el.children) {
+            if (!child.classList.contains('toggle')) {
+                child.classList.toggle('blur');
+            }
+        }
+        i.classList.toggle('fa-eye');
+        i.classList.toggle('fa-eye-slash');
+    }
+    i.addEventListener('click', toggleBlur);
+    toggleBlur();
+});

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -19,6 +19,12 @@ function loadDynamicPicker(element) {
             input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
             picked = (isMultiple) ? (JSON.parse(input.value)) : ((input.value === '[]') ? (null) : ([JSON.parse(input.value)]));
 
+        if (!isMultiple) {
+            if (input.value === '[]'){
+                input.value = null;
+            }
+        }
+
         const app = createApp({
             template: '<pick-entity ' +
                 ':multiple="multiple" ' +

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue

@@ -562,6 +562,7 @@ export default {
          this.entity.loaded.cities = [];
          this.entity.loaded.countries = [];
 
+         this.entity.selected.confidential = this.context.edit ? this.entity.address.confidential : false;
          this.entity.selected.isNoAddress = (this.context.edit && this.entity.address.text === '') ? true : false;
 
          this.entity.selected.country = this.context.edit ? this.entity.address.country : {};
@@ -593,6 +594,7 @@ export default {
       {
          console.log('apply changes');
          let newAddress = {
+            'confidential': this.entity.selected.confidential,
             'isNoAddress': this.entity.selected.isNoAddress,
             'street': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.street,
             'streetNumber': this.entity.selected.isNoAddress ? '' : this.entity.selected.address.streetNumber,

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue

@@ -6,7 +6,6 @@
             <input class="form-control"
             type="text"
             name="floor"
-            maxlength=16
             :placeholder="$t('floor')"
             v-model="floor"/>
             <label for="floor">{{ $t('floor') }}</label>
@@ -15,7 +14,6 @@
             <input class="form-control"
             type="text"
             name="corridor"
-            maxlength=16
             :placeholder="$t('corridor')"
             v-model="corridor"/>
             <label for="corridor">{{ $t('corridor') }}</label>
@@ -24,7 +22,6 @@
             <input class="form-control"
             type="text"
             name="steps"
-            maxlength=16
             :placeholder="$t('steps')"
             v-model="steps"/>
             <label for="steps">{{ $t('steps') }}</label>
@@ -33,7 +30,6 @@
             <input class="form-control"
             type="text"
             name="flat"
-            maxlength=16
             :placeholder="$t('flat')"
             v-model="flat"/>
             <label for="flat">{{ $t('flat') }}</label>

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue

@@ -17,12 +17,22 @@
       <div class="row my-3">
          <div class="col-lg-6">
 
+            <div class="form-check">
+               <input type="checkbox"
+                  class="form-check-input"
+                  id="isConfidential"
+                  v-model="isConfidential"
+                  :value="valueConfidential" />
+               <label class="form-check-label" for="isConfidential">
+                  {{ $t('isConfidential') }}
+               </label>
+            </div>
             <div class="form-check">
                <input type="checkbox"
                   class="form-check-input"
                   id="isNoAddress"
                   v-model="isNoAddress"
-                  v-bind:value="value" />
+                  :value="value" />
                <label class="form-check-label" for="isNoAddress">
                   {{ $t('isNoAddress') }}
                </label>
@@ -118,7 +128,8 @@ export default {
    emits: ['getCities', 'getReferenceAddresses'],
    data() {
       return {
-         value: false
+         value: false,
+         valueConfidential: false,
       }
    },
    computed: {
@@ -134,6 +145,14 @@ export default {
       addressMap() {
          return this.entity.addressMap;
       },
+      isConfidential: {
+         set(value) {
+            this.entity.selected.confidential = value;
+         },
+         get() {
+            return this.entity.selected.confidential;
+         }
+      },
       isNoAddress: {
          set(value) {
             console.log('isNoAddress value', value);

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js

@@ -18,6 +18,7 @@ const addressMessages = {
         other_address: 'Autre adresse',
         create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse',
         isNoAddress: 'Pas d\'adresse complète',
+        isConfidential: 'Adresse confidentielle',
         street: 'Nom de rue',
         streetNumber: 'Numéro',
         floor: 'Étage',

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue

@@ -1,22 +1,26 @@
 <template>
-    <div class="confidential" v-on:click="toggleBlur">
-        <div class="confidential-content blur">
+    <div :class="classes">
+        <div class="confidential-content" :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
-        <i class="fa fa-eye toggle" aria-hidden="true"></i>
+        <div>
+            <i class="fa fa-eye toggle" aria-hidden="true" @click="toggleBlur"></i>
+        </div>
     </div>
 </template>
 
 <script>
 export default {
     name: "Confidential",
+    data() {
+        return {
+            isBlurred: true,
+        };
+    },
     methods : {
-        toggleBlur: function(e){
-            if(e.target.matches('.toggle')){
-                e.target.previousElementSibling.classList.toggle("blur");
-                e.target.classList.toggle("fa-eye");
-                e.target.classList.toggle("fa-eye-slash");
-            }
+        toggleBlur() {
+            console.log('toggle blur');
+            this.isBlurred = !this.isBlurred;
         },
     }
 }
@@ -39,4 +43,4 @@ export default {
         -moz-filter: blur(5px);
         filter: blur(5px);
     }
-</style>
+</style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue

@@ -1,26 +1,58 @@
 <template>
+
    <component :is="component" class="chill-entity entity-address my-3">
 
       <component :is="component" class="address" :class="multiline">
-         <div v-if="isMultiline === true">
-            <p v-for="(l, i) in address.lines" :key="`line-${i}`">
-               {{ l }}
-            </p>
+
+         <div v-if="isConfidential">
+            <confidential>
+               <template v-slot:confidential-content>
+                  <div v-if="isMultiline === true">
+                     <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+                        {{ l }}
+                     </p>
+                  </div>
+                  <div v-else>
+                     <p v-if="address.text"
+                        class="street">
+                        {{ address.text }}
+                     </p>
+                     <p v-if="address.postcode"
+                        class="postcode">
+                        {{ address.postcode.code }} {{ address.postcode.name }}
+                     </p>
+                     <p v-if="address.country"
+                        class="country">
+                        {{ address.country.name.fr }}
+                     </p>
+                  </div>
+               </template>
+
+            </confidential>
          </div>
-         <div v-else>
-            <p v-if="address.text"
-               class="street">
-               {{ address.text }}
-            </p>
-            <p v-if="address.postcode"
-               class="postcode">
-               {{ address.postcode.code }} {{ address.postcode.name }}
-            </p>
-            <p v-if="address.country"
-               class="country">
-               {{ address.country.name.fr }}
-            </p>
+
+         <div v-if="!isConfidential">
+            <div v-if="isMultiline === true">
+               <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+                  {{ l }}
+               </p>
+            </div>
+            <div v-else>
+               <p v-if="address.text"
+                  class="street">
+                  {{ address.text }}
+               </p>
+               <p v-if="address.postcode"
+                  class="postcode">
+                  {{ address.postcode.code }} {{ address.postcode.name }}
+               </p>
+               <p v-if="address.country"
+                  class="country">
+                  {{ address.country.name.fr }}
+               </p>
+            </div>
          </div>
+
       </component>
 
       <!-- <div v-if="isMultiline === true" class="address-more">
@@ -78,8 +110,14 @@
 </template>
 
 <script>
+
+import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
+
 export default {
    name: 'AddressRenderBox',
+   components: {
+      Confidential
+   },
    props: {
       address: {
          type: Object
@@ -100,6 +138,9 @@ export default {
       multiline() {
          //console.log(this.isMultiline, typeof this.isMultiline);
          return this.isMultiline === true ? "multiline" : "";
+      },
+      isConfidential() {
+         return this.address.confidential;
       }
    }
 };

src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig

@@ -59,7 +59,7 @@
     must be shown in such list
 #}
 {%- if render == 'list' -%}
-    <li class="chill-entity entity-address">
+    <li class="chill-entity entity-address {% if address.confidential %}confidential{% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-li fa-map-marker"></i>
         {% endif %}
@@ -68,7 +68,7 @@
 {%- endif -%}
 
 {%- if render == 'inline' -%}
-    <span class="chill-entity entity-address">
+    <span class="chill-entity entity-address {% if address.confidential %}confidential{% endif %}">
         {% if options['with_picto'] %}
             <i class="fa fa-fw fa-map-marker"></i>
         {% endif %}
@@ -77,7 +77,7 @@
 {%- endif -%}
 
 {%- if render == 'bloc' -%}
-    <div class="chill-entity entity-address">
+    <div class="chill-entity entity-address {% if address.confidential %}confidential{% endif %}">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
             {% if address.postCode is not empty %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">

src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php

@@ -45,6 +45,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
         'extra',
         'validFrom' => DateTimeInterface::class,
         'validTo' => DateTimeInterface::class,
+        'confidential',
     ];
 
     private AddressRender $addressRender;
@@ -83,6 +84,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                 'buildingName' => $address->getBuildingName(),
                 'distribution' => $address->getDistribution(),
                 'extra' => $address->getExtra(),
+                'confidential' => $address->getConfidential(),
                 'lines' => $this->addressRender->renderLines($address),
             ];
 

src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php

@@ -44,7 +44,9 @@ use function count;
 final class ExportManagerTest extends KernelTestCase
 {
     use PrepareCenterTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
 
     private Prophet $prophet;

src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php

@@ -34,8 +34,11 @@ use function in_array;
 final class AuthorizationHelperTest extends KernelTestCase
 {
     use PrepareCenterTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
+
     use ProphecyTrait;
 
     protected function setUp(): void

src/Bundle/ChillMainBundle/migrations/Version20220124085957.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\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Alter some address fields + add confidential field on Address.
+ */
+final class Version20220124085957 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address DROP confidential');
+        $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE VARCHAR(16)');
+        $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE VARCHAR(16)');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Alter some address fields + add confidential field on Address';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_address ADD confidential BOOLEAN DEFAULT FALSE');
+        $this->addSql('ALTER TABLE chill_main_address ALTER floor TYPE TEXT');
+        $this->addSql('ALTER TABLE chill_main_address ALTER corridor TYPE TEXT');
+        $this->addSql('ALTER TABLE chill_main_address ALTER steps TYPE TEXT');
+        $this->addSql('ALTER TABLE chill_main_address ALTER flat TYPE TEXT');
+    }
+}

src/Bundle/ChillMainBundle/migrations/Version20220125134253.php

@@ -0,0 +1,48 @@
+<?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;
+
+/**
+ * Create a new entity ResidentialAddress.
+ */
+final class Version20220125134253 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_main_residential_address_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_main_residential_address');
+    }
+
+    public function getDescription(): string
+    {
+        return 'Create a new entity ResidentialAddress';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_main_residential_address_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_residential_address (id INT NOT NULL, person_id INT NOT NULL, address_id INT DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, residentialAddressComment_comment TEXT DEFAULT NULL, residentialAddressComment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, residentialAddressComment_userId INT DEFAULT NULL, hostPerson_id INT DEFAULT NULL, hostThirdParty_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_9BC1FD50217BBB47 ON chill_main_residential_address (person_id)');
+        $this->addSql('CREATE INDEX IDX_9BC1FD50DCA38092 ON chill_main_residential_address (hostPerson_id)');
+        $this->addSql('CREATE INDEX IDX_9BC1FD508DFC48DC ON chill_main_residential_address (hostThirdParty_id)');
+        $this->addSql('CREATE INDEX IDX_9BC1FD50F5B7AF75 ON chill_main_residential_address (address_id)');
+        $this->addSql('COMMENT ON COLUMN chill_main_residential_address.startDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_main_residential_address.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD50217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD50DCA38092 FOREIGN KEY (hostPerson_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD508DFC48DC FOREIGN KEY (hostThirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_residential_address ADD CONSTRAINT FK_9BC1FD50F5B7AF75 FOREIGN KEY (address_id) REFERENCES chill_main_address (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -52,6 +52,8 @@ Since %date%: Depuis le %date%
 since %date%: depuis le %date%
 Until %date%: Jusqu'au %date%
 until %date%: jusqu'au %date%
+Since: Depuis le
+Until: Jusqu'au
 #elements used in software
 centers: centres
 Centers: Centres