TZ changes from prod

ICAO and IATA code lookup
Add bookout system POC
2025-06-01 07:18:11 +00:00 · 2025-04-15 17:13:47 +00:00 · 2025-04-15 16:21:23 +00:00 · 2025-04-07 16:27:01 +00:00 · 2025-03-31 16:37:40 +00:00 · 2025-03-31 12:33:26 +00:00
27 changed files with 1432 additions and 489 deletions
--- a/action.php
+++ b/action.php
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -34,6 +33,10 @@
            background-color: #f9f9f9;
        }

+        .details th {
+            text-align: right; /* Justify table headings to the right */
+        }
+
        .details p {
            margin: 10px 0;
            font-size: 16px;
@@ -71,47 +74,113 @@
        button:hover {
            background-color: #0056b3;
        }
+
        .editable {
-            cursor: pointer;
            padding: 5px;
-            border-radius: 3px;
-            transition: background 0.3s;
+            font-size: 16px;
+            border: 1px solid #ddd;
+            border-radius: 5px;
+            width: 90%;
+            box-sizing: border-box;
        }
-        .editable:hover {
-            background:rgb(226, 43, 43);
+
+        input:focus {
+            border-color: #007bff;
+            outline: none;
        }
+
+        .edit-button {
+            margin-left: 10px;
+            padding: 5px 10px;
+            font-size: 0.9rem;
+            background-color: transparent;
+            border: none;
+            cursor: pointer;
+            transition: 0.3s;
+        }
+
+        .edit-button img {
+            width: 20px;
+            height: 20px;
+        }
+
+        .edit-button:hover img {
+            filter: brightness(0.8);
+        }
+
    </style>
 </head>
 <body>
 <script>

-
-
-
-
-
 document.addEventListener("DOMContentLoaded", function () {
    let id = "<?php echo $_GET['id'];?>";

+    // Disable all dropdowns by default
+    document.querySelectorAll("select.editable").forEach((element) => {
+        element.disabled = true;
+    });
+
    // Select all editable elements
    document.querySelectorAll(".editable").forEach((element) => {
-        let oldValue = element.textContent.trim(); // Store initial value
+        let oldValue = element.value || element.textContent.trim(); // Store initial value

        element.addEventListener("focus", function () {
-            oldValue = this.textContent.trim(); // Store old value when focused
+            oldValue = this.value || this.textContent.trim(); // Store old value when focused
        });

        element.addEventListener("blur", function () {
-            let newValue = this.textContent.trim();
+            let newValue = this.value || this.textContent.trim();
            let column = this.getAttribute("data-column");

            if (newValue !== oldValue) {
                sendUpdate(id, column, oldValue, newValue, element);
            }
        });
+
+        element.addEventListener("keydown", function (event) {
+            if (event.key === "Enter") {
+                event.preventDefault(); // Prevent new line
+                this.blur(); // Trigger blur event to save changes
+            }
+        });
+    });
+
+    // Select all edit buttons
+    document.querySelectorAll(".edit-button").forEach((button) => {
+        button.addEventListener("click", function () {
+            editField(button);
+        });
    });
 });

+/**
+ * Enables editing for the field
+ */
+function editField(button) {
+    let element = button.parentElement.nextElementSibling.firstElementChild;
+    if (element.tagName === "INPUT") {
+        element.readOnly = false;
+        element.focus();
+    } else if (element.tagName === "SELECT") {
+        element.disabled = false; // Enable dropdown
+        element.focus();
+    } else {
+        element.contentEditable = true;
+        element.focus();
+    }
+
+    element.addEventListener("blur", function () {
+        if (element.tagName === "INPUT") {
+            element.readOnly = true;
+        } else if (element.tagName === "SELECT") {
+            element.disabled = true; // Disable dropdown
+        } else {
+            element.contentEditable = false;
+        }
+    }, { once: true });
+}
+
 /**
 * Sends the updated data to the server
 */
@@ -128,12 +197,20 @@ function sendUpdate(flightId, column, oldValue, newValue, element) {
            oldValue = newValue; // ✅ Update oldValue to prevent reverting
        } else {
            alert("Error updating data");
-            element.textContent = oldValue; // ❌ Revert ONLY if update fails
+            if (element.tagName === "INPUT") {
+                element.value = oldValue; // ❌ Revert ONLY if update fails
+            } else {
+                element.textContent = oldValue; // ❌ Revert ONLY if update fails
+            }
        }
    })
    .catch(error => {
        console.error("Fetch error:", error);
-        element.textContent = oldValue; // ❌ Revert only on network failure
+        if (element.tagName === "INPUT") {
+            element.value = oldValue; // ❌ Revert only on network failure
+        } else {
+            element.textContent = oldValue; // ❌ Revert only on network failure
+        }
    });
 }

@@ -213,31 +290,58 @@ function opDetail() {
        // Output data of the row
        $row = $result->fetch_assoc();
        echo '<div class="container">';
-        echo '<div class="details"><p><strong>Aircraft Reg: </strong>' . $row['ac_reg'] . "</p>";
-        echo "<p><strong>Aircraft Type:</strong> " . $row['ac_type'] . "</p>";
-        echo "<p><strong>Callsign:</strong> " . $row['ac_call'] . "</p>";
-        echo "<p><strong>Captain's Name:</strong> " . $row['captain'] . "</p>";
-        echo "<p><strong>Arriving From:</strong> " . $row['in_from'] . "</p>";
-        echo "<p><strong>POB IN:</strong> " . $row['pob_in'] . "</p>";
-        echo "<p><strong>ETA:</strong> " . $row['eta'] . "</p>";
+        echo '<table class="details">';
+        echo '<tr><th>Aircraft Reg</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="text" class="editable" data-column="ac_reg" value="' . $row['ac_reg'] . '" readonly></td></tr>';
+        echo '<tr><th>Aircraft Type</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="text" class="editable" data-column="ac_type" value="' . $row['ac_type'] . '" readonly></td></tr>';
+        echo '<tr><th>Callsign</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="text" class="editable" data-column="ac_call" value="' . $row['ac_call'] . '" readonly></td></tr>';
+        echo '<tr><th>Captain</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="text" class="editable" data-column="captain" value="' . $row['captain'] . '" readonly></td></tr>';
+        echo '<tr><th>Arriving From:</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><span class="editable" data-column="in_from">' . $row['in_from'] . '</span></td></tr>';
+        echo '<tr><th>POB IN</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="number" class="editable" data-column="pob_in" value="' . $row['pob_in'] . '" readonly></td></tr>';
+        echo '<tr><th>ETA Z</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="datetime-local" class="editable" data-column="eta" value="' . ($row['eta'] ? date('Y-m-d\TH:i', strtotime($row['eta'])) : '') . '" readonly></td></tr>';
+        echo '<tr><th>Fuel</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><select class="editable" data-column="fuel" onchange="this.blur()" disabled>';
+        echo '<option value="None"' . ($row['fuel'] === 'None' ? ' selected' : '') . '>None</option>';
+        echo '<option value="100LL"' . ($row['fuel'] === '100LL' ? ' selected' : '') . '>100LL</option>';
+        echo '<option value="JET A1"' . ($row['fuel'] === 'JET A1' ? ' selected' : '') . '>JET A1</option>';
+        echo '</select></td></tr>';
+        echo '<tr><th>POB OUT</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="number" class="editable" data-column="pob_out" value="' . $row['pob_out'] . '" readonly></td></tr>';
+        echo '<tr><th>Outbound To</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><span class="editable" data-column="out_to">' . $row['out_to'] . '</span></td></tr>';
+        echo '<tr><th>ETD Z</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="datetime-local" class="editable" data-column="etd" value="' . ($row['etd'] ? date('Y-m-d\TH:i', strtotime($row['etd'])) : '') . '" readonly></td></tr>';
+        echo '<tr><th>Email Address</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="email" class="editable" data-column="email" value="' . $row['email'] . '" readonly></td></tr>';
+        echo '<tr><th>Phone</th><td><button class="edit-button" onclick="editField(this)"><img src="assets/edit.png" alt="Edit"></button></td><td><input type="tel" class="editable" data-column="phone" value="' . $row['phone'] . '" readonly></td></tr>';
+        echo '<tr><th>Notes</th><td></td><td>' . $row['notes'] . '</td></tr>';
+        echo '<tr><th>PPR created</th><td></td><td>' . $row['submitted_dt'] . ' by ' . $row['created_by'] . '</td></tr>';
+        echo '</table>';

-        echo "<p><strong>Fuel Required:</strong> " . $row['fuel'] . "</p>";
+        // Fetch journal entries
+        $journalSql = "SELECT * FROM journal WHERE ppr_id = " . $_GET['id'] . " ORDER BY id DESC";
+        $journalResult = $conn->query($journalSql);
+        $journalCount = $journalResult->num_rows;

-        echo "<p><strong>POB OUT:</strong><span class=\"editable\" data-column=\"pob_out\" contenteditable=\"true\">" . $row['pob_out'] . "</p>";
-        echo "<p><strong>Outbound To:</strong><span class=\"editable\" data-column=\"out_to\" contenteditable=\"true\">" . $row['out_to'] . "</p>";
-        echo "<p><strong>ETD:</strong><span class=\"editable\" data-column=\"etd\" contenteditable=\"true\">" . $row['etd'] . "</p>";
+        // Add button to toggle journal entries
+        echo '<br><button onclick="window.close()">Close Window</button>';
+        echo ' <button onclick="toggleJournal()">Show Journal Entries (' . $journalCount . ')</button>';
+        echo '<div id="journal-entries" style="display:none;">';
+        echo '<h3>Journal Entries</h3>';
+        echo '<table class="journal-table">';
+        echo '<tr><th>Timestamp</th><th>User</th><th>Entry</th></tr>';

+        if ($journalCount > 0) {
+            while ($journalRow = $journalResult->fetch_assoc()) {
+                echo '<tr>';
+                echo '<td>' . $journalRow['entry_dt'] . '</td>';
+                echo '<td>' . $journalRow['user'] . '</td>';
+                echo '<td>' . $journalRow['entry'] . '</td>';
+                echo '</tr>';
+            }
+        } else {
+            echo '<tr><td colspan="3">No journal entries found.</td></tr>';
+        }

-        echo "<p><strong>Email Address:</strong> " . $row['email'] . "</p>";
-        echo "<p><strong>Phone:</strong> " . $row['phone'] . "</p>";
-
-        
-        echo "<p><strong>Notes:</strong> " . $row['notes'] . "</p>";
-        echo "<p><i>PPR created at:</strong> " . $row['submitted_dt'] . " by " . $row['created_by'] . "</p></div>";
-
+        echo '</table>';
+        echo '</div>';
+        echo '</div>';
    } else {
        echo "No details found for the given ID.";
-    
    }
    $conn->close();
 }
