diff --git a/app/Resources/views/admin/event/bankwires.html.twig b/app/Resources/views/admin/event/bankwires.html.twig index 67dbf0b80..a86ea8677 100644 --- a/app/Resources/views/admin/event/bankwires.html.twig +++ b/app/Resources/views/admin/event/bankwires.html.twig @@ -54,7 +54,7 @@
- Aucune virement en attente. + Aucune virement en attente. {% if event == null %} Essayez de changer d'événement{% endif %}
{% endif %} diff --git a/app/Resources/views/admin/event/prices.html.twig b/app/Resources/views/admin/event/prices.html.twig index f03ccb152..deed518dc 100644 --- a/app/Resources/views/admin/event/prices.html.twig +++ b/app/Resources/views/admin/event/prices.html.twig @@ -73,6 +73,14 @@ {% endif %} + + {% else %} + +
+ + Aucune information. {% if event == null %}Essayez de changez d'événement !{% endif %} +
+ {% endfor %} diff --git a/app/Resources/views/admin/event/rooms.html.twig b/app/Resources/views/admin/event/rooms.html.twig index 935a0f056..5b593d7b5 100644 --- a/app/Resources/views/admin/event/rooms.html.twig +++ b/app/Resources/views/admin/event/rooms.html.twig @@ -1,18 +1,26 @@ {% extends 'admin/base_with_header.html.twig' %} {% block content %} -

Liste des salles pour {{ event.title }}

+

Liste des salles pour {{ event == null ? '':event.title }}

{% include 'admin/event/change_event.html.twig' with {form: event_select_form} only %} -
- - + {% if event == null %} +
+
+ + Changez d'événement pour afficher les données. +
+
+ {% else %} +
+
+ - - + + {% for form in editForms %} {% endfor %} - - + + - -
Salle
@@ -25,7 +33,7 @@
@@ -50,7 +58,8 @@ />
-
+ + + + {% endif %} {% endblock %} diff --git a/app/Resources/views/admin/event/speakers_management.html.twig b/app/Resources/views/admin/event/speakers_management.html.twig index 29b0b937e..09eeaa019 100644 --- a/app/Resources/views/admin/event/speakers_management.html.twig +++ b/app/Resources/views/admin/event/speakers_management.html.twig @@ -109,6 +109,13 @@ + {% else %} + +
+ + Aucune information. {% if event == null %}Essayez de changez d'événement !{% endif %} +
+ {% endfor %} diff --git a/app/Resources/views/admin/event/special_price.html.twig b/app/Resources/views/admin/event/special_price.html.twig index 18a1f74dd..d7955474a 100644 --- a/app/Resources/views/admin/event/special_price.html.twig +++ b/app/Resources/views/admin/event/special_price.html.twig @@ -44,7 +44,7 @@
- Aucun token créé + Aucun token trouvé.{% if event == null %} Essayez de changer d'événement{% endif %}
{% endif %} @@ -53,7 +53,14 @@

Nouveau token

- + {% if form == null %} +
+
+ + Changer d'événement pour pouvoir ajouter un token. +
+
+ {% else %} {{ form_start(form) }} @@ -107,5 +114,6 @@ {{ form_errors(form) }} {{ form_end(form) }} + {% endif %} {% endblock %} diff --git a/app/Resources/views/admin/event/sponsor_ticket.html.twig b/app/Resources/views/admin/event/sponsor_ticket.html.twig index 6f2c6e5b4..4c2c1350d 100644 --- a/app/Resources/views/admin/event/sponsor_ticket.html.twig +++ b/app/Resources/views/admin/event/sponsor_ticket.html.twig @@ -1,6 +1,6 @@ {% extends 'admin/base_with_header.html.twig' %} -{% form_theme form _self %} + {%- block form_row -%} {%- set widget_attr = {} -%} {%- if help is not empty -%} @@ -18,10 +18,13 @@ {%- endblock form_row -%} {% block content %} -

Liste des tokens sponsors pour {{ event.title }}

+

Liste des tokens sponsors pour {{ event == null ? '' : event.title }}

