household list of accompanying periods + upgrade DBAL version to 3.1

CHANGELOG.md

@@ -25,10 +25,12 @@ and this project adheres to
 * [person] show current address in search results
 * [person] show alt names in search results
 * [admin]: links to activity admin section added again.
+* [household]: View accompanying periods of current and old household members.
 * [tasks]: different layout for task list / my tasks, and fix link to tasks in alert or in warning
 * [admin]: links to activity admin section added again.
 * [household]: household addresses ordered by ValidFrom date and by id to show the last created address on top.
 * [socialWorkAction]: display of social issue and parent issues + banner context added. 
+* [DBAL dependencies] Upgrade to DBAL 3.1
 
 ## Test releases
 

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -44,7 +44,7 @@ class ActivityReason
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -43,7 +43,7 @@ class ActivityReasonCategory
 
     /**
      * @var string
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -44,7 +44,7 @@ class ActivityType
     private ?int $id;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private array $name = [];
 

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -40,7 +40,7 @@ class ActivityTypeCategory
     private ?int $id;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private array $name = [];
 

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php

@@ -71,7 +71,7 @@ class TranslatableActivityType extends AbstractType
 
         if ($options['active_only'] === true) {
             $qb->where($qb->expr()->eq('at.active', ':active'));
-            $qb->setParameter('active', true, \Doctrine\DBAL\Types\Type::BOOLEAN);
+            $qb->setParameter('active', true, \Doctrine\DBAL\Types\Types::BOOLEAN);
         }
     }
 

src/Bundle/ChillActivityBundle/migrations/Version20161114085659.php

@@ -4,7 +4,7 @@ namespace Chill\Migrations\Activity;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 
 /**
  * Add an "active" column on activitytype table

src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php

@@ -22,7 +22,6 @@ final class Version20210401090853 extends AbstractMigration
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SEQUENCE activitytypecategory_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
         $this->addSql('CREATE TABLE activitytypecategory (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN activitytypecategory.name IS \'(DC2Type:json_array)\'');
         $this->addSql('INSERT INTO activitytypecategory VALUES(1, \'{"fr": "Défaut", "en": "Default"}\', true)');
 
     }

src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php

@@ -51,7 +51,6 @@ final class Version20210408122329 extends AbstractMigration
         $this->addSql('ALTER TABLE activitytype ADD socialDataLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
         $this->addSql('ALTER TABLE activitytype ALTER name SET NOT NULL');
         $this->addSql('ALTER TABLE activitytype ALTER active DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN activitytype.name IS \'(DC2Type:json_array)\'');
     }
 
     public function down(Schema $schema) : void

src/Bundle/ChillCalendarBundle/Entity/CancelReason.php

@@ -34,7 +34,7 @@ class CancelReason
     private $canceledBy;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name = [];
 

src/Bundle/ChillCalendarBundle/Entity/Invite.php

@@ -25,7 +25,7 @@ class Invite
     private User $user;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private array $status = [];
 

src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php

@@ -50,10 +50,7 @@ final class Version20210715141731 extends AbstractMigration
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:date_immutable)\'');
         $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:date_immutable)\'');
         $this->addSql('CREATE TABLE chill_calendar.cancel_reason (id INT NOT NULL, active BOOLEAN NOT NULL, canceledBy JSON NOT NULL, name JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.name IS \'(DC2Type:json_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS \'(DC2Type:json_array)\'');
         $this->addSql('CREATE TABLE chill_calendar.invite (id INT NOT NULL, user_id INT DEFAULT NULL, status JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.invite.status IS \'(DC2Type:json_array)\'');
         $this->addSql('CREATE INDEX IDX_F517FFA7A76ED395 ON chill_calendar.invite (user_id)');
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');

src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php

@@ -34,6 +34,5 @@ final class Version20210723074557 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy TYPE JSON');
         $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledby IS \'(DC2Type:json_array)\'');
     }
 }

src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php

@@ -65,14 +65,14 @@ class CustomField
     /**
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $options = array();
 
     /**
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php

@@ -50,7 +50,7 @@ class Option
      * A json representation of text (multilingual)
      *
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $text;
 

src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php

@@ -45,7 +45,7 @@ class CustomFieldsGroup
     /**
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 
@@ -80,7 +80,7 @@ class CustomFieldsGroup
     /**
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $options = array();
 

src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php

@@ -21,7 +21,7 @@ class DocGeneratorTemplate
     private int $id;
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      * @Serializer\Groups({"read"})
      */
     private array $name = [];

