Merge remote-tracking branch 'origin/master' into 232_resources_comment

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -17,6 +17,7 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCentersInterface;
 use Chill\MainBundle\Entity\HasScopesInterface;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
@@ -118,6 +119,13 @@ class AccompanyingPeriod implements
      */
     private ?Address $addressLocation = null;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @Groups({"read", "write"})
+     * @Assert\NotBlank(groups={AccompanyingPeriod::STEP_CONFIRMED})
+     */
+    private ?Location $administrativeLocation = null;
+
     /**
      * @var DateTime
      *
@@ -507,6 +515,11 @@ class AccompanyingPeriod implements
         return $this->addressLocation;
     }
 
+    public function getAdministrativeLocation(): ?Location
+    {
+        return $this->administrativeLocation;
+    }
+
     /**
      * Get a list of person which have an adresse available for a valid location.
      *
@@ -980,6 +993,13 @@ class AccompanyingPeriod implements
         return $this;
     }
 
+    public function setAdministrativeLocation(?Location $administrativeLocation): AccompanyingPeriod
+    {
+        $this->administrativeLocation = $administrativeLocation;
+
+        return $this;
+    }
+
     /**
      * Set closingDate.
      *

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php

@@ -39,32 +39,32 @@ class AccompanyingPeriodWorkGoal
     /**
      * @ORM\ManyToOne(targetEntity=Goal::class)
      * @Serializer\Groups({"accompanying_period_work:edit"})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private $goal;
+    private ?Goal $goal = null;
 
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="text")
      * @Serializer\Groups({"accompanying_period_work:edit"})
      * @Serializer\Groups({"read"})
      */
-    private $note;
+    private ?string $note = null;
 
     /**
      * @ORM\ManyToMany(targetEntity=Result::class, inversedBy="accompanyingPeriodWorkGoals")
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_goal_result")
      * @Serializer\Groups({"accompanying_period_work:edit"})
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
-    private $results;
+    private Collection $results;
 
     public function __construct()
     {

src/Bundle/ChillPersonBundle/Entity/PersonAltName.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * PersonAltName.
@@ -34,6 +35,7 @@ class PersonAltName
      * @var string
      *
      * @ORM\Column(name="key", type="string", length=255)
+     * @Groups({"write"})
      */
     private $key;
 
@@ -41,6 +43,7 @@ class PersonAltName
      * @var string
      *
      * @ORM\Column(name="label", type="text")
+     * @Groups({"write"})
      */
     private $label;
 

src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php

@@ -28,7 +28,7 @@ class Relation
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;