diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js index 0f2b52568..32049dcdd 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js @@ -69,7 +69,8 @@ const messages = { }, holder: "Titulaire", years_old: "an | {n} an | {n} ans", - + residential_address: "Adresse de résidence", + located_at: "réside chez" } } }; diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php index b2f10ac08..c59511552 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php @@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable; use Chill\PersonBundle\Repository\ResidentialAddressRepository; use Chill\PersonBundle\Entity\Person; use Chill\ThirdPartyBundle\Entity\ThirdParty; +use Symfony\Component\Serializer\Annotation\Groups; use DateTimeImmutable; use Doctrine\ORM\Mapping as ORM; @@ -28,6 +29,7 @@ class ResidentialAddress /** * @ORM\ManyToOne(targetEntity=Address::class) * @ORM\JoinColumn(nullable=true) + * @Groups({"read"}) */ private ?Address $address = null; @@ -38,18 +40,21 @@ class ResidentialAddress /** * @ORM\Column(type="datetime_immutable", nullable=true) + * @Groups({"read"}) */ private ?DateTimeImmutable $endDate = null; /** * @ORM\ManyToOne(targetEntity=Person::class) * @ORM\JoinColumn(nullable=true) + * @Groups({"read"}) */ private ?Person $hostPerson = null; /** * @ORM\ManyToOne(targetEntity=ThirdParty::class) * @ORM\JoinColumn(nullable=true) + * @Groups({"read"}) */ private ?ThirdParty $hostThirdParty = null; @@ -68,6 +73,7 @@ class ResidentialAddress /** * @ORM\Column(type="datetime_immutable") + * @Groups({"read"}) */ private ?DateTimeImmutable $startDate = null; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue index 84c1f25e6..648319079 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue @@ -117,18 +117,50 @@ -