@@ -262,7 +366,74 @@ switch($_GET['op']) {
    default:

 }
-
 ?>
-<p><center><button onclick="window.close()">Close Window</button></center>
+
+<script>
+function toggleJournal() {
+    var journalEntries = document.getElementById("journal-entries");
+    var toggleButton = document.querySelector("button[onclick='toggleJournal()']");
+    if (journalEntries.style.display === "none") {
+        journalEntries.style.display = "block";
+        toggleButton.textContent = "Hide Journal Entries";
+    } else {
+        journalEntries.style.display = "none";
+        toggleButton.textContent = "Show Journal Entries";
+    }
+}
+</script>
+
+<style>
+    .journal-table {
+        width: 100%;
+        border-collapse: collapse;
+        margin-top: 20px;
+    }
+
+    .journal-table th, .journal-table td {
+        border: 1px solid #ddd;
+        padding: 8px;
+        text-align: left;
+    }
+
+    .journal-table th {
+        background-color: #f2f2f2;
+        color: #333;
+    }
+
+    .journal-table tr:nth-child(even) {
+        background-color: #f9f9f9;
+    }
+
+    .journal-table tr:hover {
+        background-color: #f1f1f1;
+    }
+
+    .edit-button {
+        margin-left: 10px;
+        padding: 5px 10px;
+        font-size: 0.9rem;
+        background-color: transparent;
+        border: none;
+        cursor: pointer;
+        transition: 0.3s;
+    }
+
+    .edit-button img {
+        width: 20px;
+        height: 20px;
+    }
+
+    .edit-button:hover img {
+        filter: brightness(0.8);
+    }
+
+    .editable {
+    background-color: transparent;
+    transition: background-color 0.3s ease;
+    }
+
+    .editable:focus {
+        background-color: white;
+    }
+</style>

--- a/admin.php
+++ b/admin.php
@@ -6,25 +6,9 @@ require_db_auth();
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta http-equiv="refresh" content="300">
-    <script>
-    document.addEventListener("DOMContentLoaded", function() {
-    let rows = document.querySelectorAll("table tbody tr");
-    
-    rows.forEach(row => {
-        let fuelCell = row.cells[3]; // Get the "Fuel" cell (index 3)
-        
-        if (fuelCell.textContent == "100LL") {
-            row.classList.add("highlight100LL"); // Add the class
-        } else if (fuelCell.textContent == "JET A1") {
-            row.classList.add("highlightJET"); // Add the class
-        }
-    });
-});
-    </script>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Swansea Daily PPR</title>
+    <title>PPR Monthly Reports</title>
    <style>

        /* Styling for the table */
@@ -59,16 +43,6 @@ require_db_auth();
            background-color: #f1f1f1;
        }

-        .highlight100LL {
-            background-color: #ADD8E6 !important;
-            #font-weight: bold;
-        }
-
-        .highlightJET {
-            background-color: yellow !important; /* Allow it to override the odd/even shading */
-            #font-weight: bold;
-        }
-
        button {
            padding: 10px 20px;
            font-size: 1rem;
@@ -91,32 +65,18 @@ require_db_auth();
            border-radius: 5px;
        }

+        .container {
+            text-align: center;
+            margin-bottom: 20px;
+        }
+
    </style>
 </head>
 <body>

+<?php include("menu.php"); ?>
+
    <script>
-        function markLanded(id) {
-            page="action.php?op=landed&id=" + id;
-            var xhr = new XMLHttpRequest();
-            xhr.open("GET", page, false);  // 'false' makes the request synchronous
-            xhr.send();
-            window.location.reload(true);
-        }
-        function markCancel(id) {
-            page="action.php?op=cancel&id=" + id;
-            var xhr = new XMLHttpRequest();
-            xhr.open("GET", page, false);  // 'false' makes the request synchronous
-            xhr.send();
-            window.location.reload(true);
-        }
-        function deletePpr(id) {
-            page="action.php?op=delete&id=" + id;
-            var xhr = new XMLHttpRequest();
-            xhr.open("GET", page, false);  // 'false' makes the request synchronous
-            xhr.send();
-            window.location.reload(true);
-        }
        function openDetail(id) {
            page="action.php?op=detail&id=" + id;
            var popupWindow = window.open(page, "PopupWindow", "toolbar=no, location=no, directories=no,status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=yes, width=600, height=1100");
@@ -128,28 +88,31 @@ require_db_auth();

        }
    </script>
+
    <center><h2>Swansea Inbound PPR ADMIN</h2></center>

    <div class="container">
-    <h2>Select a Month</h2>
-    <select id="monthSelect">
-        <option value="1">January</option>
-        <option value="2">February</option>
-        <option value="3">March</option>
-        <option value="4">April</option>
-        <option value="5">May</option>
-        <option value="6">June</option>
-        <option value="7">July</option>
-        <option value="8">August</option>
-        <option value="9">September</option>
-        <option value="10">October</option>
-        <option value="11">November</option>
-        <option value="12">December</option>
-    </select>
-    <select id="yearSelect"></select>
-    <button onclick="selectMonthYear()">Submit</button>
-    <p id="output"></p>
-</div>
+        <div style="display: inline-block; text-align: left;">
+            <select id="monthSelect">
+                <option value="1">January</option>
+                <option value="2">February</option>
+                <option value="3">March</option>
+                <option value="4">April</option>
+                <option value="5">May</option>
+                <option value="6">June</option>
+                <option value="7">July</option>
+                <option value="8">August</option>
+                <option value="9">September</option>
+                <option value="10">October</option>
+                <option value="11">November</option>
+                <option value="12">December</option>
+            </select>
+            <select id="yearSelect"></select>
+            <button onclick="selectMonthYear()">Submit</button>
+            <button onclick="downloadCSV()">Download CSV</button>
+        </div>
+        <p id="output"></p>
+    </div>

 <script>
    function populateYearDropdown() {
@@ -186,19 +149,16 @@ require_db_auth();
    selectMonth();
    populateYearDropdown();

+    function downloadCSV() {
+        let year = document.getElementById("yearSelect").value;
+        let month = document.getElementById("monthSelect").value;
+        window.location.href = `download.php?year=${year}&month=${month}`;
+    }
 </script>

 <?php

-
-
-// Create connection
-$conn = new mysqli($host, $username, $password, $database);
-
-// Check connection
-if ($conn->connect_error) {
-    die("Connection failed: " . $conn->connect_error);
-}
+$conn = connectDb();

 $year = $_GET['year'] ?? date('Y');
 $month = $_GET['month'] ?? date('n');
@@ -221,7 +181,6 @@ if ($result->num_rows > 0) {
        }
        
    }
-   // echo '<th>actions</th>';

    echo '  </tr>
            </thead>
@@ -235,7 +194,6 @@ if ($result->num_rows > 0) {
                echo '<td>' . htmlspecialchars($value ?? '') . '</td>';
            }
        }
-     //   echo '<td><img src="cancel-icon.webp" title="Cancel PPR" style="width: 25px; height: auto;" onclick="markCancel(' . $row['id'] . ')"><img src="cancel-icon.webp" title="DELETE PPR" style="width: 25px; height: auto;" onclick="deletePpr(' . $row['id'] . ')"><img src="land.webp" title="Mark Landed" style="width: 30px; height: auto;" onclick="markLanded(' . $row['id'] . ')"></td>';
        echo '</tr>';
    }

@@ -244,15 +202,7 @@ if ($result->num_rows > 0) {
    echo "No results found.";
 }

-// Close the database connection
 $conn->close();
-
 ?>

-<center><button onclick="openPopup()">Log New PPR</button></center>
-
-    <script>
-        function openPopup() {
-            window.open("input.html", "PopupWindow", "toolbar=no, location=no, directories=no,status=no, menubar=no, scrollbars=yes, resizable=yes, copyhistory=yes, width=600, height=1100");
-        }
-    </script>
+<?php include("footer.php"); ?>
--- a/arrivals.php
+++ b/arrivals.php
@@ -25,56 +25,53 @@ include("functions.php");
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Swansea Daily PPR</title>
    <style>
-
        /* Styling for the table */
        table {
-            width: 80%;
+            width: 90%;
            border-collapse: collapse;
-            margin: 20px 0;
-            margin-left: auto;   /* Automatically adjusts left margin */
-            margin-right: auto;  /* Automatically adjusts right margin */
-
+            margin: 20px auto;
+            background-color: #000; /* Black background for digital display effect */
+            color: #0f0; /* Bright green text for digital display effect */
+            font-family: 'Courier New', Courier, monospace; /* Monospace font for digital look */
+            font-size: 18px;
+            text-align: center;
        }
        table, th, td {
-            border: 1px solid #ddd;
+            border: 1px solid #444; /* Subtle border for table cells */
        }
        th {
-            padding: 8px;
-            text-align: center;
+            padding: 10px;
+            background-color: #222; /* Darker background for headers */
+            color: #fff; /* White text for headers */
+            font-weight: bold;
+            text-transform: uppercase;
        }
        td {
-            padding: 8px;
-            text-align: center;
-            font-family: Arial, sans-serif;
-            font-size: 16pt;
-        }
-        th {
-            background-color: #f2f2f2;
+            padding: 10px;
        }
        tr:nth-child(even) {
-            background-color: #f9f9f9;
+            background-color: #111; /* Slightly lighter background for even rows */
        }
        tr:hover {
-            background-color: #f1f1f1;
+            background-color: #333; /* Highlight row on hover */
        }

+        /* Highlight styles for fuel types */
        .highlight100LL {
-            background-color: #ADD8E6 !important;
-            #font-weight: bold;
+            background-color: #0044cc !important; /* Blue for 100LL */
+            color: #fff !important; /* White text */
        }
-
        .highlightJET {
-            background-color: yellow !important; /* Allow it to override the odd/even shading */
-            #font-weight: bold;
-        }
-        .acreg {
-            padding: 4px;
-            text-align: center;
-            font-family: Arial, sans-serif;
-            font-size: 10pt;
-            font-style: italic;
+            background-color: #ffcc00 !important; /* Yellow for JET A1 */
+            color: #000 !important; /* Black text */
        }

+        /* Styling for aircraft registration */
+        .acreg {
+            font-size: 14px;
+            font-style: italic;
+            color: #ccc; /* Light gray for subtle emphasis */
+        }
    </style>
 </head>
 <body>
