diff --git a/composer.json b/composer.json index f5f1a2806..fb8c9c333 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src", - "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle" + "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle", + "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle" } }, "autoload-dev": { diff --git a/src/Bundle/ChillCalendarBundle/.gitignore b/src/Bundle/ChillCalendarBundle/.gitignore new file mode 100644 index 000000000..f443cb81e --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/.gitignore @@ -0,0 +1,11 @@ +composer.lock +vendor/* +parameters.yml +*~ +*.DS_Store +*.sass-cache +Resources/node_modules/ +Tests/Fixtures/App/app/config/parameters.yml +/nbproject/private/ +Resources/test/Fixtures/App/bootstrap.php.cache + diff --git a/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php new file mode 100644 index 000000000..cfbfa5b38 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php @@ -0,0 +1,9 @@ +getMethod()) { + case Request::METHOD_GET: + return [ 'groups' => [ 'calendar:read' ] ]; + } + } + return parent::getContextForSerialization($action, $request, $_format, $entity); + } + + protected function customizeQuery(string $action, Request $request, $qb): void + { + if ($request->query->has('main_user')) { + + $qb->where('e.mainUser = :main_user') + ->setParameter('main_user', $request->query->get('main_user')); + } + } + +} diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php new file mode 100644 index 000000000..5e5746387 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php @@ -0,0 +1,390 @@ +, + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\CalendarBundle\Controller; + +use Chill\MainBundle\Security\Authorization\AuthorizationHelper; +use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Privacy\PrivacyEvent; +use Psr\Log\LoggerInterface; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Form\Form; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\Form\Extension\Core\Type\SubmitType; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Security\Core\Role\Role; +use Chill\CalendarBundle\Entity\Calendar; +use Chill\CalendarBundle\Form\CalendarType; +use Chill\MainBundle\Entity\User; +use Symfony\Component\Serializer\SerializerInterface; +use Symfony\Component\Routing\Annotation\Route; + +/** + * Class CalendarController + * + * @package Chill\CalendarBundle\Controller + */ +class CalendarController extends AbstractController +{ + protected EventDispatcherInterface $eventDispatcher; + + protected AuthorizationHelper $authorizationHelper; + + protected LoggerInterface $logger; + + protected SerializerInterface $serializer; + + public function __construct( + EventDispatcherInterface $eventDispatcher, + AuthorizationHelper $authorizationHelper, + LoggerInterface $logger, + SerializerInterface $serializer + ) { + $this->eventDispatcher = $eventDispatcher; + $this->authorizationHelper = $authorizationHelper; + $this->logger = $logger; + $this->serializer = $serializer; + } + + /** + * Lists all Calendar entities. + * @Route("/{_locale}/calendar/", name="chill_calendar_calendar") + */ + public function listAction(Request $request): Response + { + $em = $this->getDoctrine()->getManager(); + $view = null; + + [$user, $accompanyingPeriod] = $this->getEntity($request); + + if ($user instanceof User) { + + // $calendar = $em->getRepository(Calendar::class) + // ->findByUser($user) + // ; + + // $view = 'ChillCalendarBundle:Calendar:listByUser.html.twig'; + } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) { + $calendarItems = $em->getRepository(Calendar::class)->findBy( + ['accompanyingPeriod' => $accompanyingPeriod] + ); + + $view = 'ChillCalendarBundle:Calendar:listByAccompanyingCourse.html.twig'; + } + + return $this->render($view, [ + 'calendarItems' => $calendarItems, + 'user' => $user, + 'accompanyingCourse' => $accompanyingPeriod, + ]); + } + + /** + * Create a new calendar item + * @Route("/{_locale}/calendar/new", name="chill_calendar_calendar_new") + */ + public function newAction(Request $request): Response + { + $em = $this->getDoctrine()->getManager(); + + [$user, $accompanyingPeriod] = $this->getEntity($request); + + if ($accompanyingPeriod instanceof AccompanyingPeriod) { + $view = 'ChillCalendarBundle:Calendar:newAccompanyingCourse.html.twig'; + } + // elseif ($user instanceof User) { + // $view = 'ChillCalendarBundle:Calendar:newUser.html.twig'; + // } + + $entity = new Calendar(); + $entity->setUser($this->getUser()); + $entity->setStatus($entity::STATUS_VALID); + + // if ($user instanceof User) { + // $entity->setPerson($user); + // } + + if ($accompanyingPeriod instanceof AccompanyingPeriod) { + $entity->setAccompanyingPeriod($accompanyingPeriod); + } + + $form = $this->createForm(CalendarType::class, $entity, [ + 'accompanyingPeriod' => $accompanyingPeriod, + ])->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $em->persist($entity); + $em->flush(); + + $this->addFlash('success', $this->get('translator')->trans('Success : calendar item created!')); + + $params = $this->buildParamsToUrl($user, $accompanyingPeriod); //TODO useful? + $params['id'] = $entity->getId(); + + return $this->redirectToRoute('chill_calendar_calendar_show', $params); + } elseif ($form->isSubmitted() and !$form->isValid()) { + $this->addFlash('error', $this->get('translator')->trans('This form contains errors')); + } + + + if ($view === null) { + throw $this->createNotFoundException('Template not found'); + } + + $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']); + + return $this->render($view, [ + 'user' => $user, + 'accompanyingCourse' => $accompanyingPeriod, + 'entity' => $entity, + 'form' => $form->createView(), + 'entity_json' => $entity_array + ]); + } + + /** + * Show a calendar item + * @Route("/{_locale}/calendar/{id}/show", name="chill_calendar_calendar_show") + */ + public function showAction(Request $request, $id): Response + { + $em = $this->getDoctrine()->getManager(); + + [$user, $accompanyingPeriod] = $this->getEntity($request); + + if ($accompanyingPeriod instanceof AccompanyingPeriod) { + $view = 'ChillCalendarBundle:Calendar:showAccompanyingCourse.html.twig'; + } + // elseif ($person instanceof Person) { + // $view = 'ChillCalendarBundle:Calendar:showPerson.html.twig'; + // } + + $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id); + + if (!$entity) { + throw $this->createNotFoundException('Unable to find Calendar entity.'); + } + + if (null !== $accompanyingPeriod) { + $entity->personsAssociated = $entity->getPersonsAssociated(); + $entity->personsNotAssociated = $entity->getPersonsNotAssociated(); + } + + // $deleteForm = $this->createDeleteForm($id, $accompanyingPeriod); + + if ($view === null) { + throw $this->createNotFoundException('Template not found'); + } + + return $this->render($view, [ + //'person' => $person, + 'accompanyingCourse' => $accompanyingPeriod, + 'entity' => $entity, + //'delete_form' => $deleteForm->createView(), + ]); + } + + + + /** + * Edit a calendar item + * @Route("/{_locale}/calendar/{id}/edit", name="chill_calendar_calendar_edit") + */ + public function editAction($id, Request $request): Response + { + $em = $this->getDoctrine()->getManager(); + + [$user, $accompanyingPeriod] = $this->getEntity($request); + + if ($accompanyingPeriod instanceof AccompanyingPeriod) { + $view = 'ChillCalendarBundle:Calendar:editAccompanyingCourse.html.twig'; + } + // elseif ($person instanceof Person) { + // $view = 'ChillCalendarBundle:Calendar:editPerson.html.twig'; + // } + + $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id); + + if (!$entity) { + throw $this->createNotFoundException('Unable to find Calendar entity.'); + } + + $form = $this->createForm(CalendarType::class, $entity, [ + 'accompanyingPeriod' => $accompanyingPeriod, + ])->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $em->persist($entity); + $em->flush(); + + $this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!')); + + $params = $this->buildParamsToUrl($user, $accompanyingPeriod); + $params['id'] = $id; + return $this->redirectToRoute('chill_calendar_calendar_show', $params); + } elseif ($form->isSubmitted() and !$form->isValid()) { + $this->addFlash('error', $this->get('translator')->trans('This form contains errors')); + } + + $deleteForm = $this->createDeleteForm($id, $user, $accompanyingPeriod); + + if ($view === null) { + throw $this->createNotFoundException('Template not found'); + } + + $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']); + + return $this->render($view, [ + 'entity' => $entity, + 'form' => $form->createView(), + 'delete_form' => $deleteForm->createView(), + 'accompanyingCourse' => $accompanyingPeriod, + 'entity_json' => $entity_array + ]); + } + + /** + * Delete a calendar item + * @Route("/{_locale}/calendar/{id}/delete", name="chill_calendar_calendar_delete") + */ + public function deleteAction(Request $request, $id) + { + $em = $this->getDoctrine()->getManager(); + + [$user, $accompanyingPeriod] = $this->getEntity($request); + + if ($accompanyingPeriod instanceof AccompanyingPeriod) { + $view = 'ChillCalendarBundle:Calendar:confirm_deleteAccompanyingCourse.html.twig'; + } + // elseif ($person instanceof Person) { + // $view = 'ChillCalendarBundle:Calendar:confirm_deletePerson.html.twig'; + // } + + /* @var $entity Calendar */ + $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id); + + if (!$entity) { + throw $this->createNotFoundException('Unable to find Calendar entity.'); + } + + $form = $this->createDeleteForm($id, $user, $accompanyingPeriod); + + if ($request->getMethod() === Request::METHOD_DELETE) { + $form->handleRequest($request); + + if ($form->isValid()) { + + $this->logger->notice("A calendar event has been removed", [ + 'by_user' => $this->getUser()->getUsername(), + 'calendar_id' => $entity->getId() + ]); + + $em->remove($entity); + $em->flush(); + + $this->addFlash('success', $this->get('translator') + ->trans("The calendar has been successfully removed.")); + + $params = $this->buildParamsToUrl($user, $accompanyingPeriod); + return $this->redirectToRoute('chill_calendar_calendar', $params); + } + } + + if ($view === null) { + throw $this->createNotFoundException('Template not found'); + } + + return $this->render($view, [ + 'calendar' => $entity, + 'delete_form' => $form->createView(), + 'accompanyingCourse' => $accompanyingPeriod, + ]); + } + + /** + * Creates a form to delete a Calendar entity by id. + */ + private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): Form + { + $params = $this->buildParamsToUrl($person, $accompanyingPeriod); + $params['id'] = $id; + + return $this->createFormBuilder() + ->setAction($this->generateUrl('chill_calendar_calendar_delete', $params)) + ->setMethod('DELETE') + ->add('submit', SubmitType::class, ['label' => 'Delete']) + ->getForm() + ; + } + + private function getEntity(Request $request): array + { + $em = $this->getDoctrine()->getManager(); + $user = $accompanyingPeriod = null; + + if ($request->query->has('user_id')) { + $user_id = $request->get('user_id'); + $user = $em->getRepository(User::class)->find($user_id); + + if ($user === null) { + throw $this->createNotFoundException('User not found'); + } + + $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $user); + } elseif ($request->query->has('accompanying_period_id')) { + $accompanying_period_id = $request->get('accompanying_period_id'); + $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id); + + if ($accompanyingPeriod === null) { + throw $this->createNotFoundException('Accompanying Period not found'); + } + + // TODO Add permission + // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person); + } else { + throw $this->createNotFoundException("Person or Accompanying Period not found"); + } + + return [ + $user, $accompanyingPeriod + ]; + } + + private function buildParamsToUrl( + ?User $user, + ?AccompanyingPeriod $accompanyingPeriod + ): array { + $params = []; + + if ($user) { + $params['user_id'] = $user->getId(); + } + + if ($accompanyingPeriod) { + $params['accompanying_period_id'] = $accompanyingPeriod->getId(); + } + + return $params; + } +} diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php new file mode 100644 index 000000000..be279ed36 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php @@ -0,0 +1,38 @@ +query->has('user')) { + $user = $request->query->get('user'); + } + + $em = $this->getDoctrine()->getManager(); + + $query = $em->createQuery( + 'SELECT c FROM ChillCalendarBundle:CalendarRange c + WHERE NOT EXISTS (SELECT cal.id FROM ChillCalendarBundle:Calendar cal WHERE cal.calendarRange = c.id)') + ; + + $results = $query->getResult(); + + return $this->json(['count' => count($results), 'results' => $results], Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]); + //TODO use also the paginator, eg return $this->serializeCollection('get', $request, $_format, $paginator, $results); + } + +} \ No newline at end of file diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php new file mode 100644 index 000000000..0bf19418f --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php @@ -0,0 +1,82 @@ +userRepository = $em->getRepository(User::class); + } + + public function getOrder(): int + { + return 40003; + } + + public static function getGroups(): array + { + return ['calendar']; + } + + public static $references = []; + + public function load(ObjectManager $manager): void + { + $arr = range(-50, 50); + + print "Creating calendar range ('plage de disponibilités')\n"; + + $users = $this->userRepository->findAll(); + + $days = [ + '2021-08-23', + '2021-08-24', + '2021-08-25', + '2021-08-26', + '2021-08-30', + '2021-08-31', + '2021-09-01', + '2021-09-02', + ]; + + $hours = [ + '10:00:00', + '11:30:00', + '13:30:00', + '15:00:00' + ]; + + foreach ($users as $u) { + foreach ($days as $d) { + foreach ($hours as $h){ + $event = $d.' '.$h; + $startEvent = new DateTimeImmutable($event); + $endEvent = new DateTimeImmutable($event.' + 1 hours'); + $calendarRange= (new CalendarRange()) + ->setUser($u) + ->setStartDate($startEvent) + ->setEndDate($endEvent); + + $manager->persist($calendarRange); + } + + } + + } + $manager->flush(); + } +} \ No newline at end of file diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php new file mode 100644 index 000000000..370b08f07 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php @@ -0,0 +1,46 @@ + CancelReason::CANCELEDBY_USER], + ['name' => CancelReason::CANCELEDBY_PERSON], + ['name' => CancelReason::CANCELEDBY_DONOTCOUNT], + ]; + + foreach ($arr as $a) { + print "Creating calendar cancel reason : " . $a['name'] . "\n"; + $cancelReason= (new CancelReason()) + ->setCanceledBy($a['name']) + ->setActive(true); + $manager->persist($cancelReason); + $reference = 'CancelReason_'.$a['name']; + $this->addReference($reference, $cancelReason); + static::$references[] = $reference; + } + + $manager->flush(); + } +} diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php new file mode 100644 index 000000000..9c265b3ac --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php @@ -0,0 +1,44 @@ + ['fr' => 'Rendez-vous décliné']], + ['name' => ['fr' => 'Rendez-vous accepté']], + ]; + + foreach ($arr as $a) { + print "Creating calendar invite : " . $a['name']['fr'] . "\n"; + $invite= (new Invite()) + ->setStatus($a['name']); + $manager->persist($invite); + $reference = 'Invite_'.$a['name']['fr']; + $this->addReference($reference, $invite); + static::$references[] = $reference; + } + + $manager->flush(); + } +} diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php new file mode 100644 index 000000000..2927d4910 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php @@ -0,0 +1,106 @@ +processConfiguration($configuration, $configs); + + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yml'); + $loader->load('services/controller.yml'); + $loader->load('services/fixtures.yml'); + $loader->load('services/form.yml'); + } + + public function prepend(ContainerBuilder $container) + { + $this->preprendRoutes($container); + $this->prependCruds($container); + } + + protected function preprendRoutes(ContainerBuilder $container) + { + + $container->prependExtensionConfig('chill_main', [ + 'routing' => [ + 'resources' => [ + '@ChillCalendarBundle/Resources/config/routing.yml' + ] + ] + ]); + } + + /** + * @param ContainerBuilder $container + */ + protected function prependCruds(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', [ + 'apis' => [ + [ + 'controller' => \Chill\CalendarBundle\Controller\CalendarRangeAPIController::class, + 'class' => \Chill\CalendarBundle\Entity\CalendarRange::class, + 'name' => 'calendar_range', + 'base_path' => '/api/1.0/calendar/calendar-range', + 'base_role' => 'ROLE_USER', + 'actions' => [ + '_index' => [ + 'methods' => [ + Request::METHOD_GET => true, + Request::METHOD_HEAD => true + ], + ], + '_entity' => [ + 'methods' => [ + Request::METHOD_GET => true, + Request::METHOD_HEAD => true + ] + ], + ] + ], + [ + 'controller' => \Chill\CalendarBundle\Controller\CalendarAPIController::class, + 'class' => \Chill\CalendarBundle\Entity\Calendar::class, + 'name' => 'calendar', + 'base_path' => '/api/1.0/calendar/calendar', + 'base_role' => 'ROLE_USER', + 'actions' => [ + '_index' => [ + 'methods' => [ + Request::METHOD_GET => true, + Request::METHOD_HEAD => true + ], + ], + '_entity' => [ + 'methods' => [ + Request::METHOD_GET => true, + Request::METHOD_HEAD => true + ] + ], + ] + ] + ] + ]); + } + + +} diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php new file mode 100644 index 000000000..40524b53e --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php @@ -0,0 +1,29 @@ +getRootNode('chill_calendar'); + + // Here you should define the parameters that are allowed to + // configure your bundle. See the documentation linked above for + // more information on that topic. + + return $treeBuilder; + } +} diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php new file mode 100644 index 000000000..0663ca08b --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php @@ -0,0 +1,405 @@ +comment = new CommentEmbeddable(); + $this->persons = new ArrayCollection(); + $this->professionals = new ArrayCollection(); + $this->invites = new ArrayCollection(); + } + + + public function getId(): ?int + { + return $this->id; + } + + public function getSendSMS(): ?bool + { + return $this->sendSMS; + } + + public function setSendSMS(?bool $sendSMS): self + { + $this->sendSMS = $sendSMS; + + return $this; + } + + public function getComment(): CommentEmbeddable + { + return $this->comment; + } + + public function setComment(CommentEmbeddable $comment): self + { + $this->comment = $comment; + + return $this; + } + + public function getStartDate(): ?\DateTimeImmutable + { + return $this->startDate; + } + + public function setStartDate(\DateTimeImmutable $startDate): self + { + $this->startDate = $startDate; + + return $this; + } + + public function getEndDate(): ?\DateTimeImmutable + { + return $this->endDate; + } + + public function setEndDate(\DateTimeImmutable $endDate): self + { + $this->endDate = $endDate; + + return $this; + } + + public function getStatus(): ?string + { + return $this->status; + } + + public function setStatus(string $status): self + { + $this->status = $status; + + return $this; + } + + public function getUser(): ?User + { + return $this->user; + } + + public function setUser(?User $user): self + { + $this->user = $user; + + return $this; + } + + public function getAccompanyingPeriod(): ?AccompanyingPeriod + { + return $this->accompanyingPeriod; + } + + public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self + { + $this->accompanyingPeriod = $accompanyingPeriod; + + return $this; + } + + public function getMainUser(): ?User + { + return $this->mainUser; + } + + public function setMainUser(?User $mainUser): self + { + $this->mainUser = $mainUser; + + return $this; + } + + /** + * @return Collection|Person[] + */ + public function getPersons(): Collection + { + return $this->persons; + } + + public function addPerson(?Person $person): self + { + if (null !== $person) { + $this->persons[] = $person; + } + + return $this; + } + + public function removePerson(Person $person): self + { + $this->persons->removeElement($person); + + return $this; + } + + /** + * @return Collection|ThirdParty[] + */ + public function getProfessionals(): Collection + { + return $this->professionals; + } + + public function addProfessional(?ThirdParty $professional): self + { + if (null !== $professional) { + $this->professionals[] = $professional; + } + + return $this; + } + + public function removeProfessional(ThirdParty $professional): self + { + $this->professionals->removeElement($professional); + + return $this; + } + + /** + * @return Collection|Invite[] + */ + public function getInvites(): Collection + { + return $this->invites; + } + + public function addInvite(?Invite $invite): self + { + if (null !== $invite) { + $this->invites[] = $invite; + } + + return $this; + } + + public function removeInvite(Invite $invite): self + { + $this->invites->removeElement($invite); + + return $this; + } + + public function getCancelReason(): ?CancelReason + { + return $this->cancelReason; + } + + public function setCancelReason(?CancelReason $cancelReason): self + { + $this->cancelReason = $cancelReason; + + return $this; + } + + public function getCalendarRange(): ?CalendarRange + { + return $this->calendarRange; + } + + public function setCalendarRange(?CalendarRange $calendarRange): self + { + $this->calendarRange = $calendarRange; + + return $this; + } + + public function getActivity(): ?Activity + { + return $this->activity; + } + + public function setActivity(?Activity $activity): self + { + $this->activity = $activity; + + return $this; + } + + public function getPersonsAssociated(): array + { + if (null !== $this->accompanyingPeriod) { + $personsAssociated = []; + foreach ($this->accompanyingPeriod->getParticipations() as $participation) { + if ($this->persons->contains($participation->getPerson())) { + $personsAssociated[] = $participation->getPerson(); + } + } + return $personsAssociated; + } + return []; + } + + public function getPersonsNotAssociated(): array + { + if (null !== $this->accompanyingPeriod) { + $personsNotAssociated = []; + foreach ($this->persons as $person) { + if (!in_array($person, $this->getPersonsAssociated())) { + $personsNotAssociated[] = $person; + } + } + return $personsNotAssociated; + } + return []; + } + + + public function getThirdParties(): Collection + { + return $this->getProfessionals(); + } + + public function getusers(): Collection + { + return $this->getInvites(); //TODO get users of the invite + } + + public static function loadValidatorMetadata(ClassMetadata $metadata): void + { + $metadata->addPropertyConstraint('startDate', new NotBlank()); + $metadata->addPropertyConstraint('startDate', new Range([ + 'min' => '2 years ago', + 'max' => '+ 2 years', + ])); + $metadata->addPropertyConstraint('endDate', new NotBlank()); + $metadata->addPropertyConstraint('endDate', new Range([ + 'min' => '2 years ago', + 'max' => '+ 2 years', + ])); + } + +} diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php new file mode 100644 index 000000000..f9582c8c2 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php @@ -0,0 +1,99 @@ +calendars = new ArrayCollection(); + } + + public function getId(): ?int + { + return $this->id; + } + + public function getStartDate(): ?\DateTimeImmutable + { + return $this->startDate; + } + + public function setStartDate(\DateTimeImmutable $startDate): self + { + $this->startDate = $startDate; + + return $this; + } + + public function getEndDate(): ?\DateTimeImmutable + { + return $this->endDate; + } + + public function setEndDate(\DateTimeImmutable $endDate): self + { + $this->endDate = $endDate; + + return $this; + } + + public function getUser(): ?User + { + return $this->user; + } + + public function setUser(?User $user): self + { + $this->user = $user; + + return $this; + } + + +} diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php new file mode 100644 index 000000000..ce3d1f6e4 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php @@ -0,0 +1,81 @@ +id; + } + + public function getActive(): ?bool + { + return $this->active; + } + + public function setActive(bool $active): self + { + $this->active = $active; + + return $this; + } + + public function getCanceledBy(): ?string + { + return $this->canceledBy; + } + + public function setCanceledBy(string $canceledBy): self + { + $this->canceledBy = $canceledBy; + + return $this; + } + + public function getName(): ?array + { + return $this->name; + } + + public function setName(array $name): self + { + $this->name = $name; + + return $this; + } +} diff --git a/src/Bundle/ChillCalendarBundle/Entity/Invite.php b/src/Bundle/ChillCalendarBundle/Entity/Invite.php new file mode 100644 index 000000000..5baca36ab --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Entity/Invite.php @@ -0,0 +1,60 @@ +id; + } + + public function getStatus(): ?array + { + return $this->status; + } + + public function setStatus(array $status): self + { + $this->status = $status; + + return $this; + } + + public function getUser(): ?User + { + return $this->user; + } + + public function setUser(?User $user): self + { + $this->user = $user; + + return $this; + } +} diff --git a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php new file mode 100644 index 000000000..c2f3ea6ba --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php @@ -0,0 +1,228 @@ +translatableStringHelper = $translatableStringHelper; + $this->om = $om; + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('comment', CommentType::class, [ + 'required' => false + ]) + ->add('cancelReason', EntityType::class, [ + 'required' => false, + 'class' => CancelReason::class, + 'choice_label' => function (CancelReason $entity) { + return $entity->getCanceledBy(); + }, + ]) + ->add('sendSMS', ChoiceType::class, [ + 'required' => false, + 'choices' => [ + 'Oui' => true, + 'Non' => false + ], + 'expanded' => true + ]) + ; + + + $builder->add('mainUser', HiddenType::class); + $builder->get('mainUser') + ->addModelTransformer(new CallbackTransformer( + function (?User $user): int { + if (NULL !== $user) { + $res = $user->getId(); + } else { + $res = -1; //TODO cannot be null in any ways... + } + return $res; + }, + function (?int $userId): User { + return $this->om->getRepository(user::class)->findOneBy(['id' => (int) $userId]); + } + )) + ; + + $builder->add('startDate', HiddenType::class); + $builder->get('startDate') + ->addModelTransformer(new CallbackTransformer( + function (?DateTimeImmutable $dateTimeImmutable): string { + if (NULL !== $dateTimeImmutable) { + $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s'); + } else { + $res = ''; + } + return $res; + }, + function (?string $dateAsString): DateTimeImmutable { + dump($dateAsString); + return new DateTimeImmutable($dateAsString); + } + )) + ; + + $builder->add('endDate', HiddenType::class); + $builder->get('endDate') + ->addModelTransformer(new CallbackTransformer( + function (?DateTimeImmutable $dateTimeImmutable): string { + if (NULL !== $dateTimeImmutable) { + $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s'); + } else { + $res = ''; + } + return $res; + }, + function (?string $dateAsString): DateTimeImmutable { + return new DateTimeImmutable($dateAsString); + } + )) + ; + + $builder->add('persons', HiddenType::class); + $builder->get('persons') + ->addModelTransformer(new CallbackTransformer( + function (iterable $personsAsIterable): string { + $personIds = []; + foreach ($personsAsIterable as $value) { + $personIds[] = $value->getId(); + } + return implode(',', $personIds); + }, + function (?string $personsAsString): array { + return array_map( + fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]), + explode(',', $personsAsString) + ); + } + )) + ; + + $builder->add('professionals', HiddenType::class); + $builder->get('professionals') + ->addModelTransformer(new CallbackTransformer( + function (iterable $thirdpartyAsIterable): string { + $thirdpartyIds = []; + foreach ($thirdpartyAsIterable as $value) { + $thirdpartyIds[] = $value->getId(); + } + return implode(',', $thirdpartyIds); + }, + function (?string $thirdpartyAsString): array { + return array_map( + fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]), + explode(',', $thirdpartyAsString) + ); + } + )) + ; + + $builder->add('calendarRange', HiddenType::class); + $builder->get('calendarRange') + ->addModelTransformer(new CallbackTransformer( + function (?CalendarRange $calendarRange): ?int { + if (NULL !== $calendarRange) { + $res = $calendarRange->getId(); + } else { + $res = -1; + } + return $res; + }, + function (?string $calendarRangeId): ?CalendarRange { + if (NULL !== $calendarRangeId) { + $res = $this->om->getRepository(CalendarRange::class)->findOneBy(['id' => (int) $calendarRangeId]); + } else { + $res = NULL; + } + return $res; + } + )) + ; + + + // $builder->add('invites', HiddenType::class); + // $builder->get('invites') + // ->addModelTransformer(new CallbackTransformer( + // function (iterable $usersAsIterable): string { + // $userIds = []; + // foreach ($usersAsIterable as $value) { + // $userIds[] = $value->getId(); + // } + // return implode(',', $userIds); + // }, + // function (?string $usersAsString): array { + // return array_map( + // fn(string $id): ?Invite => $this->om->getRepository(Invite::class)->findOneBy(['id' => (int) $id]), + // explode(',', $usersAsString) + // ); + // } + // )) + // ; + + + }/** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => Calendar::class + ]); + + $resolver + ->setRequired(['accompanyingPeriod']) + ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']) + ; + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix() + { + return 'chill_calendarbundle_calendar'; + } + + +} + + diff --git a/src/Bundle/ChillCalendarBundle/LICENSE b/src/Bundle/ChillCalendarBundle/LICENSE new file mode 100644 index 000000000..2def0e883 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file diff --git a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php new file mode 100644 index 000000000..949dc0560 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseMenuBuilder.php @@ -0,0 +1,47 @@ +translator = $translator; + $this->authorizationHelper = $authorizationHelper; + $this->tokenStorage = $tokenStorage; + } + public static function getMenuIds(): array + { + return ['accompanyingCourse']; + } + + public function buildMenu($menuId, MenuItem $menu, array $parameters) + { + $period = $parameters['accompanyingCourse']; + + if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) { + $menu->addChild($this->translator->trans('Calendar list'), [ + 'route' => 'chill_calendar_calendar', + 'routeParameters' => [ + 'accompanying_period_id' => $period->getId(), + ]]) + ->setExtras(['order' => 41]); + } + } +} diff --git a/src/Bundle/ChillCalendarBundle/README.md b/src/Bundle/ChillCalendarBundle/README.md new file mode 100644 index 000000000..538a7ffa7 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/README.md @@ -0,0 +1,6 @@ +Calendar bundle +=============== + +This bundle adds a calendar to chill. + + diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php new file mode 100644 index 000000000..152c0f097 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('c') + ->andWhere('c.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('c.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?CalendarRange + { + return $this->createQueryBuilder('c') + ->andWhere('c.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php new file mode 100644 index 000000000..edb51bb35 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('c') + ->andWhere('c.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('c.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?Calendar + { + return $this->createQueryBuilder('c') + ->andWhere('c.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php new file mode 100644 index 000000000..5bd07fbd9 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('c') + ->andWhere('c.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('c.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?CancelReason + { + return $this->createQueryBuilder('c') + ->andWhere('c.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php new file mode 100644 index 000000000..ece11269f --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('i') + ->andWhere('i.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('i.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?Invite + { + return $this->createQueryBuilder('i') + ->andWhere('i.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/routing.yml b/src/Bundle/ChillCalendarBundle/Resources/config/routing.yml new file mode 100644 index 000000000..70ce2b6d4 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/config/routing.yml @@ -0,0 +1,3 @@ +chill_calendar_controllers: + resource: '../../Controller/' + type: annotation diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services.yml new file mode 100644 index 000000000..c41c2ad93 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/config/services.yml @@ -0,0 +1,14 @@ +--- +services: + + Chill\CalendarBundle\Repository\: + autowire: true + resource: '../../Repository/' + tags: + - { name: 'doctrine.repository_service' } + + Chill\CalendarBundle\Menu\: + autowire: true + autoconfigure: true + resource: '../../Menu/' + tags: ['chill.menu_builder'] diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml new file mode 100644 index 000000000..a0457c5a8 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml @@ -0,0 +1,5 @@ +services: + Chill\CalendarBundle\Controller\: + autowire: true + resource: '../../../Controller' + tags: ['controller.service_arguments'] diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml new file mode 100644 index 000000000..2bef0bdc4 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml @@ -0,0 +1,13 @@ +--- +services: + Chill\CalendarBundle\DataFixtures\ORM\LoadCancelReason: + tags: + - { 'name': doctrine.fixture.orm } + Chill\CalendarBundle\DataFixtures\ORM\LoadInvite: + tags: + - { 'name': doctrine.fixture.orm } + Chill\CalendarBundle\DataFixtures\ORM\LoadCalendarRange: + autowire: true + autoconfigure: true + tags: + - { 'name': doctrine.fixture.orm } \ No newline at end of file diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/form.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/form.yml new file mode 100644 index 000000000..85095dc9a --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/form.yml @@ -0,0 +1,10 @@ +--- +services: + chill.calendar.form.type.calendar: + class: Chill\CalendarBundle\Form\CalendarType + arguments: + - "@chill.main.helper.translatable_string" + - "@doctrine.orm.entity_manager" + + tags: + - { name: form.type, alias: chill_calendarbundle_calendar } \ No newline at end of file diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue new file mode 100644 index 000000000..fb4429a1d --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue @@ -0,0 +1,127 @@ + + + + diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js new file mode 100644 index 000000000..c086fed07 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js @@ -0,0 +1,23 @@ +import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n' +import { calendarUserSelectorMessages } from '../_components/CalendarUserSelector/js/i18n'; + +const appMessages = { + fr: { + choose_your_date: "Sélectionnez votre plage", + activity: { + add_persons: "Ajouter des personnes concernées", + bloc_persons: "Usagers", + bloc_persons_associated: "Usagers du parcours", + bloc_persons_not_associated: "Tiers non-pro.", + bloc_thirdparty: "Tiers professionnels", + bloc_users: "T(M)S", + } + } +} + +Object.assign(appMessages.fr, personMessages.fr); +Object.assign(appMessages.fr, calendarUserSelectorMessages.fr); + +export { + appMessages +}; diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/index.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/index.js new file mode 100644 index 000000000..d4c07f4a7 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/index.js @@ -0,0 +1,16 @@ +import { createApp } from 'vue'; +import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n' +import { appMessages } from './i18n' +import store from './store' + +import App from './App.vue'; + +const i18n = _createI18n(appMessages); + +const app = createApp({ + template: ``, +}) +.use(store) +.use(i18n) +.component('app', App) +.mount('#calendar'); diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js new file mode 100644 index 000000000..03d0548dc --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js @@ -0,0 +1,136 @@ +import 'es6-promise/auto'; +import { createStore } from 'vuex'; + +const debug = process.env.NODE_ENV !== 'production'; + +const addIdToValue = (string, id) => { + let array = string ? string.split(',') : []; + array.push(id.toString()); + let str = array.join(); + return str; +}; + +const removeIdFromValue = (string, id) => { + let array = string.split(','); + array = array.filter(el => el !== id.toString()); + let str = array.join(); + return str; +}; + +/* +* Assign missing keys for the ConcernedGroups component +*/ +const mapEntity = (entity) => { + Object.assign(entity, {thirdParties: entity.professionals, users: entity.invites}); + return entity; +}; + +const store = createStore({ + strict: debug, + state: { + activity: mapEntity(window.entity), + currentEvent: null + }, + mutations: { + + // ConcernedGroups + addPersonsInvolved(state, payload) { + //console.log('### mutation addPersonsInvolved', payload.result.type); + switch (payload.result.type) { + case 'person': + state.activity.persons.push(payload.result); + break; + case 'thirdparty': + state.activity.thirdParties.push(payload.result); + break; + case 'user': + state.activity.users.push(payload.result); + break; + }; + }, + removePersonInvolved(state, payload) { + //console.log('### mutation removePersonInvolved', payload.type); + switch (payload.type) { + case 'person': + state.activity.persons = state.activity.persons.filter(person => person !== payload); + break; + case 'thirdparty': + state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload); + break; + case 'user': + state.activity.users = state.activity.users.filter(user => user !== payload); + break; + }; + }, + // Calendar + setEvents(state, payload) { + console.log(payload) + state.currentEvent = {start: payload.start, end: payload.end} + } + }, + actions: { + addPersonsInvolved({ commit }, payload) { + console.log('### action addPersonsInvolved', payload.result.type); + switch (payload.result.type) { + case 'person': + let aPersons = document.getElementById("chill_calendarbundle_calendar_persons"); + aPersons.value = addIdToValue(aPersons.value, payload.result.id); + break; + case 'thirdparty': + let aThirdParties = document.getElementById("chill_calendarbundle_calendar_professionals"); + aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id); + break; + case 'user': + let aUsers = document.getElementById("chill_calendarbundle_calendar_invites"); + aUsers.value = addIdToValue(aUsers.value, payload.result.id); + break; + }; + commit('addPersonsInvolved', payload); + }, + removePersonInvolved({ commit }, payload) { + //console.log('### action removePersonInvolved', payload); + switch (payload.type) { + case 'person': + let aPersons = document.getElementById("chill_calendarbundle_calendar_persons"); + aPersons.value = removeIdFromValue(aPersons.value, payload.id); + break; + case 'thirdparty': + let aThirdParties = document.getElementById("chill_calendarbundle_calendar_professionals"); + aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id); + break; + case 'user': + let aUsers = document.getElementById("chill_calendarbundle_calendar_invites"); + aUsers.value = removeIdFromValue(aUsers.value, payload.id); + break; + }; + commit('removePersonInvolved', payload); + }, + + // Calendar + createEvent({ commit }, payload) { + console.log('### action createEvent', payload); + let startDateInput = document.getElementById("chill_calendarbundle_calendar_startDate"); + startDateInput.value = payload.startStr; + let endDateInput = document.getElementById("chill_calendarbundle_calendar_endDate"); + endDateInput.value = payload.endStr; + let mainUserInput = document.getElementById("chill_calendarbundle_calendar_mainUser"); + mainUserInput.value = payload.users.logged.id; + commit('setEvents', payload); + }, + updateEvent({ commit }, payload) { + console.log('### action updateEvent', payload); + let startDateInput = document.getElementById("chill_calendarbundle_calendar_startDate"); + startDateInput.value = payload.event.start.toISOString(); + let endDateInput = document.getElementById("chill_calendarbundle_calendar_endDate"); + endDateInput.value = payload.event.end.toISOString(); + let calendarRangeInput = document.getElementById("chill_calendarbundle_calendar_calendarRange"); + calendarRangeInput.value = Number(payload.event.extendedProps.calendarRangeId); + let mainUserInput = document.getElementById("chill_calendarbundle_calendar_mainUser"); + mainUserInput.value = Number(payload.event.source.id); + commit('setEvents', payload); + }, + + } +}); + +export default store; diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue new file mode 100644 index 000000000..c0db531ac --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/api.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/api.js new file mode 100644 index 000000000..a11ca8498 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/api.js @@ -0,0 +1,32 @@ +/* +* Endpoint chill_api_single_calendar_range +* method GET, get Calendar ranges +* @returns {Promise} a promise containing all Calendar ranges objects +*/ +const fetchCalendarRanges = () => { + const url = `/api/1.0/calendar/calendar-range-available.json`; + return fetch(url) + .then(response => { + if (response.ok) { return response.json(); } + throw Error('Error with request resource response'); + }); +}; + +/* +* Endpoint chill_api_single_calendar +* method GET, get Calendar events, can be filtered by mainUser +* @returns {Promise} a promise containing all Calendar objects +*/ +const fetchCalendar = (mainUserId) => { + const url = `/api/1.0/calendar/calendar.json?main_user=${mainUserId}&item_per_page=1000`; + return fetch(url) + .then(response => { + if (response.ok) { return response.json(); } + throw Error('Error with request resource response'); + }); +}; + +export { + fetchCalendarRanges, + fetchCalendar +}; diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js new file mode 100644 index 000000000..d5491df8c --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js @@ -0,0 +1,12 @@ +const calendarUserSelectorMessages = { + fr: { + choose_your_calendar_user: "Afficher les plages de disponibilités", + select_user: "Sélectionnez des calendriers", + show_my_calendar: "Affichez mon calendrier" + } + }; + + export { + calendarUserSelectorMessages + }; + \ No newline at end of file diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig new file mode 100644 index 000000000..d957293b2 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig @@ -0,0 +1,16 @@ +{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} + +{% set activeRouteKey = 'chill_calendar_calendar' %} + +{% block title 'Remove calendar item'|trans %} + +{% block content %} + {{ include('@ChillMain/Util/confirmation_template.html.twig', + { + 'title' : 'Remove calendar item'|trans, + 'confirm_question' : 'Are you sure you want to remove the calendar item?'|trans, + 'cancel_route' : 'chill_calendar_calendar', + 'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : calendar.id }, + 'form' : delete_form + } ) }} +{% endblock %} diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig new file mode 100644 index 000000000..9f8172bb4 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig @@ -0,0 +1,17 @@ +{% extends "@ChillPerson/Person/layout.html.twig" %} + +{% set activeRouteKey = 'chill_activity_activity_list' %} +{% set person = activity.person %} + +{% block title 'Remove activity'|trans %} + +{% block personcontent %} +{{ include('@ChillMain/Util/confirmation_template.html.twig', + { + 'title' : 'Remove activity'|trans, + 'confirm_question' : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname } ), + 'cancel_route' : 'chill_activity_activity_list', + 'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id }, + 'form' : delete_form + } ) }} +{% endblock %} diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig new file mode 100644 index 000000000..784d3686d --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig @@ -0,0 +1,78 @@ +

