From 6e13ae5a33c4cd22f9ddbe3ab5208d9af88fd322 Mon Sep 17 00:00:00 2001 From: Chrystel Moreau Date: Thu, 2 Jul 2020 13:19:08 +0200 Subject: [PATCH] =?UTF-8?q?gestion=20des=20inscriptions=20multiples=20sur?= =?UTF-8?q?=201/2=20journ=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Action/DashboardParticipantParcoursFormationAction.php | 4 ++-- app/templates/dashboard_admin_parcours_agenda.twig | 4 ++-- app/templates/dashboard_participant_parcours_agenda.twig | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/Action/DashboardParticipantParcoursFormationAction.php b/app/src/Action/DashboardParticipantParcoursFormationAction.php index 2377dbf..a581f45 100644 --- a/app/src/Action/DashboardParticipantParcoursFormationAction.php +++ b/app/src/Action/DashboardParticipantParcoursFormationAction.php @@ -67,7 +67,7 @@ final class DashboardParticipantParcoursFormationAction // verification du nb inscrits par rapport au quota if ($nb_inscrits != $quota) { // verification du nb d'inscription par 1/2 journée - if (count($allParticipantAgenda) < 1 || $agenda[0]->getFormation()->getType() == 'Groupe de Travail') { + //if (count($allParticipantAgenda) < 1 || $agenda[0]->getFormation()->getType() == 'Groupe de Travail') { $inscription = new \App\Entity\ParticipantAgenda(); $inscription->setParticipant($participant); $inscription->setAgenda($agenda[0]); @@ -77,7 +77,7 @@ final class DashboardParticipantParcoursFormationAction $this->em->persist($inscription); $this->em->flush(); - } + //} } } diff --git a/app/templates/dashboard_admin_parcours_agenda.twig b/app/templates/dashboard_admin_parcours_agenda.twig index 75b435d..2faefcb 100644 --- a/app/templates/dashboard_admin_parcours_agenda.twig +++ b/app/templates/dashboard_admin_parcours_agenda.twig @@ -109,10 +109,10 @@ {% elseif inscription and inscription.getAgenda().getFormation().getType() != 'Groupe de Travail' %} #} - {% elseif inscription +{# {% elseif inscription and (agenda['agenda'].getFormation().getType() != 'Groupe de Travail' or (agenda['agenda'].getDateDebut() == inscription.getAgenda().getDateDebut() and agenda['agenda'].getDateFin() == inscription.getAgenda().getDateFin())) - %} + %}#} {% else %} {% if prct < 100 %} diff --git a/app/templates/dashboard_participant_parcours_agenda.twig b/app/templates/dashboard_participant_parcours_agenda.twig index 19bb24a..b919b5d 100644 --- a/app/templates/dashboard_participant_parcours_agenda.twig +++ b/app/templates/dashboard_participant_parcours_agenda.twig @@ -118,10 +118,10 @@ {% elseif inscription and inscription.getAgenda().getFormation().getType() != 'Groupe de Travail' %} #} - {% elseif inscription +{# {% elseif inscription and (agenda['agenda'].getFormation().getType() != 'Groupe de Travail' or (agenda['agenda'].getDateDebut() == inscription.getAgenda().getDateDebut() and agenda['agenda'].getDateFin() == inscription.getAgenda().getDateFin())) - %} + %} #} {% else %} -- GitLab