--- a/assets/WBCAFE.jpg
+++ b/assets/WBCAFE.jpg
--- a/assets/arrive.png
+++ b/assets/arrive.png
--- a/assets/cancel-icon.webp
+++ b/assets/cancel-icon.webp
--- a/assets/depart.png
+++ b/assets/depart.png
--- a/assets/edit.png
+++ b/assets/edit.png
--- a/assets/egfh.webp
+++ b/assets/egfh.webp
--- a/assets/flightImg.png
+++ b/assets/flightImg.png
--- a/assets/land.webp
+++ b/assets/land.webp
--- a/assets/logo.png
+++ b/assets/logo.png
--- a/bookout.html
+++ b/bookout.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Book Out</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            background-color: #f4f4f4;
+        }
+        .form-container {
+            max-width: 500px;
+            margin: 20px auto;
+            padding: 20px;
+            background: #fff;
+            border-radius: 8px;
+            box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+        }
+        .form-container h2 {
+            text-align: center;
+            margin-bottom: 20px;
+        }
+        .form-group {
+            margin-bottom: 15px;
+        }
+        .form-group label {
+            display: block;
+            margin-bottom: 5px;
+            font-weight: bold;
+        }
+        .form-group input, .form-group select {
+            width: 100%;
+            padding: 10px;
+            font-size: 1rem;
+            border: 1px solid #ccc;
+            border-radius: 5px;
+        }
+        .form-group input:focus, .form-group select:focus {
+            border-color: #007bff;
+            outline: none;
+            box-shadow: 0 0 5px rgba(0, 123, 255, 0.5);
+        }
+        .hidden {
+            display: none;
+        }
+        button {
+            width: 100%;
+            padding: 10px;
+            font-size: 1rem;
+            color: #fff;
+            background-color: #007bff;
+            border: none;
+            border-radius: 5px;
+            cursor: pointer;
+        }
+        button:hover {
+            background-color: #0056b3;
+        }
+
+        @media (max-width: 768px) {
+            .form-container {
+                width: 100%; /* Ensure it fits the screen */
+                margin: 20px auto;
+                padding: 15px;
+                box-sizing: border-box; /* Include padding in width calculation */
+            }
+            .form-group input, .form-group select, button {
+                font-size: 0.9rem;
+                padding: 8px;
+            }
+            h2 {
+                font-size: 1.5rem;
+            }
+        }
+
+        @media (max-width: 480px) {
+            .form-container {
+                width: 100%; /* Ensure it fits the screen */
+                margin: 10px auto;
+                padding: 10px;
+                box-sizing: border-box; /* Include padding in width calculation */
+            }
+            .form-group input, .form-group select, button {
+                font-size: 0.8rem;
+                padding: 6px;
+            }
+            h2 {
+                font-size: 1.2rem;
+            }
+        }
+
+        .nature-button {
+            flex: 1;
+            padding: 10px;
+            font-size: 1rem;
+            color: #fff;
+            background-color: #007bff;
+            border: none;
+            border-radius: 5px;
+            cursor: pointer;
+            transition: background-color 0.3s;
+        }
+        .nature-button:hover {
+            background-color: #0056b3;
+        }
+        .nature-button.selected {
+            background-color: #28a745; /* Green for selected */
+        }
+
+        .pob-button {
+            flex: 1;
+            padding: 10px;
+            font-size: 1rem;
+            color: #fff;
+            background-color: #007bff;
+            border: none;
+            border-radius: 5px;
+            cursor: pointer;
+            transition: background-color 0.3s;
+        }
+        .pob-button:hover {
+            background-color: #0056b3;
+        }
+        .pob-button.selected {
+            background-color: #28a745; /* Green for selected */
+        }
+    </style>
+    <script>
+        function toggleLandawayFields(natureOfFlight) {
+            const landawayFields = document.getElementById("landaway-fields");
+            document.getElementById("nature_of_flight").value = natureOfFlight;
+
+            // Update button styles
+            document.querySelectorAll(".nature-button").forEach(button => {
+                button.classList.remove("selected");
+            });
+            document.getElementById(`nature_${natureOfFlight}`).classList.add("selected");
+
+            if (natureOfFlight === "Landaway") {
+                landawayFields.classList.remove("hidden");
+            } else {
+                landawayFields.classList.add("hidden");
+            }
+        }
+
+        function selectPOB(pob) {
+            document.getElementById("pob").value = pob;
+
+            // Update button styles
+            document.querySelectorAll(".pob-button").forEach(button => {
+                button.classList.remove("selected");
+            });
+            document.getElementById(`pob_${pob}`).classList.add("selected");
+        }
+
+        function setCookie(name, value, days) {
+            const date = new Date();
+            date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+            document.cookie = `${name}=${value};expires=${date.toUTCString()};path=/`;
+        }
+
+        function getCookie(name) {
+            const cookies = document.cookie.split(';');
+            for (let i = 0; i < cookies.length; i++) {
+                const cookie = cookies[i].trim();
+                if (cookie.startsWith(name + '=')) {
+                    return cookie.substring(name.length + 1);
+                }
+            }
+            return '';
+        }
+
+        function handleAircraftRegInput() {
+            const acRegInput = document.getElementById("ac_reg");
+            const acTypeInput = document.getElementById("ac_type");
+            const captainNameInput = document.getElementById("captain_name");
+            acRegInput.value = acRegInput.value.toUpperCase();
+            setCookie("ac_reg", acRegInput.value, 30);
+            setCookie("ac_type", acTypeInput.value, 30);
+            setCookie("captain_name", captainNameInput.value, 30);
+        }
+
+        function populateAircraftFields() {
+            const savedReg = getCookie("ac_reg");
+            const savedType = getCookie("ac_type");
+            const savedCaptainName = getCookie("captain_name");
+            if (savedReg) {
+                document.getElementById("ac_reg").value = savedReg;
+            }
+            if (savedType) {
+                document.getElementById("ac_type").value = savedType;
+            }
+            if (savedCaptainName) {
+                document.getElementById("captain_name").value = savedCaptainName;
+            }
+        }
+
+        document.addEventListener("DOMContentLoaded", populateAircraftFields);
+    </script>
+</head>
+<body>
+    <div class="form-container">
+        <h2>Log Outgoing Flight</h2>
+        <form action="submit_outgoing.php" method="POST">
+            <div class="form-group">
+                <label for="ac_reg">Aircraft Registration</label>
+                <input type="text" id="ac_reg" name="ac_reg" required maxlength="16" oninput="handleAircraftRegInput()">
+            </div>
+            <div class="form-group">
+                <label for="ac_type">Aircraft Type</label>
+                <input type="text" id="ac_type" name="ac_type" required maxlength="32" oninput="handleAircraftRegInput()">
+            </div>
+            <div class="form-group">
+                <label for="captain_name">Captain's Name</label>
+                <input type="text" id="captain_name" name="captain_name" required maxlength="64" oninput="handleAircraftRegInput()">
+            </div>
+            <div class="form-group">
+                <label>POB (Persons on Board)</label>
+                <input type="hidden" id="pob" name="pob" required>
+                <div style="display: flex; gap: 10px;">
+                    <button type="button" id="pob_1" class="pob-button" onclick="selectPOB(1)">1</button>
+                    <button type="button" id="pob_2" class="pob-button" onclick="selectPOB(2)">2</button>
+                    <button type="button" id="pob_3" class="pob-button" onclick="selectPOB(3)">3</button>
+                    <button type="button" id="pob_4" class="pob-button" onclick="selectPOB(4)">4</button>
+                    <button type="button" id="pob_5" class="pob-button" onclick="selectPOB(5)">5</button>
+                    <button type="button" id="pob_6" class="pob-button" onclick="selectPOB(6)">6</button>
+                </div>
+            </div>
+            <div class="form-group">
+                <label>Nature of Flight</label>
+                <input type="hidden" id="nature_of_flight" name="nature_of_flight" required>
+                <div style="display: flex; gap: 10px;">
+                    <button type="button" id="nature_Local" class="nature-button" onclick="toggleLandawayFields('Local')">Local</button>
+                    <button type="button" id="nature_Circuits" class="nature-button" onclick="toggleLandawayFields('Circuits')">Circuits</button>
+                    <button type="button" id="nature_Landaway" class="nature-button" onclick="toggleLandawayFields('Landaway')">Landaway</button>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="departure_time">Time of Departure</label>
+                <input type="datetime-local" id="etd" name="etd" required>
+            </div>
+            <div id="landaway-fields" class="hidden">
+                <div class="form-group">
+                    <label for="destination">Destination</label>
+                    <input type="text" id="destination" name="destination" maxlength="64">
+                </div>
+                <div class="form-group">
+                    <label for="return_time">Estimated Time of Return</label>
+                    <input type="datetime-local" id="eta" name="eta">
+                </div>
+            </div>
+            <button type="submit">Submit</button>
+        </form>
+    </div>
+</body>
+</html>
--- a/download.php
+++ b/download.php
@@ -0,0 +1,47 @@
+<?php
+include("functions.php");
+require_db_auth();
+
+// Create connection
+$conn = new mysqli($host, $username, $password, $database);
+
+// Check connection
+if ($conn->connect_error) {
+    die("Connection failed: " . $conn->connect_error);
+}
+
+$year = $_GET['year'] ?? date('Y');
+$month = $_GET['month'] ?? date('n');
+
+$datetime = DateTime::createFromFormat('!m', $month);
+$monthName = $datetime->format('F');
+$filename = $monthName . $year . '.csv';
+
+header('Content-Type: text/csv');
+header('Content-Disposition: attachment;filename=' . $filename);
+
+$output = fopen('php://output', 'w');
+
+$escape = '\\'; // Define the escape character
+
+// Fetch data
+$sql = "SELECT * FROM submitted WHERE status != 'DELETED' and MONTH(eta) = $month and YEAR(eta) = $year ORDER BY eta ASC;";
+$result = $conn->query($sql);
+
+// Output column headers
+$fields = $result->fetch_fields();
+$headers = [];
+foreach ($fields as $field) {
+    $headers[] = $field->name;
+}
+fputcsv($output, $headers, ',', '"', $escape);
+
+// Output rows
+while ($row = $result->fetch_assoc()) {
+    fputcsv($output, $row, ',', '"', $escape);
+}
+
+// Close the database connection
+$conn->close();
+fclose($output);
+?>
--- a/footer.php
+++ b/footer.php
@@ -0,0 +1,36 @@
+<style>
+.footer-bar {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: #333;
+    color: white;
+    padding: 10px 0;
+    font-family: Arial, sans-serif;
+    font-size: 14px;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    height: 50px; /* Define the height explicitly */
+    box-sizing: border-box;
+}
+
+.footer-bar a {
+    color: #007bff;
+    text-decoration: none;
+    margin-left: 5px;
+}
+
+.footer-bar a:hover {
+    text-decoration: underline;
+}
+
+body {
+    padding-bottom: 50px; /* Add padding equal to the footer height */
+    box-sizing: border-box;
+}
+</style>
+
+<div class="footer-bar">
+    <span>Swansea Airport PPR system Version 1.0</span>
+</div>
--- a/functions.php
+++ b/functions.php
@@ -1,10 +1,11 @@
 <?php

 // Database connection details
