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

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -28,6 +28,7 @@ use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
+use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
@@ -111,6 +112,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * @ORM\OneToMany(targetEntity=AccompanyingPeriodParticipation::class,
      *     mappedBy="person",
      * cascade={"persist", "remove", "merge", "detach"})
+     * @ORM\OrderBy({"startDate": "DESC"})
      */
     private $accompanyingPeriodParticipations;
 
@@ -468,6 +470,13 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      */
     private $proxyAccompanyingPeriodOpenState = false; //TO-DELETE ?
 
+    /**
+     * @ORM\OneToMany(targetEntity=PersonResource::class, mappedBy="personOwner")
+     *
+     * @var Collection|PersonResource[];
+     */
+    private Collection $resources;
+
     /**
      * The person's spoken languages.
      *
@@ -512,6 +521,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->accompanyingPeriodRequested = new ArrayCollection();
         $this->budgetResources = new ArrayCollection();
         $this->budgetCharges = new ArrayCollection();
+        $this->resources = new ArrayCollection();
     }
 
     /**
@@ -1272,7 +1282,20 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->placeOfBirth;
     }
 
-    public function getSpokenLanguages(): ?Collection
+    /**
+     * @return PersonResource[]|Collection
+     */
+    public function getResources()
+    {
+        return $this->resources;
+    }
+
+    /**
+     * Get spokenLanguages.
+     *
+     * @return ArrayCollection
+     */
+    public function getSpokenLanguages()
     {
         return $this->spokenLanguages;
     }