src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php

@@ -22,7 +22,6 @@ final class Version20210812214310 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_docgen_template ADD entities TEXT');
         $this->addSql('ALTER TABLE chill_docgen_template ADD context VARCHAR(255)');
         $this->addSql('COMMENT ON COLUMN chill_docgen_template.entities IS \'(DC2Type:simple_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS \'(DC2Type:json_array)\'');
     }
 
     public function down(Schema $schema): void

src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php

@@ -34,7 +34,7 @@ class DocumentCategory
 
 
     /**
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php

@@ -39,14 +39,14 @@ class StoredObject implements AsyncFileInterface, Document
     private $filename;
 
     /**
-     * @ORM\Column(type="json_array", name="key")
+     * @ORM\Column(type="json", name="key")
      */
     private array $keyInfos = [];
 
     /**
      *
      * @var int[]
-     * @ORM\Column(type="json_array", name="iv")
+     * @ORM\Column(type="json", name="iv")
      */
     private array $iv = [];
 
@@ -69,7 +69,7 @@ class StoredObject implements AsyncFileInterface, Document
     private string $type = '';
 
     /**
-     * @ORM\Column(type="json_array", name="datas")
+     * @ORM\Column(type="json", name="datas")
      * @Serializer\Groups({"read"})
      */
     private array $datas = [];

src/Bundle/ChillDocStoreBundle/migrations/Version20180605102533.php

@@ -17,7 +17,6 @@ final class Version20180605102533 extends AbstractMigration
         $this->addSql('CREATE SCHEMA chill_doc');
         $this->addSql('CREATE SEQUENCE chill_doc.person_document_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_doc.document_category (bundle_id VARCHAR(255) NOT NULL, id_inside_bundle INT NOT NULL, document_class VARCHAR(255) NOT NULL, name JSON NOT NULL, PRIMARY KEY(bundle_id, id_inside_bundle))');
-        $this->addSql('COMMENT ON COLUMN chill_doc.document_category.name IS \'(DC2Type:json_array)\'');
         $this->addSql('CREATE TABLE chill_doc.person_document (id INT NOT NULL, category_bundle_id VARCHAR(255) DEFAULT NULL, category_id_inside_bundle INT DEFAULT NULL, scope_id INT DEFAULT NULL, user_id INT DEFAULT NULL, person_id INT DEFAULT NULL, title TEXT NOT NULL, description TEXT NOT NULL, content TEXT NOT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))');
         $this->addSql('CREATE INDEX IDX_41DA53C369A0BE36EF62EFC ON chill_doc.person_document (category_bundle_id, category_id_inside_bundle)');
         $this->addSql('CREATE INDEX IDX_41DA53C682B5931 ON chill_doc.person_document (scope_id)');

src/Bundle/ChillDocStoreBundle/migrations/Version20180606133338.php

@@ -16,9 +16,6 @@ final class Version20180606133338 extends AbstractMigration
 
         $this->addSql('CREATE SEQUENCE chill_doc.stored_object_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_doc.stored_object (id INT NOT NULL, filename TEXT NOT NULL, key JSON NOT NULL, iv JSON NOT NULL, creation_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, type TEXT NOT NULL, datas JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.key IS \'(DC2Type:json_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.iv IS \'(DC2Type:json_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_doc.stored_object.datas IS \'(DC2Type:json_array)\'');
         $this->addSql('ALTER TABLE chill_doc.person_document ADD object_id INT DEFAULT NULL');
         $this->addSql('ALTER TABLE chill_doc.person_document DROP content');
         $this->addSql('ALTER TABLE chill_doc.person_document ADD CONSTRAINT FK_41DA53C232D562B FOREIGN KEY (object_id) REFERENCES chill_doc.stored_object (id) NOT DEFERRABLE INITIALLY IMMEDIATE');