{{ "Update calendar"|trans }}

+ +{{ form_start(form) }} +{{ form_errors(form) }} + +{%- if form.mainUser is defined -%} + {{ form_row(form.mainUser) }} +{% endif %} + +

{{ 'Concerned groups'|trans }}

+ +{%- if form.persons is defined -%} + {{ form_widget(form.persons) }} +{% endif %} +{%- if form.professionals is defined -%} + {{ form_widget(form.professionals) }} +{% endif %} +{%- if form.nonProfessionals is defined -%} + {{ form_widget(form.nonProfessionals) }} +{% endif %} +{%- if form.users is defined -%} + {{ form_widget(form.users) }} +{% endif %} + +
+ +

{{ 'Calendar data'|trans }}

+ +{%- if form.startDate is defined -%} + {{ form_row(form.startDate) }} +{% endif %} + +{%- if form.endDate is defined -%} + {{ form_row(form.endDate) }} +{% endif %} + +{%- if form.calendarRange is defined -%} + {{ form_row(form.calendarRange) }} +{% endif %} + +.. location + +{%- if form.cancelReason is defined -%} + {{ form_row(form.cancelReason) }} +{% endif %} + +{%- if form.comment is defined -%} + {{ form_row(form.comment) }} +{% endif %} + +{%- if form.sendSMS is defined -%} + {{ form_row(form.sendSMS) }} +{% endif %} + + +..calendarRange + + +{{ form_end(form) }} + diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig new file mode 100644 index 000000000..d0295d0e2 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig @@ -0,0 +1,38 @@ +{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} + +{% set activeRouteKey = 'chill_calendar_calendar_list' %} + +{% block title 'Update calendar'|trans %} + +{% block content %} +
+
+
+ +
{# <=== vue component #} + {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'accompanyingCourse'} %} + +
+
+
+{% endblock %} + +{% block js %} + {{ parent() }} + + {{ encore_entry_script_tags('vue_calendar') }} +{% endblock %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('vue_calendar') }} +{% endblock %} diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig new file mode 100644 index 000000000..c7ad42343 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig @@ -0,0 +1,142 @@ +{% set user_id = null %} +{% if user %} + {% set user_id = user.id %} +{% endif %} + +{% set accompanying_course_id = null %} +{% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} +{% endif %} + +

