From dc7d96d82603501d0685cc46de7db09cc9123892 Mon Sep 17 00:00:00 2001 From: ryana Date: Mon, 8 Jun 2026 16:37:59 +0200 Subject: [PATCH] modif --- controllers/lecture_page_ctrl.php | 14 ++++++-------- index.php | 4 ++-- models/lecture_page_model.php | 10 +++++----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/controllers/lecture_page_ctrl.php b/controllers/lecture_page_ctrl.php index 9e7afd6..baf0f83 100644 --- a/controllers/lecture_page_ctrl.php +++ b/controllers/lecture_page_ctrl.php @@ -3,7 +3,7 @@ function planning_afficher_ctrl() { require_once 'models/connection.php'; - require_once 'models/planning_model.php'; + require_once 'models/lecture_page_model.php'; $co = connection(); @@ -34,22 +34,22 @@ function planning_afficher_ctrl() { $grille = []; foreach ($sauveteurs as $s) { - $sauveteursById[$s['ID_Sauveteur']] = $s; - $grille[$s['ID_Sauveteur']] = array_fill_keys($creneaux, ''); + $sauveteursById[$s['ID']] = $s; + $grille[$s['ID']] = array_fill_keys($creneaux, ''); } // Remplissage des missions foreach ($missions as $m) { - $id = $m['ID_Sauveteur']; + $id = $m['ID']; if (!isset($grille[$id])) continue; $specialite = $sauveteursById[$id]['Specialite'] ?? ''; $couleur = $couleurs[$specialite] ?? '#cccccc'; - $debut = new DateTime($m['DtaHeureDebut']); - $fin = new DateTime($m['DtaHeureFin']); + $debut = new DateTime($m['DateHeureDebut']); + $fin = new DateTime($m['DateHeureFin']); foreach ($creneaux as $c) { @@ -61,6 +61,4 @@ function planning_afficher_ctrl() { } } } - - require 'views/planning_view.php'; } diff --git a/index.php b/index.php index db61581..b8585e5 100644 --- a/index.php +++ b/index.php @@ -28,12 +28,12 @@ case null: - require('views/lecture_page.php'); + require('controllers/lecture_page_ctrl.php'); planning_afficher_ctrl(); break; case '': - require('views/lecture_page.php'); + require('controllers/lecture_page_ctrl.php'); planning_afficher_ctrl(); break; diff --git a/models/lecture_page_model.php b/models/lecture_page_model.php index 7ce2653..9e540ae 100644 --- a/models/lecture_page_model.php +++ b/models/lecture_page_model.php @@ -1,20 +1,20 @@ query($req)->fetchAll(PDO::FETCH_ASSOC); } // 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 + SELECT ID, DateHeureDebut, DateHeureFin, ID_Sauveteur FROM Mission - WHERE DATE(DtaHeureDebut) = :date - OR DATE(DtaHeureFin) = :date + WHERE DATE(DateHeureDebut) = :date + OR DATE(DateHeureFin) = :date "; $stmt = $c->prepare($req);