src/Bundle/ChillEventBundle/Entity/EventType.php

@@ -46,7 +46,7 @@ class EventType
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillEventBundle/Entity/Role.php

@@ -44,7 +44,7 @@ class Role
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillEventBundle/Entity/Status.php

@@ -44,7 +44,7 @@ class Status
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php

@@ -18,7 +18,7 @@ class NativeDateIntervalType extends DateIntervalType
 
     public function getName(): string
     {
-        return \Doctrine\DBAL\Types\Type::DATEINTERVAL;
+        return \Doctrine\DBAL\Types\Types::DATEINTERVAL;
     }
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string

src/Bundle/ChillMainBundle/Entity/Country.php

@@ -28,7 +28,7 @@ class Country
     /**
      * @var string
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      * @groups({"read"})
      *
      */

src/Bundle/ChillMainBundle/Entity/Language.php

@@ -43,7 +43,7 @@ class Language
     /**
      * @var string array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillMainBundle/Entity/Scope.php

@@ -52,7 +52,7 @@ class Scope
      *
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      * @Groups({"read"})
      */
     private $name = [];

src/Bundle/ChillMainBundle/Entity/User.php

@@ -116,7 +116,7 @@ class User implements AdvancedUserInterface {
      * Array where SAML attributes's data are stored
      * @var array
      *
-     * @ORM\Column(type="json_array", nullable=true)
+     * @ORM\Column(type="json", nullable=true)
      */
     private $attributes;
 

src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

@@ -20,7 +20,7 @@
 namespace Chill\MainBundle\Timeline;
 
 use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Doctrine\ORM\Query;
@@ -101,7 +101,7 @@ class TimelineBuilder implements ContainerAwareInterface
     public function countItems($context, array $args)
     {
         $rsm = (new ResultSetMapping())
-            ->addScalarResult('total', 'total', Type::INTEGER);
+            ->addScalarResult('total', 'total', Types::INTEGER);
 
         list($select, $parameters) = $this->buildUnionQuery($context, $args);
 

src/Bundle/ChillMainBundle/migrations/Version20210304085819.php

@@ -20,7 +20,6 @@ final class Version20210304085819 extends AbstractMigration
     public function up(Schema $schema) : void
     {
         $this->addSql('ALTER TABLE users ADD attributes JSONB DEFAULT NULL');
-        $this->addSql('COMMENT ON COLUMN users.attributes IS \'(DC2Type:json_array)\'');
     }
 
     public function down(Schema $schema) : void

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -14,6 +14,8 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\Position;
 use Chill\PersonBundle\Repository\Household\PositionRepository;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Symfony\Component\Security\Core\Security;
 
 /**
  * @Route("/{_locale}/person/household")
@@ -24,11 +26,14 @@ class HouseholdController extends AbstractController
 
     private PositionRepository $positionRepository;
 
-    public function __construct(TranslatorInterface $translator, PositionRepository $positionRepository)
+    private Security $security;
+
+    public function __construct(TranslatorInterface $translator, PositionRepository $positionRepository, Security $security)
 
     {
         $this->translator = $translator;
         $this->positionRepository = $positionRepository;
+        $this->security = $security;
     }
 
     /**
@@ -77,17 +82,46 @@ class HouseholdController extends AbstractController
      */
     public function accompanyingPeriod(Request $request, Household $household)
     {
-        // TODO ACL
 
-        $members = $household->getMembers();
+        $currentMembers = $household->getCurrentPersons();
-        foreach($members as $m) {
+        $accompanyingPeriods = [];
-            $accompanyingPeriods = $m->getPerson()->getAccompanyingPeriods();
+
+        foreach ($currentMembers as $p) {
+            $accompanyingPeriodsMember = $p->getCurrentAccompanyingPeriods();
+
+            foreach ($accompanyingPeriodsMember as $accompanyingPeriod) {
+                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $accompanyingPeriod)) {
+                    continue;
+                } else {
+                $accompanyingPeriods[$accompanyingPeriod->getId()] = $accompanyingPeriod;
+                }
+            }
+        }
+
+        $oldMembers = $household->getNonCurrentMembers();
+        $accompanyingPeriodsOld = [];
+
+        foreach ($oldMembers as $m) {
+            $accompanyingPeriodsOldMember = $m->getPerson()->getAccompanyingPeriods();
+
+            foreach ($accompanyingPeriodsOldMember as $accompanyingPeriod) {
+                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $accompanyingPeriod)) {
+                    continue;
+                } else {
+                    $id = $accompanyingPeriod->getId();
+
+                    if (!array_key_exists($id, $accompanyingPeriodsOld) && !array_key_exists($id, $accompanyingPeriods)) {
+                        $accompanyingPeriodsOld[$id] = $accompanyingPeriod;
+                    }
+                }
+            }
         }
 
         return $this->render('@ChillPerson/Household/accompanying_period.html.twig',
             [
                 'household' => $household,
-                'accompanying_periods' => $accompanyingPeriods
+                'accompanying_periods' => $accompanyingPeriods,
+                'accompanying_periods_old' => $accompanyingPeriodsOld
             ]
         );
     }

