From 7bea9c1fe65cc7f88fbac6f0fe06e5c385ae45f2 Mon Sep 17 00:00:00 2001
From: ExostFlash <120869320+ExostFlash@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:05:00 +0100
Subject: [PATCH] corrige bug

---
 src/Controller/HomeController.php | 53 +++++++++++++++++++++----------
 templates/home/choice.html.twig   |  4 +--
 templates/home/index.html.twig    |  8 ++++-
 templates/home/menu.html.twig     | 23 ++++++++++++++
 4 files changed, 69 insertions(+), 19 deletions(-)
 create mode 100644 templates/home/menu.html.twig

diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index 1c0f6e3..fd09406 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -22,23 +22,28 @@ class HomeController extends AbstractController
     private $restoRepository;
     private $menuRepository;
     private $role_user;
-    public function __construct(userRepository $userRepository, restoRepository $restoRepository, menuRepository $menuRepository, Security $security)
+    public function __construct(UserRepository $userRepository, RestoRepository $restoRepository, MenuRepository $menuRepository, Security $security)
     {
-        $utilisateur = $security->getUser();
-        $email_user = $utilisateur->getUserIdentifier();
-
-        $user = $userRepository->findOneBy(['email' => $email_user]);
-
-        $role_user = $user->getGrade();
-        $id_resto = $user->getIdResto();
-        $id_user = $user->getId();
-
-        $this->role_user = $role_user;
-        $this->id_resto = $id_resto;
-        $this->id_user = $id_user;
         $this->userRepository = $userRepository;
         $this->restoRepository = $restoRepository;
         $this->menuRepository = $menuRepository;
+
+        $utilisateur = $security->getUser();
+
+        if ($utilisateur != null) {
+            $email_user = $utilisateur->getUserIdentifier();
+            $user = $userRepository->findOneBy(['email' => $email_user]);
+
+            if ($user) {
+                $role_user = $user->getGrade();
+                $id_resto = $user->getIdResto();
+                $id_user = $user->getId();
+
+                $this->role_user = $role_user;
+                $this->id_resto = $id_resto;
+                $this->id_user = $id_user;
+            }
+        }
     }
 
     #[Route('/', name: 'app_home')]
@@ -52,7 +57,7 @@ class HomeController extends AbstractController
         ]);
     }
 
-    #[Route('/{idresto}', name: 'app_home_choice')]
+    #[Route('/choix/{idresto}', name: 'app_home_choice')]
     public function choice($idresto): Response
     {
         $resto = $this->restoRepository->find($idresto);
@@ -65,7 +70,7 @@ class HomeController extends AbstractController
         ]);
     }
 
-    #[Route('/{idresto}/resa', name: 'app_home_resa')]
+    #[Route('/resa/{idresto}', name: 'app_home_resa')]
     public function resa(): Response
     {
         return $this->render('home/resa.html.twig', [
@@ -73,9 +78,12 @@ class HomeController extends AbstractController
         ]);
     }
 
-    #[Route('/{idresto}/{idmenu}', name: 'app_home_ticket')]
+    #[Route('/ticket/{idresto}/{idmenu}', name: 'app_home_ticket')]
     public function ticket($idresto, $idmenu, Request $request, EntityManagerInterface $entityManager): Response
     {
+        $idresto = (int) $idresto;
+        $idmenu = (int) $idmenu;
+
         $ticket = new Ticket();
         $ticket->setIdResto($idresto);
         $ticket->setIdUsers($this->id_user);
@@ -91,4 +99,17 @@ class HomeController extends AbstractController
 
         return $this->redirectToRoute('app_home', [], Response::HTTP_SEE_OTHER);
     }
+
+    #[Route('/menu/{idresto}', name: 'app_home_menu')]
+    public function menu($idresto): Response
+    {
+        $resto = $this->restoRepository->find($idresto);
+        $menus = $this->menuRepository->findBy(['id_resto' => $idresto]);
+
+        return $this->render('home/menu.html.twig', [
+            'controller_name' => 'Home',
+            'resto' => $resto,
+            'menus' => $menus,
+        ]);
+    }
 }
diff --git a/templates/home/choice.html.twig b/templates/home/choice.html.twig
index a95213b..2ba3091 100644
--- a/templates/home/choice.html.twig
+++ b/templates/home/choice.html.twig
@@ -1,12 +1,12 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Home{% endblock %}
+{% block title %}Choix{% endblock %}
 
 {% block body %}
 
 <div class="center">
     <h1>Commande/Resa</h1>
-    <h5>{{ resto.address }}</h5>
+    <h5>{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}</h5>
 
     <p>Vous souhaitez reserver au restaurant : <code><a href="{{ path('app_home_resa', {'idresto': resto.id}) }}">C'est par ici !</a></code>
 
diff --git a/templates/home/index.html.twig b/templates/home/index.html.twig
index 3a55346..81e477a 100644
--- a/templates/home/index.html.twig
+++ b/templates/home/index.html.twig
@@ -9,12 +9,18 @@
     
 {% if not app.user %}
     <p>compte utilisateur c'est <code><a href="/user">ici</a></code></p>
+    <h5>Menu par Resto :</h5>
+    <ul>
+    {% for resto in restos %}
+        <li><code><a href="{{ path('app_home_menu', {'idresto': resto.id}) }}">{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}</a></code></li>
+    {% endfor %}
+    </ul>
 {% else %}
     <p>Laisser un avis <code><a href="/avis">ici</a></code></p>
     <h5>Réserver/Commander :</h5>
     <ul>
     {% for resto in restos %}
-    <li><code><a href="{{ path('app_home_choice', {'idresto': resto.id}) }}">{{ resto.address }}</a></code></li>
+        <li><code><a href="{{ path('app_home_choice', {'idresto': resto.id}) }}">{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}</a></code></li>
     {% endfor %}
     </ul>
 {% endif %}
diff --git a/templates/home/menu.html.twig b/templates/home/menu.html.twig
new file mode 100644
index 0000000..3caca43
--- /dev/null
+++ b/templates/home/menu.html.twig
@@ -0,0 +1,23 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Menu{% endblock %}
+
+{% block body %}
+
+<div class="center">
+    <h1>Menu</h1>
+    <h5>{{ resto.address }}, {{ resto.ville }}, {{ resto.pay }}</h5>
+
+    {% for menu in menus %}
+        <article>
+            <h3>Menu {{ menu.id }}</h3>
+            <ul>
+                <li><code>Entrée :</code> {{ menu.entre }}</li>
+                <li><code>Plat :</code> {{ menu.plat }}</li>
+                <li><code>Dessert :</code> {{ menu.dessert }}</li>
+            </ul>
+        </article>
+    {% endfor %}
+
+</div>
+{% endblock %}