Merge branch 'add-dependents' into 'master'

add household properties :  number of dependents and number of dependents with disabilities

See merge request Chill-Projet/chill-bundles!778

src/Bundle/ChillPersonBundle/Entity/AdministrativeStatus.php

@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * 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.
+ */
+
+namespace Chill\PersonBundle\Entity;
+
+use Chill\PersonBundle\Repository\AdministrativeStatusRepository;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_person_administrative_status' => AdministrativeStatus::class])]
+#[ORM\Entity(repositoryClass: AdministrativeStatusRepository::class)]
+#[ORM\Table(name: 'chill_person_administrative_status')]
+class AdministrativeStatus
+{
+    #[Serializer\Groups(['read', 'docgen:read'])]
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)]
+    private ?int $id = null;
+
+    #[Serializer\Groups(['read', 'docgen:read'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
+    #[Serializer\Context(['is-translatable' => true], groups: ['docgen:read'])]
+    private array $name = [];
+
+    #[Serializer\Groups(['read'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
+    private bool $active = true;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::FLOAT, name: 'ordering', nullable: true, options: ['default' => '0.0'])]
+    private float $order = 0;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
+
+    public function getName(): ?array
+    {
+        return $this->name;
+    }
+
+    public function getOrder(): ?float
+    {
+        return $this->order;
+    }
+
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function setOrder(float $order): self
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+}

src/Bundle/ChillPersonBundle/Entity/EmploymentStatus.php

@@ -11,11 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity;
 
+use Chill\PersonBundle\Repository\EmploymentStatusRepository;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_person_employment_status' => EmploymentStatus::class])]
-#[ORM\Entity]
+#[ORM\Entity(repositoryClass: EmploymentStatusRepository::class)]
 #[ORM\Table(name: 'chill_person_employment_status')]
 class EmploymentStatus
 {

src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php

@@ -58,6 +58,18 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true, options: ['default' => null])]
     private ?int $numberOfChildren = null;
 
+    #[Assert\NotNull]
+    #[Assert\GreaterThanOrEqual(0, groups: ['Default', 'household_composition'])]
+    #[Serializer\Groups(['docgen:read'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true, options: ['default' => null])]
+    private ?int $numberOfDependents = null;
+
+    #[Assert\NotNull]
+    #[Assert\GreaterThanOrEqual(0, groups: ['Default', 'household_composition'])]
+    #[Serializer\Groups(['docgen:read'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true, options: ['default' => null])]
+    private ?int $numberOfDependentsWithDisabilities  = null;
+
     #[Assert\NotNull(groups: ['Default', 'household_composition'])]
     #[Serializer\Groups(['docgen:read'])]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATE_IMMUTABLE, nullable: false)]
@@ -98,6 +110,16 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this->numberOfChildren;
     }
 
+    public function getNumberOfDependents(): ?int
+    {
+        return $this->numberOfDependents;
+    }
+
+    public function getNumberOfDependentsWithDisabilities(): ?int
+    {
+        return $this->numberOfDependentsWithDisabilities;
+    }
+
     public function getStartDate(): ?\DateTimeImmutable
     {
         return $this->startDate;
@@ -142,6 +164,20 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
         return $this;
     }
 
+    public function setNumberOfDependents(?int $numberOfDependents): HouseholdComposition
+    {
+        $this->numberOfDependents = $numberOfDependents;
+
+        return $this;
+    }
+
+    public function setNumberOfDependentsWithDisabilities(?int $numberOfDependentsWithDisabilities): HouseholdComposition
+    {
+        $this->numberOfDependentsWithDisabilities = $numberOfDependentsWithDisabilities;
+
+        return $this;
+    }
+
     public function setStartDate(?\DateTimeImmutable $startDate): HouseholdComposition
     {
         $this->startDate = $startDate;

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -304,6 +304,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT)]
     private string $memo = '';
 
+    /**
+     * The person's administrative status.
+     */
+    #[ORM\ManyToOne(targetEntity: AdministrativeStatus::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?AdministrativeStatus $administrativeStatus = null;
+
     /**
      * The person's mobile phone number.
      */
@@ -777,6 +784,11 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->addresses;
     }
 
+    public function getAdministrativeStatus(): ?AdministrativeStatus
+    {
+        return $this->administrativeStatus;
+    }
+
     /**
      * Return the age of a person, calculated at the date 'now'.
      *
@@ -1420,6 +1432,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
+    public function setAdministrativeStatus(?AdministrativeStatus $administrativeStatus): self
+    {
+        $this->administrativeStatus = $administrativeStatus;
+
+        return $this;
+    }
+
     public function setAcceptSMS(bool $acceptSMS): self
     {
         $this->acceptSMS = $acceptSMS;