{{ 'Calendar list' |trans }}

+ +{% if calendarItems|length == 0 %} +

+ {{ "There is no calendar items."|trans }} + +

+{% else %} + +
+ + {% for calendar in calendarItems %} + +
+
+
+ + {% if calendar.startDate %} +

{{ calendar.startDate|format_datetime('long') }}

+ {% endif %} + + {% if calendar.endDate %} +

{{ calendar.endDate|format_datetime('long') }}

+ {% endif %} + + +
+

+ + {{ calendar.endDate.diff(calendar.startDate)|date("%H:%M")}} +

+
+ + {% if context == 'user' and calendar.accompanyingPeriod is not empty %} +
+ + + {{ calendar.accompanyingPeriod.id }} + +
+ {% endif %} + +
+
+
    + {% if calendar.user %} +
  • + {{ 'by'|trans }}{{ calendar.user.usernameCanonical }} +
    • + {% endif %} + + {% if calendar.mainUser is not empty %} +
  • + {{ 'main user concerned'|trans }}{{ calendar.mainUser.usernameCanonical }} +
    • + {% endif %} + + +
  • + {%- if calendar.comment.isEmpty -%} + {{ 'No comments'|trans }} + {%- else -%} + {{ calendar.comment|chill_entity_render_box }} + {%- endif -%} +
    • + + +
