diff --git a/public/img/pointeur.png b/public/img/pointeur.png new file mode 100644 index 0000000..eb93730 Binary files /dev/null and b/public/img/pointeur.png differ diff --git a/src/Controller/AdminController.php b/src/Controller/AdminController.php index 8f52699..8c3264b 100644 --- a/src/Controller/AdminController.php +++ b/src/Controller/AdminController.php @@ -6,6 +6,7 @@ use App\Entity\Participant; use App\Entity\PasswordResetToken; use App\Entity\Site; use App\Entity\Ville; +use App\Repository\EtatRepository; use App\Repository\ParticipantRepository; use App\Repository\SiteRepository; use App\Repository\SortieRepository; @@ -400,4 +401,17 @@ class AdminController extends AbstractController ]); } + #[Route('/admin/sortie/annuler/{id}', name: 'app_adminSortieAnnuler')] + public function sortieAnuler(String $id, EntityManagerInterface $entityManager, + SortieRepository $sortieRepository, EtatRepository $etatRepository): Response + { + $etat = $etatRepository->findOneBy(["libelle" => "Annulée"]); + $sortie = $sortieRepository->find($id); + $sortie->setEtat($etat); + $entityManager->persist($sortie); + $entityManager->flush(); + $this->addFlash('success', "La sortie a bien été annuler"); + return $this->redirectToRoute('app_adminSortie'); + } + } diff --git a/templates/admin/sidebar.html.twig b/templates/admin/sidebar.html.twig index 099f60e..c4b7508 100644 --- a/templates/admin/sidebar.html.twig +++ b/templates/admin/sidebar.html.twig @@ -22,4 +22,4 @@ - + \ No newline at end of file diff --git a/templates/admin/sortie.html.twig b/templates/admin/sortie.html.twig index c91d807..065bae5 100644 --- a/templates/admin/sortie.html.twig +++ b/templates/admin/sortie.html.twig @@ -16,7 +16,6 @@ - @@ -32,27 +31,20 @@ {% for sortie in sorties %} - - + - + - + {% if sortie.etat.libelle != 'Annulée' and sortie.etat.libelle != 'Terminée' %} + + {% endif %} {% else %} @@ -63,7 +55,6 @@
Nom Date début durée
{{ sortie.nom }}{{ sortie.dateHeureDebut }}{{ sortie.dateHeureDebut|date('d/m/Y H:i') }} {{ sortie.duree }}{{ sortie.dateLimiteInscription }}{{ sortie.dateLimiteInscription|date('d/m/Y H:i') }} {{ sortie.nbInscriptionsMax }} {{ sortie.organisateur.pseudo }} {{ sortie.site.nom }} {{ sortie.lieu.nom }} {{ sortie.etat.libelle }} - {# {% if not sortie.etat %} - - {% endif %} - - Logo - - - Logo - #} - + Annuler +
- {% endblock %} \ No newline at end of file diff --git a/templates/main/footer.html.twig b/templates/main/footer.html.twig index 37e527b..19480b9 100644 --- a/templates/main/footer.html.twig +++ b/templates/main/footer.html.twig @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/templates/sortie/view.html.twig b/templates/sortie/view.html.twig index e175177..7914dab 100644 --- a/templates/sortie/view.html.twig +++ b/templates/sortie/view.html.twig @@ -13,7 +13,7 @@ {% block content %}
-

🎉 Détails de la sortie

+

🎉 {{ sortie.nom }} 🎉

@@ -129,11 +129,21 @@