src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php

@@ -41,7 +41,7 @@ class MaritalStatus
 
     /**
      * @var string array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
 

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -406,7 +406,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * Array where customfield's data are stored
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $cFData;
 
@@ -613,6 +613,26 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $accompanyingPeriods;
     }
 
+    /**
+     * Get current accompanyingPeriods array
+     */
+    public function getCurrentAccompanyingPeriods(): array
+    {
+        $currentAccompanyingPeriods = [];
+        $currentDate = new DateTime();
+
+        foreach ($this->accompanyingPeriodParticipations as $participation)
+        {
+            $endDate = $participation->getEndDate();
+
+            if ($endDate === null || $endDate > $currentDate){
+                $currentAccompanyingPeriods[] = $participation->getAccompanyingPeriod();
+            }
+        }
+
+        return $currentAccompanyingPeriods;
+    }
+
     /**
      * Get AccompanyingPeriodParticipations Collection
      *

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodClosingFilter.php

@@ -21,7 +21,7 @@ use Chill\MainBundle\Export\FilterInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
 
 /**
@@ -44,8 +44,8 @@ class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportEl
             $qb->expr()->gte('accompanying_period.closingDate', ':date_from'));
 
         $qb->andWhere($clause);
-        $qb->setParameter('date_from', $data['date_from'], Type::DATE);
+        $qb->setParameter('date_from', $data['date_from'], Types::DATE_MUTABLE);
-        $qb->setParameter('date_to', $data['date_to'], Type::DATE);
+        $qb->setParameter('date_to', $data['date_to'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodFilter.php

@@ -21,7 +21,7 @@ use Chill\MainBundle\Export\FilterInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
 
 /**
@@ -52,8 +52,8 @@ class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement i
             );
 
         $qb->andWhere($clause);
-        $qb->setParameter('date_from', $data['date_from'], Type::DATE);
+        $qb->setParameter('date_from', $data['date_from'], Types::DATE_MUTABLE);
-        $qb->setParameter('date_to', $data['date_to'], Type::DATE);
+        $qb->setParameter('date_to', $data['date_to'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingPeriodOpeningFilter.php

@@ -21,7 +21,7 @@ use Chill\MainBundle\Export\FilterInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
 
 /**
@@ -44,8 +44,8 @@ class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportEl
             $qb->expr()->gte('accompanying_period.openingDate', ':date_from'));
 
         $qb->andWhere($clause);
-        $qb->setParameter('date_from', $data['date_from'], Type::DATE);
+        $qb->setParameter('date_from', $data['date_from'], Types::DATE_MUTABLE);
-        $qb->setParameter('date_to', $data['date_to'], Type::DATE);
+        $qb->setParameter('date_to', $data['date_to'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig

@@ -77,7 +77,7 @@
                             <div class="wl-row">
                                 <div class="wl-col title"><h3>{{ 'Participants'|trans }}</h3></div>
                                 <div class="wl-col list">
-                                    {% for p in accompanying_period.participations %}
+                                    {% for p in accompanying_period.getCurrentParticipations %}
                                         <span class="wl-item badge-person">
                                             <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
                                                 {{ p.person|chill_entity_render_string }}

src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig

@@ -9,6 +9,37 @@
 
     {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
 
+    {% if accompanying_periods_old|length > 0 %}
+        <style>
+                button[aria-expanded="true"] > span.folded,
+                button[aria-expanded="false"] > span.unfolded { display: none; }
+                button[aria-expanded="false"] > span.folded,
+                button[aria-expanded="true"] > span.unfolded { display: inline; }
+            </style>
+            <div class="accordion" id="nonCurrent">
+                <div class="accordion-item">
+                    <h2 class="accordion-header" id="heading_{{ household.id }}">
+                        <button
+                            class="accordion-button collapsed"
+                            type="button"
+                            data-bs-toggle="collapse"
+                            data-bs-target="#collapse_{{ household.id }}"
+                            aria-expanded="false"
+                            aria-controls="collapse_{{ household.id }}">
+                            <span class="folded">{{ 'household.Show accompanying periods of past or future memberships'|trans({'length': accompanying_periods_old|length}) }}</span>
+                            <span class="unfolded text-secondary">{{ 'household.Hide memberships'|trans }}</span>
+                        </button>
+                    </h2>
+                    <div id="collapse_{{ household.id }}"
+                        class="accordion-collapse collapse"
+                        aria-labelledby="heading_{{ household.id }}"
+                        data-bs-parent="#nonCurrent">
+                        {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' with {'accompanying_periods' : accompanying_periods_old} %}
+                    </div>
+                </div>
+            </div>
+    {% endif %}
+
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="btn btn-cancel">

src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php

@@ -22,7 +22,7 @@ namespace Chill\PersonBundle\Widget;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
@@ -123,7 +123,7 @@ class PersonListWidget implements WidgetInterface
                     (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
                 );
             $and->add($or);
-            $qb->setParameter('now', new \DateTime(), Type::DATE);
+            $qb->setParameter('now', new \DateTime(), Types::DATE_MUTABLE);
         }
 
 

src/Bundle/ChillPersonBundle/Widget/PersonListWidget/PersonFilteringInterface.php

@@ -61,7 +61,7 @@ interface PersonFilteringInterface
     public function getPersonIds(EntityManager $em, User $user)
     {
         $rsmBuilder = new ResultSetMappingBuilder($em);
-        $rsmBuilder->addScalarResult('id', 'id', Type::BIGINT);
+        $rsmBuilder->addScalarResult('id', 'id', Types::BIGINT);
 
         $personTable = $em->getClassMetadata('ChillPersonBundle:Person')
                 ->getTableName();

src/Bundle/ChillPersonBundle/migrations/Version20150607231010.php

@@ -17,7 +17,6 @@ class Version20150607231010 extends AbstractMigration
         . 'recorded.';
     }
 
-
     /**
      * @param Schema $schema
      */
