Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julien Fastré
2022-05-27 15:47:25 +02:00
parent 014c460eef 01f1605cb8
commit 54a3e2b2ef
276 changed files with 4245 additions and 1708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php
View File

@@ -35,7 +35,7 @@ class HouseholdMember
/**
* @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
* @Serializer\Groups({"read", "docgen:read"})
* @Assert\GreaterThan(
* @Assert\GreaterThanOrEqual(
* propertyPath="startDate",
* message="household_membership.The end date must be after start date",
* groups={"household_memberships"}
@@ -82,14 +82,13 @@ class HouseholdMember
/**
* @ORM\ManyToOne(targetEntity=Position::class)
* @Serializer\Groups({"read", "docgen:read"})
* @Assert\NotNull(groups={"household_memberships_created"})
*/
private ?Position $position = null;
/**
* @ORM\Column(type="boolean", name="sharedhousehold")
*/
private bool $shareHousehold = false;
private bool $shareHousehold = true;
/**
* @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
@@ -201,15 +200,18 @@ class HouseholdMember
return $this;
}
public function setPosition(Position $position): self
public function setPosition(?Position $position): self
{
if ($this->position instanceof Position) {
if ($this->position instanceof Position && $this->position !== $position) {
throw new LogicException('The position is already set. You cannot change ' .
'a position of a membership');
}
$this->position = $position;
$this->shareHousehold = $position->getShareHousehold();
if (null !== $position) {
$this->shareHousehold = $position->getShareHousehold();
}
return $this;
}

4
src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
View File

@@ -121,14 +121,14 @@ class Evaluation
return $this;
}
public function setDelay(DateInterval $delay): self
public function setDelay(?DateInterval $delay): self
{
$this->delay = $delay;
return $this;
}
public function setNotificationDelay(DateInterval $notificationDelay): self
public function setNotificationDelay(?DateInterval $notificationDelay): self
{
$this->notificationDelay = $notificationDelay;

2
src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
View File

@@ -45,7 +45,7 @@ class Result
/**
* @ORM\Column(type="datetime", nullable=true)
*/
private DateTime $desactivationDate;
private ?DateTime $desactivationDate;
/**
* @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")