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

rdv -> activity: add comment

Browse Source
This commit is contained in:
nobohan 2021-09-21 16:48:43 +02:00
parent 1a6c37e5a6
commit d172ae9682
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Bundle/ChillActivityBundle/Controller/ActivityController.php
View File

@ -39,6 +39,7 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Role\Role; use Symfony\Component\Security\Core\Role\Role;
use Chill\ActivityBundle\Entity\Activity; use Chill\ActivityBundle\Entity\Activity;
use Chill\ActivityBundle\Form\ActivityType; use Chill\ActivityBundle\Form\ActivityType;
use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
use Symfony\Component\Serializer\SerializerInterface; use Symfony\Component\Serializer\SerializerInterface;
/** /**
@ -236,6 +237,15 @@ class ActivityController extends AbstractController
$entity->addThirdParty($professional); $entity->addThirdParty($professional);
} }
} }
if (array_key_exists('comment', $activityData)) {
$comment = new CommentEmbeddable();
$comment->setComment($activityData['comment']);
$comment->setUserId($this->getUser()->getid());
$comment->setDate(new \DateTime('now'));
$entity->setComment($comment);
}
} }
// TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période

3
src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
View File

@ -233,7 +233,8 @@ class CalendarController extends AbstractController
'personsId' => $personsId, 'personsId' => $personsId,
'professionalsId' => $professionalsId, 'professionalsId' => $professionalsId,
'date' => $entity->getStartDate()->format('Y-m-d'), 'date' => $entity->getStartDate()->format('Y-m-d'),
'durationTime' => $durationTimeInMinutes 'durationTime' => $durationTimeInMinutes,
'comment' => $entity->getComment()->getComment(),
]; ];
return $this->render($view, [ return $this->render($view, [