@@ -28,36 +27,26 @@ class Version20150607231010 extends AbstractMigration
             'Migration can only be executed safely on \'postgresql\'.'
         );
 
-        // retrieve center for setting a default center
-        $centers = $this->connection->fetchAll('SELECT id FROM centers');
-
-        if (count($centers) > 0) {
-            $defaultCenterId = $centers[0]['id'];
-        } else { // if no center, performs other checks
-            //check if there are data in person table
-            $nbPeople = $this->connection->fetchColumn('SELECT count(*) FROM person');
-
-            if ($nbPeople > 0) {
-                // we have data ! We have to create a center !
-                $newCenterId = $this->connection->fetchColumn('SELECT nextval(\'centers_id_seq\');');
-                $this->addSql(
-                    'INSERT INTO centers (id, name) VALUES (:id, :name)',
-                    ['id' => $newCenterId, 'name' => 'Auto-created center']
-                );
-                $defaultCenterId = $newCenterId;
-            }
-        }
-
         $this->addSql('ALTER TABLE person ADD center_id INT');
 
+        // retrieve center for setting a default center
+        $stmt = $this->connection->executeQuery("SELECT id FROM centers ORDER BY id ASC LIMIT 1");
+        $center = $stmt->fetchOne();
+
+        if ($center !== false) {
+            $defaultCenterId = $center['id'];
+        }
+
         if (isset($defaultCenterId)) {
             $this->addSql('UPDATE person SET center_id = :id', array('id' => $defaultCenterId));
         }
 