-$host = 'sasaprod.pattinson.org';  // Replace with your database host (usually 'localhost')
-$username = 'ppruser';   // Replace with your database username
-$password = 'iJ8kN*5[g6P3jaqN';       // Replace with your database password
-$database = 'pprdevdb'; // Replace with your database name
+$host = 'sasaprod.pattinson.org';
+$username = 'ppruser';
+$password = 'iJ8kN*5[g6P3jaqN';
+$database = 'pprdevdb';
+$created_by = "Website (DEV)";

 $mailHost = 'send.one.com'; // Your SMTP server
 $mailSMTPAuth = true;
@@ -15,7 +16,7 @@ $mailPort = 465;
 $mailFromAddress = 'noreply@swansea-airport.wales';
 $mailFromName = 'Swansea Airport';

-$baseUrl = "https://ppr.swansea-airport.wales/dev";
+$baseUrl = "https://pprdev.swansea-airport.wales";

 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
@@ -172,9 +173,11 @@ function generatePprEmail($entryId, $email, $ac_reg) {
        $mail->isHTML(true);
        $mail->Subject = "PPR Confirmation for " . $ac_reg;
        $mail->Body = "
-            <p>This is to confirm we have received your PPR. To view or cancel your PPR please click the button:</p>
+        
+            <p>Dear Pilot,<p>This is to confirm we have received your PPR information, and we look forward to welcoming you at Swansea Airport.<p>Please review our <a href=https://swansea-airport.wales/pilot-information/arrival-procedures.html>arrival procedures</a> prior to your arrival.<p>To view or cancel your PPR please click the button:</p>
            <a href='$secureLink' style='display: inline-block; padding: 10px 20px; color: white; background-color: #007bff; text-decoration: none; border-radius: 5px;'>View PPR</a>
-        ";
+            <p><img src='https://ppr.swansea-airport.wales/dev/assets/egfh.webp' alt='Swansea Airport' style='width: 200px;'>
+            ";

        $mail->send();
        echo "Email sent successfully!";
@@ -185,4 +188,24 @@ function generatePprEmail($entryId, $email, $ac_reg) {
        logJournal($conn, $entryId, "Confirm email FAILED");
    }
 }
+
+function getAirport($conn, $code) {
+    $query = "";
+    if (strlen($code) === 4) {
+        $query = "SELECT name FROM airports WHERE icao = ?";
+    } elseif (strlen($code) === 3) {
+        $query = "SELECT name FROM airports WHERE iata = ?";
+    } else {
+        return null; // Invalid code length
+    }
+
+    $stmt = $conn->prepare($query);
+    $stmt->bind_param("s", $code);
+    $stmt->execute();
+    $stmt->bind_result($name);
+    $stmt->fetch();
+    $stmt->close();
+
+    return $name;
+}
 ?>
