Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'docgen-add-household-composition' into 'master'

Browse Source 
Feature: add Household composition on household in docgen

See merge request Chill-Projet/chill-bundles!537
This commit is contained in:
Julien Fastré 2023-05-19 09:39:56 +00:00
commit fb9f182edd
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Entity/Household/Household.php
View File

@ -213,6 +213,10 @@ class Household
return null; return null;
} }
/**
* @Serializer\Groups({"docgen:read"})
* @Serializer\SerializedName("current_composition")
*/
public function getCurrentComposition(?DateTimeImmutable $at = null): ?HouseholdComposition public function getCurrentComposition(?DateTimeImmutable $at = null): ?HouseholdComposition
{ {
$at ??= new DateTimeImmutable('today'); $at ??= new DateTimeImmutable('today');

4
src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php
View File

@ -44,6 +44,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
/** /**
* @ORM\Column(type="date_immutable", nullable=true, options={"default": null}) * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
* @Assert\GreaterThanOrEqual(propertyPath="startDate", groups={"Default", "household_composition"}) * @Assert\GreaterThanOrEqual(propertyPath="startDate", groups={"Default", "household_composition"})
* @Serializer\Groups({"docgen:read"})
*/ */
private ?DateTimeImmutable $endDate = null; private ?DateTimeImmutable $endDate = null;
@ -56,6 +57,7 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
/** /**
* @ORM\ManyToOne(targetEntity=HouseholdCompositionType::class) * @ORM\ManyToOne(targetEntity=HouseholdCompositionType::class)
* @ORM\JoinColumn(nullable=false) * @ORM\JoinColumn(nullable=false)
* @Serializer\Groups({"docgen:read"})
*/ */
private ?HouseholdCompositionType $householdCompositionType = null; private ?HouseholdCompositionType $householdCompositionType = null;
@ -71,12 +73,14 @@ class HouseholdComposition implements TrackCreationInterface, TrackUpdateInterfa
* @ORM\Column(type="integer", nullable=true, options={"default": null}) * @ORM\Column(type="integer", nullable=true, options={"default": null})
* @Assert\NotNull * @Assert\NotNull
* @Assert\GreaterThanOrEqual(0, groups={"Default", "household_composition"}) * @Assert\GreaterThanOrEqual(0, groups={"Default", "household_composition"})
* @Serializer\Groups({"docgen:read"})
*/ */
private ?int $numberOfChildren = null; private ?int $numberOfChildren = null;
/** /**
* @ORM\Column(type="date_immutable", nullable=false) * @ORM\Column(type="date_immutable", nullable=false)
* @Assert\NotNull(groups={"Default", "household_composition"}) * @Assert\NotNull(groups={"Default", "household_composition"})
* @Serializer\Groups({"docgen:read"})
*/ */
private ?DateTimeImmutable $startDate = null; private ?DateTimeImmutable $startDate = null;