{% include 'admin/event/change_event.html.twig' with {form: event_select_form} only %}
+ {% if event == null %} +
Changez d'événement dans le menu ci dessus
+ {% else %} + {% endif %}
{% if tokens|length > 0 %} @@ -103,7 +107,7 @@
- Aucune invitation créée + Aucune invitation trouvée. {% if event == null %} Essayez de changer d'événement{% endif %}
{% endif %} @@ -118,6 +122,15 @@
+ {% if form == null %} +
+
+ + Changer d'événement pour pouvoir ajouter un token. +
+
+ {% else %} + {% form_theme form _self %} {{ form_start(form) }} {{ form_widget(form) }} @@ -131,6 +144,7 @@
{{ form_end(form) }} + {% endif %} {% endblock %} diff --git a/app/Resources/views/admin/event/stats.html.twig b/app/Resources/views/admin/event/stats.html.twig index fb8c98365..f640395a8 100644 --- a/app/Resources/views/admin/event/stats.html.twig +++ b/app/Resources/views/admin/event/stats.html.twig @@ -4,66 +4,76 @@

Suivi

{% include 'admin/event/change_event.html.twig' with {form: event_select_form} only %} -
-

Évolution des inscriptions

-
-
-
+ {% if event == null %} -
-

Jours de vente restants

-
+
+
+ + Changez d'événement pour afficher les données. +
+
+ {% else %} +
+

Évolution des inscriptions

+
+
+
- {% set percentage = ( (stats.min - stats.daysToEndOfSales) / stats.min * 100)|round %} -
-
-
+
+

Jours de vente restants

+
+ + {% set percentage = ( (stats.min - stats.daysToEndOfSales) / stats.min * 100)|round %} +
+
+
+
+
{{ stats.daysToEndOfSales * -1 }} jours restants sur {{ stats.min * -1 }}
-
{{ stats.daysToEndOfSales * -1 }} jours restants sur {{ stats.min * -1 }}
-
-
-

Progression des ventes: Jour 1

-
- {% set percentage = seats.available > 0 ? ( (seats.one) / seats.available * 100)|round : 0 %} -
-
-
+
+

Progression des ventes: Jour 1

+
+ {% set percentage = seats.available > 0 ? ( (seats.one) / seats.available * 100)|round : 0 %} +
+
+
+
+
{{ seats.one }} places vendues sur {{ seats.available }}
-
{{ seats.one }} places vendues sur {{ seats.available }}
-
-
-

Progression des ventes: Jour 2

-
+
+

Progression des ventes: Jour 2

+
- {% set percentage = seats.available > 0 ? ( (seats.two) / seats.available * 100)|round : 0 %} -
-
-
+ {% set percentage = seats.available > 0 ? ( (seats.two) / seats.available * 100)|round : 0 %} +
+
+
+
+
{{ seats.two }} places vendues sur {{ seats.available }}
-
{{ seats.two }} places vendues sur {{ seats.available }}
-
-
-

Répartition des billets

-
-
-
+
+

Répartition des billets