--- a/input.html
+++ b/input.html
@@ -5,10 +5,10 @@
    
    // Set default value to current date & time
    document.addEventListener("DOMContentLoaded", function () {
-        let now = new Date();
-        let localDatetime = now.toISOString().slice(0, 16); // Format for datetime-local input
+        const currentIsoDateString = new Date(Date.now() - new Date().getTimezoneOffset() * 60000).toISOString()
+        let localDatetime = currentIsoDateString.slice(0, 16); // Format for datetime-local input
        document.getElementById("eta").value = localDatetime;
-        document.getElementById("etd").value = localDatetime;
+      //  document.getElementById("etd").value = localDatetime;
    });

    function fetchResults() {
@@ -137,43 +137,43 @@
        <form action="newppr.php" method="POST">
            <div class="form-group">
                <label for="ac_reg">Registration</label>
-                <input type="text" id="ac_reg" name="ac_reg" onkeyup="fetchResults()" required>
+                <input type="text" id="ac_reg" name="ac_reg" onkeyup="fetchResults()" required maxlength="16">
            </div>
            <div id="results"></div>
            <div class="form-group">
                <label for="ac_type">Type</label>
-                <input type="text" id="ac_type" name="ac_type" required>
+                <input type="text" id="ac_type" name="ac_type" required maxlength="16">
            </div>
            <div class="form-group">
                <label class="optional-label" for="ac_call">Callsign (optional)</label>
-                <input type="text" id="ac_call" name="ac_call">
+                <input type="text" id="ac_call" name="ac_call" maxlength="16">
            </div>
            <div class="form-group">
                <label for="captain">Captain's Name</label>
-                <input type="text" id="captain" name="captain" required>
+                <input type="text" id="captain" name="captain" required maxlength="64">
            </div>
            <div class="form-group">
                <label for="in_from">Arriving From</label>
-                <input type="text" id="in_from" name="in_from" required>
+                <input type="text" id="in_from" name="in_from" required maxlength="64">
            </div>
            <div class="form-group">
                <label for="pob_in">POB Inbound</label>
                <input type="number" id="pob_in" name="pob_in" required>
            </div>
            <div class="form-group"></div>
-            <label for="eta">ETA</label>
+            <label for="eta">ETA (Local)</label>
            <input type="datetime-local" id="eta" name="eta">
            </div>
            <div class="form-group">
                <label for="out_to">Out to</label>
-                <input type="text" id="out_to" name="out_to">
+                <input type="text" id="out_to" name="out_to" maxlength="64">
            </div>
            <div class="form-group">
                <label for="pob_out">POB Outbound</label>
                <input type="number" id="pob_out" name="pob_out" >
            </div>
            <div class="form-group"></div>
-            <label for="eta">Departing At</label>
+            <label for="eta">Departing At (Local)</label>
            <input type="datetime-local" id="etd" name="etd">
            </div>

@@ -188,11 +188,11 @@

            <div class="form-group">
                <label class="optional-label" for="email">Email (optional)</label>
-                <input type="email" id="email" name="email" >
+                <input type="email" id="email" name="email" maxlength="128">
            </div>
            <div class="form-group">
                <label class="optional-label" for="phone">Phone (optional)</label>
-                <input type="text" id="phone" name="phone" >
+                <input type="text" id="phone" name="phone" maxlength="16">
            </div>

            <div class="form-group">
--- a/menu.php
+++ b/menu.php
@@ -0,0 +1,33 @@
+<style>
+.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;
+        }
+</style>
+
+<div class="menu-bar">
+    <a href="tower.php" class="<?= basename($_SERVER['PHP_SELF']) === 'tower.php' ? 'active' : '' ?>">HOME</a>
+    <a href="upcoming.php" class="<?= basename($_SERVER['PHP_SELF']) === 'upcoming.php' ? 'active' : '' ?>">Future PPRs</a>
+    <a href="admin.php" class="<?= basename($_SERVER['PHP_SELF']) === 'admin.php' ? 'active' : '' ?>">Reports</a>
+</div>
--- a/newppr.php
+++ b/newppr.php
@@ -11,7 +11,14 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
    echo "<h2>Received POST Data:</h2><ul>";
    foreach ($_POST as $key => $value) {
        $escaped_key = "`" . $conn->real_escape_string($key) . "`";
-        $escaped_value = ($value === '' || $value === null) ? "NULL" : (is_numeric($value) ? $value : "'" . $conn->real_escape_string($value) . "'");
+        if ($key === 'eta' || $key === 'etd') {
+            // Convert London time to UTC
+            $datetime = new DateTime($value, new DateTimeZone('Europe/London'));
+            $datetime->setTimezone(new DateTimeZone('UTC'));
+            $escaped_value = "'" . $datetime->format('Y-m-d H:i:s') . "'";
+        } else {
+            $escaped_value = ($value === '' || $value === null) ? "NULL" : (is_numeric($value) ? $value : "'" . $conn->real_escape_string($value) . "'");
+        }
        $columns[] = $escaped_key;
        $values[] = $escaped_value;
        echo "<li><strong>" . htmlspecialchars($key) . ":</strong> " . htmlspecialchars($value) . "</li>";
--- a/public.css
+++ b/public.css
@@ -0,0 +1,106 @@
+/* Overall page styling */
+body {
+    margin: 0;
+    font-family: Arial, sans-serif;
+    display: grid;
+    grid-template-rows: auto 1fr auto;
+    grid-template-columns: 1fr;
+    height: 100vh;
+    font-size: 30px; /* Increased font size */
+  }
+
+  /* Header styles */
+  header {
+    background-color: #333;
+    color: white;
+    padding: 20px;
+    text-align: center;
+    img.left-image {
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: auto;
+    }
+    img.right-image {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 9%;
+        height: auto;
+    }
+  }
+
+  /* Main section styles */
+  main {
+    display: grid;
+    grid-template-columns: 1fr 1fr; /* Two equal-width columns */
+    gap: 20px;
+    padding: 20px;
+    overflow-y: auto;
+  }
+
+  /* Table styles */
+  table {
+    width: 100%;
+    border-collapse: collapse;
+    margin: 0;
+    border: 1px solid #ccc;
+  }
+
+  th, td {
+    padding: 12px;
+    text-align: left;
+    border: 1px solid #ccc;
+  }
+
+  th {
+    background-color: #f4f4f4;
+  }
+
+  tr:nth-child(even) {
+    background-color: #d3d3d3;
+  }
+
+  /* Footer styles */
+  footer {
+    background-color: #333;
+    color: white;
+    text-align: center;
+    padding: 10px 0;
+    position: relative;
+    overflow: hidden;
+  }
+
+  /* Marquee container */
+  .marquee {
+    display: inline-block;
+    white-space: nowrap;
+    padding-right: 100%; /* This makes the text start out of view */
+    animation: scroll-left 20s linear infinte;
+  }
+
+  /* Keyframes for scrolling animation */
+  @keyframes scroll-left {
+    from {
+        transform: translateX(100%);
+    }
+    to {
+        transform: translateX(-100%);
+    }
+  }
+
+  /* Marquee text styling */
+  .marquee-text {
+    font-size: 18px;
+    font-weight: bold;
+    color: #f4f4f4;
+    padding-left: 50px;
+    text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
+  }
+
+  /* Responsive adjustments */
+  @media (max-width: 768px) {
+    main {
+      grid-template-columns: 1fr; /* Stack columns on smaller screens */
+    }
+  }
--- a/public.php
+++ b/public.php
@@ -0,0 +1,116 @@
+<?php
+include("functions.php");
+
+// Create connection
+$conn = connectDb();
+
+// Fetch arrivals for today's date with status 'NEW'
+$arrivalsSql = "SELECT ac_reg, ac_type, in_from, TIME_FORMAT(eta, '%H:%i') AS due 
+                FROM submitted 
+                WHERE DATE(eta) = CURDATE() AND status = 'NEW' 
+                ORDER BY eta ASC";
+$arrivalsResult = $conn->query($arrivalsSql);
+
+// Fetch departures for today's date with status 'LANDED'
+$departuresSql = "SELECT ac_reg, ac_type, out_to, TIME_FORMAT(etd, '%H:%i') AS due 
+                  FROM submitted 
+                  WHERE DATE(etd) = CURDATE() AND status = 'LANDED' 
+                  ORDER BY etd ASC";
+$departuresResult = $conn->query($departuresSql);
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="refresh" content="300">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Swansea Airport - Arrivals & Departures</title>
+    <link rel="stylesheet" href="public.css">
+</head>
+<body>
+    <header>
+        <img src="assets/logo.png" alt="EGFH Logo" class="left-image">
+        <h1>Arrivals/Departures Information</h1>
+        <img src="assets/flightImg.png" alt="EGFH Logo" class="right-image">
+    </header>
+
+    <main>
+        <!-- Left column with arrivals table -->
+        <div>
+            <h2><center>Arrivals</center></h2>
+            <table>
+                <thead>
+                    <tr>
+                        <th>Registration</th>
+                        <th>Aircraft Type</th>
+                        <th>From</th>
+                        <th>Due</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php if ($arrivalsResult->num_rows > 0): ?>
+                        <?php while ($row = $arrivalsResult->fetch_assoc()): ?>
+                            <tr>
+                                <td><?= htmlspecialchars($row['ac_reg']) ?></td>
+                                <td><?= htmlspecialchars($row['ac_type']) ?></td>
+                                <td><?= htmlspecialchars($row['in_from']) ?></td>
+                                <td><?= htmlspecialchars($row['due']) ?></td>
+                            </tr>
+                        <?php endwhile; ?>
+                    <?php else: ?>
+                        <tr>
+                            <td colspan="4">No arrivals found.</td>
+                        </tr>
+                    <?php endif; ?>
+                </tbody>
+            </table>
+        </div>
+
+        <!-- Right column with departures table -->
+        <div>
+            <h2><center>Departures</center></h2>
+            <table>
+                <thead>
+                    <tr>
+                        <th>Registration</th>
+                        <th>Aircraft Type</th>
+                        <th>To</th>
+                        <th>Due</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php if ($departuresResult->num_rows > 0): ?>
+                        <?php while ($row = $departuresResult->fetch_assoc()): ?>
+                            <tr>
+                                <td><?= htmlspecialchars($row['ac_reg']) ?></td>
+                                <td><?= htmlspecialchars($row['ac_type']) ?></td>
+                                <td><?= htmlspecialchars($row['out_to']) ?></td>
+                                <td><?= htmlspecialchars($row['due']) ?></td>
+                            </tr>
+                        <?php endwhile; ?>
+                    <?php else: ?>
+                        <tr>
+                            <td colspan="4">No departures found.</td>
+                        </tr>
+                    <?php endif; ?>
+                </tbody>
+            </table>
+        </div>
+    </main>
+
+    <footer>
+        <!-- Footer content -->
+        <div class="iso-marquee-linkwrap">
+            <div class="iso-marquee--long iso-marquee">
+                <!-- Add marquee content here -->
+            </div>
+        </div>
+    </footer>
+</body>
+</html>
+
+<?php
+// Close the database connection
+$conn->close();
+?>
--- a/testhook.json
+++ b/testhook.json
@@ -1,65 +1,60 @@
 {
-    "form_title": "PPR Request Form",
-    "form_slug": "ppr-request-form-joclld",
+    "form_title": "DEV DEV DEV PPR Request Form",
+    "form_slug": "ppr-request-form-joclld-1",
    "submission": {
-        "Aircraft Registration": "G-BJAJ",
-        "Aircraft Type": "AA5",
-        "Callsign": "TEST1",
-        "Captain or PIC Name": "TESTY MCTESTFACE",
-        "Arriving From": "Wellesbourne",
-        "ETA": "11\/02\/2025 14:33",
-        "POB Inbound": "2",
-        "Fuel Required": "100LL",
-        "Departing To": "Pembrey",
-        "ETD": "12\/02\/2025 00:00",
-        "POB Outbound": "2",
+        "Aircraft Registration": "G-LORD",
+        "Aircraft Type": "RV-8",
+        "Captain or PIC Name": "The Lord Rotherwick",
+        "Arriving From": "at Lodge",
+        "ETA": "17\/03\/2025 17:22",
+        "POB Inbound": "1",
+        "Fuel Required": "None",
+        "Departing To": "Ranger\u2019s Lodge",
+        "ETD": "20\/03\/2025 00:00",
+        "POB Outbound": "1",
        "Email": "james@pattinson.org",
-        "Phone Number": "+441212121212",
-        "Additional Information": "Here are some notes man"
+        "Phone Number": "+44123123123",
+        "Additional Information": "I am resending my PPR as I didn\u2019t receive a confirmation from my PPR yesterday."
    },
    "data": {
        "617dd0cd-2d17-4d7f-826b-5348afdb30b3": {
-            "value": "G-BJAJ",
+            "value": "G-YSIR",
            "name": "Aircraft Registration"
        },
        "148a55d8-5357-49a3-b9aa-2a5d4dc64173": {
-            "value": "AA5",
+            "value": "RV-8",
            "name": "Aircraft Type"
        },
-        "52d7bc90-9d26-48a1-82db-b91b4ccd2f92": {
-            "value": "TEST1",
-            "name": "Callsign"
-        },
        "49b2de0d-5bd6-4b0c-86dd-b18b85f8b8ff": {
-            "value": "TESTY MCTESTFACE",
+            "value": "The Lord Rotherwick",
            "name": "Captain or PIC Name"
        },
        "4b4f7ecd-f80c-4e86-a7ab-6fadb3220df8": {
-            "value": "Wellesbourne",
+            "value": "Private strip at Ranger\u2019s",
            "name": "Arriving From"
        },
        "ca4ac44f-0388-4a70-a072-38276ed2ac13": {
-            "value": "11\/02\/2025 14:33",
+            "value": "31\/03\/2025 13:00",
            "name": "ETA"
        },
        "6fc47c54-7383-48fd-93fc-d8080f5ed8f5": {
-            "value": "2",
+            "value": "1",
            "name": "POB Inbound"
        },
        "d153c8a5-8345-4e6a-abfd-cf8adcc06f2d": {
-            "value": "100LL",
+            "value": "None",
            "name": "Fuel Required"
        },
        "ba95fd3f-1ec0-4553-95d3-a0b6a850738d": {
-            "value": "Pembrey",
+            "value": "Ranger\u2019s Lodge",
            "name": "Departing To"
        },
        "53d60abd-eb75-4b1f-92b6-5d47d26367ec": {
-            "value": "12\/02\/2025 00:00",
+            "value": "31\/03\/2025 00:00",
            "name": "ETD"
        },
        "d1ac0860-31f4-4914-9d0b-cae42dfc7eda": {
-            "value": "2",
+            "value": "1",
            "name": "POB Outbound"
        },
        "0198c86c-edd1-4aaf-93a1-d68f8fc8c365": {
@@ -67,11 +62,11 @@
            "name": "Email"
        },
        "e40ebc2d-887b-42b3-931d-c981c76b0c20": {
-            "value": "+441212121212",
+            "value": "+44123123123",
            "name": "Phone Number"
        },
        "73d26c2c-1d3d-44e2-82fc-3a1a2600c393": {
-            "value": "Here are some notes man",
+            "value": "I am resending my PPR as I didn\u2019t receive a confirmation from my PPR yesterday.",
            "name": "Additional Information"
        }
    },
--- a/tower.php
+++ b/tower.php
@@ -140,35 +140,64 @@ require_db_auth();
            cursor: pointer;
        }

+        /* Add this CSS for the red triangle */
+        .red-triangle {
+            position: relative;
+        }
+
+        .red-triangle::before {
+            content: "";
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 0;
+            height: 0;
+            border-left: 10px solid red;
+            border-bottom: 10px solid transparent;
+        }
+
+        .red-triangle:hover::after {
+            content: attr(data-notes);
+            position: absolute;
+            top: 20px;
+            left: 0;
+            background: #fff;
+            border: 1px solid #ddd;
+            padding: 5px;
+            border-radius: 5px;
+            white-space: nowrap;
+            z-index: 10;
+        }
+
    </style>
 </head>
 <body>

-<script>
-function markDeparted(id) {
+<?php include("menu.php"); ?>

+<script>
+function markAction(id, action, title, buttonText) {
    const now = new Date();
    const currentTime = now.toISOString().slice(11, 16); // Extract HH:MM

    Swal.fire({
-        title: "Depart Aircraft at time",
+        title: title,
        html: `<input type="time" id="timepicker" class="swal2-input" value="${currentTime}">`,
        icon: "info",
        showCancelButton: true,
        confirmButtonColor: "#3085d6",
        cancelButtonColor: "#d33",
-        confirmButtonText: "Departed",
+        confirmButtonText: buttonText,
        preConfirm: () => {
-    const time = document.getElementById("timepicker").value;
-    if (!time) {
-        Swal.showValidationMessage("Please select a time");
-    }
-      return time;
-    }
-
+            const time = document.getElementById("timepicker").value;
+            if (!time) {
+                Swal.showValidationMessage("Please select a time");
+            }
+            return time;
+        }
    }).then((result) => {
        if (result.isConfirmed) {
-            page="action.php?op=departed&id=" + id + "&time=" + encodeURIComponent(result.value);
+            const page = `action.php?op=${action}&id=${id}&time=${encodeURIComponent(result.value)}`;
            var xhr = new XMLHttpRequest();
            xhr.open("GET", page, false);  // 'false' makes the request synchronous
            xhr.send();
@@ -177,209 +206,161 @@ function markDeparted(id) {
    });
 }

-          function markLanded(id) {
+function markDeparted(id) {
+    markAction(id, "departed", "Depart Aircraft at time (UTC)", "Departed");
+}

-            const now = new Date();
-            const currentTime = now.toISOString().slice(11, 16); // Extract HH:MM
+function markLanded(id) {
+    markAction(id, "landed", "Land Aircraft at time (UTC)", "Landed");
+}

-            Swal.fire({
-                title: "Land Aircraft at time",
-                html: `<input type="time" id="timepicker" class="swal2-input" value="${currentTime}">`,
-                icon: "info",
-                showCancelButton: true,
-                confirmButtonColor: "#3085d6",
-                cancelButtonColor: "#d33",
-                confirmButtonText: "Landed",
-                preConfirm: () => {
-            const time = document.getElementById("timepicker").value;
-            if (!time) {
-                Swal.showValidationMessage("Please select a time");
-            }
-            return time;
-        }
-
-           }).then((result) => {
-                if (result.isConfirmed) {
-                    page="action.php?op=landed&id=" + id + "&time=" + encodeURIComponent(result.value);
-                    var xhr = new XMLHttpRequest();
-                    xhr.open("GET", page, false);  // 'false' makes the request synchronous
-                    xhr.send();
-                    window.location.reload(true);
-                }
-            });
-        }
-        function markLanded(id) {
-
-            const now = new Date();
-            const currentTime = now.toISOString().slice(11, 16); // Extract HH:MM
-
-            Swal.fire({
-                title: "Land Aircraft at time",
-                html: `<input type="time" id="timepicker" class="swal2-input" value="${currentTime}">`,
-                icon: "info",
-                showCancelButton: true,
-                confirmButtonColor: "#3085d6",
-                cancelButtonColor: "#d33",
-                confirmButtonText: "Landed",
-                preConfirm: () => {
-            const time = document.getElementById("timepicker").value;
-            if (!time) {
-                Swal.showValidationMessage("Please select a time");
-            }
-            return time;
-        }
-
-           }).then((result) => {
-                if (result.isConfirmed) {
-                    page="action.php?op=landed&id=" + id + "&time=" + encodeURIComponent(result.value);
-                    var xhr = new XMLHttpRequest();
-                    xhr.open("GET", page, false);  // 'false' makes the request synchronous
-                    xhr.send();
-                    window.location.reload(true);
-                }
-            });
-        }
-        function markCancel(id) {
-            page="action.php?op=cancel&id=" + id;
+function markCancel(id) {
+    Swal.fire({
+        title: "Are you sure?",
+        text: "This action will cancel the PPR.",
+        icon: "warning",
+        showCancelButton: true,
+        confirmButtonColor: "#3085d6",
+        cancelButtonColor: "#d33",
+        confirmButtonText: "Yes, cancel it!",
+        cancelButtonText: "No, keep it"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            const page = `action.php?op=cancel&id=${id}`;
            var xhr = new XMLHttpRequest();
            xhr.open("GET", page, false);  // 'false' makes the request synchronous
            xhr.send();
            window.location.reload(true);
        }
-        function openDetail(id) {
-            page="action.php?op=detail&id=" + id;
-            var popupWindow = window.open(page, "PopupWindow", "toolbar=no, location=no, directories=no,status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=yes, width=600, height=1100");
-            popupWindow.onload = function () {
-                var contentHeight = popupWindow.document.body.scrollHeight;
-                var contentWidth = popupWindow.document.body.scrollWidth;
-                popupWindow.resizeTo(contentWidth + 20, contentHeight + 180); // Adding padding to prevent clipping
-            };
+    });
+}

-        }
+function openDetail(id) {
+    const page = `action.php?op=detail&id=${id}`;
+    var popupWindow = window.open(page, "PopupWindow", "toolbar=no, location=no, directories=no,status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=yes, width=600, height=1100");
+    popupWindow.onload = function () {
+        var contentHeight = popupWindow.document.body.scrollHeight;
+        var contentWidth = popupWindow.document.body.scrollWidth;
+        popupWindow.resizeTo(contentWidth + 20, contentHeight + 180); // Adding padding to prevent clipping
+    };
+}
+</script>
+<center><h2>Tower Ops <?php echo date('l d M Y'); ?></h2></center>

-    </script>
-    <center><h2>Tower Ops <?php echo date('l d M Y'); ?></h2></center>
-
-    <!--
-   <div class="checkbox-container">
-        <label>
-            <input type="checkbox" id="toggle-canceled" onchange="toggleRows('state-CANCELED', this.checked)"> Show CANCELED
-        </label>
+<!--
+<div class="checkbox-container">
+    <label>
+        <input type="checkbox" id="toggle-canceled" onchange="toggleRows('state-CANCELED', this.checked)"> Show CANCELED
+    </label>
 </div>
-    -->
+-->

-<div class="heading">Inbound PPR</div>
+<div class="heading">Inbound Aircraft</div>

 <?php

-// Create connection
-$conn = new mysqli($host, $username, $password, $database);
-
-// Check connection
-if ($conn->connect_error) {
-    die("Connection failed: " . $conn->connect_error);
-}
-
-// Define your SQL query
-$sql = "SELECT id, status, ac_reg, ac_type, ac_call, TIME_FORMAT(eta,'%H:%i') AS ETA, fuel, in_from, pob_in FROM submitted WHERE DATE(eta) = CURDATE() AND (status = 'NEW' OR status = 'CANCELED') ORDER BY eta ASC;";  // Replace with your table name
-
-// Execute the query
-$result = $conn->query($sql);
-
-// Check if there are results
-if ($result->num_rows > 0) {
-    // Start HTML table
-    echo '<table border="1" id="arrivals">
-            <thead>
-                <tr>';
-                
-    // Output table headers (assuming column names are known)
-    $fields = $result->fetch_fields();
-    foreach ($fields as $field) {
-        if ($field->name != 'status' && $field->name != 'id' && $field->name != 'ac_call') {
-            echo '<th>' . htmlspecialchars($field->name ?? '') . '</th>';
-        }
-        
+function renderTableCell($key, $value, $row) {
+    if ($key == 'ETA' || $key == 'ETD') {
+        return "<td>" . htmlspecialchars($value ?? '') . (!empty($value) ? " Z" : "") . "</td>"; // Add "Z" suffix only if not blank
    }
-    echo '<th>actions</th>';
-
-    echo '  </tr>
-            </thead>
-            <tbody>';
-
-    // Output table rows
-    while ($row = $result->fetch_assoc()) {
-        echo '<tr class="state-' . $row['status'] . '" data-id=' . $row['id'] . '>';
-        foreach ($row as $key => $value) {
-            if ($key != 'status' && $key != 'id' && $key != 'ac_call') {
-                if ($key == 'ac_reg' && $row['ac_call'] != NULL) {
-                    echo '<td>' . htmlspecialchars($row['ac_call'] ?? '') . "<br><span class=acreg>" . $value . '</span></td>';
-                } else {
-                    echo '<td>' . htmlspecialchars($value ?? '') . '</td>';
-                } 
+    if ($key == 'ac_reg' && $row['ac_call'] != NULL) {
+        $notes = htmlspecialchars($row['notes'] ?? '');
+        $acCall = htmlspecialchars($row['ac_call'] ?? '');
+        $acReg = htmlspecialchars($value ?? '');
+        if (!empty($row['notes'])) {
+            return "<td class='red-triangle' data-notes='$notes'>$acCall<br><span class='acreg'>$acReg</span></td>";
+        }
+        return "<td>$acCall<br><span class='acreg'>$acReg</span></td>";
+    } elseif ($key == 'ac_reg' && !empty($row['notes'])) {
+        $notes = htmlspecialchars($row['notes'] ?? '');
+        $acReg = htmlspecialchars($value ?? '');
+        return "<td class='red-triangle' data-notes='$notes'>$acReg</td>";
+    } elseif ($key == 'in_from' || $key == 'out_to') {
+        if (!empty($value) && (strlen($value) === 3 || strlen($value) === 4)) {
+            $airportName = getAirport(connectDb(), $value);
+            if ($airportName) {
+                return "<td>" . htmlspecialchars($value) . "<br><span style='font-size: smaller; font-style: italic;'>" . htmlspecialchars($airportName) . "</span></td>";
            }
        }
-        echo '<td><img src="cancel-icon.webp" title="Cancel PPR" style="width: 25px; height: auto;" onclick="markCancel(' . $row['id'] . ')"><img src="arrive.png" title="Land" style="width: 30px; height: auto;" onclick="markLanded(' . $row['id'] . ')"></td>';
-        echo '</tr>';
+        return "<td>" . htmlspecialchars($value ?? '') . "</td>";
+    } else {
+        return "<td>" . htmlspecialchars($value ?? '') . "</td>";
+    }
+}
+
+function renderActionsCell($id, $status = null) {
+    if ($status === 'LANDED') {
+        return "<td>
+            <img src='assets/cancel-icon.webp' title='Cancel PPR' style='width: 25px; height: auto;' onclick='markCancel($id)'>
+            <img src='assets/depart.png' title='Depart' style='width: 30px; height: auto;' onclick='markDeparted($id)'>
+        </td>";
+    } else {
+        return "<td>
+            <img src='assets/cancel-icon.webp' title='Cancel PPR' style='width: 25px; height: auto;' onclick='markCancel($id)'>
+            <img src='assets/arrive.png' title='Land' style='width: 30px; height: auto;' onclick='markLanded($id)'>
+        </td>";
+    }
+}
+
+function renderTableRow($row) {
+    $rowHtml = "<tr class='state-" . htmlspecialchars($row['status']) . "' data-id='" . htmlspecialchars($row['id']) . "'>";
+    foreach ($row as $key => $value) {
+        if (!in_array($key, ['notes', 'status', 'id', 'ac_call'])) {
+            $rowHtml .= renderTableCell($key, $value, $row);
+        }
+    }
+    $rowHtml .= renderActionsCell($row['id'], $row['status']);
+    $rowHtml .= "</tr>";
+    return $rowHtml;
+}
+
+function renderTable($result) {
+    $tableHtml = "<table border='1' id='arrivals'>
+        <thead>
+            <tr>";
+    $fields = $result->fetch_fields();
+    foreach ($fields as $field) {
+        if (!in_array($field->name, ['notes', 'status', 'id', 'ac_call'])) {
+            $tableHtml .= "<th>" . htmlspecialchars($field->name ?? '') . "</th>";
+        }
+    }
+    $tableHtml .= "<th>actions</th></tr></thead><tbody>";
+
+    while ($row = $result->fetch_assoc()) {
+        $tableHtml .= renderTableRow($row);
    }

-    echo '  </tbody></table>';
+    $tableHtml .= "</tbody></table>";
+    return $tableHtml;
+}
+
+$conn = connectDb();
+$sql = "SELECT id, status, ac_reg, ac_type, ac_call, TIME_FORMAT(eta,'%H:%i') AS ETA, fuel, in_from, pob_in, notes FROM submitted WHERE DATE(eta) = CURDATE() AND (status = 'NEW' OR status = 'CANCELED') ORDER BY eta ASC;";  // Replace with your table name
+$result = $conn->query($sql);
+
+if ($result->num_rows > 0) {
+    echo renderTable($result);
 } else {
    echo "No results found.";
 }

 ?>

-<div class="heading">Booking Out</div>
+<div class="heading">Visiting Aircraft</div>

 <div id="landed">

 <?php

 // Define your SQL query
-$sql = "SELECT id, status, ac_reg, ac_type, ac_call, TIME_FORMAT(etd,'%H:%i') AS ETD, fuel, out_to, pob_out FROM submitted WHERE DATE(eta) = CURDATE() AND status = 'LANDED' ORDER BY eta ASC;";  // Replace with your table name
+$sql = "SELECT id, status, ac_reg, ac_type, ac_call, TIME_FORMAT(etd,'%H:%i') AS ETD, fuel, out_to, pob_out, notes FROM submitted WHERE DATE(eta) = CURDATE() AND status = 'LANDED' ORDER BY eta ASC;";  // Replace with your table name

 // Execute the query
 $result = $conn->query($sql);

 // Check if there are results
 if ($result->num_rows > 0) {
-    // Start HTML table
-    echo '<table border="1" id="landed">
-            <thead>
-                <tr>';
-                
-    // Output table headers (assuming column names are known)
-    $fields = $result->fetch_fields();
-    foreach ($fields as $field) {
-        if ($field->name != 'status' && $field->name != 'id' && $field->name != 'ac_call') {
-            echo '<th>' . htmlspecialchars($field->name ?? '') . '</th>';
-        }
-        
-    }
-    echo '<th>actions</th>';
-
-    echo '  </tr>
-            </thead>
-            <tbody>';
-
-    // Output table rows
-    while ($row = $result->fetch_assoc()) {
-        echo '<tr class="state-' . $row['status'] . '" data-id=' . $row['id'] . '>';
-        foreach ($row as $key => $value) {
-            if ($key != 'status' && $key != 'id' && $key != 'ac_call') {
-                if ($key == 'ac_reg' && $row['ac_call'] != NULL) {
-                    echo '<td>' . htmlspecialchars($row['ac_call'] ?? '') . "<br><span class=acreg>" . $value . '</span></td>';
-                } else {
-                    echo '<td>' . htmlspecialchars($value ?? '') . '</td>';
-                } 
-            }
-        }
-        echo '<td><img src="cancel-icon.webp" title="Cancel PPR" style="width: 25px; height: auto;" onclick="markCancel(' . $row['id'] . ')"><img src="depart.png" title="Depart" style="width: 30px; height: auto;" onclick="markDeparted(' . $row['id'] . ')"></td>';
-        echo '</tr>';
-    }
-
-    echo '  </tbody></table>';
+    echo renderTable($result); // Use the renderTable function
 } else {
    echo "No results found.";
 }
@@ -436,5 +417,5 @@ $conn->close();

 </script>

-
+<?php include("footer.php"); ?>

--- a/upcoming.php
+++ b/upcoming.php
@@ -0,0 +1,304 @@
+<?php
+include("functions.php");
+require_db_auth();
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="refresh" content="300">
+    <!-- Include SweetAlert -->
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Upcoming Movements</title>
+    <style>
+
+        /* Table styling */
+        table {
+            width: 80%;
+            border-collapse: collapse;
+            margin: 20px auto;
+        }
+
+        table, th, td {
+            border: 1px solid #ddd;
+        }
+
+        th, td {
+            padding: 8px;
+            text-align: center;
+            font-family: Arial, sans-serif;
+        }
+
+        th {
+            padding: 8px;
+            text-align: center;
+        }
+        td {
+            padding: 8px;
+            text-align: center;
+            font-family: Arial, sans-serif;
+            font-size: 16pt;
+        }
+
+        tr:nth-child(even) {
+            background-color: #f9f9f9;
+        }
+
+        tr:hover {
+            background-color: #f1f1f1;
+        }
+
+        .highlight100LL {
+            background-color: #ADD8E6 !important;
+        }
+
+        .highlightJET {
+            background-color: yellow !important;
+        }
+
+        /* Add this CSS for the red triangle */
+        .red-triangle {
+            position: relative;
+        }
+
+        .red-triangle::before {
+            content: "";
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 0;
+            height: 0;
+            border-left: 10px solid red;
+            border-bottom: 10px solid transparent;
+        }
+
+        .red-triangle:hover::after {
+            content: attr(data-notes);
+            position: absolute;
+            top: 20px;
+            left: 0;
+            background: #fff;
+            border: 1px solid #ddd;
+            padding: 5px;
+            border-radius: 5px;
+            white-space: nowrap;
+            z-index: 10;
+        }
+
+        .checkbox-container {
+            display: flex;
+            gap: 15px;
+            margin-bottom: 15px;
+            padding: 10px;
+            background: #f9f9f9;
+            border-radius: 8px;
+            width: fit-content;
+        }
+
+        .heading {
+            width: 80%;
+            margin: 20px auto;
+            background-color: #fff;
+            text-align: center;
+            font-family: Arial, sans-serif;
+            font-size: 20pt;
+        }
+
+        label {
+            display: flex;
+            align-items: center;
+            gap: 5px;
+            font-size: 16px;
+            cursor: pointer;
+        }
+
+        .hidden {
+            display: none;
+        }
+
+        .state-CANCELED {
+            text-decoration: line-through;
+            color: gray;
+        }
+
+        .state-LANDED {
+            font-style: italic;
+            color: gray;
+        }
+
+        input[type="checkbox"] {
+            width: 18px;
+            height: 18px;
+            cursor: pointer;
+        }
+
+        .acreg {
+            padding: 4px;
+            text-align: center;
+            font-family: Arial, sans-serif;
+            font-size: 10pt;
+            font-style: italic;
+        }
+    </style>
+</head>
+<body>
+
+<?php include("menu.php"); ?>
+
+<script>
+function markAction(id, action, title, buttonText) {
+    const now = new Date();
+    const currentTime = now.toISOString().slice(11, 16); // Extract HH:MM
+
+    Swal.fire({
+        title: title,
+        html: `<input type="time" id="timepicker" class="swal2-input" value="${currentTime}">`,
+        icon: "info",
+        showCancelButton: true,
+        confirmButtonColor: "#3085d6",
+        cancelButtonColor: "#d33",
+        confirmButtonText: buttonText,
+        preConfirm: () => {
+            const time = document.getElementById("timepicker").value;
+            if (!time) {
+                Swal.showValidationMessage("Please select a time");
+            }
+            return time;
+        }
+    }).then((result) => {
+        if (result.isConfirmed) {
+            const page = `action.php?op=${action}&id=${id}&time=${encodeURIComponent(result.value)}`;
+            var xhr = new XMLHttpRequest();
+            xhr.open("GET", page, false);  // 'false' makes the request synchronous
+            xhr.send();
+            window.location.reload(true);
+        }
+    });
+}
+
+function markCancel(id) {
+    Swal.fire({
+        title: "Are you sure?",
+        text: "This action will cancel the PPR.",
+        icon: "warning",
+        showCancelButton: true,
+        confirmButtonColor: "#3085d6",
+        cancelButtonColor: "#d33",
+        confirmButtonText: "Yes, cancel it!",
+        cancelButtonText: "No, keep it"
+    }).then((result) => {
+        if (result.isConfirmed) {
+            const page = `action.php?op=cancel&id=${id}`;
+            var xhr = new XMLHttpRequest();
+            xhr.open("GET", page, false);  // 'false' makes the request synchronous
+            xhr.send();
+            window.location.reload(true);
+        }
+    });
+}
+
+function openDetail(id) {
+    const page = `action.php?op=detail&id=${id}`;
+    var popupWindow = window.open(page, "PopupWindow", "toolbar=no, location=no, directories=no,status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=yes, width=600, height=1100");
+    popupWindow.onload = function () {
+        var contentHeight = popupWindow.document.body.scrollHeight;
+        var contentWidth = popupWindow.document.body.scrollWidth;
+        popupWindow.resizeTo(contentWidth + 20, contentHeight + 180); // Adding padding to prevent clipping
+    };
+}
+</script>
+
+<center><h2>Upcoming Movements</h2></center>
+
+<?php
+
+function renderTableCell($key, $value, $row) {
+    if ($key == 'ETA') {
+        return "<td>" . htmlspecialchars($value ?? '') . (!empty($value) ? " Z" : "") . "</td>";
+    }
+    if ($key == 'ac_reg' && $row['ac_call'] != NULL) {
+        $notes = htmlspecialchars($row['notes'] ?? '');
+        $acCall = htmlspecialchars($row['ac_call'] ?? '');
+        $acReg = htmlspecialchars($value ?? '');
+        if (!empty($row['notes'])) {
+            return "<td class='red-triangle' data-notes='$notes'>$acCall<br><span class='acreg'>$acReg</span></td>";
+        }
+        return "<td>$acCall<br><span class='acreg'>$acReg</span></td>";
+    } elseif ($key == 'ac_reg' && !empty($row['notes'])) {
+        $notes = htmlspecialchars($row['notes'] ?? '');
+        $acReg = htmlspecialchars($value ?? '');
+        return "<td class='red-triangle' data-notes='$notes'>$acReg</td>";
+    } elseif ($key == 'in_from' || $key == 'out_to') {
+        if (!empty($value) && (strlen($value) === 3 || strlen($value) === 4)) {
+            $airportName = getAirport(connectDb(), $value);
+            if ($airportName) {
+                return "<td>" . htmlspecialchars($value) . "<br><span style='font-size: smaller; font-style: italic;'>" . htmlspecialchars($airportName) . "</span></td>";
+            }
+        }
+        return "<td>" . htmlspecialchars($value ?? '') . "</td>";
+    } else {
+        return "<td>" . htmlspecialchars($value ?? '') . "</td>";
+    }
+}
+
+function renderActionsCell($id) {
+    return "<td>
+        <img src='assets/cancel-icon.webp' title='Cancel PPR' style='width: 25px; height: auto;' onclick='markCancel($id)'>
+        <img src='assets/edit.png' title='Edit Details' style='width: 25px; height: auto;' onclick='openDetail($id)'>
+    </td>";
+}
+
+function renderTableRow($row) {
+    $rowHtml = "<tr>";
+    foreach ($row as $key => $value) {
+        if (!in_array($key, ['id', 'ac_call', 'notes'])) { // Exclude 'notes'
+            $rowHtml .= renderTableCell($key, $value, $row);
+        }
+    }
+    $rowHtml .= renderActionsCell($row['id']);
+    $rowHtml .= "</tr>";
+    return $rowHtml;
+}
+
+function renderTable($result) {
+    $tableHtml = "<table border='1'>
+        <thead>
+            <tr>";
+    $fields = $result->fetch_fields();
+    foreach ($fields as $field) {
+        if (!in_array($field->name, ['id', 'ac_call', 'notes'])) { // Exclude 'notes'
+            $tableHtml .= "<th>" . htmlspecialchars($field->name ?? '') . "</th>";
+        }
+    }
+    $tableHtml .= "<th>Actions</th></tr></thead><tbody>";
+
+    while ($row = $result->fetch_assoc()) {
+        $tableHtml .= renderTableRow($row);
+    }
+
+    $tableHtml .= "</tbody></table>";
+    return $tableHtml;
+}
+
+$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);
+
+if ($result->num_rows > 0) {
+    echo renderTable($result);
+} else {
+    echo "<center>No upcoming movements found.</center>";
+}
+
+$conn->close();
+?>
+
+</body>
+</html>
+<?php include("footer.php"); ?>
--- a/update_data.php
+++ b/update_data.php
@@ -25,6 +25,14 @@ if (!in_array($column, $allowed_columns)) {
    die(json_encode(['error' => 'Invalid column']));
 }

+// Convert eta or etd to UTC if supplied
+// 1st June 2025 JP - NO - when editing just use Zulu time
+//if (in_array($column, ['eta', 'etd'])) {
+//    $date = new DateTime($new_value, new DateTimeZone('Europe/London'));
+//    $date->setTimezone(new DateTimeZone('UTC'));
+//    $new_value = $date->format('Y-m-d H:i:s');
+//}
+
 $stmt = $conn->prepare("UPDATE submitted SET `$column` = ? WHERE id = ?");
 if (!$stmt) {
    die(json_encode(['error' => 'Prepare statement failed']));
--- a/webhook.php
+++ b/webhook.php
@@ -1,24 +1,17 @@
 <?php
 include("functions.php");

-// Database connection details
-$servername = "sasaprod.pattinson.org";
-$username = "root";
-$password = "PugPictureMousePen";
-$dbname = "pprdevdb";
-$created_by = "webhook-dev";
+$conn = connectDb();

-// Create connection
-$conn = new mysqli($servername, $username, $password, $dbname);
-
-// Check connection
-if ($conn->connect_error) {
-    die("Connection failed: " . $conn->connect_error);
+// Check if the URL has a 'test' parameter set
+if (isset($_GET['test'])) {
+    $payload = json_decode(file_get_contents('testhook.json'), true);
+} else {
+    $payload = json_decode(file_get_contents('php://input'), true);
 }

-// Webhook payload
-#$payload = json_decode(file_get_contents('php://input'), true);
-$payload = json_decode(file_get_contents('testhook.json'), true);
+// Log the received payload for debugging
+error_log("Received payload: " . print_r($payload, true));

 // Mapping of JSON 'name' keys to database column names
 $columnMapping = [
@@ -52,9 +45,10 @@ foreach ($payload['data'] as $key => $field) {
        $columns[] = $columnMapping[$name];
        $value = $field['value'];
        
-        // Transform ETA and ETD to MySQL datetime format
+        // Transform ETA and ETD to MySQL datetime format in UTC
        if ($name == "ETA" || $name == "ETD") {
-            $date = DateTime::createFromFormat('d/m/Y H:i', $value);
+            $date = DateTime::createFromFormat('d/m/Y H:i', $value, new DateTimeZone('Europe/London'));
+            $date->setTimezone(new DateTimeZone('UTC')); // Convert to UTC
            $value = $date->format('Y-m-d H:i:s');
        }
        
@@ -92,15 +86,15 @@ $stmt->bind_param($types, ...$values);

 // Execute the statement
 if ($stmt->execute()) {
-    echo "New record created successfully";
+    error_log("New record created successfully");
    $lastId = $stmt->insert_id;
    if (!empty($email)) {
        generatePprEmail($lastId, $email, $ac_reg);
    } else {
-        echo "Email is not set.";
+        error_log("Email is not set.");
    }
 } else {
-    echo "Error: " . $stmt->error;
+    error_log("Error: " . $stmt->error);
 }

 // Close the connection
--- a/webhook_old.php
+++ b/webhook_old.php
@@ -1,84 +0,0 @@
-<?php
-
-// Basic connection settings
-$databaseHost = 'sasaprod.pattinson.org';
-$databaseUsername = 'root';
-$databasePassword = 'PugPictureMousePen';
-$databaseName = 'pprdevdb';
-$created_by = "webhook-dev";
-
-//ini_set("error_log", "ppr.log");
-error_log("Webhook handler called");
-
-// Connect to the database
-$mysqli = mysqli_connect($databaseHost, $databaseUsername, $databasePassword, $databaseName); 
-
-header('Content-Type: application/json');
-
-#if($json = json_decode(file_get_contents("php://input"), true)) {
-if($json = json_decode(file_get_contents("testhook.json"), true)) {
-
-    $data = $json;
-
-}
-
-print_r($data);
-
-$fieldMap = array();
-$fieldMap['ac_reg'] = '617dd0cd-2d17-4d7f-826b-5348afdb30b3';
-$fieldMap['ac_type'] = '148a55d8-5357-49a3-b9aa-2a5d4dc64173';
-$fieldMap['ac_call'] = '52d7bc90-9d26-48a1-82db-b91b4ccd2f92';
-$fieldMap['captain'] = '49b2de0d-5bd6-4b0c-86dd-b18b85f8b8ff';
-$fieldMap['fuel'] = 'd153c8a5-8345-4e6a-abfd-cf8adcc06f2d';
-$fieldMap['in_from'] = '4b4f7ecd-f80c-4e86-a7ab-6fadb3220df8';
-$fieldMap['eta'] = 'ca4ac44f-0388-4a70-a072-38276ed2ac13';
-$fieldMap['pob_in'] = '6fc47c54-7383-48fd-93fc-d8080f5ed8f5';
-$fieldMap['out_to'] = 'ba95fd3f-1ec0-4553-95d3-a0b6a850738d';
-$fieldMap['etd'] = '53d60abd-eb75-4b1f-92b6-5d47d26367ec';
-$fieldMap['pob_out'] = 'd1ac0860-31f4-4914-9d0b-cae42dfc7eda';
-$fieldMap['email'] = '0198c86c-edd1-4aaf-93a1-d68f8fc8c365';
-$fieldMap['phone'] = 'e40ebc2d-887b-42b3-931d-c981c76b0c20';
-$fieldMap['notes'] = '73d26c2c-1d3d-44e2-82fc-3a1a2600c393';
-
-#print_r($json['data'][$fieldMap['eta']]['value']);
-
-$stmt = mysqli_prepare($mysqli, "INSERT INTO submitted (ac_reg, ac_type, captain, fuel, in_from, eta, pob_in, etd, pob_out, email, phone, notes, created_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-
-// Check if the statement was prepared correctly
-if ($stmt === false) {
-    die('MySQL prepare error: ' . mysqli_error($conn));
-}
-
-$ac_reg = $json['data'][$fieldMap['ac_reg']]['value'];
-$ac_type = $json['data'][$fieldMap['ac_type']]['value'];
-$captain = $json['data'][$fieldMap['captain']]['value'];
-$in_from = $json['data'][$fieldMap['in_from']]['value'];
-$fuel = $json['data'][$fieldMap['fuel']]['value'];
-$date = DateTime::createFromFormat('d/m/Y H:i', $json['data'][$fieldMap['eta']]['value']);
-$eta = $date->format('Y-m-d H:i:s');
-$pob_in = $json['data'][$fieldMap['pob_in']]['value'];
-
-if (array_key_exists($fieldMap['out_to'], $json['data'])) {
-    $date = DateTime::createFromFormat('d/m/Y H:i', $json['data'][$fieldMap['etd']]['value']);
-    $etd = $date->format('Y-m-d H:i:s');
-    $pob_out = $json['data'][$fieldMap['pob_out']]['value'];
-    $out_to = $json['data'][$fieldMap['out_to']]['value'];
-}
-
-$email = $json['data'][$fieldMap['email']]['value'];
-$phone = $json['data'][$fieldMap['phone']]['value'];
-$notes = $json['data'][$fieldMap['notes']]['value'];
-
-mysqli_stmt_bind_param($stmt, "ssssssisissss", $ac_reg, $ac_type, $captain, $fuel, $in_from, $eta, $pob_in, $etd, $pob_out, $email, $phone, $notes, $created_by);
-
-// Execute the statement
-if (mysqli_stmt_execute($stmt)) {
-    error_log("Record inserted for " . $ac_reg);
-} else {
-    error_log("Error: " . mysqli_stmt_error($stmt));
-}
-
-// Close the statement and connection
-mysqli_stmt_close($stmt);
-mysqli_close($mysqli);
-?>
Author	SHA1	Message	Date
James Pattinson	55b3fbfc63	TZ changes from prod	2025-06-01 07:18:11 +00:00
James Pattinson	c4cfb43edc	ICAO and IATA code lookup	2025-04-15 17:13:47 +00:00
James Pattinson	31c1172e08	Add bookout system POC	2025-04-15 16:21:23 +00:00
James Pattinson	94010fec01	Dave's public board	2025-04-07 16:27:01 +00:00
James Pattinson	391f057824	v1 release	2025-03-31 16:37:40 +00:00
James Pattinson	41dcd937cd	Prep for 1.0	2025-03-31 12:33:26 +00:00
James Pattinson	ac5cd4f3a0	Menu bar and Upcoming PPR	2025-03-31 12:08:39 +00:00
James Pattinson	f6368f12f1	Tweaks	2025-03-31 10:23:40 +00:00
James Pattinson	f6ba990e1c	TZ and editable fields	2025-03-31 10:04:40 +00:00
James Pattinson	ca28f490eb	TZ changes	2025-03-31 08:29:59 +00:00
James Pattinson	07cb5d1419	Before refactor	2025-03-31 07:59:02 +00:00
James Pattinson	4385a13498	revert `15b2d36bf6` revert Notes on main screen	2025-03-17 20:41:13 +00:00
James Pattinson	15b2d36bf6	Notes on main screen	2025-03-17 20:37:43 +00:00
James Pattinson	9e25f0023c	Admin sort	2025-03-17 20:37:04 +00:00
James Pattinson	935e13d44b	CSV Download and Notes highlight	2025-03-16 17:17:42 +00:00
James Pattinson	82f2c5c16c	Tidy	2025-03-15 18:18:05 +00:00
James Pattinson	11a1bf464b	General tidy and image move	2025-03-15 18:17:21 +00:00
James Pattinson	a8d87582c9	Working	2025-03-14 18:52:35 +00:00
James Pattinson	f0d26295d8	Editing working somewhat	2025-03-14 17:27:47 +00:00
James Pattinson	9c77d8ffb0	Show/hide journal	2025-03-14 08:35:14 +00:00
James Pattinson	426c5092ba	Journal display	2025-03-13 18:11:19 +00:00