From 3b56cc818b5348331904f3d3966c3e61592f6714 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 18 Jan 2022 11:08:24 +0100
Subject: [PATCH 01/30] entities + migration created

---
 .../Entity/Person/PersonResource.php          | 255 ++++++++++++++++++
 .../Entity/Person/PersonResourceKind.php      |  69 +++++
 .../migrations/Version20220118100237.php      | 231 ++++++++++++++++
 3 files changed, 555 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
 create mode 100644 src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
new file mode 100644
index 000000000..21adbea5e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -0,0 +1,255 @@
+<?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\Entity\Person;
+
+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\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="chill_person_resource")
+ * @DiscriminatorMap(typeProperty="type", mapping={
+ *     "personResource": personResource::class
+ * })
+ */
+class PersonResource implements TrackCreationInterface, TrackUpdateInterface
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Groups({"read"})
+     */
+    private ?Person $personOwner = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read"})
+     */
+    private ?Person $person = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read"})
+     */
+    private ?ThirdParty $thirdParty = null;
+
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     * @Groups({"read"})
+     */
+    private $freeText;
+
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     * @Groups({"read"})
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=PersonResourceKind::class, inversedBy="personResources")
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read"})
+     */
+    private $kind;
+
+    /**
+     * @ORM\Column(type="datetime")
+     */
+    private $createdAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private User $createdBy;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    private $updatedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private User $updatedBy;
+
+    public function __construct()
+    {
+        $this->comment = new CommentEmbeddable();
+    }
+
+    /**
+     * GETTERS
+     */
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getFreeText(): ?string
+    {
+        return $this->freeText;
+    }
+
+    public function getComment(): CommentEmbeddable
+    {
+        return $this->comment;
+    }
+
+    public function getKind(): ?PersonResourceKind
+    {
+        return $this->kind;
+    }
+
+    public function getPersonOwner(): ?Person
+    {
+        return $this->personOwner;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getThirdParty(): ?ThirdParty
+    {
+        return $this->thirdParty;
+    }
+
+    public function getCreatedAt(): ?DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function getUpdatedAt(): ?DateTimeInterface
+    {
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    /**
+     * SETTERS
+     */
+
+    public function setFreeText(?string $freeText): self
+    {
+        $this->freeText = $freeText;
+
+        if ('' !== $freeText) {
+            $this->setPerson(null);
+            $this->setThirdParty(null);
+        }
+
+        return $this;
+    }
+
+    public function setComment(CommentEmbeddable $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function setKind(?PersonResourceKind $kind): self
+    {
+        $this->kind = $kind;
+
+        return $this;
+    }
+
+    public function setPersonOwner(?Person $personOwner): self
+    {
+        $this->personOwner = $personOwner;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        if (null !== $person) {
+            $this->setFreeText("");
+            $this->setThirdParty(null);
+        }
+
+        return $this;
+    }
+
+    public function setThirdParty(?ThirdParty $thirdParty): self
+    {
+        $this->thirdParty = $thirdParty;
+
+        if (null !== $thirdParty) {
+            $this->setFreeText("");
+            $this->setPerson(null);
+        }
+
+        return $this;
+    }
+
+    public function setCreatedAt(DateTimeInterface $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function setCreatedBy(?User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(DateTimeInterface $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(?User $updatedBy): self
+    {
+        $this->updatedBy = $updatedBy;
+
+        return $this;
+    }
+
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
new file mode 100644
index 000000000..03b2aa858
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
@@ -0,0 +1,69 @@
+<?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\Entity\Person;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * **About denormalization**: this operation is operated by @see{AccompanyingPeriodResourdeNormalizer}.
+ *
+ * @ORM\Entity
+ * @ORM\Table(name="chill_person_resource_kind")
+ */
+class PersonResourceKind
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private int $id;
+
+    /**
+     * @ORM\Column(type="json", length=255)
+     */
+    private array $label;
+
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $isActive = true;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getIsActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    public function getLabel(): ?array
+    {
+        return $this->label;
+    }
+
+    public function setLabel(array $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function setIsActive(bool $isActive): self
+    {
+        $this->isActive = $isActive;
+
+        return $this;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php b/src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php
new file mode 100644
index 000000000..8f58b42b0
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php
@@ -0,0 +1,231 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Creation of PersonResource and PersonResourceKind
+ */
+final class Version20220118100237 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Creation of PersonResource and PersonResourceKind';
+    }
+
+    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('CREATE SEQUENCE chill_person_resource_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_person_resource_kind_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_resource (id INT NOT NULL, person_id INT DEFAULT NULL, kind_id INT DEFAULT NULL, freeText TEXT DEFAULT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_comment TEXT DEFAULT NULL, comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_userId INT DEFAULT NULL, personOwner_id INT NOT NULL, thirdParty_id INT DEFAULT NULL, createdBy_id INT NOT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_FA5B7D92D19C515B ON chill_person_resource (personOwner_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D92217BBB47 ON chill_person_resource (person_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D923EA5CAB0 ON chill_person_resource (thirdParty_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D9230602CA9 ON chill_person_resource (kind_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D923174800F ON chill_person_resource (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D9265FF1AEC ON chill_person_resource (updatedBy_id)');
+        $this->addSql('CREATE TABLE chill_person_resource_kind (id INT NOT NULL, label JSON NOT NULL, isActive BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D92D19C515B FOREIGN KEY (personOwner_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D92217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D923EA5CAB0 FOREIGN KEY (thirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D9230602CA9 FOREIGN KEY (kind_id) REFERENCES chill_person_resource_kind (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D923174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D9265FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        // $this->addSql('DROP TABLE chill_main_address_legacy');
+        // $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 point TYPE geometry(POINT,4326)');
+        // $this->addSql('ALTER TABLE chill_main_address ALTER point DROP DEFAULT');
+        // $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 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_64a4a621504cb38d RENAME TO IDX_E260A868504CB38D');
+        // $this->addSql('DROP INDEX participations_no_overlap');
+        // $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_accompanying_period_work DROP CONSTRAINT fk_b694fb3616d9d9b');
+        // $this->addSql('DROP INDEX idx_b694fb3616d9d9b');
+        // $this->addSql('ALTER TABLE chill_person_household DROP CONSTRAINT fk_household_comment_embeddable_user');
+        // $this->addSql('DROP INDEX IDX_BE50A270116F5FA9');
+        // $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 mobilenumber_trgm_idx');
+        // $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
+        // $this->addSql('DROP INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin');
+        // $this->addSql('DROP INDEX phonenumber_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 DROP DEFAULT');
+        // $this->addSql('ALTER TABLE chill_person_person ALTER cfdata SET NOT NULL');
+        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT');
+        // $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_relations ALTER isactive DROP NOT NULL');
+        // $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('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('ALTER TABLE chill_person_resource DROP CONSTRAINT FK_FA5B7D9230602CA9');
+        $this->addSql('DROP SEQUENCE chill_person_resource_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_resource_kind_id_seq CASCADE');
+        // $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('DROP TABLE chill_person_resource');
+        $this->addSql('DROP TABLE chill_person_resource_kind');
+        // $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 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 INDEX idx_589d51b4ef1a9d84 RENAME TO idx_154a075fef1a9d84');
+        // $this->addSql('ALTER INDEX idx_589d51b4a76ed395 RENAME TO idx_154a075fa76ed395');
+        // $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 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('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('CREATE INDEX participations_no_overlap ON chill_person_accompanying_period_participation (person_id, accompanyingperiod_id)');
+        // $this->addSql('ALTER TABLE chill_main_location ALTER active SET DEFAULT \'true\'');
+        // $this->addSql('ALTER INDEX idx_ac74095aa76ed395 RENAME TO idx_55026b0ca76ed395');
+        // $this->addSql('ALTER INDEX idx_ac74095a682b5931 RENAME TO idx_55026b0c682b5931');
+        // $this->addSql('ALTER INDEX idx_ac74095a217bbb47 RENAME TO idx_55026b0c217bbb47');
+        // $this->addSql('ALTER INDEX idx_ac74095ac54c8c93 RENAME TO idx_55026b0cc54c8c93');
+        // $this->addSql('ALTER INDEX idx_ac74095ad7fa8ef0 RENAME TO IDX_AC74095A550B0C53');
+        // $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 SET DEFAULT \'\'');
+        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber SET 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('CREATE INDEX mobilenumber_trgm_idx ON chill_person_person (mobilenumber)');
+        // $this->addSql('CREATE INDEX fullnamecanonical_trgm_idx ON chill_person_person (center_id, fullnamecanonical)');
+        // $this->addSql('CREATE INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin ON chill_person_person (fullnamecanonical)');
+        // $this->addSql('CREATE INDEX phonenumber_trgm_idx ON chill_person_person (phonenumber)');
+        // $this->addSql('ALTER INDEX idx_bf210a141c9da55 RENAME TO idx_3370d4401c9da55');
+        // $this->addSql('ALTER INDEX idx_bf210a143818da5 RENAME TO idx_3370d4403818da5');
+        // $this->addSql('ALTER INDEX idx_bf210a145932f377 RENAME TO idx_person_center');
+        // $this->addSql('ALTER INDEX idx_bf210a14d7d03ce3 RENAME TO IDX_BF210A145521BE40');
+        // $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('CREATE INDEX idx_b694fb3616d9d9b ON chill_person_accompanying_period_work (handlingthierparty_id)');
+        // $this->addSql('ALTER TABLE chill_main_address ADD customs JSONB 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('CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address (id, validfrom, validto)');
+        // $this->addSql('ALTER TABLE chill_vendee.vendeeperson_entourage DROP CONSTRAINT FK_4D319FFEF57537C3');
+        // $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 chill_vendee.idx_dd0a4c00eef79338 RENAME TO idx_1a4b602deef79338');
+        // $this->addSql('CREATE INDEX chill_custom_canonicalized_trgm_idx_gist ON chill_3party.third_party (canonicalized) WHERE (active IS TRUE)');
+        // $this->addSql('ALTER INDEX idx_a14d8f3d96df1f10 RENAME TO idx_a14d8f3d447bbb3b');
+        // $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('ALTER INDEX idx_e260a868504cb38d RENAME TO idx_64a4a621504cb38d');
+        // $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('CREATE INDEX internal_center_geom_idx ON chill_vendee.center_polygon (geom)');
+        // $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 permission_groups ALTER flags SET DEFAULT \'[]\'');
+        // $this->addSql('ALTER TABLE chill_person_marital_status ALTER id TYPE VARCHAR(10)');
+        // $this->addSql('ALTER TABLE chill_person_relations ALTER isActive SET NOT NULL');
+        // $this->addSql('ALTER TABLE custom_field_long_choice_options ALTER internal_key SET DEFAULT \'\'');
+        // $this->addSql('ALTER INDEX idx_7a48df7f5df53b66 RENAME TO idx_286dc95df53b66');
+        // $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 customfieldsgroup ALTER options SET DEFAULT \'{}\'');
+        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options 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 TABLE activityreasoncategory ALTER name DROP NOT NULL');
+    }
+}

From ff0b0678a5de58abc49f76e8cd59a2fde1b655b4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 18 Jan 2022 11:11:29 +0100
Subject: [PATCH 02/30] changelog entry added

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c78c7a3c..89e67e21c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to
 * vuejs: add validation on required fields for AddPerson, Address and Location components
 * vuejs: treat 422 validation errors in locations and AddPerson components
 * [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
 
 ## Test releases
 

From 6e4bfd45c6ccd4104e5b3244fbb0e6ac18738293 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 18 Jan 2022 13:55:09 +0100
Subject: [PATCH 03/30] route and menu entry added in person menu + start of
 templates/controller

---
 .../Controller/PersonResourceController.php   | 43 +++++++++++++
 .../Menu/PersonMenuBuilder.php                | 10 +++
 .../Repository/PersonResourceRepository.php   | 61 +++++++++++++++++++
 .../views/PersonResource/list.html.twig       | 32 ++++++++++
 .../ChillPersonBundle/config/routes.yaml      |  4 ++
 .../translations/messages.fr.yml              |  5 ++
 6 files changed, 155 insertions(+)
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
new file mode 100644
index 000000000..e02b6e4c3
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.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\PersonBundle\Controller;
+
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Repository\PersonResourceRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+final class PersonResourceController extends AbstractController
+{
+    private PersonResourceRepository $personResourceRepository;
+
+    public function __construct(
+        PersonResourceRepository $personResourceRepository,
+        PersonRepository $personRepository
+        )
+    {
+        $this->personResourceRepository = $personResourceRepository;
+        $this->personRepository = $personRepository;
+    }
+
+    public function listAction($person_id)
+    {
+        dump($person_id);
+        $person = $this->personRepository->find($person_id);
+        dump($person);
+        return $this->render(
+            'ChillPersonBundle:PersonResource:list.html.twig',
+            [
+                'person' => $person
+            ]
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index d83fa29dd..228309737 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -96,6 +96,16 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 100,
                 ]);
         }
+
+        $menu->addChild($this->translator->trans('person_resources_menu'), [
+            'route' => 'chill_person_resource_list',
+            'routeParameters' => [
+                'person_id' => $parameters['person']->getId(),
+            ],
+        ])
+        ->setExtras([
+            'order' => 99999,
+        ]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
new file mode 100644
index 000000000..1874bec05
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
@@ -0,0 +1,61 @@
+<?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\Repository;
+
+use Chill\PersonBundle\Entity\Person\PersonResource;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectRepository;
+
+final class PersonResourceRepository implements ObjectRepository
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->repository = $entityManager->getRepository(PersonResource::class);
+    }
+
+    public function find($id): ?PersonResource
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return PersonResource[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return PersonResource[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?PersonResource
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return PersonResource::class;
+    }
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
new file mode 100644
index 000000000..8e943c43a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -0,0 +1,32 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_resource_list' %}
+
+{% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
+
+{% block personcontent %}
+
+{{ person }}
+<div class="flex-table">
+    <div class="item-bloc">
+        <div class="item-row">
+            <div class="item-col">Hello</div>
+            <div class="item-col">there</div>
+        </div>
+        <div class="item-row separator">
+            <div class="item-col">How</div>
+            <div class="item-col">are</div>
+        </div>
+    </div>
+    <div class="item-bloc">
+        <div class="item-row">
+            <div class="item-col">you</div>
+            <div class="item-col">doing</div>
+        </div>
+        <div class="item-row">
+            <div class="item-col">today</div>
+            <div class="item-col">?</div>
+        </div>
+    </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index bbcb7c39b..3fbf38c0d 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -55,6 +55,10 @@ chill_person_accompanying_period_re_open:
     path: /{_locale}/person/{person_id}/accompanying-period/{period_id}/re-open
     controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::reOpenAction
 
+chill_person_resource_list:
+    path: /{_locale}/person/resource/{person_id}/general
+    controller: Chill\PersonBundle\Controller\PersonResourceController::listAction
+
 chill_person_address_list:
     path: /{_locale}/person/{person_id}/address/list
     controller: Chill\PersonBundle\Controller\PersonAddressController::listAction
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 5d0e2b16a..e2758034e 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -220,6 +220,11 @@ Delete accompanying period: Supprimer la période d'accompagnement
 Are you sure you want to remove the accompanying period "%id%" ?:  Êtes-vous sûr de vouloir supprimer la période d'accompagnement %id% ?
 The accompanying course has been successfully removed.: La période d'accompagnement a été supprimée.
 
+# person resource
+
+person_resources_menu: "Ressources"
+Person resources: 'Réssources de la personne'
+
 # pickAPersonType
 Pick a person: Choisir une personne
 

From 58ac4b01ef9f61a72a23a8d40155d15ea3de7911 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 18 Jan 2022 14:54:03 +0100
Subject: [PATCH 04/30] form created + general layout of templates

---
 .../Controller/PersonResourceController.php   |  9 ++-
 .../Form/PersonResourceType.php               | 79 +++++++++++++++++++
 .../views/PersonResource/create.html.twig     | 24 ++++++
 .../views/PersonResource/list.html.twig       | 18 +++--
 .../translations/messages.fr.yml              |  3 +-
 5 files changed, 121 insertions(+), 12 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index e02b6e4c3..6db871e5b 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
+use Chill\PersonBundle\Form\PersonResourceType;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\PersonResourceRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -30,13 +31,15 @@ final class PersonResourceController extends AbstractController
 
     public function listAction($person_id)
     {
-        dump($person_id);
         $person = $this->personRepository->find($person_id);
-        dump($person);
+
+        $form = $this->createForm(PersonResourceType::class);
+
         return $this->render(
             'ChillPersonBundle:PersonResource:list.html.twig',
             [
-                'person' => $person
+                'person' => $person,
+                'form' => $form->createView()
             ]
         );
     }
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
new file mode 100644
index 000000000..8863d705c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -0,0 +1,79 @@
+<?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\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\PersonBundle\Entity\Person\PersonResource;
+use Chill\PersonBundle\Entity\Person\PersonResourceKind;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\RadioType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class PersonResourceType extends AbstractType
+{
+    private CategoryRender $categoryRender;
+
+    public function __construct(CategoryRender $categoryRender)
+    {
+        $this->categoryRender = $categoryRender;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('kind', EntityType::class, [
+                'label' => 'Type',
+                'required' => true,
+                'class' => PersonResourceKind::class,
+                'query_builder' => static function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('pr');
+                    $qb->where($qb->expr()->eq('pr.isActive', 'TRUE'));
+                    return $qb;
+                },
+                'choice_label' => function (PersonResourceKind $personResourceKind) {
+                    $options = [];
+                    return $this->categoryRender->renderString($personResourceKind, $options);
+                }
+            ])
+            ->add('linkedEntity', ChoiceType::class, [
+                'choices' => [
+                    'Usager' => 'person',
+                    'Tiers' => 'thirdparty',
+                    'Description libre' => 'freeText'
+                ],
+                'expanded' => true,
+                'label' => 'Associer un'
+            ])
+            ->add('comment', ChillTextareaType::class, [
+                'label' => 'Note',
+                'required' => false
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => PersonResource::class,
+        ]);
+    }
+
+    // public function getBlockPrefix(): string
+    // {
+    //     return 'chill_personbundle_personresource';
+    // }
+
+}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
new file mode 100644
index 000000000..9ba297d8b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -0,0 +1,24 @@
+<div class="col-md col-xxl">
+
+    <h1>{{ 'Add a person resource'|trans }}</h1>
+
+    {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
+
+    {{ form_row(form.kind) }}
+
+    {{ form_row(form.linkedEntity) }}
+
+    {{ form_row(form.comment) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="dropdown">
+            <a class="btn btn-create"
+            href="#" role="button" id="newPersonResource">
+                {{ 'Add a person resource'|trans }}
+            </a>
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+</div>
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 8e943c43a..b931c4f95 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -6,27 +6,29 @@
 
 {% block personcontent %}
 
-{{ person }}
 <div class="flex-table">
     <div class="item-bloc">
         <div class="item-row">
-            <div class="item-col">Hello</div>
-            <div class="item-col">there</div>
+            <div class="item-col">Name of resource</div>
+            <div class="item-col">kind of resource</div>
         </div>
-        <div class="item-row separator">
+        {# <div class="item-row separator">
             <div class="item-col">How</div>
             <div class="item-col">are</div>
-        </div>
+        </div> #}
     </div>
     <div class="item-bloc">
         <div class="item-row">
-            <div class="item-col">you</div>
+            <div class="item-col">comment zone</div>
             <div class="item-col">doing</div>
         </div>
         <div class="item-row">
-            <div class="item-col">today</div>
-            <div class="item-col">?</div>
+            {# <div class="item-col">today</div> #}
+            <div class="item-col">Buttons</div>
         </div>
     </div>
 </div>
+
+{% include "@ChillPerson/PersonResource/create.html.twig" %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index e2758034e..e7d4b3a1b 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -223,7 +223,8 @@ The accompanying course has been successfully removed.: La période d'accompagne
 # person resource
 
 person_resources_menu: "Ressources"
-Person resources: 'Réssources de la personne'
+Person resources: "Réssources de la personne"
+Add a person resource: "Ajouter une réssource"
 
 # pickAPersonType
 Pick a person: Choisir une personne

From 001e2f96229007d7737781dae28a355fd32662e8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 19 Jan 2022 09:48:39 +0100
Subject: [PATCH 05/30] js files put in place + select menus added for
 selecting person/thirdparty/... show-hide not working yet

---
 .../Controller/PersonResourceController.php   | 24 ++++++++++-
 .../Entity/Person/PersonResourceKind.php      | 10 ++---
 .../Form/PersonResourceType.php               | 40 ++++++++++++++++---
 .../public/page/person_resource/index.js      | 33 +++++++++++++++
 .../views/PersonResource/create.html.twig     | 14 ++++++-
 .../views/PersonResource/list.html.twig       |  6 ++-
 .../ChillPersonBundle/chill.webpack.config.js |  1 +
 .../translations/messages.fr.yml              |  4 +-
 8 files changed, 116 insertions(+), 16 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 6db871e5b..799967c82 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -11,30 +11,50 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
+use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Form\PersonResourceType;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\PersonResourceRepository;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
 
 final class PersonResourceController extends AbstractController
 {
     private PersonResourceRepository $personResourceRepository;
+    private PersonRepository $personRepository;
+    private EntityManagerInterface $em;
 
     public function __construct(
         PersonResourceRepository $personResourceRepository,
-        PersonRepository $personRepository
+        PersonRepository $personRepository,
+        EntityManagerInterface $em
         )
     {
         $this->personResourceRepository = $personResourceRepository;
         $this->personRepository = $personRepository;
+        $this->em = $em;
     }
 
-    public function listAction($person_id)
+    public function listAction(Request $request, $person_id)
     {
         $person = $this->personRepository->find($person_id);
+        $personResource = new PersonResource();
 
         $form = $this->createForm(PersonResourceType::class);
 
+        $form->handleRequest($request);
+
+        if ($request->getMethod() === Request::METHOD_POST && $form->isValid()) {
+            $this->em->persist($personResource);
+            $this->em->flush();
+
+            return $this->redirectToRoute(
+                'chill_person_resource',
+                ['person_id' => $person->getId()]
+            );
+        }
+
         return $this->render(
             'ChillPersonBundle:PersonResource:list.html.twig',
             [
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
index 03b2aa858..619382f68 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
@@ -31,7 +31,7 @@ class PersonResourceKind
     /**
      * @ORM\Column(type="json", length=255)
      */
-    private array $label;
+    private array $title;
 
     /**
      * @ORM\Column(type="boolean")
@@ -48,14 +48,14 @@ class PersonResourceKind
         return $this->isActive;
     }
 
-    public function getLabel(): ?array
+    public function getTitle(): ?array
     {
-        return $this->label;
+        return $this->title;
     }
 
-    public function setLabel(array $label): self
+    public function setTitle(array $title): self
     {
-        $this->label = $label;
+        $this->title = $title;
 
         return $this;
     }
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index 8863d705c..fabc30e5e 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -13,8 +13,12 @@ namespace Chill\PersonBundle\Form;
 
 use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person\PersonResourceKind;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -26,10 +30,14 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 final class PersonResourceType extends AbstractType
 {
     private CategoryRender $categoryRender;
+    private PersonRender $personRender;
+    private ThirdPartyRender $thirdPartyRender;
 
-    public function __construct(CategoryRender $categoryRender)
+    public function __construct(CategoryRender $categoryRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
     {
         $this->categoryRender = $categoryRender;
+        $this->personRender = $personRender;
+        $this->thirdPartyRender = $thirdPartyRender;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -58,6 +66,28 @@ final class PersonResourceType extends AbstractType
                 'expanded' => true,
                 'label' => 'Associer un'
             ])
+            ->add('person', EntityType::class, [
+                'label' => 'Usager',
+                'class' => Person::class,
+                'required' => false,
+                'choice_label' => function (Person $person) {
+                    $options = [];
+                    return $this->personRender->renderString($person, $options);
+                }
+            ])
+            ->add('thirdparty', EntityType::class, [
+                'label' => 'Tiers',
+                'class' => ThirdParty::class,
+                'required' => false,
+                'choice_label' => function (ThirdParty $thirdParty) {
+                    $options = [];
+                    return $this->thirdPartyRender->renderString($thirdParty, $options);
+                }
+            ])
+            ->add('freetext', ChillTextareaType::class, [
+                'label' => 'Description libre',
+                'required' => false
+            ])
             ->add('comment', ChillTextareaType::class, [
                 'label' => 'Note',
                 'required' => false
@@ -71,9 +101,9 @@ final class PersonResourceType extends AbstractType
         ]);
     }
 
-    // public function getBlockPrefix(): string
-    // {
-    //     return 'chill_personbundle_personresource';
-    // }
+    public function getBlockPrefix(): string
+    {
+        return 'chill_personbundle_person_resource';
+    }
 
 }
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js
new file mode 100644
index 000000000..8ef2021f1
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js
@@ -0,0 +1,33 @@
+import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
+
+window.addEventListener('DOMContentLoaded', function() {
+    let
+        linkedEntityContainer = document.querySelector('#linked-entity'),
+        personContainer = document.querySelector('#person-entity'),
+        thirdpartyContainer = document.querySelector('#thirdparty-entity'),
+        freetextContainer = document.querySelector('#freetext-entity')
+    ;
+
+    if (null === linkedEntityContainer) {
+        return;
+    }
+
+    new ShowHide({
+        debug: true,
+        load_event: null,
+        froms: [linkedEntityContainer],
+        container: [personContainer, thirdpartyContainer, freetextContainer],
+        test: function(containers, arg2, arg3) {
+            for (let container of containers) {
+                for (let input of container.querySelectorAll('input')) {
+                    if (!input.checked) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                }
+            }
+
+        },
+    })
+});
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 9ba297d8b..74bdeb57e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -6,7 +6,19 @@
 
     {{ form_row(form.kind) }}
 
-    {{ form_row(form.linkedEntity) }}
+    <div id="linked-entity">
+        {{ form_row(form.linkedEntity) }}
+    </div>
+
+    <div id="person-entity">
+        {{ form_row(form.person) }}
+    </div>
+    <div id="thirdparty-entity">
+        {{ form_row(form.thirdparty) }}
+    </div>
+    <div id="freetext-entity">
+        {{ form_row(form.freetext) }}
+    </div>
 
     {{ form_row(form.comment) }}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index b931c4f95..844f39d41 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -20,7 +20,7 @@
     <div class="item-bloc">
         <div class="item-row">
             <div class="item-col">comment zone</div>
-            <div class="item-col">doing</div>
+            <div class="item-col">....</div>
         </div>
         <div class="item-row">
             {# <div class="item-col">today</div> #}
@@ -31,4 +31,8 @@
 
 {% include "@ChillPerson/PersonResource/create.html.twig" %}
 
+{% endblock %}
+
+{% block js %}
+    {# {{ encore_entry_script_tags('page_person_resource') }} #}
 {% 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 7a8b79c7c..9cf6717fd 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -18,4 +18,5 @@ module.exports = function(encore, entries)
     encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');
     encore.addEntry('page_accompanying_course_index_person_locate', __dirname + '/Resources/public/page/accompanying_course_index/person_locate.js');
     encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
+    encore.addEntry('page_person_resource', __dirname + '/Resources/public/page/person_resource/index.js');
 };
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index e7d4b3a1b..7165d7084 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -223,8 +223,8 @@ The accompanying course has been successfully removed.: La période d'accompagne
 # person resource
 
 person_resources_menu: "Ressources"
-Person resources: "Réssources de la personne"
-Add a person resource: "Ajouter une réssource"
+Person resources: "Ressources de la personne"
+Add a person resource: "Ajouter une ressource"
 
 # pickAPersonType
 Pick a person: Choisir une personne

From 96dc711b4ff102bd09c642896693aa9602b8c4bf Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 19 Jan 2022 19:38:57 +0100
Subject: [PATCH 06/30] migration adjusted

---
 .../migrations/Version20220118100237.php      | 231 ------------------
 .../migrations/Version20220119155944.php      |  50 ++++
 2 files changed, 50 insertions(+), 231 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php b/src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php
deleted file mode 100644
index 8f58b42b0..000000000
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220118100237.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Person;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Creation of PersonResource and PersonResourceKind
- */
-final class Version20220118100237 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Creation of PersonResource and PersonResourceKind';
-    }
-
-    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('CREATE SEQUENCE chill_person_resource_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE SEQUENCE chill_person_resource_kind_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_person_resource (id INT NOT NULL, person_id INT DEFAULT NULL, kind_id INT DEFAULT NULL, freeText TEXT DEFAULT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_comment TEXT DEFAULT NULL, comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_userId INT DEFAULT NULL, personOwner_id INT NOT NULL, thirdParty_id INT DEFAULT NULL, createdBy_id INT NOT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE INDEX IDX_FA5B7D92D19C515B ON chill_person_resource (personOwner_id)');
-        $this->addSql('CREATE INDEX IDX_FA5B7D92217BBB47 ON chill_person_resource (person_id)');
-        $this->addSql('CREATE INDEX IDX_FA5B7D923EA5CAB0 ON chill_person_resource (thirdParty_id)');
-        $this->addSql('CREATE INDEX IDX_FA5B7D9230602CA9 ON chill_person_resource (kind_id)');
-        $this->addSql('CREATE INDEX IDX_FA5B7D923174800F ON chill_person_resource (createdBy_id)');
-        $this->addSql('CREATE INDEX IDX_FA5B7D9265FF1AEC ON chill_person_resource (updatedBy_id)');
-        $this->addSql('CREATE TABLE chill_person_resource_kind (id INT NOT NULL, label JSON NOT NULL, isActive BOOLEAN NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D92D19C515B FOREIGN KEY (personOwner_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D92217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D923EA5CAB0 FOREIGN KEY (thirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D9230602CA9 FOREIGN KEY (kind_id) REFERENCES chill_person_resource_kind (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D923174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D9265FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        // $this->addSql('DROP TABLE chill_main_address_legacy');
-        // $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 point TYPE geometry(POINT,4326)');
-        // $this->addSql('ALTER TABLE chill_main_address ALTER point DROP DEFAULT');
-        // $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 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_64a4a621504cb38d RENAME TO IDX_E260A868504CB38D');
-        // $this->addSql('DROP INDEX participations_no_overlap');
-        // $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_accompanying_period_work DROP CONSTRAINT fk_b694fb3616d9d9b');
-        // $this->addSql('DROP INDEX idx_b694fb3616d9d9b');
-        // $this->addSql('ALTER TABLE chill_person_household DROP CONSTRAINT fk_household_comment_embeddable_user');
-        // $this->addSql('DROP INDEX IDX_BE50A270116F5FA9');
-        // $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 mobilenumber_trgm_idx');
-        // $this->addSql('DROP INDEX fullnamecanonical_trgm_idx');
-        // $this->addSql('DROP INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin');
-        // $this->addSql('DROP INDEX phonenumber_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 DROP DEFAULT');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER cfdata SET NOT NULL');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER mobilenumber DROP DEFAULT');
-        // $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_relations ALTER isactive DROP NOT NULL');
-        // $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('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('ALTER TABLE chill_person_resource DROP CONSTRAINT FK_FA5B7D9230602CA9');
-        $this->addSql('DROP SEQUENCE chill_person_resource_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_person_resource_kind_id_seq CASCADE');
-        // $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('DROP TABLE chill_person_resource');
-        $this->addSql('DROP TABLE chill_person_resource_kind');
-        // $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 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 INDEX idx_589d51b4ef1a9d84 RENAME TO idx_154a075fef1a9d84');
-        // $this->addSql('ALTER INDEX idx_589d51b4a76ed395 RENAME TO idx_154a075fa76ed395');
-        // $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 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('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('CREATE INDEX participations_no_overlap ON chill_person_accompanying_period_participation (person_id, accompanyingperiod_id)');
-        // $this->addSql('ALTER TABLE chill_main_location ALTER active SET DEFAULT \'true\'');
-        // $this->addSql('ALTER INDEX idx_ac74095aa76ed395 RENAME TO idx_55026b0ca76ed395');
-        // $this->addSql('ALTER INDEX idx_ac74095a682b5931 RENAME TO idx_55026b0c682b5931');
-        // $this->addSql('ALTER INDEX idx_ac74095a217bbb47 RENAME TO idx_55026b0c217bbb47');
-        // $this->addSql('ALTER INDEX idx_ac74095ac54c8c93 RENAME TO idx_55026b0cc54c8c93');
-        // $this->addSql('ALTER INDEX idx_ac74095ad7fa8ef0 RENAME TO IDX_AC74095A550B0C53');
-        // $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 SET DEFAULT \'\'');
-        // $this->addSql('ALTER TABLE chill_person_person ALTER phonenumber SET 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('CREATE INDEX mobilenumber_trgm_idx ON chill_person_person (mobilenumber)');
-        // $this->addSql('CREATE INDEX fullnamecanonical_trgm_idx ON chill_person_person (center_id, fullnamecanonical)');
-        // $this->addSql('CREATE INDEX chill_custom_fullnamecanonical_only_trgm_idx_gin ON chill_person_person (fullnamecanonical)');
-        // $this->addSql('CREATE INDEX phonenumber_trgm_idx ON chill_person_person (phonenumber)');
-        // $this->addSql('ALTER INDEX idx_bf210a141c9da55 RENAME TO idx_3370d4401c9da55');
-        // $this->addSql('ALTER INDEX idx_bf210a143818da5 RENAME TO idx_3370d4403818da5');
-        // $this->addSql('ALTER INDEX idx_bf210a145932f377 RENAME TO idx_person_center');
-        // $this->addSql('ALTER INDEX idx_bf210a14d7d03ce3 RENAME TO IDX_BF210A145521BE40');
-        // $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('CREATE INDEX idx_b694fb3616d9d9b ON chill_person_accompanying_period_work (handlingthierparty_id)');
-        // $this->addSql('ALTER TABLE chill_main_address ADD customs JSONB 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('CREATE INDEX chill_custom_main_address_filtering_idx ON chill_main_address (id, validfrom, validto)');
-        // $this->addSql('ALTER TABLE chill_vendee.vendeeperson_entourage DROP CONSTRAINT FK_4D319FFEF57537C3');
-        // $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 chill_vendee.idx_dd0a4c00eef79338 RENAME TO idx_1a4b602deef79338');
-        // $this->addSql('CREATE INDEX chill_custom_canonicalized_trgm_idx_gist ON chill_3party.third_party (canonicalized) WHERE (active IS TRUE)');
-        // $this->addSql('ALTER INDEX idx_a14d8f3d96df1f10 RENAME TO idx_a14d8f3d447bbb3b');
-        // $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('ALTER INDEX idx_e260a868504cb38d RENAME TO idx_64a4a621504cb38d');
-        // $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('CREATE INDEX internal_center_geom_idx ON chill_vendee.center_polygon (geom)');
-        // $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 permission_groups ALTER flags SET DEFAULT \'[]\'');
-        // $this->addSql('ALTER TABLE chill_person_marital_status ALTER id TYPE VARCHAR(10)');
-        // $this->addSql('ALTER TABLE chill_person_relations ALTER isActive SET NOT NULL');
-        // $this->addSql('ALTER TABLE custom_field_long_choice_options ALTER internal_key SET DEFAULT \'\'');
-        // $this->addSql('ALTER INDEX idx_7a48df7f5df53b66 RENAME TO idx_286dc95df53b66');
-        // $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 customfieldsgroup ALTER options SET DEFAULT \'{}\'');
-        // $this->addSql('ALTER TABLE customfieldsgroup ALTER options 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 TABLE activityreasoncategory ALTER name DROP NOT NULL');
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
new file mode 100644
index 000000000..e35bf12d7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Creation of person resource and person resource kind
+ */
+final class Version20220119155944 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Creation of person resource and person resource kind';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SEQUENCE chill_person_resource_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_person_resource_kind_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_person_resource (id INT NOT NULL, person_id INT DEFAULT NULL, kind_id INT DEFAULT NULL, freeText TEXT DEFAULT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_comment TEXT DEFAULT NULL, comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_userId INT DEFAULT NULL, personOwner_id INT NOT NULL, thirdParty_id INT DEFAULT NULL, createdBy_id INT NOT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_FA5B7D92D19C515B ON chill_person_resource (personOwner_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D92217BBB47 ON chill_person_resource (person_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D923EA5CAB0 ON chill_person_resource (thirdParty_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D9230602CA9 ON chill_person_resource (kind_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D923174800F ON chill_person_resource (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_FA5B7D9265FF1AEC ON chill_person_resource (updatedBy_id)');
+        $this->addSql('CREATE TABLE chill_person_resource_kind (id INT NOT NULL, title JSON NOT NULL, isActive BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D92D19C515B FOREIGN KEY (personOwner_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D92217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D923EA5CAB0 FOREIGN KEY (thirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D9230602CA9 FOREIGN KEY (kind_id) REFERENCES chill_person_resource_kind (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D923174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D9265FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE chill_person_resource DROP CONSTRAINT FK_FA5B7D9230602CA9');
+        $this->addSql('DROP SEQUENCE chill_person_resource_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_resource_kind_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_resource');
+        $this->addSql('DROP TABLE chill_person_resource_kind');
+    }
+}

From 2bdf1166984ac17a40be33e3786187b71d3fa6dc Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 19 Jan 2022 19:46:01 +0100
Subject: [PATCH 07/30] adjustments to form + rendering of resource kinds

---
 .../Controller/PersonResourceController.php   |  1 +
 .../Form/PersonResourceType.php               | 18 ++-----
 .../views/PersonResource/create.html.twig     | 33 +++++++++---
 .../Templating/Entity/ResourceKindRender.php  | 52 +++++++++++++++++++
 4 files changed, 84 insertions(+), 20 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 799967c82..c770c03bc 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -46,6 +46,7 @@ final class PersonResourceController extends AbstractController
         $form->handleRequest($request);
 
         if ($request->getMethod() === Request::METHOD_POST && $form->isValid()) {
+            dump($personResource);
             $this->em->persist($personResource);
             $this->em->flush();
 
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index fabc30e5e..6db7be525 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -17,6 +17,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person\PersonResourceKind;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\PersonBundle\Templating\Entity\ResourceKindRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityRepository;
@@ -29,13 +30,13 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class PersonResourceType extends AbstractType
 {
-    private CategoryRender $categoryRender;
+    private ResourceKindRender $resourceKindRender;
     private PersonRender $personRender;
     private ThirdPartyRender $thirdPartyRender;
 
-    public function __construct(CategoryRender $categoryRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
+    public function __construct(ResourceKindRender $resourceKindRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
     {
-        $this->categoryRender = $categoryRender;
+        $this->resourceKindRender = $resourceKindRender;
         $this->personRender = $personRender;
         $this->thirdPartyRender = $thirdPartyRender;
     }
@@ -54,18 +55,9 @@ final class PersonResourceType extends AbstractType
                 },
                 'choice_label' => function (PersonResourceKind $personResourceKind) {
                     $options = [];
-                    return $this->categoryRender->renderString($personResourceKind, $options);
+                    return $this->resourceKindRender->renderString($personResourceKind, $options);
                 }
             ])
-            ->add('linkedEntity', ChoiceType::class, [
-                'choices' => [
-                    'Usager' => 'person',
-                    'Tiers' => 'thirdparty',
-                    'Description libre' => 'freeText'
-                ],
-                'expanded' => true,
-                'label' => 'Associer un'
-            ])
             ->add('person', EntityType::class, [
                 'label' => 'Usager',
                 'class' => Person::class,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 74bdeb57e..86c4ef9d1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -7,7 +7,27 @@
     {{ form_row(form.kind) }}
 
     <div id="linked-entity">
-        {{ form_row(form.linkedEntity) }}
+        <fieldset class="mb-3">
+            <div class="row">
+                <legend class="col-sm-4 col-form-label required">Associer un</legend>
+                <div class="col-sm-8">
+                    <div id="chill_personbundle_person_resource_linkedEntity">
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" class="form-check-input" value="person" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
+                        </div>
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" class="form-check-input" value="thirdparty" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
+                        </div>
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" class="form-check-input" value="freeText" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </fieldset>
     </div>
 
     <div id="person-entity">
@@ -21,13 +41,12 @@
     </div>
 
     {{ form_row(form.comment) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class="dropdown">
-            <a class="btn btn-create"
-            href="#" role="button" id="newPersonResource">
+    <ul class="record_actions">
+        <li class="create">
+            <button class="btn btn-create"
+            type="submit" id="newPersonResource">
                 {{ 'Add a person resource'|trans }}
-            </a>
+            </button>
         </li>
     </ul>
 
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
new file mode 100644
index 000000000..d6435e345
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
@@ -0,0 +1,52 @@
+<?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\Templating\Entity;
+
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Person\PersonResourceKind;
+
+final class ResourceKindRender implements ChillEntityRenderInterface
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function renderBox($entity, array $options): string
+    {
+        return
+            '<span class="resource">' .
+            $this->translatableStringHelper->localize(
+                $entity->getTitle()
+            ) .
+            '</span>';
+    }
+
+    public function renderString($entity, array $options): string
+    {
+        $title = '';
+
+        if (null !== $entity->getTitle()) {
+            $title = $this->translatableStringHelper->localize($entity->getTitle());
+            return $title;
+        }
+    }
+
+    public function supports($entity, array $options): bool
+    {
+        return $entity instanceof PersonResourceKind;
+    }
+
+}
\ No newline at end of file

From dd589af1be1fc0e88b0e42a01e2a81c0e045fcea Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 20 Jan 2022 17:11:51 +0100
Subject: [PATCH 08/30] all views created for person resource

---
 .../Controller/PersonResourceController.php   | 128 ++++++++++++++++--
 .../views/PersonResource/create.html.twig     |  38 ++++--
 .../views/PersonResource/delete.html.twig     |  17 +++
 .../views/PersonResource/edit.html.twig       |  17 +++
 .../views/PersonResource/list.html.twig       |  80 ++++++++---
 .../ChillPersonBundle/config/routes.yaml      |  10 +-
 .../translations/messages.fr.yml              |   6 +
 7 files changed, 250 insertions(+), 46 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index c770c03bc..8fadf73c8 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -15,51 +15,161 @@ use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Form\PersonResourceType;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\PersonResourceRepository;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonResourceController extends AbstractController
 {
     private PersonResourceRepository $personResourceRepository;
     private PersonRepository $personRepository;
     private EntityManagerInterface $em;
+    private TranslatorInterface $translator;
 
     public function __construct(
         PersonResourceRepository $personResourceRepository,
         PersonRepository $personRepository,
-        EntityManagerInterface $em
+        EntityManagerInterface $em,
+        TranslatorInterface $translator
         )
     {
         $this->personResourceRepository = $personResourceRepository;
         $this->personRepository = $personRepository;
         $this->em = $em;
+        $this->translator = $translator;
     }
 
     public function listAction(Request $request, $person_id)
     {
-        $person = $this->personRepository->find($person_id);
-        $personResource = new PersonResource();
+        $personOwner = $this->personRepository->find($person_id);
+        $this->denyAccessUnlessGranted(PersonVoter::SEE, $personOwner);
+
+        $personResources = [];
+        $personResources = $this->personResourceRepository->findBy(['personOwner' => $personOwner->getId()]);
 
         $form = $this->createForm(PersonResourceType::class);
 
         $form->handleRequest($request);
 
         if ($request->getMethod() === Request::METHOD_POST && $form->isValid()) {
-            dump($personResource);
+
+            $this->denyAccessUnlessGranted(PersonVoter::CREATE, $personOwner);
+
+            $personResource = new PersonResource();
+
+            $person = $form['person']->getData();
+            $thirdparty = $form['thirdparty']->getData();
+            $freetext = $form['freetext']->getData();
+            $comment = $form['comment']->getData();
+            $kind = $form['kind']->getData();
+
+            $personResource->setKind($kind);
+            $personResource->setPerson($person);
+            $personResource->setThirdParty($thirdparty);
+            $personResource->setFreeText($freetext);
+            $personResource->setComment($comment);
+
+            $personResource->setPersonOwner($personOwner);
+
             $this->em->persist($personResource);
             $this->em->flush();
 
-            return $this->redirectToRoute(
-                'chill_person_resource',
-                ['person_id' => $person->getId()]
-            );
+            return $this->redirectToRoute('chill_person_resource_list', [
+                'person_id' => $personOwner->getId(),
+            ]);
+
         }
 
         return $this->render(
             'ChillPersonBundle:PersonResource:list.html.twig',
             [
-                'person' => $person,
+                'person' => $personOwner,
+                'personResources' => $personResources,
+                'form' => $form->createView()
+            ]
+        );
+    }
+
+    public function editAction(Request $request, $resource_id, $person_id): Response
+    {
+        $resource = $this->personResourceRepository->find($resource_id);
+        $personOwner = $this->personRepository->find($person_id);
+
+        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $personOwner);
+
+        if (null === $resource) {
+            throw $this->createNotFoundException('Unable to find Resource entity.');
+        }
+
+        $form = $this->createForm(PersonResourceType::class, $resource);
+        $form->handleRequest($request);
+
+        if($form->isSubmitted() && $form->isValid()) {
+            $this->em->persist($resource);
+            $this->em->flush();
+
+            return $this->redirectToRoute('chill_person_resource_list', [
+                'person_id' => $personOwner->getId(),
+            ]);
+        }
+
+        return $this->render(
+            'ChillPersonBundle:PersonResource:edit.html.twig',
+            [
+                'person' => $personOwner,
+                'resource' => $resource,
+                'form' => $form->createView(),
+                'action' => 'edit'
+            ]
+        );
+    }
+
+    public function deleteAction(Request $request, $person_id, $resource_id): Response
+    {
+
+        $personOwner = $this->personRepository->find($person_id);
+        $resource = $this->personResourceRepository->find($resource_id);
+
+        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $personOwner);
+
+        if (null === $resource) {
+            throw $this->createNotFoundException('Unable to find Resource entity.');
+        }
+
+        $form = $this->createFormBuilder()
+            ->setAction($this->generateUrl('chill_person_resource_delete', [
+                'resource_id' => $resource_id,
+                'person_id' => $person_id,
+            ]))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+
+        if($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->em->remove($resource);
+                $this->em->flush();
+
+                $this->addFlash('success', $this->translator
+                    ->trans('The resource has been successfully removed.'));
+
+                return $this->redirectToRoute('chill_person_resource_list', [
+                    'person_id' => $personOwner->getId(),
+                ]);
+            }
+        }
+
+        return $this->render(
+            'ChillPersonBundle:PersonResource:delete.html.twig',
+            [
+                'person' => $personOwner,
+                'resource' => $resource,
                 'form' => $form->createView()
             ]
         );
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 86c4ef9d1..6b9389f3b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -1,7 +1,5 @@
 <div class="col-md col-xxl">
 
-    <h1>{{ 'Add a person resource'|trans }}</h1>
-
     {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
 
     {{ form_row(form.kind) }}
@@ -9,19 +7,19 @@
     <div id="linked-entity">
         <fieldset class="mb-3">
             <div class="row">
-                <legend class="col-sm-4 col-form-label required">Associer un</legend>
+                <legend class="col-sm-4 col-form-label">Associer un</legend>
                 <div class="col-sm-8">
                     <div id="chill_personbundle_person_resource_linkedEntity">
                         <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" class="form-check-input" value="person" />
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
                             <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
                         </div>
                         <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" class="form-check-input" value="thirdparty" />
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
                             <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
                         </div>
                         <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" class="form-check-input" value="freeText" />
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freeText" />
                             <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
                         </div>
                     </div>
@@ -41,14 +39,26 @@
     </div>
 
     {{ form_row(form.comment) }}
-    <ul class="record_actions">
-        <li class="create">
-            <button class="btn btn-create"
-            type="submit" id="newPersonResource">
-                {{ 'Add a person resource'|trans }}
-            </button>
-        </li>
-    </ul>
+
+    {% if action is defined %}
+        <ul class="record_actions">
+            <li class="edit">
+                <button class="btn btn-edit"
+                type="submit" id="newPersonResource">
+                    {{ 'edit resource'|trans|capitalize }}
+                </button>
+            </li>
+        </ul>
+    {% else %}
+        <ul class="record_actions">
+            <li class="create">
+                <button class="btn btn-create"
+                type="submit" id="newPersonResource">
+                    {{ 'Add a person resource'|trans }}
+                </button>
+            </li>
+        </ul>
+    {% endif %}
 
     {{ form_end(form) }}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig
new file mode 100644
index 000000000..57acaa634
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/delete.html.twig
@@ -0,0 +1,17 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_resource_list' %}
+{# {% set person = person %} #}
+
+{% block title  'Remove resource'|trans %}
+
+{% block personcontent %}
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
+    {
+        'title'             : 'Remove resource'|trans,
+        'confirm_question'  : 'Are you sure you want to remove the resource for "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname } ),
+        'cancel_route'      : 'chill_person_resource_list',
+        'cancel_parameters' : { 'person_id' : person.id },
+        'form'              : form
+    } ) }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
new file mode 100644
index 000000000..6aa47228d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
@@ -0,0 +1,17 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_resource_edit' %}
+
+{% block title %}{{ 'edit resource'|trans|capitalize }}{% endblock %}
+
+{% block personcontent %}
+
+<h1 style="margin-bottom: 2rem;">{{ 'edit resource'|trans }}</h1>
+
+{% include "@ChillPerson/PersonResource/create.html.twig" %}
+
+{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource') }}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 844f39d41..1ed726477 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -6,33 +6,69 @@
 
 {% block personcontent %}
 
-<div class="flex-table">
-    <div class="item-bloc">
-        <div class="item-row">
-            <div class="item-col">Name of resource</div>
-            <div class="item-col">kind of resource</div>
+<h1>{{ 'List of resources'|trans }}</h1>
+
+{% if personResources is not null %}
+    {% for resource in personResources %}
+        <div class="flex-table">
+            <div class="item-bloc">
+                <div class="item-row">
+                    <div class="wrap-header">
+                        <div class="wh-row">
+                            <div class="wh-col">
+                                {% if resource.person is not null %}
+                                    <div class="item-col"><p class="h3">{{ resource.person }}</p></div>
+                                {% elseif resource.thirdparty is not null %}
+                                    <div class="item-col"><p class="h3">{{ resource.thirdparty }}</p></div>
+                                {% else %}
+                                    <div class="item-col"><p class="h3">{{ resource.freetext }}</p></div>
+                                {% endif %}
+                                <div class="wh-col">
+                                    <span>{{ resource.kind.title.fr }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="item-row separator">
+                    <section class="chill-entity entity-comment-embeddable">
+                        <blockquote class="chill-user-quote">
+                            <div>{{ resource.comment.comment }}<div>
+                        </blockquote>
+                    </section>
+                </div>
+                <div class="item-row separator">
+                    <div class="item-col">
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_person_resource_edit', {'resource_id': resource.id,
+                                                'person_id': person.id,}) }}"
+                                                class="btn btn-sm btn-edit"
+                                                title="{{ 'Edit'|trans }}"></a>
+                            </li>
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_person_resource_delete', {'person_id': person.id,
+                                                'resource_id': resource.id}) }}"
+                                    class="btn btn-sm btn-delete"
+                                    title="{{ 'Delete'|trans }}"></a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
         </div>
-        {# <div class="item-row separator">
-            <div class="item-col">How</div>
-            <div class="item-col">are</div>
-        </div> #}
-    </div>
-    <div class="item-bloc">
-        <div class="item-row">
-            <div class="item-col">comment zone</div>
-            <div class="item-col">....</div>
-        </div>
-        <div class="item-row">
-            {# <div class="item-col">today</div> #}
-            <div class="item-col">Buttons</div>
-        </div>
-    </div>
-</div>
+    {% endfor %}
+
+{% else %}
+    <p>{{ 'There are no available resources'|trans }}</p>
+{% endif %}
+
+<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
 
 {% include "@ChillPerson/PersonResource/create.html.twig" %}
 
 {% endblock %}
 
 {% block js %}
-    {# {{ encore_entry_script_tags('page_person_resource') }} #}
+    {{ encore_entry_script_tags('page_person_resource') }}
 {% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/config/routes.yaml b/src/Bundle/ChillPersonBundle/config/routes.yaml
index 3fbf38c0d..13d1c1227 100644
--- a/src/Bundle/ChillPersonBundle/config/routes.yaml
+++ b/src/Bundle/ChillPersonBundle/config/routes.yaml
@@ -56,9 +56,17 @@ chill_person_accompanying_period_re_open:
     controller: Chill\PersonBundle\Controller\AccompanyingPeriodController::reOpenAction
 
 chill_person_resource_list:
-    path: /{_locale}/person/resource/{person_id}/general
+    path: /{_locale}/person/{person_id}/resources/list
     controller: Chill\PersonBundle\Controller\PersonResourceController::listAction
 
+chill_person_resource_edit:
+    path: /{_locale}/person/{person_id}/resources/{resource_id}/edit
+    controller: Chill\PersonBundle\Controller\PersonResourceController::editAction
+
+chill_person_resource_delete:
+    path: /{_locale}/person/{person_id}/resources/{resource_id}/delete
+    controller: Chill\PersonBundle\Controller\PersonResourceController::deleteAction
+
 chill_person_address_list:
     path: /{_locale}/person/{person_id}/address/list
     controller: Chill\PersonBundle\Controller\PersonAddressController::listAction
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 7165d7084..d28b216d6 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -225,6 +225,12 @@ The accompanying course has been successfully removed.: La période d'accompagne
 person_resources_menu: "Ressources"
 Person resources: "Ressources de la personne"
 Add a person resource: "Ajouter une ressource"
+edit resource: "Modifier ressource"
+Remove resource: "Supprimer ressource"
+Are you sure you want to remove the resource for "%name%" ?: Étes-vous sûr de vouloir supprimer cette ressource de %name%?
+The resource has been successfully removed.: "La ressource a été supprimée."
+List of resources: "Liste des ressources"
+There are no available resources: "Il y aucun ressource"
 
 # pickAPersonType
 Pick a person: Choisir une personne

From dcdee1d6e371504400957d25c873d17605828525 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 20 Jan 2022 17:12:18 +0100
Subject: [PATCH 09/30] attempt to make show hide work

---
 .../Resources/public/lib/show_hide/show_hide.js    |  1 +
 .../Resources/public/page/person_resource/index.js | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
index ec6b796ec..edda5a03d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
@@ -39,6 +39,7 @@ var ShowHide = function(options) {
                 contents.push(el);
             }
             container_content.push(contents);
+            console.log('container content', container_content);
         }
 
         // attach the listener on each input
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js
index 8ef2021f1..b7007dd2b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js
@@ -7,7 +7,6 @@ window.addEventListener('DOMContentLoaded', function() {
         thirdpartyContainer = document.querySelector('#thirdparty-entity'),
         freetextContainer = document.querySelector('#freetext-entity')
     ;
-
     if (null === linkedEntityContainer) {
         return;
     }
@@ -17,17 +16,12 @@ window.addEventListener('DOMContentLoaded', function() {
         load_event: null,
         froms: [linkedEntityContainer],
         container: [personContainer, thirdpartyContainer, freetextContainer],
-        test: function(containers, arg2, arg3) {
-            for (let container of containers) {
-                for (let input of container.querySelectorAll('input')) {
-                    if (!input.checked) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
+        test: function(froms, event) {
+            if (event) {
+                console.log(event);
             }
 
+            return true;
         },
     })
 });

From d63d9c2f4ebdff981b320e6b4d73da386517a7d7 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 20 Jan 2022 17:13:28 +0100
Subject: [PATCH 10/30] bug fixed in entity

---
 .../ChillPersonBundle/Entity/Person/PersonResource.php   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 21adbea5e..d7b089598 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTime;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
@@ -46,14 +47,14 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
     private ?Person $personOwner = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="personResources")
      * @ORM\JoinColumn(nullable=true)
      * @Groups({"read"})
      */
     private ?Person $person = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     * @ORM\ManyToOne(targetEntity=ThirdParty::class, inversedBy="personResources")
      * @ORM\JoinColumn(nullable=true)
      * @Groups({"read"})
      */
@@ -171,7 +172,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
     {
         $this->freeText = $freeText;
 
-        if ('' !== $freeText) {
+        if ('' !== $freeText && $freeText !== null) {
             $this->setPerson(null);
             $this->setThirdParty(null);
         }
@@ -179,7 +180,7 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setComment(CommentEmbeddable $comment): self
+    public function setComment(?CommentEmbeddable $comment): self
     {
         $this->comment = $comment;
 

From 8a2e588190e6f0fbdb524bf3343d2e2e730235eb Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 20 Jan 2022 17:14:14 +0100
Subject: [PATCH 11/30] fix embeddableComment field, but still cannot be null
 and date+user_id are not set...?

---
 src/Bundle/ChillPersonBundle/Form/PersonResourceType.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index 6db7be525..50e5a459d 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Form;
 
 use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\CommentType;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person\PersonResourceKind;
@@ -46,7 +47,7 @@ final class PersonResourceType extends AbstractType
         $builder
             ->add('kind', EntityType::class, [
                 'label' => 'Type',
-                'required' => true,
+                'required' => false,
                 'class' => PersonResourceKind::class,
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('pr');
@@ -80,7 +81,7 @@ final class PersonResourceType extends AbstractType
                 'label' => 'Description libre',
                 'required' => false
             ])
-            ->add('comment', ChillTextareaType::class, [
+            ->add('comment', CommentType::class, [
                 'label' => 'Note',
                 'required' => false
             ]);

From f26cba415bd4e3d1fb1aa5943670325692a36b96 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 12:07:54 +0100
Subject: [PATCH 12/30] fix for comment embeddable null + template adjustments

---
 .../Entity/Person/PersonResource.php          |  5 +++
 .../views/PersonResource/list.html.twig       | 33 ++++++++++++++++---
 .../translations/messages.fr.yml              |  1 +
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index d7b089598..3e4345a58 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -182,6 +182,11 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
     public function setComment(?CommentEmbeddable $comment): self
     {
+        if ($comment === null) {
+            $this->comment->setComment('');
+            return $this;
+        }
+
         $this->comment = $comment;
 
         return $this;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 1ed726477..7e1e191a8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -17,24 +17,47 @@
                         <div class="wh-row">
                             <div class="wh-col">
                                 {% if resource.person is not null %}
-                                    <div class="item-col"><p class="h3">{{ resource.person }}</p></div>
+                                    <div class="item-col">
+                                        <div class="denomination h3">
+                                            <span class="name">{{ resource.person }}</span>
+                                            <span class="badge rounded-pill bg-person">{{ 'person'|trans|capitalize }}</span>
+                                        </div>
+                                    </div>
                                 {% elseif resource.thirdparty is not null %}
-                                    <div class="item-col"><p class="h3">{{ resource.thirdparty }}</p></div>
+                                    <div class="item-col">
+                                        <div class="denomination h3">
+                                            <span class="name">{{ resource.thirdparty }}</span>
+                                            <span class="badge rounded-pill bg-thirdparty">
+                                                {{ 'thirdparty'|trans|capitalize }}
+                                                <i class="fa fa-fw fa-user-md"></i>
+                                            </span>
+                                        </div>
+                                    </div>
                                 {% else %}
-                                    <div class="item-col"><p class="h3">{{ resource.freetext }}</p></div>
+                                    <div class="item-col">
+                                        <div class="denomination h3">
+                                            <span>{{ resource.freetext }}</span>
+                                        </div>
+                                    </div>
                                 {% endif %}
                                 <div class="wh-col">
-                                    <span>{{ resource.kind.title.fr }}</span>
+                                    {% if resource.kind %}
+                                    <span>{{ resource.kind.title.fr|capitalize }}</span>
+                                    {% endif %}
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="item-row separator">
+                <div class="item-row">
                     <section class="chill-entity entity-comment-embeddable">
+                    {% if resource.kind %}
                         <blockquote class="chill-user-quote">
                             <div>{{ resource.comment.comment }}<div>
                         </blockquote>
+                    {% else %}
+                        <p class="chill-no-data-statement">{{ 'no comment found'|trans|capitalize }}</p>
+                    {% endif %}
                     </section>
                 </div>
                 <div class="item-row separator">
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index d28b216d6..5b1ed488e 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -231,6 +231,7 @@ Are you sure you want to remove the resource for "%name%" ?: Étes-vous sûr de
 The resource has been successfully removed.: "La ressource a été supprimée."
 List of resources: "Liste des ressources"
 There are no available resources: "Il y aucun ressource"
+no comment found: "Aucun commentaire"
 
 # pickAPersonType
 Pick a person: Choisir une personne

From 7acd6c7fc3039d70a8e3426ad31b120a67254780 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 12:34:14 +0100
Subject: [PATCH 13/30] add placeholders for inputs

---
 src/Bundle/ChillPersonBundle/Form/PersonResourceType.php  | 8 +++++++-
 .../page/person_resource/{index.js => person-input.js}    | 0
 src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 rename src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/{index.js => person-input.js} (100%)

diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index 50e5a459d..f99a45f9c 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -28,18 +28,21 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\RadioType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonResourceType extends AbstractType
 {
     private ResourceKindRender $resourceKindRender;
     private PersonRender $personRender;
     private ThirdPartyRender $thirdPartyRender;
+    private TranslatorInterface $translator;
 
-    public function __construct(ResourceKindRender $resourceKindRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender)
+    public function __construct(ResourceKindRender $resourceKindRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender, TranslatorInterface $translator)
     {
         $this->resourceKindRender = $resourceKindRender;
         $this->personRender = $personRender;
         $this->thirdPartyRender = $thirdPartyRender;
+        $this->translator = $translator;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -54,6 +57,7 @@ final class PersonResourceType extends AbstractType
                     $qb->where($qb->expr()->eq('pr.isActive', 'TRUE'));
                     return $qb;
                 },
+                'placeholder' => $this->translator->trans('Select a type'),
                 'choice_label' => function (PersonResourceKind $personResourceKind) {
                     $options = [];
                     return $this->resourceKindRender->renderString($personResourceKind, $options);
@@ -62,6 +66,7 @@ final class PersonResourceType extends AbstractType
             ->add('person', EntityType::class, [
                 'label' => 'Usager',
                 'class' => Person::class,
+                'placeholder' => $this->translator->trans('Select a person'),
                 'required' => false,
                 'choice_label' => function (Person $person) {
                     $options = [];
@@ -72,6 +77,7 @@ final class PersonResourceType extends AbstractType
                 'label' => 'Tiers',
                 'class' => ThirdParty::class,
                 'required' => false,
+                'placeholder' => $this->translator->trans('Select a thirdparty'),
                 'choice_label' => function (ThirdParty $thirdParty) {
                     $options = [];
                     return $this->thirdPartyRender->renderString($thirdParty, $options);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/index.js
rename to src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 5b1ed488e..27ff553d1 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -232,6 +232,10 @@ The resource has been successfully removed.: "La ressource a été supprimée."
 List of resources: "Liste des ressources"
 There are no available resources: "Il y aucun ressource"
 no comment found: "Aucun commentaire"
+Select a type: "Choisissez un type"
+Select a person: "Choisissez un usager"
+Select a thirdparty: "Choisissez un tiers"
+
 
 # pickAPersonType
 Pick a person: Choisir une personne

From 52009bd7c654ccd1a3c426b25fea2f7fd031daf6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 12:35:33 +0100
Subject: [PATCH 14/30] show hide functional

---
 .../page/person_resource/freetext-input.js    | 25 +++++++++++++++++++
 .../page/person_resource/person-input.js      | 18 ++++++-------
 .../page/person_resource/thirdparty-input.js  | 25 +++++++++++++++++++
 .../views/PersonResource/create.html.twig     |  4 +--
 .../views/PersonResource/list.html.twig       |  4 ++-
 .../ChillPersonBundle/chill.webpack.config.js |  4 ++-
 6 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
new file mode 100644
index 000000000..65b66dc13
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
@@ -0,0 +1,25 @@
+import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
+
+window.addEventListener('DOMContentLoaded', function() {
+    let
+        freetextContainer = document.querySelector('#freetext-entity'),
+        entitySelector = document.querySelector('#entity-selector')
+    ;
+    if (null === entitySelector) {
+        return;
+    }
+
+    new ShowHide({
+        debug: true,
+        load_event: null,
+        froms: [entitySelector],
+        container: [freetextContainer],
+        test: function(froms, event) {
+            for (let container of froms) {
+                return container.querySelector('input[value="freetext"]').checked;
+            }
+            console.log('we couldnt find the input');
+            return false;
+        },
+    })
+});
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js
index b7007dd2b..da5f812c6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js
@@ -2,26 +2,24 @@ import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
 
 window.addEventListener('DOMContentLoaded', function() {
     let
-        linkedEntityContainer = document.querySelector('#linked-entity'),
         personContainer = document.querySelector('#person-entity'),
-        thirdpartyContainer = document.querySelector('#thirdparty-entity'),
-        freetextContainer = document.querySelector('#freetext-entity')
+        entitySelector = document.querySelector('#entity-selector')
     ;
-    if (null === linkedEntityContainer) {
+    if (null === entitySelector) {
         return;
     }
 
     new ShowHide({
         debug: true,
         load_event: null,
-        froms: [linkedEntityContainer],
-        container: [personContainer, thirdpartyContainer, freetextContainer],
+        froms: [entitySelector],
+        container: [personContainer],
         test: function(froms, event) {
-            if (event) {
-                console.log(event);
+            for (let container of froms) {
+                return container.querySelector('input[value="person"]').checked;
             }
-
-            return true;
+            console.log('we couldnt find the input');
+            return false;
         },
     })
 });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js
new file mode 100644
index 000000000..876adc7c9
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js
@@ -0,0 +1,25 @@
+import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
+
+window.addEventListener('DOMContentLoaded', function() {
+    let
+        thirdpartyContainer = document.querySelector('#thirdparty-entity'),
+        entitySelector = document.querySelector('#entity-selector')
+    ;
+    if (null === entitySelector) {
+        return;
+    }
+
+    new ShowHide({
+        debug: true,
+        load_event: null,
+        froms: [entitySelector],
+        container: [thirdpartyContainer],
+        test: function(froms, event) {
+            for (let container of froms) {
+                return container.querySelector('input[value="thirdparty"]').checked;
+            }
+            console.log('we couldnt find the input');
+            return false;
+        },
+    })
+});
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 6b9389f3b..9bf140b0f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -9,7 +9,7 @@
             <div class="row">
                 <legend class="col-sm-4 col-form-label">Associer un</legend>
                 <div class="col-sm-8">
-                    <div id="chill_personbundle_person_resource_linkedEntity">
+                    <div id="entity-selector">
                         <div class="form-check">
                             <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
                             <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
@@ -19,7 +19,7 @@
                             <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
                         </div>
                         <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freeText" />
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
                             <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
                         </div>
                     </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 7e1e191a8..79f05aeed 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -93,5 +93,7 @@
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_script_tags('page_person_resource') }}
+    {{ encore_entry_script_tags('page_person_resource_person_input') }}
+    {{ encore_entry_script_tags('page_person_resource_thirdparty_input') }}
+    {{ encore_entry_script_tags('page_person_resource_freetext_input') }}
 {% 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 9cf6717fd..5915a32eb 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -18,5 +18,7 @@ module.exports = function(encore, entries)
     encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');
     encore.addEntry('page_accompanying_course_index_person_locate', __dirname + '/Resources/public/page/accompanying_course_index/person_locate.js');
     encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
-    encore.addEntry('page_person_resource', __dirname + '/Resources/public/page/person_resource/index.js');
+    encore.addEntry('page_person_resource_person_input', __dirname + '/Resources/public/page/person_resource/person-input.js');
+    encore.addEntry('page_person_resource_thirdparty_input', __dirname + '/Resources/public/page/person_resource/thirdparty-input.js');
+    encore.addEntry('page_person_resource_freetext_input', __dirname + '/Resources/public/page/person_resource/freetext-input.js');
 };

From 4ab0a28f7d336167c7757f941508bdb1d94ddc1f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 13:05:38 +0100
Subject: [PATCH 15/30] fix phpstan error

---
 .../ChillPersonBundle/Templating/Entity/ResourceKindRender.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
index d6435e345..377df38b0 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
@@ -42,6 +42,8 @@ final class ResourceKindRender implements ChillEntityRenderInterface
             $title = $this->translatableStringHelper->localize($entity->getTitle());
             return $title;
         }
+
+        return $title;
     }
 
     public function supports($entity, array $options): bool

From b26d0905a38a9885a28baa98ed7504860c55e214 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 15:01:12 +0100
Subject: [PATCH 16/30] type variable added and file renamed in transformer

---
 ...erToJsonTransformer.php => EntityToJsonTransformer.php} | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename src/Bundle/ChillMainBundle/Form/Type/DataTransformer/{UserToJsonTransformer.php => EntityToJsonTransformer.php} (92%)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
similarity index 92%
rename from src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php
rename to src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index df670f891..969247908 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -25,13 +25,16 @@ class UserToJsonTransformer implements DataTransformerInterface
 
     private bool $multiple;
 
+    private string $type;
+
     private SerializerInterface $serializer;
 
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple, string $type)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
         $this->multiple = $multiple;
+        $this->type = $type;
     }
 
     public function reverseTransform($value)
@@ -72,7 +75,7 @@ class UserToJsonTransformer implements DataTransformerInterface
 
         return
             $this->denormalizer->denormalize(
-                ['type' => $item['type'], 'id' => $item['id']],
+                ['type' => $this->type, 'id' => $item['id']],
                 User::class,
                 'json',
                 [AbstractNormalizer::GROUPS => ['read']],

From 972657b38ecfdacaf3dcb8f6328fb63a7daca8fd Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 15:53:52 +0100
Subject: [PATCH 17/30] different dynamic entity picker types created

---
 .../EntityToJsonTransformer.php               |  6 +-
 .../Form/Type/PickUserDynamicType.php         |  5 +-
 .../Resources/views/Form/fields.html.twig     |  2 +-
 .../Form/Type/PickPersonDynamicType.php       | 62 +++++++++++++++++++
 .../Form/Type/PickThirdpartyDynamicType.php   | 62 +++++++++++++++++++
 5 files changed, 131 insertions(+), 6 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php

diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index 969247908..3b1909ba7 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use function array_key_exists;
 
-class UserToJsonTransformer implements DataTransformerInterface
+class EntityToJsonTransformer implements DataTransformerInterface
 {
     private DenormalizerInterface $denormalizer;
 
@@ -75,8 +75,8 @@ class UserToJsonTransformer implements DataTransformerInterface
 
         return
             $this->denormalizer->denormalize(
-                ['type' => $this->type, 'id' => $item['id']],
-                User::class,
+                ['type' => $item['type'], 'id' => $item['id']],
+                $this->type,
                 'json',
                 [AbstractNormalizer::GROUPS => ['read']],
             );
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index 52798608e..ec7590992 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
 use Chill\MainBundle\Form\Type\DataTransformer\UserToJsonTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -38,7 +39,7 @@ class PickUserDynamicType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addViewTransformer(new UserToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple']));
+        $builder->addViewTransformer(new EntityToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'], 'user'));
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
@@ -58,6 +59,6 @@ class PickUserDynamicType extends AbstractType
 
     public function getBlockPrefix()
     {
-        return 'pick_user_dynamic';
+        return 'pick_entity_dynamic';
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 25f1363c3..8bb09623f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -216,7 +216,7 @@
     {% endif %}
 {% endblock %}
 
-{% block pick_user_dynamic_widget %}
+{% block pick_entity_dynamic_widget %}
     <input type="hidden" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %} data-input-uniqid="{{ form.vars['uniqid'] }}"/>
     <div data-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}"></div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
new file mode 100644
index 000000000..41c90406f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
@@ -0,0 +1,62 @@
+<?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\Type;
+
+use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Pick user dymically, using vuejs module "AddPerson".
+ */
+class PickPersonDynamicType extends AbstractType
+{
+    private DenormalizerInterface $denormalizer;
+
+    private SerializerInterface $serializer;
+
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    {
+        $this->denormalizer = $denormalizer;
+        $this->serializer = $serializer;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addViewTransformer(new EntityToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'], 'person'));
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['multiple'] = $options['multiple'];
+        $view->vars['types'] = ['person'];
+        $view->vars['uniqid'] = uniqid('pick_user_dyn');
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('multiple', false)
+            ->setAllowedTypes('multiple', ['bool'])
+            ->setDefault('compound', false);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'pick_entity_dynamic';
+    }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
new file mode 100644
index 000000000..7c2fbff4f
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
@@ -0,0 +1,62 @@
+<?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\Type;
+
+use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Pick user dymically, using vuejs module "AddPerson".
+ */
+class PickThirdpartyDynamicType extends AbstractType
+{
+    private DenormalizerInterface $denormalizer;
+
+    private SerializerInterface $serializer;
+
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    {
+        $this->denormalizer = $denormalizer;
+        $this->serializer = $serializer;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addViewTransformer(new EntityToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'], 'thirdparty'));
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['multiple'] = $options['multiple'];
+        $view->vars['types'] = ['thirdparty'];
+        $view->vars['uniqid'] = uniqid('pick_user_dyn');
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('multiple', false)
+            ->setAllowedTypes('multiple', ['bool'])
+            ->setDefault('compound', false);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'pick_entity_dynamic';
+    }
+}

From 84993ca05b932cc91b7609e64ca91bb0fb18eae8 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 15:55:22 +0100
Subject: [PATCH 18/30] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ad04a636..222de12ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to
 * [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
 * [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
 * [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+* [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386)
 
 ### test release 2022-01-17
 

From 92788ccdc0ae5ff7163f19f31ee84b14d8a697bd Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 21 Jan 2022 15:58:55 +0100
Subject: [PATCH 19/30] php cs-fixes

---
 .../Form/Type/DataTransformer/EntityToJsonTransformer.php   | 4 ++--
 .../ChillMainBundle/Form/Type/PickUserDynamicType.php       | 1 -
 src/Bundle/ChillPersonBundle/Form/CreationPersonType.php    | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index 3b1909ba7..984560a12 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -25,10 +25,10 @@ class EntityToJsonTransformer implements DataTransformerInterface
 
     private bool $multiple;
 
-    private string $type;
-
     private SerializerInterface $serializer;
 
+    private string $type;
+
     public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple, string $type)
     {
         $this->denormalizer = $denormalizer;
diff --git a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
index ec7590992..3bc4df436 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
-use Chill\MainBundle\Form\Type\DataTransformer\UserToJsonTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index 82437eb30..a33858c02 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -61,13 +61,13 @@ final class CreationPersonType extends AbstractType
                 'required' => false,
             ])
             ->add('phonenumber', TelType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('mobilenumber', TelType::class, [
-                'required' => false
+                'required' => false,
             ])
             ->add('email', EmailType::class, [
-                'required' => false
+                'required' => false,
             ]);
 
         if ($this->askCenters) {

From 514d75fa5fa6925d86272ca863c47fad584ef955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 24 Jan 2022 19:26:16 +0100
Subject: [PATCH 20/30] improve migration

---
 .../ChillPersonBundle/migrations/Version20220119155944.php     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
index e35bf12d7..a4d2e5575 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
@@ -19,7 +19,6 @@ final class Version20220119155944 extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        // this up() migration is auto-generated, please modify it to your needs
         $this->addSql('CREATE SEQUENCE chill_person_resource_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE SEQUENCE chill_person_resource_kind_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
         $this->addSql('CREATE TABLE chill_person_resource (id INT NOT NULL, person_id INT DEFAULT NULL, kind_id INT DEFAULT NULL, freeText TEXT DEFAULT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_comment TEXT DEFAULT NULL, comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, comment_userId INT DEFAULT NULL, personOwner_id INT NOT NULL, thirdParty_id INT DEFAULT NULL, createdBy_id INT NOT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
@@ -40,8 +39,6 @@ final class Version20220119155944 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_resource DROP CONSTRAINT FK_FA5B7D9230602CA9');
         $this->addSql('DROP SEQUENCE chill_person_resource_id_seq CASCADE');
         $this->addSql('DROP SEQUENCE chill_person_resource_kind_id_seq CASCADE');
         $this->addSql('DROP TABLE chill_person_resource');

From dec26e2ba4b024d484d40419e31c4a5d3b08f971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 24 Jan 2022 19:42:06 +0100
Subject: [PATCH 21/30] merge dynamic types

---
 .../Form/PersonResourceType.php               | 22 +++++--------------
 .../views/PersonResource/list.html.twig       | 20 ++++++++++++-----
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index f99a45f9c..91b1c2643 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -17,9 +17,11 @@ use Chill\MainBundle\Form\Type\CommentType;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person\PersonResourceKind;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Chill\PersonBundle\Templating\Entity\ResourceKindRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -63,25 +65,11 @@ final class PersonResourceType extends AbstractType
                     return $this->resourceKindRender->renderString($personResourceKind, $options);
                 }
             ])
-            ->add('person', EntityType::class, [
+            ->add('person', PickPersonDynamicType::class, [
                 'label' => 'Usager',
-                'class' => Person::class,
-                'placeholder' => $this->translator->trans('Select a person'),
-                'required' => false,
-                'choice_label' => function (Person $person) {
-                    $options = [];
-                    return $this->personRender->renderString($person, $options);
-                }
             ])
-            ->add('thirdparty', EntityType::class, [
+            ->add('thirdparty', PickThirdpartyDynamicType::class, [
                 'label' => 'Tiers',
-                'class' => ThirdParty::class,
-                'required' => false,
-                'placeholder' => $this->translator->trans('Select a thirdparty'),
-                'choice_label' => function (ThirdParty $thirdParty) {
-                    $options = [];
-                    return $this->thirdPartyRender->renderString($thirdParty, $options);
-                }
             ])
             ->add('freetext', ChillTextareaType::class, [
                 'label' => 'Description libre',
@@ -105,4 +93,4 @@ final class PersonResourceType extends AbstractType
         return 'chill_personbundle_person_resource';
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index 79f05aeed..b572d9d11 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -4,6 +4,20 @@
 
 {% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
 
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource_person_input') }}
+    {{ encore_entry_script_tags('page_person_resource_thirdparty_input') }}
+    {{ encore_entry_script_tags('page_person_resource_freetext_input') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_person_resource_person_input') }}
+    {{ encore_entry_link_tags('page_person_resource_thirdparty_input') }}
+    {{ encore_entry_link_tags('page_person_resource_freetext_input') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
 {% block personcontent %}
 
 <h1>{{ 'List of resources'|trans }}</h1>
@@ -91,9 +105,3 @@
 {% include "@ChillPerson/PersonResource/create.html.twig" %}
 
 {% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('page_person_resource_person_input') }}
-    {{ encore_entry_script_tags('page_person_resource_thirdparty_input') }}
-    {{ encore_entry_script_tags('page_person_resource_freetext_input') }}
-{% endblock %}
\ No newline at end of file

From 8cd01d4317e02e5cb0da85cc4f3a498a86271431 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 25 Jan 2022 14:43:51 +0100
Subject: [PATCH 22/30] fix backend error of data transformer

---
 .../EntityToJsonTransformer.php               | 29 +++++++++++++++++--
 .../{person-input.js => showhide-input.js}    |  0
 2 files changed, 27 insertions(+), 2 deletions(-)
 rename src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/{person-input.js => showhide-input.js} (100%)

diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index 7ff68b13a..85030606d 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -12,11 +12,16 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException as ExceptionUnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
+use UnexpectedValueException;
+
 use function array_key_exists;
 
 class EntityToJsonTransformer implements DataTransformerInterface
@@ -41,6 +46,8 @@ class EntityToJsonTransformer implements DataTransformerInterface
     {
         $denormalized = json_decode($value, true);
 
+        dump($value);
+
         if ($this->multiple) {
             if (null === $denormalized) {
                 return [];
@@ -52,6 +59,10 @@ class EntityToJsonTransformer implements DataTransformerInterface
             );
         }
 
+        if ($value === '') {
+            return null;
+        }
+
         return $this->denormalizeOne($denormalized);
     }
 
@@ -69,7 +80,7 @@ class EntityToJsonTransformer implements DataTransformerInterface
         ]);
     }
 
-    private function denormalizeOne(array $item): User
+    private function denormalizeOne(array $item)
     {
         if (!array_key_exists('type', $item)) {
             throw new TransformationFailedException('the key "type" is missing on element');
@@ -79,10 +90,24 @@ class EntityToJsonTransformer implements DataTransformerInterface
             throw new TransformationFailedException('the key "id" is missing on element');
         }
 
+        switch ($this->type) {
+            case 'user':
+                $class = User::class;
+                break;
+            case 'person':
+                $class = Person::class;
+                break;
+            case 'thirdparty':
+                $class = ThirdParty::class;
+                break;
+            default:
+                throw new \UnexpectedValueException('This type is not supported');
+        }
+
         return
             $this->denormalizer->denormalize(
                 ['type' => $item['type'], 'id' => $item['id']],
-                $this->type,
+                $class,
                 'json',
                 [AbstractNormalizer::GROUPS => ['read']],
             );
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/person-input.js
rename to src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js

From 0bd10b6dfa45b9e2af48fe7045d64c40e8a7360a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 25 Jan 2022 14:45:38 +0100
Subject: [PATCH 23/30] show-hide files combined into one js file

---
 .../page/person_resource/freetext-input.js    | 25 ---------------
 .../page/person_resource/showhide-input.js    | 32 ++++++++++++++++++-
 .../page/person_resource/thirdparty-input.js  | 25 ---------------
 .../views/PersonResource/list.html.twig       | 28 +++++++---------
 .../ChillPersonBundle/chill.webpack.config.js |  4 +--
 5 files changed, 43 insertions(+), 71 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
deleted file mode 100644
index 65b66dc13..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/freetext-input.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
-
-window.addEventListener('DOMContentLoaded', function() {
-    let
-        freetextContainer = document.querySelector('#freetext-entity'),
-        entitySelector = document.querySelector('#entity-selector')
-    ;
-    if (null === entitySelector) {
-        return;
-    }
-
-    new ShowHide({
-        debug: true,
-        load_event: null,
-        froms: [entitySelector],
-        container: [freetextContainer],
-        test: function(froms, event) {
-            for (let container of froms) {
-                return container.querySelector('input[value="freetext"]').checked;
-            }
-            console.log('we couldnt find the input');
-            return false;
-        },
-    })
-});
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
index da5f812c6..d9da5eb79 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
@@ -3,7 +3,9 @@ import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
 window.addEventListener('DOMContentLoaded', function() {
     let
         personContainer = document.querySelector('#person-entity'),
-        entitySelector = document.querySelector('#entity-selector')
+        entitySelector = document.querySelector('#entity-selector'),
+        freetextContainer = document.querySelector('#freetext-entity'),
+        thirdpartyContainer = document.querySelector('#thirdparty-entity')
     ;
     if (null === entitySelector) {
         return;
@@ -22,4 +24,32 @@ window.addEventListener('DOMContentLoaded', function() {
             return false;
         },
     })
+
+    new ShowHide({
+        debug: true,
+        load_event: null,
+        froms: [entitySelector],
+        container: [thirdpartyContainer],
+        test: function(froms, event) {
+            for (let container of froms) {
+                return container.querySelector('input[value="thirdparty"]').checked;
+            }
+            console.log('we couldnt find the input');
+            return false;
+        },
+    })
+
+    new ShowHide({
+        debug: true,
+        load_event: null,
+        froms: [entitySelector],
+        container: [freetextContainer],
+        test: function(froms, event) {
+            for (let container of froms) {
+                return container.querySelector('input[value="freetext"]').checked;
+            }
+            console.log('we couldnt find the input');
+            return false;
+        },
+    })
 });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js
deleted file mode 100644
index 876adc7c9..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/thirdparty-input.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
-
-window.addEventListener('DOMContentLoaded', function() {
-    let
-        thirdpartyContainer = document.querySelector('#thirdparty-entity'),
-        entitySelector = document.querySelector('#entity-selector')
-    ;
-    if (null === entitySelector) {
-        return;
-    }
-
-    new ShowHide({
-        debug: true,
-        load_event: null,
-        froms: [entitySelector],
-        container: [thirdpartyContainer],
-        test: function(froms, event) {
-            for (let container of froms) {
-                return container.querySelector('input[value="thirdparty"]').checked;
-            }
-            console.log('we couldnt find the input');
-            return false;
-        },
-    })
-});
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index b572d9d11..cb542b6a1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -5,16 +5,12 @@
 {% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
 
 {% block js %}
-    {{ encore_entry_script_tags('page_person_resource_person_input') }}
-    {{ encore_entry_script_tags('page_person_resource_thirdparty_input') }}
-    {{ encore_entry_script_tags('page_person_resource_freetext_input') }}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
     {{ encore_entry_script_tags('mod_pickentity_type') }}
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('page_person_resource_person_input') }}
-    {{ encore_entry_link_tags('page_person_resource_thirdparty_input') }}
-    {{ encore_entry_link_tags('page_person_resource_freetext_input') }}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
     {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
@@ -63,17 +59,15 @@
                         </div>
                     </div>
                 </div>
-                <div class="item-row">
-                    <section class="chill-entity entity-comment-embeddable">
-                    {% if resource.kind %}
-                        <blockquote class="chill-user-quote">
-                            <div>{{ resource.comment.comment }}<div>
-                        </blockquote>
-                    {% else %}
-                        <p class="chill-no-data-statement">{{ 'no comment found'|trans|capitalize }}</p>
-                    {% endif %}
-                    </section>
-                </div>
+                {% if resource.kind %}
+                    <div class="item-row separator">
+                        <section class="chill-entity entity-comment-embeddable">
+                            <blockquote class="chill-user-quote">
+                                <div>{{ resource.comment.comment }}<div>
+                            </blockquote>
+                        </section>
+                    </div>
+                {% endif %}
                 <div class="item-row separator">
                     <div class="item-col">
                         <ul class="record_actions">
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index 109810075..3825d46d7 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -18,8 +18,6 @@ module.exports = function(encore, entries)
     encore.addEntry('page_person', __dirname + '/Resources/public/page/person/index.js');
     encore.addEntry('page_accompanying_course_index_person_locate', __dirname + '/Resources/public/page/accompanying_course_index/person_locate.js');
     encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
-    encore.addEntry('page_person_resource_person_input', __dirname + '/Resources/public/page/person_resource/person-input.js');
-    encore.addEntry('page_person_resource_thirdparty_input', __dirname + '/Resources/public/page/person_resource/thirdparty-input.js');
-    encore.addEntry('page_person_resource_freetext_input', __dirname + '/Resources/public/page/person_resource/freetext-input.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');
 };

From 55c2c41cea7d4a01be3deb254c23861d128a7db2 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 25 Jan 2022 14:46:09 +0100
Subject: [PATCH 24/30] styling changes collapse form

---
 .../views/PersonResource/create.html.twig     | 119 ++++++++++--------
 1 file changed, 64 insertions(+), 55 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 9bf140b0f..06c7dd541 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -1,65 +1,74 @@
 <div class="col-md col-xxl">
+    <div id="collapseForm" class="collapse">
+        {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
 
-    {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
+        {{ form_row(form.kind) }}
 
-    {{ form_row(form.kind) }}
-
-    <div id="linked-entity">
-        <fieldset class="mb-3">
-            <div class="row">
-                <legend class="col-sm-4 col-form-label">Associer un</legend>
-                <div class="col-sm-8">
-                    <div id="entity-selector">
-                        <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
-                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
-                        </div>
-                        <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
-                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
-                        </div>
-                        <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
-                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+        <div id="linked-entity">
+            <fieldset class="mb-3">
+                <div class="row">
+                    <legend class="col-sm-4 col-form-label">Associer un</legend>
+                    <div class="col-sm-8">
+                        <div id="entity-selector">
+                            <div class="form-check">
+                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
+                            </div>
+                            <div class="form-check">
+                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
+                            </div>
+                            <div class="form-check">
+                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-        </fieldset>
+            </fieldset>
+        </div>
+
+        <div id="person-entity">
+            {{ form_row(form.person) }}
+        </div>
+        <div id="thirdparty-entity">
+            {{ form_row(form.thirdparty) }}
+        </div>
+        <div id="freetext-entity">
+            {{ form_row(form.freetext) }}
+        </div>
+
+        {{ form_row(form.comment) }}
+
+        {% if action is defined %}
+            <ul class="record_actions sticky-form-buttons">
+                <li class="edit">
+                    <button class="btn btn-edit"
+                    type="submit" id="newPersonResource">
+                        {{ 'edit resource'|trans|capitalize }}
+                    </button>
+                </li>
+            </ul>
+        {% else %}
+            <ul class="record_actions">
+                <li>
+                    <button class="btn btn-create"
+                    type="submit" id="newPersonResource">
+                        {{ 'Save'|trans }}
+                    </button>
+                </li>
+            </ul>
+        {% endif %}
+
+        {{ form_end(form) }}
     </div>
 
-    <div id="person-entity">
-        {{ form_row(form.person) }}
-    </div>
-    <div id="thirdparty-entity">
-        {{ form_row(form.thirdparty) }}
-    </div>
-    <div id="freetext-entity">
-        {{ form_row(form.freetext) }}
-    </div>
-
-    {{ form_row(form.comment) }}
-
-    {% if action is defined %}
-        <ul class="record_actions">
-            <li class="edit">
-                <button class="btn btn-edit"
-                type="submit" id="newPersonResource">
-                    {{ 'edit resource'|trans|capitalize }}
-                </button>
-            </li>
-        </ul>
-    {% else %}
-        <ul class="record_actions">
-            <li class="create">
-                <button class="btn btn-create"
-                type="submit" id="newPersonResource">
-                    {{ 'Add a person resource'|trans }}
-                </button>
-            </li>
-        </ul>
-    {% endif %}
-
-    {{ form_end(form) }}
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
+                {{ 'Add a person resource'|trans }}
+            </button>
+        </li>
+    </ul>
 
 </div>
\ No newline at end of file

From 963b0b1ed26bbf1d180703aa2b1f0c4f899c2c13 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 25 Jan 2022 16:06:27 +0100
Subject: [PATCH 25/30] bugfixes in display of dynamicPicker

---
 .../public/lib/show_hide/show_hide.js         |  2 +-
 .../public/module/pick-entity/index.js        | 47 ++++++++++++++++---
 .../public/vuejs/PickEntity/PickEntity.vue    |  6 ++-
 .../page/person_resource/showhide-input.js    |  6 +--
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
index edda5a03d..f2bcc9b45 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/show_hide/show_hide.js
@@ -39,7 +39,7 @@ var ShowHide = function(options) {
                 contents.push(el);
             }
             container_content.push(contents);
-            console.log('container content', container_content);
+            // console.log('container content', container_content);
         }
 
         // attach the listener on each input
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 329ac4e6c..c3786f137 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -5,18 +5,22 @@ import { appMessages } from 'ChillMainAssets/vuejs/PickEntity/i18n';
 
 const i18n = _createI18n(appMessages);
 
-window.addEventListener('DOMContentLoaded', function(e) {
+let appsOnPage = new Map();
 
-    let apps = document.querySelectorAll('[data-module="pick-dynamic"]');
+
+function loadDynamicPicker(element) {
+
+    let apps = element.querySelectorAll('[data-module="pick-dynamic"]');
 
     apps.forEach(function(el) {
 
         const
             isMultiple = parseInt(el.dataset.multiple) === 1,
-            input = document.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
-            picked = isMultiple ? JSON.parse(input.value) : [JSON.parse(input.value)];
+            uniqId = el.dataset.uniqid,
+            input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
+            picked = (isMultiple) ? (JSON.parse(input.value)) : ((input.value === '[]') ? (null) : ([JSON.parse(input.value)]));
 
-        createApp({
+        const app = createApp({
             template: '<pick-entity ' +
                 ':multiple="multiple" ' +
                 ':types="types" ' +
@@ -65,5 +69,36 @@ window.addEventListener('DOMContentLoaded', function(e) {
         })
         .use(i18n)
         .mount(el);
+
+        appsOnPage.set(uniqId, app);
     });
-});
+}
+
+
+// document.addEventListener('show-hide-show', function(e) {
+//     console.log('creation event caught')
+//     loadDynamicPicker(e.detail.container)
+// })
+
+// document.addEventListener('show-hide-hide', function(e) {
+//     console.log('hiding event caught')
+//     e.detail.container.querySelectorAll('[data-module="pick-dynamic"]').forEach((el) => {
+//         let uniqId = el.dataset.uniqid;
+//         console.log(uniqId);
+//         if (appsOnPage.has(uniqId)) {
+//             appsOnPage.get(uniqId).unmount();
+//             console.log('App has been unmounted')
+//             appsOnPage.delete(uniqId);
+//         }
+//     })
+// })
+
+document.addEventListener('DOMContentLoaded', function(e) {
+    console.log('loaded event', e)
+    loadDynamicPicker(document)
+})
+
+
+
+
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 43f3ebf94..137224691 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -1,5 +1,5 @@
 <template>
-    <ul class="list-suggest remove-items">
+    <ul class="list-suggest remove-items" v-if="picked.length">
         <li v-for="p in picked" @click="removeEntity(p)" :key="p.type+p.id">
             <span class="chill_denomination">{{ p.text }}</span>
         </li>
@@ -79,11 +79,15 @@ export default {
             );
             this.$refs.addPersons.resetSearch(); // to cast child method
             modal.showModal = false;
+            console.log(this.picked)
         },
         removeEntity(entity) {
             console.log('remove entity', entity);
             this.$emit('removeEntity', entity);
         }
     },
+    mounted() {
+        console.log(this.picked);
+    }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
index d9da5eb79..4ee360c1c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/page/person_resource/showhide-input.js
@@ -12,7 +12,7 @@ window.addEventListener('DOMContentLoaded', function() {
     }
 
     new ShowHide({
-        debug: true,
+        debug: false,
         load_event: null,
         froms: [entitySelector],
         container: [personContainer],
@@ -26,7 +26,7 @@ window.addEventListener('DOMContentLoaded', function() {
     })
 
     new ShowHide({
-        debug: true,
+        debug: false,
         load_event: null,
         froms: [entitySelector],
         container: [thirdpartyContainer],
@@ -40,7 +40,7 @@ window.addEventListener('DOMContentLoaded', function() {
     })
 
     new ShowHide({
-        debug: true,
+        debug: false,
         load_event: null,
         froms: [entitySelector],
         container: [freetextContainer],

From 8392e2e6bd40100eeb641b34a3fd3044e61fb2a1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 25 Jan 2022 16:09:11 +0100
Subject: [PATCH 26/30] reorganize templates to fix edit form

---
 .../views/PersonResource/create.html.twig     | 62 +-----------------
 .../views/PersonResource/edit.html.twig       | 16 +++--
 .../views/PersonResource/form.html.twig       | 63 +++++++++++++++++++
 .../views/PersonResource/list.html.twig       |  2 +-
 4 files changed, 76 insertions(+), 67 deletions(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index 06c7dd541..6e05f2d6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -1,66 +1,6 @@
 <div class="col-md col-xxl">
     <div id="collapseForm" class="collapse">
-        {{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
-
-        {{ form_row(form.kind) }}
-
-        <div id="linked-entity">
-            <fieldset class="mb-3">
-                <div class="row">
-                    <legend class="col-sm-4 col-form-label">Associer un</legend>
-                    <div class="col-sm-8">
-                        <div id="entity-selector">
-                            <div class="form-check">
-                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
-                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
-                            </div>
-                            <div class="form-check">
-                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
-                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
-                            </div>
-                            <div class="form-check">
-                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
-                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </fieldset>
-        </div>
-
-        <div id="person-entity">
-            {{ form_row(form.person) }}
-        </div>
-        <div id="thirdparty-entity">
-            {{ form_row(form.thirdparty) }}
-        </div>
-        <div id="freetext-entity">
-            {{ form_row(form.freetext) }}
-        </div>
-
-        {{ form_row(form.comment) }}
-
-        {% if action is defined %}
-            <ul class="record_actions sticky-form-buttons">
-                <li class="edit">
-                    <button class="btn btn-edit"
-                    type="submit" id="newPersonResource">
-                        {{ 'edit resource'|trans|capitalize }}
-                    </button>
-                </li>
-            </ul>
-        {% else %}
-            <ul class="record_actions">
-                <li>
-                    <button class="btn btn-create"
-                    type="submit" id="newPersonResource">
-                        {{ 'Save'|trans }}
-                    </button>
-                </li>
-            </ul>
-        {% endif %}
-
-        {{ form_end(form) }}
+        {% include "@ChillPerson/PersonResource/form.html.twig" %}
     </div>
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
index 6aa47228d..652c00ff0 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/edit.html.twig
@@ -2,16 +2,22 @@
 
 {% set activeRouteKey = 'chill_person_resource_edit' %}
 
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
 {% block title %}{{ 'edit resource'|trans|capitalize }}{% endblock %}
 
 {% block personcontent %}
 
 <h1 style="margin-bottom: 2rem;">{{ 'edit resource'|trans }}</h1>
 
-{% include "@ChillPerson/PersonResource/create.html.twig" %}
+{% include "@ChillPerson/PersonResource/form.html.twig" %}
 
 {% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('page_person_resource') }}
-{% endblock %}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
new file mode 100644
index 000000000..1074e960f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
@@ -0,0 +1,63 @@
+{{ form_start(form, {'attr' : {'id' : 'create-form'}}) }}
+
+{{ form_row(form.kind) }}
+
+    <div id="linked-entity">
+        <fieldset class="mb-3">
+            <div class="row">
+                <legend class="col-sm-4 col-form-label">Associer un</legend>
+                <div class="col-sm-8">
+                    <div id="entity-selector">
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
+                        </div>
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
+                        </div>
+                        <div class="form-check">
+                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
+                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+    </div>
+
+
+    <div id="person-entity">
+        {{ form_row(form.person) }}
+    </div>
+    <div id="thirdparty-entity">
+        {{ form_row(form.thirdparty) }}
+    </div>
+    <div id="freetext-entity">
+        {{ form_row(form.freetext) }}
+    </div>
+
+
+{{ form_row(form.comment) }}
+
+{% if action is defined %}
+    <ul class="record_actions sticky-form-buttons">
+        <li class="edit">
+            <button class="btn btn-edit"
+            type="submit" id="newPersonResource">
+                {{ 'edit resource'|trans|capitalize }}
+            </button>
+        </li>
+    </ul>
+{% else %}
+    <ul class="record_actions">
+        <li>
+            <button class="btn btn-create"
+            type="submit" id="newPersonResource">
+                {{ 'Save'|trans }}
+            </button>
+        </li>
+    </ul>
+{% endif %}
+
+{{ form_end(form) }}
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
index cb542b6a1..50aeb96e2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig
@@ -59,7 +59,7 @@
                         </div>
                     </div>
                 </div>
-                {% if resource.kind %}
+                {% if resource.comment.comment is not null %}
                     <div class="item-row separator">
                         <section class="chill-entity entity-comment-embeddable">
                             <blockquote class="chill-user-quote">

From 8c27ec072071170d81d169f702e97b22ab82e8b1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 25 Jan 2022 16:38:37 +0100
Subject: [PATCH 27/30] Fix user/thirdparty/freetext field in edit form

---
 .../Controller/PersonResourceController.php   |  2 ++
 .../views/PersonResource/form.html.twig       | 27 ++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 8fadf73c8..1146dbd51 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -117,6 +117,8 @@ final class PersonResourceController extends AbstractController
             ]);
         }
 
+        dump($resource);
+
         return $this->render(
             'ChillPersonBundle:PersonResource:edit.html.twig',
             [
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
index 1074e960f..1ce3ea2ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig
@@ -9,16 +9,31 @@
                 <div class="col-sm-8">
                     <div id="entity-selector">
                         <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
-                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
+                            {% if resource is defined and resource.person is not null %}
+                                <input checked type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
+                            {% else %}
+                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_0" name="linked-entity" class="form-check-input" value="person" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_0">Usager</label>
+                            {% endif %}
                         </div>
                         <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
-                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
+                            {% if resource is defined and resource.thirdparty is not null %}
+                                <input checked type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
+                            {% else %}
+                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_1" name="linked-entity" class="form-check-input" value="thirdparty" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_1">Tiers</label>
+                            {% endif %}
                         </div>
                         <div class="form-check">
-                            <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
-                            <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+                            {% if resource is defined and resource.freeText is not null %}
+                                <input checked type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+                            {% else %}
+                                <input type="radio" id="chill_personbundle_person_resource_linkedEntity_2" name="linked-entity" class="form-check-input" value="freetext" />
+                                <label class="form-check-label" for="chill_personbundle_person_resource_linkedEntity_2">Description libre</label>
+                            {% endif %}
                         </div>
                     </div>
                 </div>

From f27dca6fb526d4a3887e90e1c78b5fcf0c3d5f59 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 25 Jan 2022 16:41:44 +0100
Subject: [PATCH 28/30] CSfixer changes

---
 .../ChillActivityBundle/Entity/Activity.php   |   1 -
 .../Service/DocGenerator/ActivityContext.php  |   3 -
 .../EntityToJsonTransformer.php               |  11 +-
 .../Controller/PersonResourceController.php   | 179 ++++++------
 .../Entity/AccompanyingPeriod.php             |   2 +-
 .../Entity/Person/PersonResource.php          | 260 +++++++++---------
 .../Entity/Person/PersonResourceKind.php      |  24 +-
 .../Form/PersonResourceType.php               |  19 +-
 .../Menu/PersonMenuBuilder.php                |   6 +-
 .../Repository/PersonResourceRepository.php   |   2 +-
 .../Templating/Entity/ResourceKindRender.php  |   6 +-
 .../migrations/Version20220119155944.php      |  25 +-
 12 files changed, 270 insertions(+), 268 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php
index b8534de52..75c2aeaf6 100644
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
-use Chill\DocStoreBundle\Entity\Document;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
diff --git a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
index c23607337..9a8e6b3b8 100644
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -24,7 +24,6 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -33,8 +32,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use function array_key_exists;
-
 class ActivityContext implements
     DocGeneratorContextWithAdminFormInterface,
     DocGeneratorContextWithPublicFormInterface
diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
index 85030606d..c6c205a47 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
@@ -16,7 +16,6 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException as ExceptionUnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -59,7 +58,7 @@ class EntityToJsonTransformer implements DataTransformerInterface
             );
         }
 
-        if ($value === '') {
+        if ('' === $value) {
             return null;
         }
 
@@ -93,15 +92,21 @@ class EntityToJsonTransformer implements DataTransformerInterface
         switch ($this->type) {
             case 'user':
                 $class = User::class;
+
                 break;
+
             case 'person':
                 $class = Person::class;
+
                 break;
+
             case 'thirdparty':
                 $class = ThirdParty::class;
+
                 break;
+
             default:
-                throw new \UnexpectedValueException('This type is not supported');
+                throw new UnexpectedValueException('This type is not supported');
         }
 
         return
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 1146dbd51..6b9b5dc6a 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -25,9 +25,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonResourceController extends AbstractController
 {
-    private PersonResourceRepository $personResourceRepository;
-    private PersonRepository $personRepository;
     private EntityManagerInterface $em;
+
+    private PersonRepository $personRepository;
+
+    private PersonResourceRepository $personResourceRepository;
+
     private TranslatorInterface $translator;
 
     public function __construct(
@@ -35,14 +38,95 @@ final class PersonResourceController extends AbstractController
         PersonRepository $personRepository,
         EntityManagerInterface $em,
         TranslatorInterface $translator
-        )
-    {
+    ) {
         $this->personResourceRepository = $personResourceRepository;
         $this->personRepository = $personRepository;
         $this->em = $em;
         $this->translator = $translator;
     }
 
+    public function deleteAction(Request $request, $person_id, $resource_id): Response
+    {
+        $personOwner = $this->personRepository->find($person_id);
+        $resource = $this->personResourceRepository->find($resource_id);
+
+        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $personOwner);
+
+        if (null === $resource) {
+            throw $this->createNotFoundException('Unable to find Resource entity.');
+        }
+
+        $form = $this->createFormBuilder()
+            ->setAction($this->generateUrl('chill_person_resource_delete', [
+                'resource_id' => $resource_id,
+                'person_id' => $person_id,
+            ]))
+            ->setMethod('DELETE')
+            ->add('submit', SubmitType::class, ['label' => 'Delete'])
+            ->getForm();
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->em->remove($resource);
+                $this->em->flush();
+
+                $this->addFlash('success', $this->translator
+                    ->trans('The resource has been successfully removed.'));
+
+                return $this->redirectToRoute('chill_person_resource_list', [
+                    'person_id' => $personOwner->getId(),
+                ]);
+            }
+        }
+
+        return $this->render(
+            'ChillPersonBundle:PersonResource:delete.html.twig',
+            [
+                'person' => $personOwner,
+                'resource' => $resource,
+                'form' => $form->createView(),
+            ]
+        );
+    }
+
+    public function editAction(Request $request, $resource_id, $person_id): Response
+    {
+        $resource = $this->personResourceRepository->find($resource_id);
+        $personOwner = $this->personRepository->find($person_id);
+
+        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $personOwner);
+
+        if (null === $resource) {
+            throw $this->createNotFoundException('Unable to find Resource entity.');
+        }
+
+        $form = $this->createForm(PersonResourceType::class, $resource);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->em->persist($resource);
+            $this->em->flush();
+
+            return $this->redirectToRoute('chill_person_resource_list', [
+                'person_id' => $personOwner->getId(),
+            ]);
+        }
+
+        dump($resource);
+
+        return $this->render(
+            'ChillPersonBundle:PersonResource:edit.html.twig',
+            [
+                'person' => $personOwner,
+                'resource' => $resource,
+                'form' => $form->createView(),
+                'action' => 'edit',
+            ]
+        );
+    }
+
     public function listAction(Request $request, $person_id)
     {
         $personOwner = $this->personRepository->find($person_id);
@@ -56,7 +140,6 @@ final class PersonResourceController extends AbstractController
         $form->handleRequest($request);
 
         if ($request->getMethod() === Request::METHOD_POST && $form->isValid()) {
-
             $this->denyAccessUnlessGranted(PersonVoter::CREATE, $personOwner);
 
             $personResource = new PersonResource();
@@ -81,7 +164,6 @@ final class PersonResourceController extends AbstractController
             return $this->redirectToRoute('chill_person_resource_list', [
                 'person_id' => $personOwner->getId(),
             ]);
-
         }
 
         return $this->render(
@@ -89,91 +171,8 @@ final class PersonResourceController extends AbstractController
             [
                 'person' => $personOwner,
                 'personResources' => $personResources,
-                'form' => $form->createView()
-            ]
-        );
-    }
-
-    public function editAction(Request $request, $resource_id, $person_id): Response
-    {
-        $resource = $this->personResourceRepository->find($resource_id);
-        $personOwner = $this->personRepository->find($person_id);
-
-        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $personOwner);
-
-        if (null === $resource) {
-            throw $this->createNotFoundException('Unable to find Resource entity.');
-        }
-
-        $form = $this->createForm(PersonResourceType::class, $resource);
-        $form->handleRequest($request);
-
-        if($form->isSubmitted() && $form->isValid()) {
-            $this->em->persist($resource);
-            $this->em->flush();
-
-            return $this->redirectToRoute('chill_person_resource_list', [
-                'person_id' => $personOwner->getId(),
-            ]);
-        }
-
-        dump($resource);
-
-        return $this->render(
-            'ChillPersonBundle:PersonResource:edit.html.twig',
-            [
-                'person' => $personOwner,
-                'resource' => $resource,
                 'form' => $form->createView(),
-                'action' => 'edit'
             ]
         );
     }
-
-    public function deleteAction(Request $request, $person_id, $resource_id): Response
-    {
-
-        $personOwner = $this->personRepository->find($person_id);
-        $resource = $this->personResourceRepository->find($resource_id);
-
-        $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $personOwner);
-
-        if (null === $resource) {
-            throw $this->createNotFoundException('Unable to find Resource entity.');
-        }
-
-        $form = $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_person_resource_delete', [
-                'resource_id' => $resource_id,
-                'person_id' => $person_id,
-            ]))
-            ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm();
-
-        if($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-                $this->em->remove($resource);
-                $this->em->flush();
-
-                $this->addFlash('success', $this->translator
-                    ->trans('The resource has been successfully removed.'));
-
-                return $this->redirectToRoute('chill_person_resource_list', [
-                    'person_id' => $personOwner->getId(),
-                ]);
-            }
-        }
-
-        return $this->render(
-            'ChillPersonBundle:PersonResource:delete.html.twig',
-            [
-                'person' => $personOwner,
-                'resource' => $resource,
-                'form' => $form->createView()
-            ]
-        );
-    }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
index 12291672b..a41130807 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -629,7 +629,7 @@ class AccompanyingPeriod implements
             return [[self::STEP_DRAFT, self::STEP_CONFIRMED]];
         }
 
-        throw new LogicException('no validation group permitted with this step: '.$this->getStep());
+        throw new LogicException('no validation group permitted with this step: ' . $this->getStep());
     }
 
     public function getId(): ?int
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 3e4345a58..344f2103a 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -32,53 +32,12 @@ use Symfony\Component\Serializer\Annotation\Groups;
  */
 class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=Person::class)
-     * @ORM\JoinColumn(nullable=false)
-     * @Groups({"read"})
-     */
-    private ?Person $personOwner = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="personResources")
-     * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read"})
-     */
-    private ?Person $person = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=ThirdParty::class, inversedBy="personResources")
-     * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read"})
-     */
-    private ?ThirdParty $thirdParty = null;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     * @Groups({"read"})
-     */
-    private $freeText;
-
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
      * @Groups({"read"})
      */
     private CommentEmbeddable $comment;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=PersonResourceKind::class, inversedBy="personResources")
-     * @ORM\JoinColumn(nullable=true)
-     * @Groups({"read"})
-     */
-    private $kind;
-
     /**
      * @ORM\Column(type="datetime")
      */
@@ -90,6 +49,47 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
      */
     private User $createdBy;
 
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     * @Groups({"read"})
+     */
+    private $freeText;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=PersonResourceKind::class, inversedBy="personResources")
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read"})
+     */
+    private $kind;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="personResources")
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read"})
+     */
+    private ?Person $person = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     * @Groups({"read"})
+     */
+    private ?Person $personOwner = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=ThirdParty::class, inversedBy="personResources")
+     * @ORM\JoinColumn(nullable=true)
+     * @Groups({"read"})
+     */
+    private ?ThirdParty $thirdParty = null;
+
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
@@ -105,45 +105,11 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         $this->comment = new CommentEmbeddable();
     }
 
-    /**
-     * GETTERS
-     */
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getFreeText(): ?string
-    {
-        return $this->freeText;
-    }
-
     public function getComment(): CommentEmbeddable
     {
         return $this->comment;
     }
 
-    public function getKind(): ?PersonResourceKind
-    {
-        return $this->kind;
-    }
-
-    public function getPersonOwner(): ?Person
-    {
-        return $this->personOwner;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
-    public function getThirdParty(): ?ThirdParty
-    {
-        return $this->thirdParty;
-    }
-
     public function getCreatedAt(): ?DateTimeInterface
     {
         return $this->createdAt;
@@ -154,6 +120,39 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return $this->createdBy;
     }
 
+    public function getFreeText(): ?string
+    {
+        return $this->freeText;
+    }
+
+    /**
+     * GETTERS.
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getKind(): ?PersonResourceKind
+    {
+        return $this->kind;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getPersonOwner(): ?Person
+    {
+        return $this->personOwner;
+    }
+
+    public function getThirdParty(): ?ThirdParty
+    {
+        return $this->thirdParty;
+    }
+
     public function getUpdatedAt(): ?DateTimeInterface
     {
         return $this->updatedAt;
@@ -164,26 +163,11 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return $this->updatedBy;
     }
 
-    /**
-     * SETTERS
-     */
-
-    public function setFreeText(?string $freeText): self
-    {
-        $this->freeText = $freeText;
-
-        if ('' !== $freeText && $freeText !== null) {
-            $this->setPerson(null);
-            $this->setThirdParty(null);
-        }
-
-        return $this;
-    }
-
     public function setComment(?CommentEmbeddable $comment): self
     {
-        if ($comment === null) {
+        if (null === $comment) {
             $this->comment->setComment('');
+
             return $this;
         }
 
@@ -192,44 +176,6 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
-    public function setKind(?PersonResourceKind $kind): self
-    {
-        $this->kind = $kind;
-
-        return $this;
-    }
-
-    public function setPersonOwner(?Person $personOwner): self
-    {
-        $this->personOwner = $personOwner;
-
-        return $this;
-    }
-
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        if (null !== $person) {
-            $this->setFreeText("");
-            $this->setThirdParty(null);
-        }
-
-        return $this;
-    }
-
-    public function setThirdParty(?ThirdParty $thirdParty): self
-    {
-        $this->thirdParty = $thirdParty;
-
-        if (null !== $thirdParty) {
-            $this->setFreeText("");
-            $this->setPerson(null);
-        }
-
-        return $this;
-    }
-
     public function setCreatedAt(DateTimeInterface $createdAt): self
     {
         $this->createdAt = $createdAt;
@@ -244,6 +190,59 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
+    /**
+     * SETTERS.
+     */
+    public function setFreeText(?string $freeText): self
+    {
+        $this->freeText = $freeText;
+
+        if ('' !== $freeText && null !== $freeText) {
+            $this->setPerson(null);
+            $this->setThirdParty(null);
+        }
+
+        return $this;
+    }
+
+    public function setKind(?PersonResourceKind $kind): self
+    {
+        $this->kind = $kind;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        if (null !== $person) {
+            $this->setFreeText('');
+            $this->setThirdParty(null);
+        }
+
+        return $this;
+    }
+
+    public function setPersonOwner(?Person $personOwner): self
+    {
+        $this->personOwner = $personOwner;
+
+        return $this;
+    }
+
+    public function setThirdParty(?ThirdParty $thirdParty): self
+    {
+        $this->thirdParty = $thirdParty;
+
+        if (null !== $thirdParty) {
+            $this->setFreeText('');
+            $this->setPerson(null);
+        }
+
+        return $this;
+    }
+
     public function setUpdatedAt(DateTimeInterface $updatedAt): self
     {
         $this->updatedAt = $updatedAt;
@@ -257,5 +256,4 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
index 619382f68..4e65fda9f 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php
@@ -28,16 +28,16 @@ class PersonResourceKind
      */
     private int $id;
 
-    /**
-     * @ORM\Column(type="json", length=255)
-     */
-    private array $title;
-
     /**
      * @ORM\Column(type="boolean")
      */
     private bool $isActive = true;
 
+    /**
+     * @ORM\Column(type="json", length=255)
+     */
+    private array $title;
+
     public function getId(): ?int
     {
         return $this->id;
@@ -53,17 +53,17 @@ class PersonResourceKind
         return $this->title;
     }
 
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
     public function setIsActive(bool $isActive): self
     {
         $this->isActive = $isActive;
 
         return $this;
     }
+
+    public function setTitle(array $title): self
+    {
+        $this->title = $title;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
index 91b1c2643..f69081584 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
@@ -11,32 +11,30 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form;
 
-use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\CommentType;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Entity\Person\PersonResourceKind;
 use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
 use Chill\PersonBundle\Templating\Entity\PersonRender;
 use Chill\PersonBundle\Templating\Entity\ResourceKindRender;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\RadioType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonResourceType extends AbstractType
 {
-    private ResourceKindRender $resourceKindRender;
     private PersonRender $personRender;
+
+    private ResourceKindRender $resourceKindRender;
+
     private ThirdPartyRender $thirdPartyRender;
+
     private TranslatorInterface $translator;
 
     public function __construct(ResourceKindRender $resourceKindRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender, TranslatorInterface $translator)
@@ -57,13 +55,15 @@ final class PersonResourceType extends AbstractType
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('pr');
                     $qb->where($qb->expr()->eq('pr.isActive', 'TRUE'));
+
                     return $qb;
                 },
                 'placeholder' => $this->translator->trans('Select a type'),
                 'choice_label' => function (PersonResourceKind $personResourceKind) {
                     $options = [];
+
                     return $this->resourceKindRender->renderString($personResourceKind, $options);
-                }
+                },
             ])
             ->add('person', PickPersonDynamicType::class, [
                 'label' => 'Usager',
@@ -73,11 +73,11 @@ final class PersonResourceType extends AbstractType
             ])
             ->add('freetext', ChillTextareaType::class, [
                 'label' => 'Description libre',
-                'required' => false
+                'required' => false,
             ])
             ->add('comment', CommentType::class, [
                 'label' => 'Note',
-                'required' => false
+                'required' => false,
             ]);
     }
 
@@ -92,5 +92,4 @@ final class PersonResourceType extends AbstractType
     {
         return 'chill_personbundle_person_resource';
     }
-
 }
diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
index 228309737..229b2d373 100644
--- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php
@@ -103,9 +103,9 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
                 'person_id' => $parameters['person']->getId(),
             ],
         ])
-        ->setExtras([
-            'order' => 99999,
-        ]);
+            ->setExtras([
+                'order' => 99999,
+            ]);
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
index 1874bec05..a0847a844 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonResourceRepository.php
@@ -58,4 +58,4 @@ final class PersonResourceRepository implements ObjectRepository
     {
         return PersonResource::class;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
index 377df38b0..8c340f305 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/ResourceKindRender.php
@@ -39,8 +39,7 @@ final class ResourceKindRender implements ChillEntityRenderInterface
         $title = '';
 
         if (null !== $entity->getTitle()) {
-            $title = $this->translatableStringHelper->localize($entity->getTitle());
-            return $title;
+            return $this->translatableStringHelper->localize($entity->getTitle());
         }
 
         return $title;
@@ -50,5 +49,4 @@ final class ResourceKindRender implements ChillEntityRenderInterface
     {
         return $entity instanceof PersonResourceKind;
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
index a4d2e5575..a5cb09fca 100644
--- a/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.php
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220119155944.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;
@@ -8,10 +15,18 @@ use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
- * Creation of person resource and person resource kind
+ * Creation of person resource and person resource kind.
  */
 final class Version20220119155944 extends AbstractMigration
 {
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_person_resource_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_person_resource_kind_id_seq CASCADE');
+        $this->addSql('DROP TABLE chill_person_resource');
+        $this->addSql('DROP TABLE chill_person_resource_kind');
+    }
+
     public function getDescription(): string
     {
         return 'Creation of person resource and person resource kind';
@@ -36,12 +51,4 @@ final class Version20220119155944 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D923174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_person_resource ADD CONSTRAINT FK_FA5B7D9265FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
     }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP SEQUENCE chill_person_resource_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_person_resource_kind_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_person_resource');
-        $this->addSql('DROP TABLE chill_person_resource_kind');
-    }
 }

From 51ab013bd737511d6b7a72b25158b5af01ff3123 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 26 Jan 2022 11:20:47 +0100
Subject: [PATCH 29/30] violation added if all three association entities are
 null

---
 .../Entity/Person/PersonResource.php               | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index 344f2103a..b6dc57ed8 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -22,6 +22,8 @@ use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * @ORM\Entity
@@ -256,4 +258,16 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
+
+    /**
+     * @Assert\Callback
+     */
+    public function validate(ExecutionContextInterface $context, $payload)
+    {
+        if ($this->person === null && $this->thirdParty === null && $this->freeText === null ) {
+            $context->buildViolation('You must associate at least one entity')
+            ->atPath('person')
+            ->addViolation();
+        }
+    }
 }

From ce3a74326de703b3676fb6324a7a09bbfd314892 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 26 Jan 2022 12:01:14 +0100
Subject: [PATCH 30/30] cs-fixes

---
 .../ChillPersonBundle/Entity/Person/PersonResource.php    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
index b6dc57ed8..4e1718a64 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
@@ -261,13 +261,15 @@ class PersonResource implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @Assert\Callback
+     *
+     * @param mixed $payload
      */
     public function validate(ExecutionContextInterface $context, $payload)
     {
-        if ($this->person === null && $this->thirdParty === null && $this->freeText === null ) {
+        if (null === $this->person && null === $this->thirdParty && null === $this->freeText) {
             $context->buildViolation('You must associate at least one entity')
-            ->atPath('person')
-            ->addViolation();
+                ->atPath('person')
+                ->addViolation();
         }
     }
 }