From 08f7cea2dcb186ed7a8c1d2e220f77346bd82401 Mon Sep 17 00:00:00 2001
From: pierre renaudot <pierrerenaudot@gmail.Com>
Date: Fri, 12 Jan 2024 11:12:03 +0100
Subject: [PATCH] correction bug / netoyage du code

---
 controleurs/c_gestionFiche.php | 10 +++++-----
 controleurs/c_homePage.php     |  2 +-
 include/menu.php               | 14 ++++++++------
 vues/v_gestionFiches.php       |  2 +-
 vues/v_homePage.php            |  4 +---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/controleurs/c_gestionFiche.php b/controleurs/c_gestionFiche.php
index 393ddb9..d68d2cf 100644
--- a/controleurs/c_gestionFiche.php
+++ b/controleurs/c_gestionFiche.php
@@ -1,12 +1,14 @@
 <?php
-$_SESSION["typeU"] = "comptable";
 
 require_once(__DIR__ . '/../Class/class.gestionFiche.php');
-$gestionFiche = new Class_gestionFiche($pdo);
 
+$typeU = $_SESSION['uType'];
+
+$gestionFiche = new Class_gestionFiche($pdo);
 $LesUtilisateurs = $gestionFiche->getLesUtilisateurs(); //RENVOIE LISTE USERS
 
-if ($_SESSION["typeU"] == "comptable") {
+// Gestion du selecteur selon le type user 
+if ($typeU == "comptable") {
     if (isset($_REQUEST['selVisiteur'])) {
         $userId = $_REQUEST['selVisiteur'];
     } else {
@@ -18,6 +20,4 @@ if ($_SESSION["typeU"] == "comptable") {
 
 $lesFiches = $gestionFiche->get_ListesFiches($userId);
 
-
-
 include("vues/v_gestionFiches.php");
diff --git a/controleurs/c_homePage.php b/controleurs/c_homePage.php
index 64cd995..1fc30f0 100644
--- a/controleurs/c_homePage.php
+++ b/controleurs/c_homePage.php
@@ -1,3 +1,3 @@
 <?php
 
-include(__DIR__ . '/../vues/v_homePage.php');
\ No newline at end of file
+include(__DIR__ . '/../vues/v_homePage.php');
diff --git a/include/menu.php b/include/menu.php
index 311fadc..a78628f 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -1,5 +1,5 @@
 <div class="col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-dark">
-    <div class="d-flex flex-column align-items-center align-items-sm-start px-3 pt-2 text-white ">
+    <div class="d-flex flex-column align-items-center align-items-sm-start px-3 pt-2 text-white min-vh-100">
         <a href="/" class="d-flex align-items-center pb-3 mb-md-0 me-md-auto text-white text-decoration-none">
             <strong><span class="fs-5 d-none d-sm-inline">GSB LABORATOIRE</span></strong>
         </a>
@@ -28,7 +28,7 @@
             if ($_SESSION['uType'] == 'visiteur'):
                 ?>
                 <li>
-                    <a href="#submenu1" data-bs-toggle="collapse" class="nav-link px-0 align-middle">
+                    <a href="#submenu1" data-bs-toggle="collapse" class="nav-link px-0 align-middle dropdown-toggle">
                         <strong><i class="fs-4 bi-speedometer2"></i> <span class="ms-1 d-none d-sm-inline">Fiche de
                                 frais</span></strong>
                     </a>
@@ -46,7 +46,7 @@
                     </ul>
                 </li>
                 <li>
-                    <a href="#" class="nav-link px-0 align-middle">
+                    <a href="#" class="nav-link px-0 align-middle dropdown-toggle">
                         <strong><i class="fs-4 bi-table"></i> <span
                                 class="ms-1 d-none d-sm-inline">Visites</span></a></strong>
                 </li>
@@ -56,9 +56,11 @@
                 Partie comptable
              -->
                 <li>
-                    <a href="#submenu2" data-bs-toggle="collapse" class="nav-link px-0 align-middle">
-                        <i class="fs-4 bi-speedometer2"></i> <span class="ms-1 d-none d-sm-inline">Fiche de frais</span>
-                    </a>
+                    <strong>
+                        <a href="#submenu2" data-bs-toggle="collapse" class="nav-link px-0 align-middle dropdown-toggle">
+                            <i class="fs-4 bi-speedometer2"></i> <span class="ms-1 d-none d-sm-inline">Fiche de frais</span>
+                        </a>
+                    </strong>
                     <ul class="collapse show nav flex-column ms-1" id="submenu2" data-bs-parent="#menu">
                         <li class="w-100">
                             <a href="index.php?direction=gestionFiche" class="nav-link px-0"> <span
diff --git a/vues/v_gestionFiches.php b/vues/v_gestionFiches.php
index 9f2495e..a54ca4a 100644
--- a/vues/v_gestionFiches.php
+++ b/vues/v_gestionFiches.php
@@ -2,7 +2,7 @@
     <div class="col-3 mb-4">
         <br>
         <?php
-        if ($_SESSION['typeU'] != 'comptable') {
+        if ($typeU != 'comptable') {
             echo '<h3>Gérer mes fiches de frais</h3>';
         } else { ?>
 
diff --git a/vues/v_homePage.php b/vues/v_homePage.php
index 664fe28..1bf6a42 100644
--- a/vues/v_homePage.php
+++ b/vues/v_homePage.php
@@ -1,6 +1,4 @@
-<h4>BONJOUR VOUS ETES
-    <?= strtoupper($_SESSION['uType']) ?>
-</h4>
+<h4 class="d-block mx-auto my-2 text-align-center">BONJOUR <?= strtoupper($_SESSION['uPrenom']) ?> NOUS SOMMES LE <?= date('d-m-Y') ?></h4>
 
 <div class="card">
     <div class="card-header">