diff --git a/controllers/lecture_page_ctrl.php b/controllers/lecture_page_ctrl.php index 4e1474a..3553e0c 100644 --- a/controllers/lecture_page_ctrl.php +++ b/controllers/lecture_page_ctrl.php @@ -1,45 +1,53 @@ '#2ecc71', - 'Sauveteur en approche de la cavité' => '#9b59b6', - 'Sauveteur sous terre' => '#8B4513', - 'Sauveteur équipe de gestion' => '#f1c40f', - "Sauveteur en mission à l'extérieur" => '#e67e22', - 'Sauveteur en repos' => '#3498db', - 'Sauveteur en brancardage civière' => '#e74c3c', -]; + $date = $_GET['date'] ?? date('Y-m-d'); + $sauveteurs = get_all_sauveteurs($c); + $missions = get_missions_by_date($c, $date); -$creneaux = []; -for ($min = 8 * 60; $min < 20 * 60; $min += 30) { - $creneaux[] = sprintf('%02d:%02d', intdiv($min, 60), $min % 60); -} + $couleurs = [ + 'Sauveteur disponible' => '#2ecc71', + 'Sauveteur en approche de la cavité' => '#9b59b6', + 'Sauveteur sous terre' => '#8B4513', + 'Sauveteur équipe de gestion' => '#f1c40f', + "Sauveteur en mission à l'extérieur" => '#e67e22', + 'Sauveteur en repos' => '#3498db', + 'Sauveteur en brancardage civière' => '#e74c3c', + ]; -// Indexer les sauveteurs par ID pour accès rapide à la spécialité -$sauveteursById = []; -foreach ($sauveteurs as $s) { - $sauveteursById[$s['ID_Sauveteur']] = $s; - $grille[$s['ID_Sauveteur']]= array_fill_keys($creneaux, false); -} + $creneaux = []; + for ($min = 8 * 60; $min < 20 * 60; $min += 30) { + $creneaux[] = sprintf('%02d:%02d', intdiv($min, 60), $min % 60); + } -foreach ($missions as $m) { - $id = $m['ID_Sauveteur']; - if (!isset($grille[$id])) continue; + $sauveteursById = []; + foreach ($sauveteurs as $s) { + $sauveteursById[$s['ID_Sauveteur']] = $s; + $grille[$s['ID_Sauveteur']] = array_fill_keys($creneaux, false); + } - $specialite = $sauveteursById[$id]['Specialite'] ?? ''; - $couleur = $couleurs[$specialite] ?? '#cccccc'; - $debut = new DateTime($m['DtaHeureDebut']); - $fin = new DateTime($m['DtaHeureFin']); + foreach ($missions as $m) { + $id = $m['ID_Sauveteur']; + if (!isset($grille[$id])) continue; - foreach ($creneaux as $c) { - $debutCreneau = new DateTime($date . ' ' . $c . ':00'); - $finCreneau = (clone $debutCreneau)->modify('+30 minutes'); - if ($debut < $finCreneau && $fin > $debutCreneau) { - $grille[$id][$c] = $couleur; + $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) { + $grille[$id][$c] = $couleur; + } } } -} -require 'view.php'; + require('views/planning_view.php'); + planning_view($sauveteurs, $creneaux, $grille, $date); +} diff --git a/controllers/operation_ctrl.php b/controllers/operation_ctrl.php new file mode 100644 index 0000000..e69de29 diff --git a/index.php b/index.php index 3422372..4ac413c 100644 --- a/index.php +++ b/index.php @@ -66,9 +66,16 @@ break; case 'operations': - require('views/operations_view.php'); + require('controllers/operation_ctrl.php'); + operations_form_ctrl(); break; +<<<<<<< HEAD + case 'add_operation': + require('controllers/operation_ctrl.php'); + add_operation_write_ctrl(); + break; +======= case 'lecture': require('views/lecture_page.php'); break; @@ -77,6 +84,7 @@ require('controllers/lecture_page_ctrl.php'); break; +>>>>>>> c98d36d6ee22b1cc45aaf2d55c29677ea8c56d65 default: require('views/404_view.php'); break; diff --git a/lecture_page_model b/lecture_page_model deleted file mode 100644 index 8b13789..0000000 --- a/lecture_page_model +++ /dev/null @@ -1 +0,0 @@ - diff --git a/models/lecture_page_model.php b/models/lecture_page_model.php index 1c2ca64..8bb7775 100644 --- a/models/lecture_page_model.php +++ b/models/lecture_page_model.php @@ -1,12 +1,25 @@ query($req); + $sauveteurs = $res->fetchAll(PDO::FETCH_ASSOC); + $res->closeCursor(); + return $sauveteurs; +} -$sauveteurs = $pdo->query('SELECT ID_Sauveteur, Nom, Prenom, Specialite FROM Sauveteur ORDER BY Nom, Prenom')->fetchAll(PDO::FETCH_ASSOC); +// Récupère les missions d'une journée +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; +} -$stmt = $pdo->prepare('SELECT ID_Mission, DtaHeureDebut, DtaHeureFin, ID_Sauveteur FROM Mission WHERE DATE(DtaHeureDebut) = ? OR DATE(DtaHeureFin) = ?'); -$stmt->execute([$date, $date]); -$missions = $stmt->fetchAll(PDO::FETCH_ASSOC); diff --git a/models/operation_crud.php b/models/operation_crud.php new file mode 100644 index 0000000..e69de29 diff --git a/views/lecture_page.php b/views/lecture_page.php index df8dac2..96bec03 100644 --- a/views/lecture_page.php +++ b/views/lecture_page.php @@ -1,3 +1,7 @@ +