+
    +
  • + +
    • + {# TOOD + {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %} + #} +
  • + +
    • + {# TOOD + {% endif %} + {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %} + #} +
  • + +
    • + {# + {% endif %} + #} +
+
+
+ + {% + if calendar.comment.comment is not empty + or calendar.users|length > 0 + or calendar.thirdParties|length > 0 + or calendar.users|length > 0 + %} +
+
+ + {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %} +
+ + {% if calendar.comment.comment is not empty %} +
+ {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }} +
+ {% endif %} +
+ {% endif %} + +
+ {% endfor %} +
+{% endif %} + +{% if context != 'user' %} +{# TODO set this condition in configuration #} + +{% endif %} diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig new file mode 100644 index 000000000..c0230344d --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig @@ -0,0 +1,9 @@ +{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} + +{% set activeRouteKey = 'chill_calendar_calendar_list' %} + +{% block title %}{{ 'Calendar list' |trans }}{% endblock title %} + +{% block content %} + {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'accompanyingCourse'} %} +{% endblock %} diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig new file mode 100644 index 000000000..501f2ebe1 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig @@ -0,0 +1,79 @@ +

{{ "Calendar item creation"|trans ~ ' :' }}

+ +{{ form_start(form) }} +{{ form_errors(form) }} + +{%- if form.mainUser is defined -%} + {{ form_row(form.mainUser) }} +{% endif %} + +

{{ 'Concerned groups'|trans }}

+ +{%- if form.persons is defined -%} + {{ form_widget(form.persons) }} +{% endif %} +{%- if form.professionals is defined -%} + {{ form_widget(form.professionals) }} +{% endif %} +{%- if form.nonProfessionals is defined -%} + {{ form_widget(form.nonProfessionals) }} +{% endif %} +{%- if form.users is defined -%} + {{ form_widget(form.users) }} +{% endif %} + +
+ +

{{ 'Calendar data'|trans }}

+ +{%- if form.startDate is defined -%} + {{ form_row(form.startDate) }} +{% endif %} + +{%- if form.endDate is defined -%} + {{ form_row(form.endDate) }} +{% endif %} + +{%- if form.calendarRange is defined -%} + {{ form_row(form.calendarRange) }} +{% endif %} + +.. location + +{%- if form.cancelReason is defined -%} + {{ form_row(form.cancelReason) }} +{% endif %} + +{%- if form.comment is defined -%} + {{ form_row(form.comment) }} +{% endif %} + +{%- if form.sendSMS is defined -%} + {{ form_row(form.sendSMS) }} +{% endif %} + + +..calendarRange + + + + +{{ form_end(form) }} diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig new file mode 100644 index 000000000..b28f7060f --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig @@ -0,0 +1,37 @@ +{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} + +{% set activeRouteKey = 'chill_calendar_calendar_new' %} + +{% block title 'Calendar item creation' |trans %} + +{% block content %} +
+
+
+ +
{# <=== vue component #} + {% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'accompanyingCourse'} %} + +
+
+
+{% endblock %} + +{% block js %} + {{ parent() }} + + {{ encore_entry_script_tags('vue_calendar') }} +{% endblock %} + +{% block css %} + {{ parent() }} + +{% endblock %} + + diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig new file mode 100644 index 000000000..f6df7ccdf --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig @@ -0,0 +1,79 @@ +

{{ "Calendar"|trans }}

+ +
+
{{ 'main user concerned'|trans }}
+
{{ entity.mainUser }}
+
+ +

{{ 'Concerned groups'|trans }}

+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %} + + +

{{ 'Calendar data'|trans }}

+ +
{{ 'start date'|trans }}
+
{{ entity.startDate|format_datetime('long') }}
+ +
{{ 'end date'|trans }}
+
{{ entity.endDate|format_datetime('long') }}
+ +
{{ 'cancel reason'|trans }}
+
+ {% if entity.cancelReason is not null %} + {{ entity.cancelReason.canceledBy|localize_translatable_string }} + {% else %} + {{ 'Unknown'|trans }} + {% endif %} +
+ +
{{ 'status'|trans }}
+
{{ entity.status }}
+ + {% if not entity.comment.isEmpty %} +
{{ 'calendar comment'|trans }}
+
{{ entity.comment|chill_entity_render_box }}
+ {% endif %} + +
{{ 'sendSMS'|trans }}
+
+ {% if entity.sendSMS is not null %} + {% if entity.sendSMS %}{{ 'Yes'|trans }}{% else %}{{ 'No'|trans }}{% endif %} + {% else %} + {{ 'Unknown'|trans }} + {% endif %} +
+ + + + +{% set accompanying_course_id = null %} +{% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} +{% endif %} + + diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showAccompanyingCourse.html.twig new file mode 100644 index 000000000..587d764b8 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showAccompanyingCourse.html.twig @@ -0,0 +1,15 @@ +{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %} + +{% set activeRouteKey = 'chill_calendar_calendar_list' %} + +{% block title 'Calendar'|trans %} + +{% block content -%} +
+
+
+ {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'accompanyingCourse'} %} +
+
+
+{% endblock content %} diff --git a/src/Bundle/ChillCalendarBundle/chill.webpack.config.js b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js new file mode 100644 index 000000000..74f1dd6ea --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/chill.webpack.config.js @@ -0,0 +1,10 @@ +// this file loads all assets from the Chill calendar bundle +module.exports = function(encore, entries) { + //entries.push(__dirname + '/Resources/public/index.js'); + + encore.addAliases({ + ChillCalendarAssets: __dirname + '/Resources/public' + }); + + encore.addEntry('vue_calendar', __dirname + '/Resources/public/vuejs/Calendar/index.js'); +}; diff --git a/src/Bundle/ChillCalendarBundle/composer.json b/src/Bundle/ChillCalendarBundle/composer.json new file mode 100644 index 000000000..fc96ea04b --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/composer.json @@ -0,0 +1,30 @@ +{ + "name": "chill-project/calendar", + "description": "This bundle extends chill for managing a calendar", + "type": "symfony-bundle", + "license": "AGPL-3.0-or-later", + "keywords" : ["chill", "social work"], + "homepage" : "hhttps://gitlab.com/Chill-Projet/chill-bundles/", + "autoload": { + "psr-4": { "Chill\\CalendarBundle\\": "" } + }, + "autoload-dev": { + "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + }, + "authors": [ + { + "name": "Champs-Libres", + "email": "info@champs-libres.coop" + } + ], + "require": { + }, + "require-dev": { + }, + "extra": { + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", + "symfony-app-dir": "Test/Fixtures/App/app/" + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php new file mode 100644 index 000000000..7e535fe27 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php @@ -0,0 +1,99 @@ +addSql('CREATE SCHEMA chill_calendar'); + $this->addSql('CREATE SEQUENCE chill_calendar.calendar_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_calendar.calendar_range_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_calendar.cancel_reason_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_calendar.invite_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_calendar.calendar (id INT NOT NULL, user_id INT DEFAULT NULL, activity_id INT DEFAULT NULL, startDate DATE NOT NULL, endDate DATE NOT NULL, status VARCHAR(255) NOT NULL, sendSMS BOOLEAN DEFAULT NULL, comment_comment TEXT DEFAULT NULL, comment_userId INT DEFAULT NULL, comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, accompanyingPeriod_id INT DEFAULT NULL, mainUser_id INT DEFAULT NULL, cancelReason_id INT DEFAULT NULL, calendarRange_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_712315ACA76ED395 ON chill_calendar.calendar (user_id)'); + $this->addSql('CREATE INDEX IDX_712315ACD7FA8EF0 ON chill_calendar.calendar (accompanyingPeriod_id)'); + $this->addSql('CREATE INDEX IDX_712315ACEFCB59C ON chill_calendar.calendar (mainUser_id)'); + $this->addSql('CREATE INDEX IDX_712315ACE980772F ON chill_calendar.calendar (cancelReason_id)'); + $this->addSql('CREATE INDEX IDX_712315ACC5CB285D ON chill_calendar.calendar (calendarRange_id)'); + $this->addSql('CREATE INDEX IDX_712315AC81C06096 ON chill_calendar.calendar (activity_id)'); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('CREATE TABLE chill_calendar.calendar_to_persons (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))'); + $this->addSql('CREATE INDEX IDX_AEE94715A40A2C8 ON chill_calendar.calendar_to_persons (calendar_id)'); + $this->addSql('CREATE INDEX IDX_AEE94715217BBB47 ON chill_calendar.calendar_to_persons (person_id)'); + $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))'); + $this->addSql('CREATE INDEX IDX_FADF2C77A40A2C8 ON chill_calendar.calendar_to_non_professionals (calendar_id)'); + $this->addSql('CREATE INDEX IDX_FADF2C77217BBB47 ON chill_calendar.calendar_to_non_professionals (person_id)'); + $this->addSql('CREATE TABLE chill_calendar.calendar_to_thirdparties (calendar_id INT NOT NULL, thirdparty_id INT NOT NULL, PRIMARY KEY(calendar_id, thirdparty_id))'); + $this->addSql('CREATE INDEX IDX_2BAB7EFDA40A2C8 ON chill_calendar.calendar_to_thirdparties (calendar_id)'); + $this->addSql('CREATE INDEX IDX_2BAB7EFDC7D3A8E6 ON chill_calendar.calendar_to_thirdparties (thirdparty_id)'); + $this->addSql('CREATE TABLE chill_calendar.calendar_to_invites (calendar_id INT NOT NULL, invite_id INT NOT NULL, PRIMARY KEY(calendar_id, invite_id))'); + $this->addSql('CREATE INDEX IDX_FCBEAAAA40A2C8 ON chill_calendar.calendar_to_invites (calendar_id)'); + $this->addSql('CREATE INDEX IDX_FCBEAAAEA417747 ON chill_calendar.calendar_to_invites (invite_id)'); + $this->addSql('CREATE TABLE chill_calendar.calendar_range (id INT NOT NULL, user_id INT DEFAULT NULL, startDate DATE NOT NULL, endDate DATE NOT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_38D57D05A76ED395 ON chill_calendar.calendar_range (user_id)'); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:date_immutable)\''); + $this->addSql('CREATE TABLE chill_calendar.cancel_reason (id INT NOT NULL, active BOOLEAN NOT NULL, canceledBy JSON NOT NULL, name JSON NOT NULL, PRIMARY KEY(id))'); + $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.name IS \'(DC2Type:json_array)\''); + $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS \'(DC2Type:json_array)\''); + $this->addSql('CREATE TABLE chill_calendar.invite (id INT NOT NULL, user_id INT DEFAULT NULL, status JSON NOT NULL, PRIMARY KEY(id))'); + $this->addSql('COMMENT ON COLUMN chill_calendar.invite.status IS \'(DC2Type:json_array)\''); + $this->addSql('CREATE INDEX IDX_F517FFA7A76ED395 ON chill_calendar.invite (user_id)'); + $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACEFCB59C FOREIGN KEY (mainUser_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACE980772F FOREIGN KEY (cancelReason_id) REFERENCES chill_calendar.cancel_reason (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACC5CB285D FOREIGN KEY (calendarRange_id) REFERENCES chill_calendar.calendar_range (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315AC81C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons ADD CONSTRAINT FK_AEE94715A40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons ADD CONSTRAINT FK_AEE94715217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT FK_FADF2C77A40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT FK_FADF2C77217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties ADD CONSTRAINT FK_2BAB7EFDA40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties ADD CONSTRAINT FK_2BAB7EFDC7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites ADD CONSTRAINT FK_FCBEAAAA40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites ADD CONSTRAINT FK_FCBEAAAEA417747 FOREIGN KEY (invite_id) REFERENCES chill_calendar.invite (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_range ADD CONSTRAINT FK_38D57D05A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.invite ADD CONSTRAINT FK_F517FFA7A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons DROP CONSTRAINT FK_AEE94715A40A2C8'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals DROP CONSTRAINT FK_FADF2C77A40A2C8'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties DROP CONSTRAINT FK_2BAB7EFDA40A2C8'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAA40A2C8'); + $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACC5CB285D'); + $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACE980772F'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAEA417747'); + $this->addSql('DROP SEQUENCE chill_calendar.calendar_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_calendar.calendar_range_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_calendar.cancel_reason_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_calendar.invite_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_calendar.calendar'); + $this->addSql('DROP TABLE chill_calendar.calendar_to_persons'); + $this->addSql('DROP TABLE chill_calendar.calendar_to_non_professionals'); + $this->addSql('DROP TABLE chill_calendar.calendar_to_thirdparties'); + $this->addSql('DROP TABLE chill_calendar.calendar_to_invites'); + $this->addSql('DROP TABLE chill_calendar.calendar_range'); + $this->addSql('DROP TABLE chill_calendar.cancel_reason'); + $this->addSql('DROP TABLE chill_calendar.invite'); + $this->addSql('DROP SCHEMA chill_calendar'); + } +} diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php new file mode 100644 index 000000000..3f85968c4 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php @@ -0,0 +1,39 @@ +addSql('DROP TABLE chill_calendar.calendar_to_non_professionals'); + $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledby TYPE VARCHAR(255)'); + $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledby DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS NULL'); + } + + public function down(Schema $schema): void + { + $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))'); + $this->addSql('CREATE INDEX idx_fadf2c77217bbb47 ON chill_calendar.calendar_to_non_professionals (person_id)'); + $this->addSql('CREATE INDEX idx_fadf2c77a40a2c8 ON chill_calendar.calendar_to_non_professionals (calendar_id)'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77a40a2c8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy TYPE JSON'); + $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledby IS \'(DC2Type:json_array)\''); + } +} diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php new file mode 100644 index 000000000..0af4fb1b8 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php @@ -0,0 +1,39 @@ +addSql('ALTER TABLE chill_calendar.calendar ALTER startdate TYPE TIMESTAMP(0) WITH TIME ZONE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startdate DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate TYPE TIMESTAMP(0) WITH TIME ZONE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:datetimetz_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:datetimetz_immutable)\''); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate TYPE DATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate TYPE DATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startdate IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.enddate IS \'(DC2Type:date_immutable)\''); + } +} diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php new file mode 100644 index 000000000..5b77338c3 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php @@ -0,0 +1,39 @@ +addSql('ALTER TABLE chill_calendar.calendar_range ALTER startdate TYPE TIMESTAMP(0) WITH TIME ZONE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startdate DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER enddate TYPE TIMESTAMP(0) WITH TIME ZONE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER enddate DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:datetimetz_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:datetimetz_immutable)\''); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate TYPE DATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate TYPE DATE'); + $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate DROP DEFAULT'); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startdate IS \'(DC2Type:date_immutable)\''); + $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.enddate IS \'(DC2Type:date_immutable)\''); + } +} diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml new file mode 100644 index 000000000..e77624061 --- /dev/null +++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml @@ -0,0 +1,20 @@ +Calendar: Rendez-vous +Calendar list: Liste des rendez-vous +There is no calendar items.: Il n'y a pas de rendez-vous +Remove calendar item: Supprimer le rendez-vous +Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir supprimer le rendez-vous? +Concerned groups: Parties concernées +Calendar data: Données du rendez-vous +Update calendar: Modifier le rendez-vous +main user concerned: Utilisateur principal +Main user: Utilisateur principal +Calendar item creation: Création du rendez-vous +start date: début du rendez-vous +end date: fin du rendez-vous +cancel reason: motif d'annulation +status: Statut du rendez-vous +calendar comment: Remarque sur le rendez-vous +sendSMS: Envoi d'un SMS +Send s m s: Envoi d'un SMS ? +Cancel reason: Motif d'annulation +Add a new calendar: Ajouter un nouveau rendez-vous