Prep for 1.0

2025-03-31 12:33:26 +00:00
parent ac5cd4f3a0
commit 41dcd937cd
5 changed files with 98 additions and 205 deletions
--- a/upcoming.php
+++ b/upcoming.php
@@ -13,33 +13,6 @@ require_db_auth();
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Upcoming Movements</title>
    <style>
-        /* ...existing styles from tower.php... */
-
-        .menu-bar {
-            display: flex;
-            justify-content: center;
-            background-color: #333;
-            padding: 10px 0;
-            margin-bottom: 20px;
-        }
-
-        .menu-bar a {
-            color: white;
-            text-decoration: none;
-            padding: 10px 20px;
-            font-family: Arial, sans-serif;
-            font-size: 16px;
-            transition: background-color 0.3s;
-        }
-
-        .menu-bar a:hover {
-            background-color: #575757;
-        }
-
-        .menu-bar a.active {
-            background-color: #007bff;
-            font-weight: bold;
-        }

        /* Table styling */
        table {
@@ -172,11 +145,7 @@ require_db_auth();
 </head>
 <body>

-<div class="menu-bar">
-    <a href="tower.php">HOME</a>
-    <a href="upcoming.php" class="active">Future PPRs</a>
-    <a href="admin.php">Reports</a>
-</div>
+<?php include("menu.php"); ?>

 <script>
 function markAction(id, action, title, buttonText) {
@@ -309,6 +278,7 @@ $conn = connectDb();
 $sql = "SELECT id, ac_reg, ac_type, ac_call, eta AS ETA, fuel, in_from, pob_in, notes 
        FROM submitted 
        WHERE DATE(eta) > CURDATE() 
+        AND status != 'CANCELED'
        ORDER BY eta ASC;";
 $result = $conn->query($sql);

@@ -323,3 +293,4 @@ $conn->close();

 </body>
 </html>
+<?php include("footer.php"); ?>