modiflecture

controllers/lecture_page_ctrl.php

@@ -1,14 +1,18 @@
 <?php
 
 function planning_afficher_ctrl() {
-    require('models/connection.php');
+
+    require_once 'models/connection.php';
+    require_once 'models/planning_model.php';
+
     $co = connection();
-    require('models/planning_model.php');
 
     $date = $_GET['date'] ?? date('Y-m-d');
-    $sauveteurs = get_all_sauveteurs($c);
-    $missions   = get_missions_by_date($c, $date);
 
+    $sauveteurs = get_all_sauveteurs($co);
+    $missions   = get_missions_by_date($co, $date);
+
+    // Couleurs
     $couleurs = [
         'Sauveteur disponible'               => '#2ecc71',
         'Sauveteur en approche de la cavité' => '#9b59b6',
@@ -19,35 +23,44 @@ function planning_afficher_ctrl() {
         'Sauveteur en brancardage civière'   => '#e74c3c',
     ];
 
+    // Créneaux 8h - 20h (30 min)
     $creneaux = [];
     for ($min = 8 * 60; $min < 20 * 60; $min += 30) {
         $creneaux[] = sprintf('%02d:%02d', intdiv($min, 60), $min % 60);
     }
 
+    // Index sauveteurs + grille vide
     $sauveteursById = [];
+    $grille = [];
+
     foreach ($sauveteurs as $s) {
         $sauveteursById[$s['ID_Sauveteur']] = $s;
-        $grille[$s['ID_Sauveteur']] = array_fill_keys($creneaux, false);
+        $grille[$s['ID_Sauveteur']] = array_fill_keys($creneaux, '');
     }
 
+    // Remplissage des missions
     foreach ($missions as $m) {
+
         $id = $m['ID_Sauveteur'];
+
         if (!isset($grille[$id])) continue;
 
         $specialite = $sauveteursById[$id]['Specialite'] ?? '';
         $couleur = $couleurs[$specialite] ?? '#cccccc';
+
         $debut = new DateTime($m['DtaHeureDebut']);
         $fin   = new DateTime($m['DtaHeureFin']);
 
         foreach ($creneaux as $c) {
-            $debutCreneau = new DateTime($date . ' ' . $c . ':00');
-            $finCreneau   = (clone $debutCreneau)->modify('+30 minutes');
-            if ($debut < $finCreneau && $fin > $debutCreneau) {
+
+            $start = new DateTime($date . ' ' . $c . ':00');
+            $end   = (clone $start)->modify('+30 minutes');
+
+            if ($debut < $end && $fin > $start) {
                 $grille[$id][$c] = $couleur;
             }
         }
     }
 
-    require('views/planning_view.php');
-    planning_view($sauveteurs, $creneaux, $grille, $date);
+    require 'views/planning_view.php';
 }

models/lecture_page_model.php

@@ -5,21 +5,22 @@ require_once 'config.php';
 // Récupère tous les sauveteurs
 function get_all_sauveteurs(PDO $c): array {
     $req = "SELECT ID_Sauveteur, Nom, Prenom, Specialite FROM Sauveteur ORDER BY Nom, Prenom";
-    $res = $c->query($req);
-    $sauveteurs = $res->fetchAll(PDO::FETCH_ASSOC);
-    $res->closeCursor();
-    return $sauveteurs;
+    return $c->query($req)->fetchAll(PDO::FETCH_ASSOC);
 }
 
-// Récupère les missions d'une journée
+// Récupère les missions d'une date
 function get_missions_by_date(PDO $c, string $date): array {
-    $req = "SELECT ID_Mission, DtaHeureDebut, DtaHeureFin, ID_Sauveteur FROM Mission WHERE DATE(DtaHeureDebut) = :date OR DATE(DtaHeureFin) = :date";
-    $prep = $c->prepare($req);
-    $prep->bindValue(':date', $date, PDO::PARAM_STR);
-    $prep->execute();
-    $missions = $prep->fetchAll(PDO::FETCH_ASSOC);
-    $prep->closeCursor();
-    return $missions;
+    $req = "
+        SELECT ID_Mission, DtaHeureDebut, DtaHeureFin, ID_Sauveteur
+        FROM Mission
+        WHERE DATE(DtaHeureDebut) = :date
+           OR DATE(DtaHeureFin) = :date
+    ";
+
+    $stmt = $c->prepare($req);
+    $stmt->bindValue(':date', $date);
+    $stmt->execute();
+
+    return $stmt->fetchAll(PDO::FETCH_ASSOC);
 }
 
-

views/lecture_page.php

@@ -33,3 +33,8 @@ function planning_view(array $sauveteurs, array $creneaux, array $grille, string
 
 </body>
 </html>
+<<<<<<< Updated upstream
+=======
+<?php
+}
+>>>>>>> Stashed changes