+        // this will fail if a person is defined, which should not happen any more at this
+        // time of writing (2021-11-09)
+        $this->addSql('ALTER TABLE person ALTER center_id SET NOT NULL');
         $this->addSql('ALTER TABLE person '
                 . 'ADD CONSTRAINT FK_person_center FOREIGN KEY (center_id) '
                 . 'REFERENCES centers (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE person ALTER center_id SET NOT NULL');
         $this->addSql('CREATE INDEX IDX_person_center ON person (center_id)');
     }
 

src/Bundle/ChillPersonBundle/migrations/Version20200310090632.php

@@ -15,7 +15,6 @@ final class Version20200310090632 extends AbstractMigration
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'postgresql', 'Migration can only be executed safely on \'postgresql\'.');
 
         $this->addSql('ALTER TABLE chill_person_closingmotive ADD parent_id INT DEFAULT NULL');
-        $this->addSql('COMMENT ON COLUMN chill_person_closingmotive.name IS \'(DC2Type:json_array)\'');
         $this->addSql('ALTER TABLE chill_person_closingmotive ADD CONSTRAINT FK_92351ECE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_person_closingmotive (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('CREATE INDEX IDX_92351ECE727ACA70 ON chill_person_closingmotive (parent_id)');
         $this->addsql("ALTER TABLE chill_person_closingmotive ADD ordering DOUBLE PRECISION DEFAULT '0' NOT NULL;");

src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php

@@ -24,6 +24,5 @@ final class Version20210419112619 extends AbstractMigration
 
     public function down(Schema $schema) : void
     {
-        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_closingmotive.name IS \'(DC2Type:json_array)\'');
     }
 }

src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml

@@ -26,6 +26,12 @@ household:
             many {Montrer # anciennes ou futures appartenances}
             other {Montrer # anciennes ou futures appartenances}
         }
+    Show accompanying periods of past or future memberships: >-
+        {length, plural,
+            one {Montrer les parcours d'une ancienne appartenance}
+            many {Montrer # parcours des anciennes ou futures appartenances}
+            other {Montrer # parcours des anciennes ou futures appartenances}
+        }
     Hide memberships: Masquer
     Those members does not share address: Ces usagers ne partagent pas l'adresse du ménage.
     Any persons into this position: Aucune personne n'appartient au ménage à cette position.

src/Bundle/ChillReportBundle/Entity/Report.php

@@ -74,7 +74,7 @@ class Report implements HasCenterInterface, HasScopeInterface
 
     /**
      * @var array
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $cFData;
 

src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\QueryBuilder;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\TaskBundle\Security\Authorization\TaskVoter;
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Chill\MainBundle\Entity\Center;
 
 /**
@@ -191,7 +191,7 @@ class SingleTaskRepository extends EntityRepository
                     ->add($this->buildNowIsAfterStartDate($qb, true))
                     ;
         }
-        $qb->setParameter('now', new \DateTime('today'), Type::DATE);
+        $qb->setParameter('now', new \DateTime('today'), Types::DATE_MUTABLE);
         $qb->andWhere($andWhere);
     }
 

src/Bundle/ChillThirdPartyBundle/migrations/Version20190307111314.php

@@ -19,7 +19,6 @@ final class Version20190307111314 extends AbstractMigration
 
         $this->addSql('CREATE SEQUENCE chill_third_party_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_third_party (id INT NOT NULL, name VARCHAR(255) NOT NULL, telephone VARCHAR(64) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, comment TEXT DEFAULT NULL, type JSON DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_third_party.type IS \'(DC2Type:json_array)\'');
 
     }