+
+
+
+ {% endif %} {% endblock %} {% block javascript %} - {{ parent() }} - - + + $(document).ready(function() { + $('.ui.progress').progress(); + }) + {% endblock %} diff --git a/app/Resources/views/admin/speaker/list.html.twig b/app/Resources/views/admin/speaker/list.html.twig index 13bc1d357..ea7a7eee2 100644 --- a/app/Resources/views/admin/speaker/list.html.twig +++ b/app/Resources/views/admin/speaker/list.html.twig @@ -21,6 +21,9 @@
+{% if eventId == null %} +
Changez d'événement dans le menu ci dessus
+ {% else %}
@@ -124,7 +128,7 @@
- Aucun speaker + Aucun speaker. {% if eventId == null %}Essayez de changez d'événement.{% endif %}
{% endif %} diff --git a/app/Resources/views/admin/vote/liste.html.twig b/app/Resources/views/admin/vote/liste.html.twig index 58c7647bb..5d96369a5 100644 --- a/app/Resources/views/admin/vote/liste.html.twig +++ b/app/Resources/views/admin/vote/liste.html.twig @@ -29,7 +29,7 @@
- Aucune vote + Aucun vote.{% if event == null %} Essayez de changez d'événement.{% endif %}
{% endif %} diff --git a/htdocs/pages/administration/forum_gestion.php b/htdocs/pages/administration/forum_gestion.php index c87d1c69f..a6a777a94 100644 --- a/htdocs/pages/administration/forum_gestion.php +++ b/htdocs/pages/administration/forum_gestion.php @@ -41,11 +41,17 @@ afficherMessage('Une erreur est survenue lors de la suppression du coupon', 'index.php?page=forum_gestion&action=lister', true); } } elseif ($action == 'supprimer') { - if ($forums->supprimer($_GET['id'])) { - Logs::log('Suppression du forum ' . $_GET['id']); - afficherMessage('Le forum a été supprimé', 'index.php?page=forum_gestion&action=lister'); + if (!$forums->supprimable($_GET['id'])) { + afficherMessage('Impossible de supprimer ce forum', + 'index.php?page=forum_gestion&action=lister', true); } else { - afficherMessage('Une erreur est survenue lors de la suppression du forum', 'index.php?page=forum_gestion&action=lister', true); + if ($forums->supprimer($_GET['id'])) { + Logs::log('Suppression du forum ' . $_GET['id']); + afficherMessage('Le forum a été supprimé', 'index.php?page=forum_gestion&action=lister'); + } else { + afficherMessage('Une erreur est survenue lors de la suppression du forum', + 'index.php?page=forum_gestion&action=lister', true); + } } } else { $formulaire = instancierFormulaire(); diff --git a/htdocs/templates/administration/forum_gestion.html b/htdocs/templates/administration/forum_gestion.html index 7a055d72a..e0c4486ef 100644 --- a/htdocs/templates/administration/forum_gestion.html +++ b/htdocs/templates/administration/forum_gestion.html @@ -49,7 +49,7 @@

Liste des événements

{if $evenement.supprimable} - eventActionHelper->getEventById($request->query->get('id')); + $id = $request->query->get('id'); + $event = null; + if ($id !==null) { + $event = $this->eventActionHelper->getEventById($id); - if ($request->isMethod(Request::METHOD_POST)) { - if (!$this->csrfTokenManager->isTokenValid(new CsrfToken('admin_event_bankwires', $request->request->get('token')))) { - $this->flashBag->add('error', 'Erreur de token CSRF, veuillez réessayer'); - } else { - $reference = $request->request->get('bankwireReceived'); - $invoice = $this->invoiceRepository->getByReference($reference); - if ($invoice === null) { - throw new NotFoundHttpException(sprintf('No invoice with this reference: "%s"', $reference)); + if ($request->isMethod(Request::METHOD_POST)) { + if (!$this->csrfTokenManager->isTokenValid(new CsrfToken('admin_event_bankwires', + $request->request->get('token')))) { + $this->flashBag->add('error', 'Erreur de token CSRF, veuillez réessayer'); + } else { + $reference = $request->request->get('bankwireReceived'); + $invoice = $this->invoiceRepository->getByReference($reference); + if ($invoice === null) { + throw new NotFoundHttpException(sprintf('No invoice with this reference: "%s"', $reference)); + } + $this->setInvoicePaid($event, $invoice); } - $this->setInvoicePaid($event, $invoice); } } return new Response($this->twig->render('admin/event/bankwires.html.twig', [ - 'pendingBankwires' => $this->invoiceRepository->getPendingBankwires($event), + 'pendingBankwires' => $event === null ? [] : $this->invoiceRepository->getPendingBankwires($event), 'event' => $event, 'title' => 'Virements en attente', 'token' => $this->csrfTokenManager->getToken('admin_event_bankwires'), diff --git a/sources/AppBundle/Controller/Admin/Event/PricesAction.php b/sources/AppBundle/Controller/Admin/Event/PricesAction.php index dec9f7648..162e4ebd6 100644 --- a/sources/AppBundle/Controller/Admin/Event/PricesAction.php +++ b/sources/AppBundle/Controller/Admin/Event/PricesAction.php @@ -35,9 +35,13 @@ public function __construct( public function __invoke(Request $request) { - $event = $this->eventActionHelper->getEventById($request->query->get('id')); - $ticketEventTypes = $this->ticketEventTypeRepository->getTicketsByEvent($event); - + $id = $request->query->get('id'); + $event = null; + $ticketEventTypes = []; + if ($id !== null) { + $event = $this->eventActionHelper->getEventById($id); + $ticketEventTypes = $this->ticketEventTypeRepository->getTicketsByEvent($event); + } return new Response($this->twig->render('admin/event/prices.html.twig', [ 'ticket_event_types' => $ticketEventTypes, 'event' => $event, diff --git a/sources/AppBundle/Controller/Admin/Event/RoomAction.php b/sources/AppBundle/Controller/Admin/Event/RoomAction.php index c9b2c1658..605d01501 100644 --- a/sources/AppBundle/Controller/Admin/Event/RoomAction.php +++ b/sources/AppBundle/Controller/Admin/Event/RoomAction.php @@ -50,45 +50,53 @@ public function __construct( public function __invoke(Request $request) { - $event = $this->eventActionHelper->getEventById($request->query->get('id')); - $rooms = $this->roomRepository->getByEvent($event); - $editForms = $this->getFormsForRooms($rooms); + $id = $request->query->get('id'); + $event = null; + $rooms = null; + $addForm = null; + $editForms = null; + if ($id !== null) { + $event = $this->eventActionHelper->getEventById($id); + $rooms = $this->roomRepository->getByEvent($event); + $editForms = $this->getFormsForRooms($rooms); - foreach ($editForms as $form) { - $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { - $room = $form->getData(); - if ($request->request->has('delete')) { - $this->roomRepository->delete($room); - $this->flashBag->add('notice', sprintf('La salle "%s" a été supprimée.', $room->getName())); - } else { - $this->roomRepository->save($room); - $this->flashBag->add('notice', sprintf('La salle "%s" a été sauvegardée.', $room->getName())); - } + foreach ($editForms as $form) { + $form->handleRequest($request); + if ($form->isSubmitted() && $form->isValid()) { + $room = $form->getData(); + if ($request->request->has('delete')) { + $this->roomRepository->delete($room); + $this->flashBag->add('notice', sprintf('La salle "%s" a été supprimée.', $room->getName())); + } else { + $this->roomRepository->save($room); + $this->flashBag->add('notice', sprintf('La salle "%s" a été sauvegardée.', $room->getName())); + } - return new RedirectResponse($this->urlGenerator->generate('admin_event_room', ['id' => $event->getId()])); + return new RedirectResponse($this->urlGenerator->generate('admin_event_room', + ['id' => $event->getId()])); + } } - } - $newRoom = new Room(); - $newRoom->setEventId($event->getId()); + $newRoom = new Room(); + $newRoom->setEventId($event->getId()); - $addForm = $this->formFactory->create(RoomType::class, $newRoom); - $addForm->handleRequest($request); + $addForm = $this->formFactory->create(RoomType::class, $newRoom); + $addForm->handleRequest($request); - if ($addForm->isSubmitted() && $addForm->isValid()) { - $newRoom = $addForm->getData(); - $this->roomRepository->save($newRoom); - $this->flashBag->add('notice', sprintf('La salle "%s" a été ajoutée.', $newRoom->getName())); + if ($addForm->isSubmitted() && $addForm->isValid()) { + $newRoom = $addForm->getData(); + $this->roomRepository->save($newRoom); + $this->flashBag->add('notice', sprintf('La salle "%s" a été ajoutée.', $newRoom->getName())); - return new RedirectResponse($this->urlGenerator->generate('admin_event_room', ['id' => $event->getId()])); + return new RedirectResponse($this->urlGenerator->generate('admin_event_room', + ['id' => $event->getId()])); + } } - return new Response($this->twig->render('admin/event/rooms.html.twig', [ 'event' => $event, 'rooms' => $rooms, - 'addForm' => $addForm->createView(), - 'editForms' => array_map(static function (Form $form) { + 'addForm' => $addForm === null ? null : $addForm->createView(), + 'editForms' => $editForms === null ? null : array_map(static function (Form $form) { return $form->createView(); }, $editForms), 'title' => 'Gestion des salles', @@ -105,7 +113,8 @@ private function getFormsForRooms(CollectionInterface $rooms) { $forms = []; foreach ($rooms as $room) { - $forms[] = $this->formFactory->createNamedBuilder('edit_room_' . $room->getId(), RoomType::class, $room)->getForm(); + $forms[] = $this->formFactory->createNamedBuilder('edit_room_' . $room->getId(), RoomType::class, + $room)->getForm(); } return $forms; diff --git a/sources/AppBundle/Controller/Admin/Event/SpeakersManagementAction.php b/sources/AppBundle/Controller/Admin/Event/SpeakersManagementAction.php index 37ba3a98a..83c2cf801 100644 --- a/sources/AppBundle/Controller/Admin/Event/SpeakersManagementAction.php +++ b/sources/AppBundle/Controller/Admin/Event/SpeakersManagementAction.php @@ -36,12 +36,16 @@ public function __construct( public function __invoke(Request $request) { - $event = $this->eventActionHelper->getEventById($request->query->get('id')); + $id = $request->query->get('id'); + $event = null; + if ($id !== null) { + $event = $this->eventActionHelper->getEventById($id); + } return new Response($this->twig->render('admin/event/speakers_management.html.twig', [ 'event' => $event, 'title' => 'Gestion documentaire des speakers', - 'speakers' => $this->speakerRepository->getScheduledSpeakersByEvent($event, true), + 'speakers' => $event === null ? null : $this->speakerRepository->getScheduledSpeakersByEvent($event, true), 'event_select_form' => $this->formFactory->create(EventSelectType::class, $event)->createView(), ])); } diff --git a/sources/AppBundle/Controller/Admin/Event/SpecialPriceAction.php b/sources/AppBundle/Controller/Admin/Event/SpecialPriceAction.php index df151a31c..8254b1975 100644 --- a/sources/AppBundle/Controller/Admin/Event/SpecialPriceAction.php +++ b/sources/AppBundle/Controller/Admin/Event/SpecialPriceAction.php @@ -56,35 +56,41 @@ public function __construct( public function __invoke(Request $request) { - $event = $this->eventActionHelper->getEventById($request->query->get('id')); - /** @var User $user */ - $user = $this->security->getUser(); - Assertion::isInstanceOf($user, User::class); + $id = $request->query->get('id'); + $event = null; + $form = null; + if ($id !== null) { + $event = $this->eventActionHelper->getEventById($id); + /** @var User $user */ + $user = $this->security->getUser(); + Assertion::isInstanceOf($user, User::class); - $specialPrice = new TicketSpecialPrice(); - $specialPrice - ->setToken(base64_encode(random_bytes(30))) - ->setEventId($event->getId()) - ->setDateStart(new DateTime()) - ->setDateEnd($event->getDateEndSales()) - ->setCreatedOn(new DateTime()) - ->setCreatorId($user->getId()); + $specialPrice = new TicketSpecialPrice(); + $specialPrice + ->setToken(base64_encode(random_bytes(30))) + ->setEventId($event->getId()) + ->setDateStart(new DateTime()) + ->setDateEnd($event->getDateEndSales()) + ->setCreatedOn(new DateTime()) + ->setCreatorId($user->getId()); - $form = $this->formFactory->create(TicketSpecialPriceType::class, $specialPrice); - $form->handleRequest($request); + $form = $this->formFactory->create(TicketSpecialPriceType::class, $specialPrice); + $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { - $this->ticketSpecialPriceRepository->save($form->getData()); - $this->flashBag->add('notice', 'Le token a été enregistré'); + if ($form->isSubmitted() && $form->isValid()) { + $this->ticketSpecialPriceRepository->save($form->getData()); + $this->flashBag->add('notice', 'Le token a été enregistré'); - return new RedirectResponse($this->urlGenerator->generate('admin_event_special_price', ['id' => $event->getId()])); + return new RedirectResponse($this->urlGenerator->generate('admin_event_special_price', + ['id' => $event->getId()])); + } } return new Response($this->twig->render('admin/event/special_price.html.twig', [ - 'special_prices' => $this->ticketSpecialPriceRepository->getByEvent($event), + 'special_prices' => $event === null ? [] : $this->ticketSpecialPriceRepository->getByEvent($event), 'event' => $event, 'title' => 'Gestion des prix custom', - 'form' => $form->createView(), + 'form' => $form === null ? null : $form->createView(), 'event_select_form' => $this->formFactory->create(EventSelectType::class, $event)->createView(), ])); } diff --git a/sources/AppBundle/Controller/Admin/Event/SponsorTicketAction.php b/sources/AppBundle/Controller/Admin/Event/SponsorTicketAction.php index bbdcecf2e..972ccb77f 100644 --- a/sources/AppBundle/Controller/Admin/Event/SponsorTicketAction.php +++ b/sources/AppBundle/Controller/Admin/Event/SponsorTicketAction.php @@ -61,41 +61,50 @@ public function __construct( public function __invoke(Request $request) { - $event = $this->eventActionHelper->getEventById($request->query->get('id')); - $tokens = $this->sponsorTicketRepository->getByEvent($event); - $edit = $request->query->has('ticket'); - if ($edit) { - $newToken = $this->sponsorTicketRepository->get($request->query->get('ticket')); - $newToken->setEditedOn(new DateTime()); - } else { - /** @var User $user */ - $user = $this->security->getUser(); - Assertion::isInstanceOf($user, User::class); - $newToken = new SponsorTicket(); - $newToken - ->setToken(base64_encode(random_bytes(30))) - ->setIdForum($event->getId()) - ->setCreatedOn(new DateTime()) - ->setEditedOn(new DateTime()) - ->setCreatorId($user->getId()); - } - $form = $this->formFactory->create(SponsorTokenType::class, $newToken); - $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { - if ($newToken->getId() === null) { - $this->sponsorTokenMail->sendNotification($newToken); + $id = $request->query->get('id'); + $form=null; + $event=null; + $tokens = []; + $edit = null; + + if ($id !== null) { + $event = $this->eventActionHelper->getEventById($id); + $tokens = $this->sponsorTicketRepository->getByEvent($event); + $edit = $request->query->has('ticket'); + if ($edit) { + $newToken = $this->sponsorTicketRepository->get($request->query->get('ticket')); + $newToken->setEditedOn(new DateTime()); + } else { + /** @var User $user */ + $user = $this->security->getUser(); + Assertion::isInstanceOf($user, User::class); + $newToken = new SponsorTicket(); + $newToken + ->setToken(base64_encode(random_bytes(30))) + ->setIdForum($event->getId()) + ->setCreatedOn(new DateTime()) + ->setEditedOn(new DateTime()) + ->setCreatorId($user->getId()); } - $this->sponsorTicketRepository->save($newToken); - $this->flashBag->add('notice', 'Le token a été enregistré'); + $form = $this->formFactory->create(SponsorTokenType::class, $newToken); + $form->handleRequest($request); + if ($form->isSubmitted() && $form->isValid()) { + if ($newToken->getId() === null) { + $this->sponsorTokenMail->sendNotification($newToken); + } + $this->sponsorTicketRepository->save($newToken); + $this->flashBag->add('notice', 'Le token a été enregistré'); - return new RedirectResponse($this->urlGenerator->generate('admin_event_sponsor_ticket', ['id' => $event->getId()])); + return new RedirectResponse($this->urlGenerator->generate('admin_event_sponsor_ticket', + ['id' => $event->getId()])); + } } return new Response($this->twig->render('admin/event/sponsor_ticket.html.twig', [ 'tokens' => $tokens, 'event' => $event, 'title' => 'Gestion des inscriptions sponsors', - 'form' => $form->createView(), + 'form' => $form === null ? null : $form->createView(), 'edit' => $edit, 'event_select_form' => $this->formFactory->create(EventSelectType::class, $event)->createView(), ])); diff --git a/sources/AppBundle/Controller/Admin/Event/StatsAction.php b/sources/AppBundle/Controller/Admin/Event/StatsAction.php index be64c9227..7e573fb95 100644 --- a/sources/AppBundle/Controller/Admin/Event/StatsAction.php +++ b/sources/AppBundle/Controller/Admin/Event/StatsAction.php @@ -52,101 +52,109 @@ public function __construct( public function __invoke(Request $request) { - $event = $this->eventActionHelper->getEventById($request->query->get('id')); + $id = $request->query->get('id'); + $event = null; + $chart = null; + $pieChartConf = null; + $stats = null; + $ticketsDayOne = null; + $ticketsDayTwo = null; + if ($id !== null) { + $event = $this->eventActionHelper->getEventById($id); - /** @var $legacyInscriptions Inscriptions */ - $legacyInscriptions = $this->legacyModelFactory->createObject(Inscriptions::class); + /** @var $legacyInscriptions Inscriptions */ + $legacyInscriptions = $this->legacyModelFactory->createObject(Inscriptions::class); - $stats = $legacyInscriptions->obtenirSuivi($event->getId()); - $ticketsDayOne = $this->ticketRepository->getPublicSoldTicketsByDay(Ticket::DAY_ONE, $event); - $ticketsDayTwo = $this->ticketRepository->getPublicSoldTicketsByDay(Ticket::DAY_TWO, $event); + $stats = $legacyInscriptions->obtenirSuivi($event->getId()); + $ticketsDayOne = $this->ticketRepository->getPublicSoldTicketsByDay(Ticket::DAY_ONE, $event); + $ticketsDayTwo = $this->ticketRepository->getPublicSoldTicketsByDay(Ticket::DAY_TWO, $event); - $ticketTypes = []; + $ticketTypes = []; - $chart = [ - 'chart' => [ - 'renderTo' => 'container', - 'zoomType' => 'x', - 'spacingRight' => 20, - ], - 'title' => ['text' => 'Evolution des inscriptions'], - 'subtitle' => ['text' => 'Cliquez/glissez dans la zone pour zoomer'], - 'xAxis' => [ - 'type' => 'linear', - 'title' => ['text' => null], - 'allowDecimals' => false, - ], - 'yAxis' => [ - 'title' => ['text' => 'Inscriptions'], - 'min' => 0, - 'startOnTick' => false, - 'showFirstLabel' => false, - ], - 'tooltip' => ['shared' => true], - 'legend' => ['enabled' => true], - 'series' => [ - [ - 'name' => $event->getTitle(), - 'data' => array_values(array_map(static function ($item) { - return $item['n']; - }, $stats['suivi'])), + $chart = [ + 'chart' => [ + 'renderTo' => 'container', + 'zoomType' => 'x', + 'spacingRight' => 20, ], - [ - 'name' => 'n-1', - 'data' => array_values(array_map(static function ($item) { - return $item['n_1']; - }, $stats['suivi'])), + 'title' => ['text' => 'Evolution des inscriptions'], + 'subtitle' => ['text' => 'Cliquez/glissez dans la zone pour zoomer'], + 'xAxis' => [ + 'type' => 'linear', + 'title' => ['text' => null], + 'allowDecimals' => false, ], - ], - ]; + 'yAxis' => [ + 'title' => ['text' => 'Inscriptions'], + 'min' => 0, + 'startOnTick' => false, + 'showFirstLabel' => false, + ], + 'tooltip' => ['shared' => true], + 'legend' => ['enabled' => true], + 'series' => [ + [ + 'name' => $event->getTitle(), + 'data' => array_values(array_map(static function ($item) { + return $item['n']; + }, $stats['suivi'])), + ], + [ + 'name' => 'n-1', + 'data' => array_values(array_map(static function ($item) { + return $item['n_1']; + }, $stats['suivi'])), + ], + ], + ]; - $rawStatsByType = $this->eventStatsRepository->getStats($event->getId())->ticketType->paying; - $totalInscrits = array_sum($rawStatsByType); - array_walk($rawStatsByType, function (&$item, $key) use (&$ticketTypes, $totalInscrits) { - if (isset($ticketTypes[$key]) === false) { - $type = $this->ticketTypeRepository->get($key); - $ticketTypes[$key] = $type->getPrettyName(); - } - $item = ['name' => $ticketTypes[$key], 'y' => $item / $totalInscrits]; - }); + $rawStatsByType = $this->eventStatsRepository->getStats($event->getId())->ticketType->paying; + $totalInscrits = array_sum($rawStatsByType); + array_walk($rawStatsByType, function (&$item, $key) use (&$ticketTypes, $totalInscrits) { + if (isset($ticketTypes[$key]) === false) { + $type = $this->ticketTypeRepository->get($key); + $ticketTypes[$key] = $type->getPrettyName(); + } + $item = ['name' => $ticketTypes[$key], 'y' => $item / $totalInscrits]; + }); - $rawStatsByType = array_values($rawStatsByType); + $rawStatsByType = array_values($rawStatsByType); - $pieChartConf = [ - "chart" => [ - "plotBackgroundColor" => null, - "plotBorderWidth" => null, - "plotShadow" => false, - "type" => 'pie', - ], - "title" => [ - "text" => 'Répartition des types d\'inscriptions payantes', - ], - "tooltip" => [ - "pointFormat" => '{series.name}: {point.percentage:.1f}%', - ], - "plotOptions" => [ - "pie" => [ - "allowPointSelect" => true, - "cursor" => 'pointer', - "dataLabels" => [ - "enabled" => true, - "format" => '{point.name}: {point.percentage:.1f} %', - "style" => [ - "color" => 'black', + $pieChartConf = [ + "chart" => [ + "plotBackgroundColor" => null, + "plotBorderWidth" => null, + "plotShadow" => false, + "type" => 'pie', + ], + "title" => [ + "text" => 'Répartition des types d\'inscriptions payantes', + ], + "tooltip" => [ + "pointFormat" => '{series.name}: {point.percentage:.1f}%', + ], + "plotOptions" => [ + "pie" => [ + "allowPointSelect" => true, + "cursor" => 'pointer', + "dataLabels" => [ + "enabled" => true, + "format" => '{point.name}: {point.percentage:.1f} %', + "style" => [ + "color" => 'black', + ], ], ], ], - ], - "series" => [ - [ - "name" => 'Inscriptions', - "colorByPoint" => true, - "data" => $rawStatsByType, + "series" => [ + [ + "name" => 'Inscriptions', + "colorByPoint" => true, + "data" => $rawStatsByType, + ], ], - ], - ]; - + ]; + } return new Response($this->twig->render('admin/event/stats.html.twig', [ 'title' => 'Suivi inscriptions', 'event' => $event, @@ -154,7 +162,7 @@ public function __invoke(Request $request) 'pieChartConf' => $pieChartConf, 'stats' => $stats, 'seats' => [ - 'available' => $event->getSeats(), + 'available' => $event === null ? null: $event->getSeats(), 'one' => $ticketsDayOne, 'two' => $ticketsDayTwo, ], diff --git a/sources/AppBundle/Controller/Admin/Speaker/SpeakerListAction.php b/sources/AppBundle/Controller/Admin/Speaker/SpeakerListAction.php index 2fbb92f86..bebf5cf96 100644 --- a/sources/AppBundle/Controller/Admin/Speaker/SpeakerListAction.php +++ b/sources/AppBundle/Controller/Admin/Speaker/SpeakerListAction.php @@ -49,28 +49,34 @@ public function __invoke(Request $request) Assertion::inArray($sort, self::VALID_SORTS); Assertion::inArray($direction, self::VALID_DIRECTIONS); $filter = $request->query->get('filter'); - $event = $this->eventActionHelper->getEventById($request->query->get('eventId')); - $speakers = $this->speakerRepository->searchSpeakers($event, $sort, $direction, $filter); - $talks = []; - foreach ($speakers as $speaker) { - $speakerTalks = []; - foreach ($this->talkRepository->getTalksBySpeaker($event, $speaker) as $talk) { - if ($talk->getType() !== Talk::TYPE_PHP_PROJECT) { - $speakerTalks[$talk->getTitle()] = $talk; + $eventId = $request->query->get('eventId'); + $event = null; + $speakers=[]; + $talks=[]; + if ($eventId !== null) { + $event = $this->eventActionHelper->getEventById($eventId); + $speakers = $this->speakerRepository->searchSpeakers($event, $sort, $direction, $filter); + $talks = []; + foreach ($speakers as $speaker) { + $speakerTalks = []; + foreach ($this->talkRepository->getTalksBySpeaker($event, $speaker) as $talk) { + if ($talk->getType() !== Talk::TYPE_PHP_PROJECT) { + $speakerTalks[$talk->getTitle()] = $talk; + } } + ksort($speakerTalks); + $talks[$speaker->getId()] = array_values($speakerTalks); } - ksort($speakerTalks); - $talks[$speaker->getId()] = array_values($speakerTalks); } /** @var Event[] $events */ $events = $this->eventRepository->getAll(); return new Response($this->twig->render('admin/speaker/list.html.twig', [ - 'eventId' => $event->getId(), + 'eventId' => $event === null ? null:$event->getId(), 'events' => $events, 'speakers' => $speakers, 'talks' => $talks, - 'nbSpeakers' => $this->speakerRepository->countByEvent($event), + 'nbSpeakers' => $event === null ? 0:$this->speakerRepository->countByEvent($event), 'sort' => $sort, 'direction' => $direction, 'filter' => $filter, diff --git a/sources/AppBundle/Controller/VoteController.php b/sources/AppBundle/Controller/VoteController.php index 62f4672e2..0c750fa3e 100644 --- a/sources/AppBundle/Controller/VoteController.php +++ b/sources/AppBundle/Controller/VoteController.php @@ -167,11 +167,7 @@ public function adminAction(Request $request) $eventRepository = $this->get('ting')->get(EventRepository::class); $event = $this->getEvent($eventRepository, $request); - if ($event === null) { - throw $this->createNotFoundException(sprintf('Could not found event')); - } - - $votes = $this->get('ting')->get(VoteRepository::class)->getVotesByEvent($event->getId()); + $votes = $event === null ? []:$this->get('ting')->get(VoteRepository::class)->getVotesByEvent($event->getId()); return $this->render('admin/vote/liste.html.twig', [ 'votes' => $votes, @@ -184,12 +180,12 @@ public function adminAction(Request $request) private function getEvent(EventRepository $eventRepository, Request $request) { $event = null; - if ($request->query->has('id') === false) { - $event = $eventRepository->getNextEvent(); - $event = $eventRepository->get($event->getId()); - } else { + if ($request->query->has('id') !== false) { $id = $request->query->getInt('id'); $event = $eventRepository->get($id); + if ($event === null) { + throw $this->createNotFoundException(sprintf('Could not found event')); + } } return $event; diff --git a/sources/AppBundle/Event/Form/EventSelectType.php b/sources/AppBundle/Event/Form/EventSelectType.php index faddfd7ad..8b6324417 100644 --- a/sources/AppBundle/Event/Form/EventSelectType.php +++ b/sources/AppBundle/Event/Form/EventSelectType.php @@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) [ 'choice_label' => 'title', 'choice_value' => 'id', - 'data' => $options['data'], + 'data' => isset($options['data']) ? $options['data']:null, 'choices' => $this->eventRepository->getAll() ] )