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

rdv: allow null concerned persons in form

Browse Source
This commit is contained in:
nobohan 2021-07-19 15:22:36 +02:00
parent db06a64a2b
commit 44a5955f40
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Bundle/ChillCalendarBundle/Entity/Calendar.php
View File

@ -58,7 +58,7 @@ class Calendar
* @ORM\JoinTable(name="chill_calendar.calendar_to_persons") * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
* @Groups({"read"}) * @Groups({"read"})
*/ */
private Collection $persons; private ?Collection $persons = null;
/** /**
* *
@ -67,7 +67,7 @@ class Calendar
* cascade={"persist", "remove", "merge", "detach"}) * cascade={"persist", "remove", "merge", "detach"})
* @ORM\JoinTable(name="chill_calendar.calendar_to_non_professionals") * @ORM\JoinTable(name="chill_calendar.calendar_to_non_professionals")
*/ */
private Collection $nonProfessionals; private ?Collection $nonProfessionals = null;
/** /**
* *
@ -77,7 +77,7 @@ class Calendar
* @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties") * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
* @Groups({"read"}) * @Groups({"read"})
*/ */
private Collection $professionals; private ?Collection $professionals = null;
/** /**
* *
@ -87,7 +87,7 @@ class Calendar
* @ORM\JoinTable(name="chill_calendar.calendar_to_invites") * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
* @Groups({"read"}) * @Groups({"read"})
*/ */
private Collection $invites; private ?Collection $invites = null;
/** /**
* @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_") * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
@ -250,9 +250,9 @@ class Calendar
return $this->persons; return $this->persons;
} }
public function addPerson(Person $person): self public function addPerson(?Person $person): self
{ {
if (!$this->persons->contains($person)) { if (null !== $person) {
$this->persons[] = $person; $this->persons[] = $person;
} }
@ -298,9 +298,9 @@ class Calendar
return $this->professionals; return $this->professionals;
} }
public function addProfessional(ThirdParty $professional): self public function addProfessional(?ThirdParty $professional): self
{ {
if (!$this->professionals->contains($professional)) { if (null !== $professional) {
$this->professionals[] = $professional; $this->professionals[] = $professional;
} }
@ -322,9 +322,9 @@ class Calendar
return $this->invites; return $this->invites;
} }
public function addInvite(Invite $invite): self public function addInvite(?Invite $invite): self
{ {
if (!$this->invites->contains($invite)) { if (null !== $invite) {
$this->invites[] = $invite; $this->invites[] = $invite;
} }
@ -401,4 +401,15 @@ class Calendar
} }
return []; return [];
} }
public function getThirdParties(): Collection
{
return $this->getProfessionals();
}
public function getusers(): Collection
{
return $this->getInvites(); //TODO get users of the invite
}
} }

3
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
View File

@ -4,6 +4,9 @@
</dl> </dl>
<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2> <h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>