From 0149f4589387909fc1c344b4b711b2da08408d92 Mon Sep 17 00:00:00 2001 From: James Pattinson Date: Fri, 19 Dec 2025 08:06:47 -0500 Subject: [PATCH] AI tweaking --- web/admin.html | 164 +++++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 102 deletions(-) diff --git a/web/admin.html b/web/admin.html index c630463..5676aab 100644 --- a/web/admin.html +++ b/web/admin.html @@ -421,7 +421,7 @@

Book Out

- +
@@ -475,7 +475,7 @@
- +
@@ -628,7 +628,7 @@
- +
@@ -686,7 +686,7 @@
- +
@@ -758,7 +758,7 @@
- +
- +
@@ -930,7 +930,7 @@

User Management

- +
@@ -1114,6 +1114,28 @@ let sessionExpiryCheckInterval = null; let etdManuallyEdited = false; // Track if user has manually edited ETD let loadPPRsTimeout = null; // Debounce timer for loadPPRs to prevent duplicate refreshes + + // Modal state variables + let currentLocalFlightId = null; + let currentBookedInArrivalId = null; + let currentDepartureId = null; + let currentArrivalId = null; + let currentOverflightId = null; + let isOverflightQSYMode = false; // Track if we're in overflight QSY mode + + // User management variables + let currentUserRole = null; + let isNewUser = false; + let currentUserId = null; + let currentChangePasswordUserId = null; + + // ==================== GENERIC MODAL HELPER ==================== + function closeModal(modalId, additionalCleanup = null) { + document.getElementById(modalId).style.display = 'none'; + if (additionalCleanup) { + additionalCleanup(); + } + } // WebSocket connection for real-time updates function connectWebSocket() { @@ -1130,11 +1152,9 @@ const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const wsUrl = `${protocol}//${window.location.host}/ws/tower-updates`; - console.log('Connecting to WebSocket:', wsUrl); wsConnection = new WebSocket(wsUrl); wsConnection.onopen = function(event) { - console.log('✅ WebSocket connected for real-time updates'); lastHeartbeatResponse = Date.now(); startHeartbeat(); showNotification('Real-time updates connected'); @@ -1145,37 +1165,31 @@ // Check if it's a heartbeat response if (event.data.startsWith('Heartbeat:')) { lastHeartbeatResponse = Date.now(); - console.log('💓 WebSocket heartbeat received'); return; } const data = JSON.parse(event.data); - console.log('WebSocket message received:', data); // Refresh PPRs when any PPR-related event occurs if (data.type && (data.type.includes('ppr_') || data.type === 'status_update')) { - console.log('PPR update detected, refreshing...'); loadPPRs(); showNotification('Data updated'); } // Refresh local flights when any local flight event occurs if (data.type && (data.type.includes('local_flight_'))) { - console.log('Local flight update detected, refreshing...'); loadPPRs(); showNotification('Local flight updated'); } // Refresh departures when any departure event occurs if (data.type && (data.type.includes('departure_'))) { - console.log('Departure update detected, refreshing...'); loadDepartures(); showNotification('Departure updated'); } // Refresh arrivals when any arrival event occurs if (data.type && (data.type.includes('arrival_'))) { - console.log('Arrival update detected, refreshing...'); loadArrivals(); showNotification('Arrival updated'); } @@ -1185,14 +1199,12 @@ }; wsConnection.onclose = function(event) { - console.log('⚠️ WebSocket disconnected', event.code, event.reason); stopHeartbeat(); // Attempt to reconnect after 5 seconds if still logged in if (accessToken) { showNotification('Real-time updates disconnected, reconnecting...', true); wsReconnectTimeout = setTimeout(() => { - console.log('Attempting to reconnect WebSocket...'); connectWebSocket(); }, 5000); } @@ -1211,7 +1223,6 @@ wsHeartbeatInterval = setInterval(() => { if (wsConnection && wsConnection.readyState === WebSocket.OPEN) { wsConnection.send('ping'); - console.log('💓 Sending WebSocket heartbeat'); // Check if last heartbeat was more than 60 seconds ago if (lastHeartbeatResponse && (Date.now() - lastHeartbeatResponse > 60000)) { @@ -1388,21 +1399,21 @@ // Press 'Escape' to close Book Out modal if it's open (allow even when typing in inputs) if (e.key === 'Escape' && document.getElementById('localFlightModal').style.display === 'block') { e.preventDefault(); - closeLocalFlightModal(); + closeModal('localFlightModal'); return; } // Press 'Escape' to close Book In modal if it's open (allow even when typing in inputs) if (e.key === 'Escape' && document.getElementById('bookInModal').style.display === 'block') { e.preventDefault(); - closeBookInModal(); + closeModal('bookInModal'); return; } // Press 'Escape' to close Overflight modal if it's open (allow even when typing in inputs) if (e.key === 'Escape' && document.getElementById('overflightModal').style.display === 'block') { e.preventDefault(); - closeOverflightModal(); + closeModal('overflightModal'); return; } @@ -1430,7 +1441,7 @@ // Press 'Escape' to close overflight edit modal if it's open (allow even when typing in inputs) if (e.key === 'Escape' && document.getElementById('overflightEditModal').style.display === 'block') { e.preventDefault(); - closeOverflightEditModal(); + closeModal('overflightEditModal'); return; } @@ -2714,11 +2725,9 @@ } function populateForm(ppr) { - console.log('populateForm called with:', ppr); Object.keys(ppr).forEach(key => { if (key === 'eta' || key === 'etd') { if (ppr[key]) { - console.log(`Processing ${key}:`, ppr[key]); // ppr[key] is UTC datetime string from API (naive, assume UTC) let utcDateStr = ppr[key]; if (!utcDateStr.includes('T')) { @@ -2728,7 +2737,6 @@ utcDateStr += 'Z'; } const date = new Date(utcDateStr); // Now correctly parsed as UTC - console.log(`Parsed date for ${key}:`, date); // Split into date and time components for separate inputs const dateField = document.getElementById(`${key}-date`); @@ -2741,7 +2749,6 @@ const day = String(date.getDate()).padStart(2, '0'); const dateValue = `${year}-${month}-${day}`; dateField.value = dateValue; - console.log(`Set ${key}-date to:`, dateValue); // Format time (round to nearest 15-minute interval) const hours = String(date.getHours()).padStart(2, '0'); @@ -2750,19 +2757,12 @@ const minutes = String(roundedMinutes).padStart(2, '0'); const timeValue = `${hours}:${minutes}`; timeField.value = timeValue; - console.log(`Set ${key}-time to:`, timeValue, `(from ${rawMinutes} minutes)`); - } else { - console.log(`Date/time fields not found for ${key}: dateField=${dateField}, timeField=${timeField}`); } - } else { - console.log(`${key} is empty`); } } else { const field = document.getElementById(key); if (field) { field.value = ppr[key] || ''; - } else { - console.log(`Field not found for key: ${key}`); } } }); @@ -2838,9 +2838,10 @@ } function closePPRModal() { - document.getElementById('pprModal').style.display = 'none'; - currentPPRId = null; - isNewPPR = false; + closeModal('pprModal', () => { + currentPPRId = null; + isNewPPR = false; + }); } // Timestamp modal functions @@ -3181,10 +3182,6 @@ } // User Management Functions - let currentUserRole = null; - let isNewUser = false; - let currentUserId = null; - async function openUserManagementModal() { if (!accessToken) return; @@ -3192,10 +3189,6 @@ await loadUsers(); } - function closeUserManagementModal() { - document.getElementById('userManagementModal').style.display = 'none'; - } - async function loadUsers() { if (!accessToken) return; @@ -3325,13 +3318,12 @@ } function closeUserModal() { - document.getElementById('userModal').style.display = 'none'; - currentUserId = null; - isNewUser = false; + closeModal('userModal', () => { + currentUserId = null; + isNewUser = false; + }); } - let currentChangePasswordUserId = null; - function openChangePasswordModal(userId, username) { if (!accessToken) return; @@ -3348,8 +3340,9 @@ } function closeChangePasswordModal() { - document.getElementById('changePasswordModal').style.display = 'none'; - currentChangePasswordUserId = null; + closeModal('changePasswordModal', () => { + currentChangePasswordUserId = null; + }); } // Change password form submission @@ -3450,9 +3443,7 @@ // Update user role detection and UI visibility async function updateUserRole() { - console.log('updateUserRole called'); // Debug log if (!accessToken) { - console.log('No access token, skipping role update'); // Debug log return; } @@ -3464,16 +3455,13 @@ if (response.ok) { const userData = await response.json(); currentUserRole = userData.role; - console.log('User role from API:', currentUserRole); // Debug log // Show user management in dropdown only for administrators const userManagementDropdown = document.getElementById('user-management-dropdown'); if (currentUserRole && currentUserRole.toUpperCase() === 'ADMINISTRATOR') { userManagementDropdown.style.display = 'block'; - console.log('Showing user management in dropdown'); // Debug log } else { userManagementDropdown.style.display = 'none'; - console.log('Hiding user management, current role:', currentUserRole); // Debug log } } } catch (error) { @@ -3499,16 +3487,16 @@ closeTimestampModal(); } if (event.target === userManagementModal) { - closeUserManagementModal(); + closeModal('userManagementModal'); } if (event.target === userModal) { closeUserModal(); } if (event.target === tableHelpModal) { - closeTableHelp(); + closeModal('tableHelpModal'); } if (event.target === bookInModal) { - closeBookInModal(); + closeModal('bookInModal'); } } @@ -3547,10 +3535,6 @@ }, 100); } - function closeLocalFlightModal() { - document.getElementById('localFlightModal').style.display = 'none'; - } - function openBookInModal() { document.getElementById('book-in-form').reset(); document.getElementById('book-in-id').value = ''; @@ -3569,10 +3553,6 @@ }, 100); } - function closeBookInModal() { - document.getElementById('bookInModal').style.display = 'none'; - } - function openOverflightModal() { document.getElementById('overflight-form').reset(); document.getElementById('overflight-id').value = ''; @@ -3598,13 +3578,6 @@ }, 100); } - function closeOverflightModal() { - document.getElementById('overflightModal').style.display = 'none'; - } - - let currentOverflightId = null; - let isOverflightQSYMode = false; // Track if we're in overflight QSY mode - async function openOverflightEditModal(overflightId) { if (!accessToken) return; @@ -3658,8 +3631,7 @@ } function closeOverflightEditModal() { - document.getElementById('overflightEditModal').style.display = 'none'; - currentOverflightId = null; + closeModal('overflightEditModal'); } async function updateOverflightStatus(newStatus, qsyTime = null) { @@ -3941,9 +3913,6 @@ } // Local Flight Edit Modal Functions - let currentLocalFlightId = null; - let currentBookedInArrivalId = null; - async function openLocalFlightEditModal(flightId) { if (!accessToken) return; @@ -4092,8 +4061,9 @@ } function closeDepartureEditModal() { - document.getElementById('departureEditModal').style.display = 'none'; - currentDepartureId = null; + closeModal('departureEditModal', () => { + currentDepartureId = null; + }); } // Departure edit form submission @@ -4150,8 +4120,6 @@ }); // Arrival Edit Modal Functions - let currentArrivalId = null; - async function openArrivalEditModal(arrivalId) { if (!accessToken) return; @@ -4196,8 +4164,9 @@ } function closeArrivalEditModal() { - document.getElementById('arrivalEditModal').style.display = 'none'; - currentArrivalId = null; + closeModal('arrivalEditModal', () => { + currentArrivalId = null; + }); } // Arrival edit form submission @@ -4457,10 +4426,6 @@ modal.style.display = 'block'; } - function closeTableHelp() { - document.getElementById('tableHelpModal').style.display = 'none'; - } - // Local flight edit form submission document.getElementById('local-flight-edit-form').addEventListener('submit', async function(e) { e.preventDefault(); @@ -4563,8 +4528,6 @@ delete flightData.flight_type; } - console.log(`Submitting ${endpoint} data:`, flightData); - try { const response = await fetch(endpoint, { method: 'POST', @@ -4593,7 +4556,7 @@ } const result = await response.json(); - closeLocalFlightModal(); + closeModal('localFlightModal'); loadPPRs(); // Refresh tables showNotification(`Aircraft ${result.registration} booked out successfully!`); } catch (error) { @@ -4643,8 +4606,6 @@ // Book In uses LANDED status (they're arriving now) arrivalData.status = 'LANDED'; - console.log('Submitting arrivals data:', arrivalData); - try { const response = await fetch('/api/v1/arrivals/', { method: 'POST', @@ -4673,7 +4634,7 @@ } const result = await response.json(); - closeBookInModal(); + closeModal('bookInModal'); loadPPRs(); // Refresh tables showNotification(`Aircraft ${result.registration} booked in successfully!`); } catch (error) { @@ -4710,8 +4671,6 @@ } }); - console.log('Submitting overflight data:', overflightData); - try { const response = await fetch('/api/v1/overflights/', { method: 'POST', @@ -4740,7 +4699,7 @@ } const result = await response.json(); - closeOverflightModal(); + closeModal('overflightModal'); loadPPRs(); showNotification(`Overflight ${result.registration} registered successfully!`); } catch (error) { @@ -4802,6 +4761,7 @@ document.getElementById('etd-date').addEventListener('change', markETDAsManuallyEdited); document.getElementById('etd-time').addEventListener('change', markETDAsManuallyEdited); }); +