diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
index ef6faa9c6..330a2ab13 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -38,6 +38,11 @@
{{ 'Duration'|trans }}
{{ entity.duration|date('H:i') }}
+ {% if chill_aside_activity_config.show_concerned_persons_count == 'visible' %}
+ {{ 'Concerned persons count'|trans }}
+ {{ entity.concernedPersonsCount }}
+ {% endif %}
+
{{ 'Remark'|trans }}
{%- if entity.note is empty -%}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
new file mode 100644
index 000000000..a1d133d8c
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
@@ -0,0 +1,49 @@
+get(EntityManagerInterface::class);
+
+ return [
+ $em->createQueryBuilder()
+ ->select('count(aside.id)')
+ ->from(AsideActivity::class, 'aside'),
+ ];
+ }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
new file mode 100644
index 000000000..499986ac1
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
@@ -0,0 +1,50 @@
+get(AsideActivityRepository::class);
+
+ yield new SumConcernedPersonsCountAsideActivity($repository);
+ }
+
+ public static function getFormData(): array
+ {
+ return [
+ [],
+ ];
+ }
+
+ public static function getModifiersCombination(): array
+ {
+ return [
+ ['aside_activity'],
+ ];
+ }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
index 40cb120da..efba7a8af 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
@@ -20,6 +20,10 @@ services:
tags:
- { name: chill.export, alias: 'avg_aside_activity_duration' }
+ Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity:
+ tags:
+ - { name: chill.export, alias: 'sum_aside_activity_concerned_persons_count' }
+
## Filters
chill.aside_activity.export.date_filter:
class: Chill\AsideActivityBundle\Export\Filter\ByDateFilter
@@ -70,3 +74,7 @@ services:
Chill\AsideActivityBundle\Export\Aggregator\ByLocationAggregator:
tags:
- { name: chill.export_aggregator, alias: 'aside_activity_location_aggregator' }
+
+ Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator:
+ tags:
+ - { name: chill.export_aggregator, alias: 'aside_activity_concerned_persons_count_aggregator' }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
new file mode 100644
index 000000000..8ea1dbf4c
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
@@ -0,0 +1,33 @@
+addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT 0');
+ }
+
+ public function down(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP concernedPersonsCount');
+ }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 7d3c7a20e..1b0e39e1b 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -27,6 +27,7 @@ Emergency: Urgent
by: "Par "
location: Lieu
Asideactivity location: Localisation de l'activité
+Concerned persons count: Nombre d'usager concernés
# Crud
crud:
@@ -177,7 +178,7 @@ export:
agent_id: Utilisateur
creator_id: Créateur
main_scope: Service principal de l'utilisateur
- main_center: Centre principal de l'utilisateur
+ main_center: Territoire principal de l'utilisateur
aside_activity_type: Catégorie d'activité annexe
date: Date
duration: Durée
@@ -190,6 +191,7 @@ export:
Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
Average aside activities duration: Durée moyenne des activités annexes
Sum aside activities duration: Durée des activités annexes
+ Sum concerned persons count for aside activities: Nombre d'usager concernés par les activités annexes
filter:
Filter by aside activity date: Filtrer les activités annexes par date
Filter by aside activity type: Filtrer les activités annexes par type d'activité
@@ -210,6 +212,8 @@ export:
'Filtered by aside activity location: only %location%': "Filtré par localisation: uniquement %location%"
aggregator:
Group by aside activity type: Grouper les activités annexes par type d'activité
+ Group by concerned persons count: Grouper les activités annexes par nombre d'usagers conernés
+ Concerned persons count: Nombre d'usagers concernés
Aside activity type: Type d'activité annexe
by_user_job:
Aggregate by user job: Grouper les activités annexes par métier des utilisateurs
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 94db03b1f..6705d7bb7 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -13,6 +13,7 @@ namespace Chill\CalendarBundle\Controller;
use Chill\CalendarBundle\Entity\Calendar;
use Chill\CalendarBundle\Form\CalendarType;
+use Chill\CalendarBundle\Form\CancelType;
use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
use Chill\CalendarBundle\Security\Voter\CalendarVoter;
@@ -30,6 +31,7 @@ use Chill\PersonBundle\Repository\PersonRepository;
use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
use Chill\PersonBundle\Security\Authorization\PersonVoter;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\EntityManagerInterface;
use http\Exception\UnexpectedValueException;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -60,6 +62,7 @@ class CalendarController extends AbstractController
private readonly UserRepositoryInterface $userRepository,
private readonly TranslatorInterface $translator,
private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+ private readonly EntityManagerInterface $em,
) {}
/**
@@ -111,6 +114,55 @@ class CalendarController extends AbstractController
]);
}
+ #[Route(path: '/{_locale}/calendar/calendar/{id}/cancel', name: 'chill_calendar_calendar_cancel')]
+ public function cancelAction(Calendar $calendar, Request $request): Response
+ {
+ // Deal with sms being sent or not
+ // Communicate cancellation with the remote calendar.
+
+ $this->denyAccessUnlessGranted(CalendarVoter::EDIT, $calendar);
+
+ [$person, $accompanyingPeriod] = [$calendar->getPerson(), $calendar->getAccompanyingPeriod()];
+
+ $form = $this->createForm(CancelType::class, $calendar);
+ $form->add('submit', SubmitType::class);
+
+ if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+ $view = '@ChillCalendar/Calendar/cancelCalendarByAccompanyingCourse.html.twig';
+ $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
+ } elseif ($person instanceof Person) {
+ $view = '@ChillCalendar/Calendar/cancelCalendarByPerson.html.twig';
+ $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
+ } else {
+ throw new \RuntimeException('nor person or accompanying period');
+ }
+
+ $form->handleRequest($request);
+
+ if ($form->isSubmitted() && $form->isValid()) {
+
+ $this->logger->notice('A calendar event has been cancelled', [
+ 'by_user' => $this->getUser()->getUsername(),
+ 'calendar_id' => $calendar->getId(),
+ ]);
+
+ $calendar->setStatus($calendar::STATUS_CANCELED);
+ $calendar->setSmsStatus($calendar::SMS_CANCEL_PENDING);
+ $this->em->flush();
+
+ $this->addFlash('success', $this->translator->trans('chill_calendar.calendar_canceled'));
+
+ return new RedirectResponse($redirectRoute);
+ }
+
+ return $this->render($view, [
+ 'calendar' => $calendar,
+ 'form' => $form->createView(),
+ 'accompanyingCourse' => $accompanyingPeriod,
+ 'person' => $person,
+ ]);
+ }
+
/**
* Edit a calendar item.
*/
@@ -266,7 +318,7 @@ class CalendarController extends AbstractController
}
if (!$this->getUser() instanceof User) {
- throw new UnauthorizedHttpException('you are not an user');
+ throw new UnauthorizedHttpException('you are not a user');
}
$view = '@ChillCalendar/Calendar/listByUser.html.twig';
diff --git a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
new file mode 100644
index 000000000..7af5ac18f
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
@@ -0,0 +1,58 @@
+denyAccessUnlessGranted('ROLE_USER');
+
+ $user = $this->getUser();
+
+ if (!$user instanceof User) {
+ throw new UnauthorizedHttpException('you are not a user');
+ }
+
+ $total = count($this->inviteRepository->findBy(['user' => $user]));
+ $paginator = $this->paginator->create($total);
+
+ $invitations = $this->inviteRepository->findBy(
+ ['user' => $user],
+ ['createdAt' => 'DESC'],
+ $paginator->getItemsPerPage(),
+ $paginator->getCurrentPageFirstItemNumber()
+ );
+
+ $view = '@ChillCalendar/Invitations/listByUser.html.twig';
+
+ return $this->render($view, [
+ 'invitations' => $invitations,
+ 'paginator' => $paginator,
+ 'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
+ ]);
+ }
+}
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
index d7e552d5d..2a8e371e0 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -35,7 +35,7 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
$arr = [
['name' => CancelReason::CANCELEDBY_USER],
['name' => CancelReason::CANCELEDBY_PERSON],
- ['name' => CancelReason::CANCELEDBY_DONOTCOUNT],
+ ['name' => CancelReason::CANCELEDBY_OTHER],
];
foreach ($arr as $a) {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index dad302193..c194c247e 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -269,6 +269,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
return $this->cancelReason;
}
+ public function isCanceled(): bool
+ {
+ return null !== $this->cancelReason;
+ }
+
public function getCenters(): ?iterable
{
return match ($this->getContext()) {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index d4a2ed9a9..04192133c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -18,14 +18,14 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Table(name: 'chill_calendar.cancel_reason')]
class CancelReason
{
- final public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
+ final public const CANCELEDBY_OTHER = 'CANCELEDBY_OTHER';
final public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
final public const CANCELEDBY_USER = 'CANCELEDBY_USER';
- #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
- private ?bool $active = null;
+ #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => true])]
+ private bool $active = true;
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]
private ?string $canceledBy = null;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
index c0ac4ddb0..311d3ac02 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
@@ -15,7 +15,7 @@ use Chill\CalendarBundle\Entity\CancelReason;
use Chill\MainBundle\Form\Type\TranslatableStringFormType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -28,7 +28,14 @@ class CancelReasonType extends AbstractType
->add('active', CheckboxType::class, [
'required' => false,
])
- ->add('canceledBy', TextType::class);
+ ->add('canceledBy', ChoiceType::class, [
+ 'choices' => [
+ 'chill_calendar.canceled_by.user' => CancelReason::CANCELEDBY_USER,
+ 'chill_calendar.canceled_by.person' => CancelReason::CANCELEDBY_PERSON,
+ 'chill_calendar.canceled_by.other' => CancelReason::CANCELEDBY_OTHER,
+ ],
+ 'required' => true,
+ ]);
}
public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelType.php b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
new file mode 100644
index 000000000..ad41a6105
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
@@ -0,0 +1,42 @@
+add('cancelReason', EntityType::class, [
+ 'class' => CancelReason::class,
+ 'required' => true,
+ 'choice_label' => fn (CancelReason $cancelReason) => $this->translatableStringHelper->localize($cancelReason->getName()),
+ ]);
+ }
+
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver->setDefaults([
+ 'data_class' => Calendar::class,
+
+ ]);
+ }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index 3a062f7b8..672b53460 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -25,6 +25,13 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
if ($this->security->isGranted('ROLE_USER')) {
$menu->addChild('My calendar list', [
'route' => 'chill_calendar_calendar_list_my',
+ ])
+ ->setExtras([
+ 'order' => 8,
+ 'icon' => 'tasks',
+ ]);
+ $menu->addChild('invite.list.title', [
+ 'route' => 'chill_calendar_invitations_list_my',
])
->setExtras([
'order' => 9,
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
index 8f62fdcdb..2319fde99 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -21,6 +21,7 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
use Chill\CalendarBundle\Entity\Calendar;
use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
+use Chill\MainBundle\Entity\User;
use Doctrine\ORM\Event\PostPersistEventArgs;
use Doctrine\ORM\Event\PostRemoveEventArgs;
use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -31,6 +32,17 @@ class CalendarEntityListener
{
public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}
+ private function getAuthenticatedUser(): User
+ {
+ $user = $this->security->getUser();
+
+ if (!$user instanceof User) {
+ throw new \LogicException('Expected an instance of User.');
+ }
+
+ return $user;
+ }
+
public function postPersist(Calendar $calendar, PostPersistEventArgs $args): void
{
if (!$calendar->preventEnqueueChanges) {
@@ -38,7 +50,7 @@ class CalendarEntityListener
new CalendarMessage(
$calendar,
CalendarMessage::CALENDAR_PERSIST,
- $this->security->getUser()
+ $this->getAuthenticatedUser()
)
);
}
@@ -50,7 +62,7 @@ class CalendarEntityListener
$this->messageBus->dispatch(
new CalendarRemovedMessage(
$calendar,
- $this->security->getUser()
+ $this->getAuthenticatedUser()
)
);
}
@@ -58,12 +70,19 @@ class CalendarEntityListener
public function postUpdate(Calendar $calendar, PostUpdateEventArgs $args): void
{
- if (!$calendar->preventEnqueueChanges) {
+ if ($calendar->getStatus() === $calendar::STATUS_CANCELED) {
+ $this->messageBus->dispatch(
+ new CalendarRemovedMessage(
+ $calendar,
+ $this->getAuthenticatedUser()
+ )
+ );
+ } elseif (!$calendar->preventEnqueueChanges) {
$this->messageBus->dispatch(
new CalendarMessage(
$calendar,
CalendarMessage::CALENDAR_UPDATE,
- $this->security->getUser()
+ $this->getAuthenticatedUser()
)
);
}
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
index 53dcea28c..7d2e88fef 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
@@ -70,6 +70,8 @@ class CalendarRemovedMessage
public function getRemoteId(): string
{
+ dump($this->remoteId);
+
return $this->remoteId;
}
}
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index 3121854e5..e6f90f279 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -191,6 +191,7 @@ class CalendarRepository implements ObjectRepository
$qb->expr()->eq('c.mainUser', ':user'),
$qb->expr()->gte('c.startDate', ':startDate'),
$qb->expr()->lte('c.endDate', ':endDate'),
+ $qb->expr()->isNull('c.cancelReason'),
)
)
->setParameters([
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 8778330f8..6cb34738c 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
/**
* @return array|Invite[]
*/
- public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+ public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
{
return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
index a0457c5a8..cce562d7d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
@@ -1,5 +1,6 @@
services:
Chill\CalendarBundle\Controller\:
autowire: true
+ autoconfigure: true
resource: '../../../Controller'
tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index cff5c00cc..c827ca4f4 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -1,17 +1,23 @@
-{# list used in context of person or accompanyingPeriod #}
+{# list used in context of person, accompanyingPeriod or user #}
-{% if calendarItems|length > 0 %}
-
-
- {% for calendar in calendarItems %}
-
-
-
+ {% endif %}
+
+ {% if calendar.comment.comment is not empty %}
+
-
- {% endif %}
+
-
-
+
+
+ {% if calendar.comment.comment is not empty
or calendar.users|length > 0
or calendar.thirdParties|length > 0
or calendar.users|length > 0 %}
@@ -76,131 +87,133 @@
} %}
+
+
+
- {% if calendar.comment.comment is not empty
+
+
+
+
-
-
-
-
+ {% if calendar.status == 'canceled' %}
+
+ {{ 'chill_calendar.canceled'|trans }}:
+ {{ calendar.cancelReason.name|localize_translatable_string }}
+
+ {% endif %}
+
+ {% if calendar.status == 'canceled' %}
+
+ {% endif %}
{% if context == 'person' and calendar.context == 'accompanying_period' %}
@@ -19,6 +25,9 @@
{% endif %}
+ {% if calendar.status == 'canceled' %}
+
+ {% endif %}
{% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
{{ calendar.startDate|format_datetime('short', 'short') }}
- {{ calendar.endDate|format_datetime('short', 'short') }}
@@ -26,44 +35,46 @@
{{ calendar.startDate|format_datetime('short', 'short') }}
- {{ calendar.endDate|format_datetime('none', 'short') }}
{% endif %}
-
-
-
- {% if calendar.mainUser is not empty %}
- {{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}
+
+
+
+ -
+ {% if calendar.mainUser is not empty %}
+ {{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}
+ {% endif %}
+
+
+ {% endif %}
+
+ {% if calendar.location is not empty %}
+
+ {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+
+
+
+ {% endif %}
+
+ {% if calendar.documents is not empty %}
+
+ {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
+ {% endif %}
+ {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
+ {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
+ {% endif %}
+ {% if calendar.location.phonenumber1 is not empty %} {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
+ {% if calendar.location.phonenumber2 is not empty %} {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
+
+
+
+ {% endif %}
+
+ {% if calendar.activity is not null %}
+
+ {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+
+
+
+
+
+
+
+ {% endif %}
- {% if calendar.activity is not null %}
- {{ 'Activity'|trans }}
+
+ + + + {{ calendar.activity.type.name | localize_translatable_string }} + + {% if calendar.activity.emergency %} + {{ 'Emergency'|trans|upper }} + {% endif %} + +
+ +-
+
- + + {{ 'Created by'|trans }} + {{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }} + + + {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %} +
- + + + {% endif %} +
-
- {% endif %}
-
- {% if calendar.location is not empty %}
-
- {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-
- {% endif %}
-
-
- {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
- {% endif %}
- {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
- {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
- {% endif %}
- {% if calendar.location.phonenumber1 is not empty %} {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
- {% if calendar.location.phonenumber2 is not empty %} {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
-
-
-
+
-
- {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
-
-
+
+
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
new file mode 100644
index 000000000..2f6759725
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title 'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+ {{ form_start(form) }}
+
+ {{ form_row(form.cancelReason) }}
+
+
+
+ {{ form_end(form) }}
+
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
new file mode 100644
index 000000000..76196b23e
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title 'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+ {{ form_start(form) }}
+
+ {{ form_row(form.cancelReason) }}
+
+
+
+ {{ form_end(form) }}
+
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
index 7ce1003bc..96ddb3388 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -34,7 +34,18 @@
{% endif %}
{% else %}
- {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
+ {% if calendarItems|length > 0 %}
+
+
+ {% if calendarItems|length < paginator.getTotalItems %}
+ {{ chill_pagination(paginator) }}
+ {% endif %}
+
+ {% endif %}
{% endif %}
-
+
+ {{ 'Transform to activity'|trans }}
+
+
+ {% endif %}
-
-{% endif %}
+
+
-
+
+ {% endif %}
{% endif %}
+ {% if calendar.activity is null and (
+ (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
+ or
+ (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
+ )
+ and calendar.status is not constant('STATUS_CANCELED', calendar)
+ %}
+
-
-
+ {{ 'Activity'|trans }}
-
- - - - {{ calendar.activity.type.name | localize_translatable_string }} - - {% if calendar.activity.emergency %} - {{ 'Emergency'|trans|upper }} - {% endif %} - -
- --
-
- - - {{ 'Created by'|trans }} - {{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }} - - - {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %} -
- - - - {% endif %} -
+
- -
+ {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
+ {% if templates|length == 0 %}
+
- + + {{ 'chill_calendar.Add a document'|trans }} + + + {% else %} +
-
+ + +-
-
- {% endfor %}
-
- {% if calendarItems|length < paginator.getTotalItems %}
- {{ chill_pagination(paginator) }}
- {% endif %}
-
-
- {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
- {% if templates|length == 0 %}
-
- - - {{ 'chill_calendar.Add a document'|trans }} - - - {% else %} -
-
- - - --
- {% endif %}
- {% endif %}
- {% if calendar.activity is null and (
- (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
- or
- (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
- )
- %}
-
- - - {{ 'Transform to activity'|trans }} - - - {% endif %} - - {% if (calendar.isInvited(app.user)) %} + {% if calendar.isInvited(app.user) and not calendar.isCanceled %} {% set invite = calendar.inviteForUser(app.user) %}
-
{% endif %} - {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %} + + {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}- -
- + {{ 'Cancel'|trans }} +
{% endif %} + {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}- -
-
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
index 9e3b59d2a..dc44b721c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
@@ -33,7 +33,17 @@
{% endif %}
{% else %}
- {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
+ {% if calendarItems|length > 0 %}
+
+ {% for calendar in calendarItems %}
+ {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
+ {% endfor %}
+
+
+ {% if calendarItems|length < paginator.getTotalItems %}
+ {{ chill_pagination(paginator) }}
+ {% endif %}
+ {% endif %}
{% endif %}
-
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
index 0668d8db5..bd99d6e6f 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
@@ -5,7 +5,7 @@
{% block table_entities_thead_tr %}
{{ 'invite.list.title'|trans }}
+ + {% if invitations|length == 0 %} ++ {{ "invite.list.none"|trans }} +
+ {% else %} +
+ {% for invitation in invitations %}
+ {% set calendar = invitation.getCalendar %}
+ {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'user'}) }}
+ {% endfor %}
+
+
+ {% if invitations|length < paginator.getTotalItems %}
+ {{ chill_pagination(paginator) }}
+ {% endif %}
+ {% endif %}
+
+{% endblock %}
+
+{% block js %}
+ {{ parent() }}
+ {{ encore_entry_script_tags('mod_answer') }}
+ {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
+{% endblock %}
+
+{% block css %}
+ {{ parent() }}
+ {{ encore_entry_link_tags('mod_answer') }}
+ {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
index dfce0548c..bce9b1487 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
@@ -19,6 +19,7 @@ declare(strict_types=1);
namespace Chill\CalendarBundle\Service\ShortMessageNotification;
use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
use libphonenumber\PhoneNumberFormat;
use libphonenumber\PhoneNumberUtil;
use Symfony\Component\Notifier\Message\SmsMessage;
@@ -57,7 +58,7 @@ class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBu
$this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
$this->engine->render('@ChillCalendar/CalendarShortMessage/short_message.txt.twig', ['calendar' => $calendar]),
);
- } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus()) {
+ } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus() && (null === $calendar->getCancelReason() || CancelReason::CANCELEDBY_PERSON !== $calendar->getCancelReason()->getCanceledBy())) {
$toUsers[] = new SmsMessage(
$this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
$this->engine->render('@ChillCalendar/CalendarShortMessage/short_message_canceled.txt.twig', ['calendar' => $calendar]),
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
new file mode 100644
index 000000000..32ed70456
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
@@ -0,0 +1,292 @@
+prophesize(InviteRepository::class);
+ $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+ $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+ // Create controller instance
+ $this->controller = new MyInvitationsController(
+ $inviteRepository->reveal(),
+ $paginatorFactory->reveal(),
+ $docGeneratorTemplateRepository->reveal()
+ );
+
+ // Set up necessary services for AbstractController
+ $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+ $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+ $twig = $this->prophesize(Environment::class);
+
+ // Use reflection to set the container
+ $reflection = new \ReflectionClass($this->controller);
+ $containerProperty = $reflection->getParentClass()->getProperty('container');
+ $containerProperty->setAccessible(true);
+
+ // Create a mock container
+ $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+ $container->has('security.authorization_checker')->willReturn(true);
+ $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+ $container->has('security.token_storage')->willReturn(true);
+ $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+ $container->has('twig')->willReturn(true);
+ $container->get('twig')->willReturn($twig->reveal());
+
+ $containerProperty->setValue($this->controller, $container->reveal());
+ }
+
+ public function testMyInvitationsReturnsCorrectAmountOfInvitations(): void
+ {
+ // Create test user
+ $user = new User();
+ $user->setUsername('testuser');
+
+ // Create test invitations
+ $invite1 = new Invite();
+ $invite1->setUser($user);
+ $invite1->setStatus(Invite::PENDING);
+
+ $invite2 = new Invite();
+ $invite2->setUser($user);
+ $invite2->setStatus(Invite::ACCEPTED);
+
+ $invite3 = new Invite();
+ $invite3->setUser($user);
+ $invite3->setStatus(Invite::DECLINED);
+
+ $allInvitations = [$invite1, $invite2, $invite3];
+ $paginatedInvitations = [$invite1, $invite2]; // First page with 2 items per page
+
+ // Set up repository prophecies
+ $inviteRepository = $this->prophesize(InviteRepository::class);
+ $inviteRepository->findBy(['user' => $user])->willReturn($allInvitations);
+ $inviteRepository->findBy(
+ ['user' => $user],
+ ['createdAt' => 'DESC'],
+ 2, // items per page
+ 0 // offset
+ )->willReturn($paginatedInvitations);
+
+ // Set up paginator prophecies
+ $paginator = $this->prophesize(PaginatorInterface::class);
+ $paginator->getItemsPerPage()->willReturn(2);
+ $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+ $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+ $paginatorFactory->create(3)->willReturn($paginator->reveal());
+
+ // Set up doc generator repository
+ $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+ $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+ // Create controller with mocked dependencies
+ $controller = new MyInvitationsController(
+ $inviteRepository->reveal(),
+ $paginatorFactory->reveal(),
+ $docGeneratorTemplateRepository->reveal()
+ );
+
+ // Set up authorization checker to return true for ROLE_USER
+ $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+ $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+ // Set up token storage to return user
+ $token = $this->prophesize(TokenInterface::class);
+ $token->getUser()->willReturn($user);
+ $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+ $tokenStorage->getToken()->willReturn($token->reveal());
+
+ // Set up twig to return a response
+ $twig = $this->prophesize(Environment::class);
+ $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+ 'invitations' => $paginatedInvitations,
+ 'paginator' => $paginator->reveal(),
+ 'templates' => [],
+ ])->willReturn('rendered content');
+
+ // Set up container
+ $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+ $container->has('security.authorization_checker')->willReturn(true);
+ $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+ $container->has('security.token_storage')->willReturn(true);
+ $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+ $container->has('twig')->willReturn(true);
+ $container->get('twig')->willReturn($twig->reveal());
+
+ // Use reflection to set the container
+ $reflection = new \ReflectionClass($controller);
+ $containerProperty = $reflection->getParentClass()->getProperty('container');
+ $containerProperty->setAccessible(true);
+ $containerProperty->setValue($controller, $container->reveal());
+
+ // Create request
+ $request = new Request();
+
+ // Execute the action
+ $response = $controller->myInvitations($request);
+
+ // Assert that response is successful
+ self::assertInstanceOf(Response::class, $response);
+ self::assertSame(200, $response->getStatusCode());
+ self::assertSame('rendered content', $response->getContent());
+ }
+
+ public function testMyInvitationsPageLoads(): void
+ {
+ // Create test user
+ $user = new User();
+ $user->setUsername('testuser');
+
+ // Set up repository prophecies - no invitations
+ $inviteRepository = $this->prophesize(InviteRepository::class);
+ $inviteRepository->findBy(['user' => $user])->willReturn([]);
+ $inviteRepository->findBy(
+ ['user' => $user],
+ ['createdAt' => 'DESC'],
+ 20, // default items per page
+ 0 // offset
+ )->willReturn([]);
+
+ // Set up paginator prophecies
+ $paginator = $this->prophesize(PaginatorInterface::class);
+ $paginator->getItemsPerPage()->willReturn(20);
+ $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+ $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+ $paginatorFactory->create(0)->willReturn($paginator->reveal());
+
+ // Set up doc generator repository
+ $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+ $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+ // Create controller with mocked dependencies
+ $controller = new MyInvitationsController(
+ $inviteRepository->reveal(),
+ $paginatorFactory->reveal(),
+ $docGeneratorTemplateRepository->reveal()
+ );
+
+ // Set up authorization checker to return true for ROLE_USER
+ $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+ $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+ // Set up token storage to return user
+ $token = $this->prophesize(TokenInterface::class);
+ $token->getUser()->willReturn($user);
+ $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+ $tokenStorage->getToken()->willReturn($token->reveal());
+
+ // Set up twig to return a response
+ $twig = $this->prophesize(Environment::class);
+ $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+ 'invitations' => [],
+ 'paginator' => $paginator->reveal(),
+ 'templates' => [],
+ ])->willReturn('empty page content');
+
+ // Set up container
+ $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+ $container->has('security.authorization_checker')->willReturn(true);
+ $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+ $container->has('security.token_storage')->willReturn(true);
+ $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+ $container->has('twig')->willReturn(true);
+ $container->get('twig')->willReturn($twig->reveal());
+
+ // Use reflection to set the container
+ $reflection = new \ReflectionClass($controller);
+ $containerProperty = $reflection->getParentClass()->getProperty('container');
+ $containerProperty->setAccessible(true);
+ $containerProperty->setValue($controller, $container->reveal());
+
+ // Create request
+ $request = new Request();
+
+ // Execute the action
+ $response = $controller->myInvitations($request);
+
+ // Assert that page loads successfully
+ self::assertInstanceOf(Response::class, $response);
+ self::assertSame(200, $response->getStatusCode());
+ self::assertSame('empty page content', $response->getContent());
+ }
+
+ public function testMyInvitationsRequiresAuthentication(): void
+ {
+ // Create controller with minimal dependencies
+ $inviteRepository = $this->prophesize(InviteRepository::class);
+ $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+ $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+ $controller = new MyInvitationsController(
+ $inviteRepository->reveal(),
+ $paginatorFactory->reveal(),
+ $docGeneratorTemplateRepository->reveal()
+ );
+
+ // Set up authorization checker to return false for ROLE_USER
+ $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+ $authorizationChecker->isGranted('ROLE_USER')->willReturn(false);
+ $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(false);
+
+ // Set up container
+ $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+ $container->has('security.authorization_checker')->willReturn(true);
+ $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+
+ // Use reflection to set the container
+ $reflection = new \ReflectionClass($controller);
+ $containerProperty = $reflection->getParentClass()->getProperty('container');
+ $containerProperty->setAccessible(true);
+ $containerProperty->setValue($controller, $container->reveal());
+
+ // Create request
+ $request = new Request();
+
+ // Expect AccessDeniedException
+ $this->expectException(\Symfony\Component\Security\Core\Exception\AccessDeniedException::class);
+
+ // Execute the action
+ $controller->myInvitations($request);
+ }
+}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index cfb2fe057..8717dcd9f 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -31,8 +31,7 @@ Will send SMS: Un SMS de rappel sera envoyé
Will not send SMS: Aucun SMS de rappel ne sera envoyé
SMS already sent: Un SMS a été envoyé
-canceledBy: supprimé par
-Canceled by: supprimé par
+Canceled by: Annulé par
Calendar configuration: Gestion des rendez-vous
crud:
@@ -44,6 +43,14 @@ crud:
title_edit: Modifier le motif d'annulation
chill_calendar:
+ canceled: Annulé
+ cancel_reason: Raison d'annulation
+ cancel_calendar_item: Annuler rendez-vous
+ calendar_canceled: Le rendez-vous a été annulé
+ canceled_by:
+ user: Utilisateur
+ person: Usager
+ other: Autre
Document: Document d'un rendez-vous
form:
The main user is mandatory. He will organize the appointment.: L'utilisateur principal est obligatoire. Il est l'organisateur de l'événement.
@@ -86,6 +93,9 @@ invite:
declined: Refusé
pending: En attente
tentative: Accepté provisoirement
+ list:
+ none: Il n'y aucun invitation
+ title: Mes invitations
# exports
Exports of calendar: Exports des rendez-vous
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
index e5071e76a..f2e3cf629 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
@@ -20,4 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
interface DocGeneratorTemplateRepositoryInterface extends ObjectRepository
{
public function countByEntity(string $entity): int;
+
+ /**
+ * @return array|DocGeneratorTemplate[]
+ */
+ public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array;
}
diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 7bcc8dbe6..b52697868 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -246,7 +246,7 @@ final class EventController extends AbstractController
'class' => Center::class,
'choices' => $centers,
'placeholder' => $this->translator->trans('Pick a center'),
- 'label' => 'To which centre should the event be associated ?',
+ 'label' => 'To which territory should the event be associated ?',
])
->add('submit', SubmitType::class, [
'label' => 'Next step',
diff --git a/src/Bundle/ChillEventBundle/translations/messages.fr.yml b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
index 2251dbd6c..45bee74e4 100644
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -64,7 +64,7 @@ CHILL_EVENT_PARTICIPATION_SEE_DETAILS: Voir le détail d'une participation
# TODO check place to put this
Next step: Étape suivante
-To which centre should the event be associated ?: À quel centre doit être associé l'événement ?
+To which territory should the event be associated ?: À quel territoire doit être associé l'événement ?
# timeline
past: passé
@@ -151,7 +151,7 @@ event:
filter:
event_types: Par types d'événement
event_dates: Par date d'événement
- center: Par centre
+ center: Par territoire
by_responsable: Par responsable
pick_responsable: Filtrer par responsables
budget:
@@ -188,7 +188,7 @@ event_id: Identifiant
event_name: Nom
event_date: Date
event_type: Type d'évenement
-event_center: Centre
+event_center: Territoire
event_moderator: Responsable
event_participants_count: Nombre de participants
event_location: Localisation
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 19e9014da..ccba39848 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -102,7 +102,6 @@ class CRUDController extends AbstractController
Resolver::class => Resolver::class,
SerializerInterface::class => SerializerInterface::class,
FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
- ManagerRegistry::class => ManagerRegistry::class,
]
);
}
@@ -674,7 +673,7 @@ class CRUDController extends AbstractController
protected function getManagerRegistry(): ManagerRegistry
{
- return $this->container->get(ManagerRegistry::class);
+ return $this->container->get('doctrine');
}
/**
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index 24acc4f78..13978493a 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -123,7 +123,7 @@ class EntityWorkflowStep
/**
* @var Collection
-
-
@@ -45,9 +43,7 @@ import { defineProps, defineEmits } from "vue";
import {
trans,
WORKFLOW_SUBSCRIBE_FINAL,
- WORKFLOW_UNSUBSCRIBE_FINAL,
WORKFLOW_SUBSCRIBE_ALL_STEPS,
- WORKFLOW_UNSUBSCRIBE_ALL_STEPS,
} from "translator";
// props
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig
index 751165357..6c5d06de7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig
@@ -1 +1 @@
- }}){kind=logo}
\ No newline at end of file
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
index 8a636a8cd..4edbc19f5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
@@ -16,7 +16,7 @@
* along with this program. If not, see