Drone flights and Bulk Logging WIPs
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
<a href="#" onclick="window.location.href = '/atc'">🎛️ ATC View</a>
|
||||
<a href="#" onclick="window.location.href = '/reports'">📊 Reports</a>
|
||||
<a href="#" onclick="window.location.href = '/movements'">📈 Movements</a>
|
||||
<a href="#" onclick="window.location.href = '/drone-requests'">Drone Requests</a>
|
||||
<a href="#" onclick="window.location.href = '/bulk-log'">🧾 Bulk Flight Log</a>
|
||||
<a href="#" onclick="window.location.href = '/journal'">📔 Journal Log</a>
|
||||
<a href="#" onclick="openUserAircraftModal(); closeAdminDropdown()" id="user-aircraft-dropdown">✈️ User Aircraft</a>
|
||||
|
||||
+204
-11
@@ -266,6 +266,85 @@
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
.match-strips {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.65rem;
|
||||
margin-top: 0.55rem;
|
||||
}
|
||||
|
||||
.match-strip-preview {
|
||||
background: transparent;
|
||||
border: 0;
|
||||
display: block;
|
||||
padding: 0;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.match-strip {
|
||||
display: inline-block;
|
||||
min-width: 760px;
|
||||
padding: 0.75rem;
|
||||
}
|
||||
|
||||
.match-strip .bulk-field {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.match-strip .strip-value {
|
||||
background: rgba(255,255,255,0.35);
|
||||
border-radius: 4px;
|
||||
color: #111;
|
||||
font-size: 0.95rem;
|
||||
font-weight: 700;
|
||||
min-height: 2rem;
|
||||
padding: 0.45rem 0.55rem;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.match-strip .callsign-preview {
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.match-strip .callsign-preview label {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.match-strip .callsign-preview .strip-value {
|
||||
align-items: center;
|
||||
background: transparent;
|
||||
display: flex;
|
||||
font-size: 1.2rem;
|
||||
justify-content: center;
|
||||
min-height: 100%;
|
||||
padding: 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.match-strip.strip-kind-local {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.match-strip.strip-kind-local .strip-value {
|
||||
background: rgba(255,255,255,0.28);
|
||||
border-radius: 0;
|
||||
min-height: 0;
|
||||
padding: 0.2rem;
|
||||
}
|
||||
|
||||
.match-strip.strip-kind-local .strip-registration .strip-value {
|
||||
background: rgba(255,255,255,0.55);
|
||||
outline: 2px solid rgba(0,0,0,0.2);
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.match-strip.strip-kind-local .strip-registration.callsign-preview .strip-value {
|
||||
background: transparent;
|
||||
font-size: 1.35rem;
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
.movement-table table {
|
||||
min-width: 1050px;
|
||||
}
|
||||
@@ -640,6 +719,10 @@
|
||||
function applySuggestion(suggestion) {
|
||||
if (!suggestion.source) return;
|
||||
|
||||
if (document.getElementById('flight-kind').value === 'LOCAL') {
|
||||
fillIfEmpty('aircraft-type', suggestion.aircraft_type);
|
||||
return;
|
||||
}
|
||||
if (suggestion.movement_id) document.getElementById('matched-movement-id').value = suggestion.movement_id;
|
||||
if (suggestion.ppr_id) document.getElementById('matched-ppr-id').value = suggestion.ppr_id;
|
||||
fillSuggestedTime(suggestion.movement_time);
|
||||
@@ -675,30 +758,138 @@
|
||||
function renderContext(context) {
|
||||
const panel = document.getElementById('context-panel');
|
||||
const pprs = context.pprs || [];
|
||||
const localFlights = context.local_flights || [];
|
||||
const movements = context.movements || [];
|
||||
if (!pprs.length && !movements.length) {
|
||||
if (!pprs.length && !localFlights.length) {
|
||||
hideContext();
|
||||
return;
|
||||
}
|
||||
|
||||
panel.className = `context-panel ${movements.length ? 'warning' : ''}`;
|
||||
panel.className = 'context-panel';
|
||||
const parts = [];
|
||||
if (movements.length) {
|
||||
parts.push(`<strong>Existing movement found.</strong> Saving will update it instead of adding another.`);
|
||||
parts.push(movements.map(m => `<span class="match-pill">${formatTime(m.timestamp)} ${m.movement_type} #${m.id}</span>`).join(''));
|
||||
}
|
||||
if (pprs.length) {
|
||||
parts.push(`<strong>Matching PPR${pprs.length > 1 ? 's' : ''}:</strong>`);
|
||||
parts.push(pprs.map(p => {
|
||||
const encoded = encodeURIComponent(JSON.stringify(p));
|
||||
return `<button type="button" class="match-pill" onclick='selectPPR("${encoded}")'>#${p.id} ${p.aircraft_registration} ${p.from_location || ''}${p.to_location ? ' to ' + p.to_location : ''}</button>`;
|
||||
}).join(''));
|
||||
parts.push(renderPPRMatchStrips(pprs));
|
||||
}
|
||||
if (localFlights.length) {
|
||||
parts.push(`<strong>Existing local flight${localFlights.length > 1 ? 's' : ''}:</strong>`);
|
||||
parts.push(renderLocalFlightMatchStrips(localFlights));
|
||||
}
|
||||
|
||||
panel.innerHTML = parts.join('<br>');
|
||||
panel.style.display = 'block';
|
||||
}
|
||||
|
||||
function renderPPRMatchStrips(pprs) {
|
||||
const kind = document.getElementById('flight-kind').value;
|
||||
return `<div class="match-strips">${pprs.map(ppr => renderPPRMatchStrip(ppr, kind)).join('')}</div>`;
|
||||
}
|
||||
|
||||
function renderLocalFlightMatchStrips(localFlights) {
|
||||
return `<div class="match-strips">${localFlights.map(local => renderLocalFlightMatchStrip(local)).join('')}</div>`;
|
||||
}
|
||||
|
||||
function renderPPRMatchStrip(ppr, kind) {
|
||||
return `
|
||||
<div class="match-strip-preview" aria-label="Matching PPR ${escapeHtml(ppr.id)} for ${escapeHtml(ppr.aircraft_registration || 'aircraft')}">
|
||||
<div class="virtual-strip match-strip ${stripClassForKind(kind)} strip-kind-${kind.toLowerCase()}">
|
||||
${kind === 'LOCAL' ? renderLocalPPRStrip(ppr) : renderStandardPPRStrip(ppr, kind)}
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function renderLocalFlightMatchStrip(local) {
|
||||
return `
|
||||
<div class="match-strip-preview" aria-label="Existing local flight ${escapeHtml(local.id)} for ${escapeHtml(local.aircraft_registration || 'aircraft')}">
|
||||
<div class="virtual-strip match-strip strip-pink strip-kind-local">
|
||||
${renderExistingLocalStrip(local)}
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function renderStandardPPRStrip(ppr, kind) {
|
||||
const isArrival = kind === 'ARRIVAL';
|
||||
const isDeparture = kind === 'DEPARTURE';
|
||||
const isOverflight = kind === 'OVERFLIGHT';
|
||||
const pob = kind === 'ARRIVAL' ? ppr.pob_in : (ppr.pob_out || ppr.pob_in);
|
||||
return `
|
||||
<div class="bulk-grid">
|
||||
${stripField('Registration', ppr.aircraft_registration)}
|
||||
${isArrival ? stripField('LDG', compactIsoTime(ppr.eta)) : ''}
|
||||
${isDeparture ? stripField('T/O', compactIsoTime(ppr.etd)) : ''}
|
||||
${isOverflight ? stripField('Contact time', '') : ''}
|
||||
${isOverflight ? stripField('QSY time', '') : ''}
|
||||
${stripField('Type', ppr.aircraft_type)}
|
||||
${stripField('C/SIGN', ppr.callsign || ppr.aircraft_registration, 'callsign-preview')}
|
||||
${['ARRIVAL', 'OVERFLIGHT'].includes(kind) ? stripField('From', ppr.from_location) : ''}
|
||||
${['DEPARTURE', 'OVERFLIGHT'].includes(kind) ? stripField('To', ppr.to_location) : ''}
|
||||
${stripField('POB', pob)}
|
||||
${['ARRIVAL', 'DEPARTURE'].includes(kind) ? stripField('Runway', '') : ''}
|
||||
${stripField('Wind', '')}
|
||||
${stripField('Pressure', '')}
|
||||
${stripField('Notes', ppr.notes, 'notes-field')}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function renderLocalPPRStrip(ppr) {
|
||||
return `
|
||||
<div class="bulk-grid">
|
||||
<div class="bulk-field strip-field local-slash-cell"></div>
|
||||
${stripField('LOC / CCTS', 'Local', 'local-nature-cell')}
|
||||
${stripField('Type', ppr.aircraft_type, 'type-cell')}
|
||||
${stripField('C/SIGN', ppr.callsign || ppr.aircraft_registration, 'strip-registration callsign-preview')}
|
||||
${stripField('T/O', compactIsoTime(ppr.etd), 'local-to-cell')}
|
||||
${stripField('LDG', compactIsoTime(ppr.eta), 'local-ldg-cell')}
|
||||
${stripField('CCTS', '', 'local-circuit-cell')}
|
||||
${stripField('POB', ppr.pob_out || ppr.pob_in, 'pob-cell')}
|
||||
${stripField('Notes', ppr.notes, 'notes-field')}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function renderExistingLocalStrip(local) {
|
||||
return `
|
||||
<div class="bulk-grid">
|
||||
<div class="bulk-field strip-field local-slash-cell"></div>
|
||||
${stripField('LOC / CCTS', local.flight_type || 'Local', 'local-nature-cell')}
|
||||
${stripField('Type', local.aircraft_type, 'type-cell')}
|
||||
${stripField('C/SIGN', local.callsign || local.aircraft_registration, 'strip-registration callsign-preview')}
|
||||
${stripField('T/O', compactIsoTime(local.takeoff_time || local.departed_time || local.etd), 'local-to-cell')}
|
||||
${stripField('LDG', compactIsoTime(local.landing_time), 'local-ldg-cell')}
|
||||
${stripField('CCTS', local.circuits, 'local-circuit-cell')}
|
||||
${stripField('POB', local.pob, 'pob-cell')}
|
||||
${stripField('Notes', local.notes, 'notes-field')}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function stripField(label, value, extraClass = '') {
|
||||
return `
|
||||
<div class="bulk-field ${extraClass}">
|
||||
<label>${escapeHtml(label)}</label>
|
||||
<div class="strip-value">${escapeHtml(value || '')}</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function compactIsoTime(value) {
|
||||
if (!value) return '';
|
||||
return compactTime(value.slice(11, 16));
|
||||
}
|
||||
|
||||
function escapeHtml(value) {
|
||||
return String(value ?? '').replace(/[&<>"']/g, char => ({
|
||||
'&': '&',
|
||||
'<': '<',
|
||||
'>': '>',
|
||||
'"': '"',
|
||||
"'": '''
|
||||
}[char]));
|
||||
}
|
||||
|
||||
function hideContext() {
|
||||
const panel = document.getElementById('context-panel');
|
||||
panel.style.display = 'none';
|
||||
@@ -717,6 +908,8 @@
|
||||
document.getElementById('pob').value = kind === 'ARRIVAL' ? (ppr.pob_in || '') : (ppr.pob_out || ppr.pob_in || '');
|
||||
if (kind === 'ARRIVAL' && ppr.eta) document.getElementById('landing-time').value = compactTime(ppr.eta.slice(11, 16));
|
||||
if (kind === 'DEPARTURE' && ppr.etd) document.getElementById('takeoff-time').value = compactTime(ppr.etd.slice(11, 16));
|
||||
if (kind === 'LOCAL' && ppr.etd) document.getElementById('local-takeoff-time').value = compactTime(ppr.etd.slice(11, 16));
|
||||
if (kind === 'LOCAL' && ppr.eta) document.getElementById('local-landing-time').value = compactTime(ppr.eta.slice(11, 16));
|
||||
document.getElementById('notes').value = ppr.notes || '';
|
||||
}
|
||||
|
||||
@@ -745,7 +938,7 @@
|
||||
pressure_setting: nullableValue('pressure-setting'),
|
||||
notes: nullableValue('notes'),
|
||||
ppr_id: nullableNumber('matched-ppr-id'),
|
||||
movement_id: nullableNumber('matched-movement-id')
|
||||
movement_id: kind === 'LOCAL' ? null : nullableNumber('matched-movement-id')
|
||||
};
|
||||
|
||||
const response = await authFetch(`${API_BASE}/movements/bulk-log`, {
|
||||
|
||||
@@ -0,0 +1,334 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Drone Flight Request</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body {
|
||||
background: #f5f5f5;
|
||||
color: #263645;
|
||||
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||
line-height: 1.5;
|
||||
}
|
||||
.container {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
||||
margin: 2rem auto;
|
||||
max-width: 900px;
|
||||
padding: 2rem;
|
||||
}
|
||||
.header {
|
||||
border-bottom: 2px solid #3498db;
|
||||
margin-bottom: 1.5rem;
|
||||
padding-bottom: 1rem;
|
||||
}
|
||||
.header h1 { color: #2c3e50; margin-bottom: 0.4rem; }
|
||||
.status {
|
||||
border-radius: 999px;
|
||||
color: white;
|
||||
display: inline-flex;
|
||||
font-size: 0.8rem;
|
||||
font-weight: 700;
|
||||
margin-top: 0.5rem;
|
||||
padding: 0.3rem 0.7rem;
|
||||
}
|
||||
.status-NEW { background: #3498db; }
|
||||
.status-APPROVED { background: #27ae60; }
|
||||
.status-DENIED { background: #c0392b; }
|
||||
.status-PENDING { background: #f39c12; }
|
||||
.status-CANCELED { background: #7f8c8d; }
|
||||
.status-INFLIGHT { background: #8e44ad; }
|
||||
.status-COMPLETED { background: #2c3e50; }
|
||||
.grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 1rem;
|
||||
}
|
||||
.full { grid-column: 1 / -1; }
|
||||
label {
|
||||
color: #555;
|
||||
display: block;
|
||||
font-weight: 600;
|
||||
margin-bottom: 0.25rem;
|
||||
}
|
||||
input, textarea {
|
||||
border: 1px solid #d6dce2;
|
||||
border-radius: 5px;
|
||||
font: inherit;
|
||||
padding: 0.65rem;
|
||||
width: 100%;
|
||||
}
|
||||
textarea { min-height: 110px; resize: vertical; }
|
||||
.actions {
|
||||
border-top: 1px solid #e6e9ec;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.75rem;
|
||||
justify-content: center;
|
||||
margin-top: 1.5rem;
|
||||
padding-top: 1.5rem;
|
||||
}
|
||||
.btn {
|
||||
border: 0;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
padding: 0.8rem 1.4rem;
|
||||
}
|
||||
.btn-primary { background: #3498db; color: white; }
|
||||
.btn-danger { background: #e74c3c; color: white; }
|
||||
.btn-secondary { background: #95a5a6; color: white; }
|
||||
.message {
|
||||
border-radius: 5px;
|
||||
display: none;
|
||||
margin-bottom: 1rem;
|
||||
padding: 0.85rem 1rem;
|
||||
}
|
||||
.message.ok { background: #d4edda; color: #155724; display: block; }
|
||||
.message.error { background: #f8d7da; color: #721c24; display: block; }
|
||||
.read-only {
|
||||
background: #eef1f4;
|
||||
border-radius: 5px;
|
||||
color: #607080;
|
||||
margin-bottom: 1rem;
|
||||
padding: 0.85rem 1rem;
|
||||
}
|
||||
@media (max-width: 720px) {
|
||||
.container { margin: 0; min-height: 100vh; border-radius: 0; }
|
||||
.grid { grid-template-columns: 1fr; }
|
||||
.full { grid-column: auto; }
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<main class="container">
|
||||
<div class="header">
|
||||
<h1>Drone Flight Request</h1>
|
||||
<p id="summary">Loading request...</p>
|
||||
<span id="status" class="status status-NEW" style="display: none;"></span>
|
||||
</div>
|
||||
|
||||
<div id="message" class="message"></div>
|
||||
<div id="locked" class="read-only" style="display: none;">This request can be viewed, but can no longer be edited or cancelled.</div>
|
||||
|
||||
<form id="request-form" style="display: none;">
|
||||
<div class="grid">
|
||||
<div>
|
||||
<label for="operator_name">Operator name</label>
|
||||
<input id="operator_name" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="operator_id">Operator ID</label>
|
||||
<input id="operator_id">
|
||||
</div>
|
||||
<div>
|
||||
<label for="flyer_name">Flyer name</label>
|
||||
<input id="flyer_name">
|
||||
</div>
|
||||
<div>
|
||||
<label for="flyer_id">Flyer ID</label>
|
||||
<input id="flyer_id">
|
||||
</div>
|
||||
<div>
|
||||
<label for="email">Email</label>
|
||||
<input id="email" type="email" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="phone">Phone</label>
|
||||
<input id="phone">
|
||||
</div>
|
||||
<div>
|
||||
<label for="estimated_takeoff_at">Estimated takeoff</label>
|
||||
<input id="estimated_takeoff_at" type="datetime-local" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="estimated_completion_at">Estimated completion</label>
|
||||
<input id="estimated_completion_at" type="datetime-local" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="maximum_elevation_ft_amsl">Maximum elevation ft AMSL</label>
|
||||
<input id="maximum_elevation_ft_amsl" type="number" min="0" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="location_inside_frz">Inside FRZ</label>
|
||||
<input id="location_inside_frz" readonly>
|
||||
</div>
|
||||
<div>
|
||||
<label for="location_latitude">Latitude</label>
|
||||
<input id="location_latitude" type="number" step="0.000001" required>
|
||||
</div>
|
||||
<div>
|
||||
<label for="location_longitude">Longitude</label>
|
||||
<input id="location_longitude" type="number" step="0.000001" required>
|
||||
</div>
|
||||
<div class="full">
|
||||
<label for="location_description">Location description</label>
|
||||
<input id="location_description">
|
||||
</div>
|
||||
<div class="full">
|
||||
<label for="notes">Notes</label>
|
||||
<textarea id="notes"></textarea>
|
||||
</div>
|
||||
<div class="full">
|
||||
<label for="operator_comments">Airport comments</label>
|
||||
<textarea id="operator_comments" readonly></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="actions">
|
||||
<button class="btn btn-primary" id="save-btn" type="submit">Save Changes</button>
|
||||
<button class="btn btn-danger" id="cancel-btn" type="button" onclick="cancelRequest()">Cancel Request</button>
|
||||
<button class="btn btn-secondary" type="button" onclick="loadRequest()">Reload</button>
|
||||
</div>
|
||||
</form>
|
||||
</main>
|
||||
|
||||
<script>
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const token = params.get('token');
|
||||
let currentRequest = null;
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
document.getElementById('request-form').addEventListener('submit', saveRequest);
|
||||
if (!token) {
|
||||
showMessage('Missing secure request token.', true);
|
||||
return;
|
||||
}
|
||||
loadRequest();
|
||||
});
|
||||
|
||||
async function loadRequest() {
|
||||
try {
|
||||
const response = await fetch(`/api/v1/drone-requests/public/edit/${encodeURIComponent(token)}`);
|
||||
const data = await response.json();
|
||||
if (!response.ok) throw new Error(data.detail || 'Unable to load request');
|
||||
currentRequest = data;
|
||||
populateForm(data);
|
||||
showMessage('', false, true);
|
||||
} catch (err) {
|
||||
showMessage(err.message, true);
|
||||
}
|
||||
}
|
||||
|
||||
function populateForm(request) {
|
||||
document.getElementById('summary').textContent = `${request.reference_number} - ${request.operator_name}`;
|
||||
const status = document.getElementById('status');
|
||||
status.textContent = request.status;
|
||||
status.className = `status status-${request.status}`;
|
||||
status.style.display = 'inline-flex';
|
||||
|
||||
setValue('operator_name', request.operator_name);
|
||||
setValue('operator_id', request.operator_id);
|
||||
setValue('flyer_name', request.flyer_name);
|
||||
setValue('flyer_id', request.flyer_id);
|
||||
setValue('email', request.email);
|
||||
setValue('phone', request.phone);
|
||||
setValue('estimated_takeoff_at', toLocalInputValue(request.estimated_takeoff_at));
|
||||
setValue('estimated_completion_at', toLocalInputValue(request.estimated_completion_at));
|
||||
setValue('maximum_elevation_ft_amsl', request.maximum_elevation_ft_amsl);
|
||||
setValue('location_inside_frz', request.location_inside_frz ? 'Yes' : 'No');
|
||||
setValue('location_latitude', request.location_latitude);
|
||||
setValue('location_longitude', request.location_longitude);
|
||||
setValue('location_description', request.location_description);
|
||||
setValue('notes', request.notes);
|
||||
setValue('operator_comments', request.operator_comments);
|
||||
|
||||
const locked = !['NEW', 'PENDING', 'APPROVED'].includes(request.status);
|
||||
document.getElementById('locked').style.display = locked ? 'block' : 'none';
|
||||
document.getElementById('save-btn').disabled = locked;
|
||||
document.getElementById('cancel-btn').disabled = locked;
|
||||
document.querySelectorAll('#request-form input, #request-form textarea').forEach(input => {
|
||||
if (input.id !== 'operator_comments' && input.id !== 'location_inside_frz') {
|
||||
input.readOnly = locked;
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById('request-form').style.display = 'block';
|
||||
}
|
||||
|
||||
async function saveRequest(event) {
|
||||
event.preventDefault();
|
||||
const payload = {
|
||||
operator_name: value('operator_name'),
|
||||
operator_id: value('operator_id') || null,
|
||||
flyer_name: value('flyer_name') || null,
|
||||
flyer_id: value('flyer_id') || null,
|
||||
email: value('email'),
|
||||
phone: value('phone') || null,
|
||||
estimated_takeoff_at: fromLocalInputValue(value('estimated_takeoff_at')),
|
||||
estimated_completion_at: fromLocalInputValue(value('estimated_completion_at')),
|
||||
maximum_elevation_ft_amsl: Number(value('maximum_elevation_ft_amsl')),
|
||||
location_latitude: Number(value('location_latitude')),
|
||||
location_longitude: Number(value('location_longitude')),
|
||||
location_description: value('location_description') || null,
|
||||
notes: value('notes') || null
|
||||
};
|
||||
|
||||
try {
|
||||
const response = await fetch(`/api/v1/drone-requests/public/edit/${encodeURIComponent(token)}`, {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(payload)
|
||||
});
|
||||
const data = await response.json();
|
||||
if (!response.ok) throw new Error(data.detail || 'Unable to save request');
|
||||
currentRequest = data;
|
||||
populateForm(data);
|
||||
showMessage('Request updated.');
|
||||
} catch (err) {
|
||||
showMessage(err.message, true);
|
||||
}
|
||||
}
|
||||
|
||||
async function cancelRequest() {
|
||||
if (!confirm('Cancel this drone flight request?')) return;
|
||||
try {
|
||||
const response = await fetch(`/api/v1/drone-requests/public/cancel/${encodeURIComponent(token)}`, {
|
||||
method: 'DELETE'
|
||||
});
|
||||
const data = await response.json();
|
||||
if (!response.ok) throw new Error(data.detail || 'Unable to cancel request');
|
||||
currentRequest = data;
|
||||
populateForm(data);
|
||||
showMessage('Request cancelled.');
|
||||
} catch (err) {
|
||||
showMessage(err.message, true);
|
||||
}
|
||||
}
|
||||
|
||||
function setValue(id, value) {
|
||||
document.getElementById(id).value = value == null ? '' : value;
|
||||
}
|
||||
|
||||
function value(id) {
|
||||
return document.getElementById(id).value.trim();
|
||||
}
|
||||
|
||||
function toLocalInputValue(value) {
|
||||
if (!value) return '';
|
||||
const normalized = value.includes('T') ? value : value.replace(' ', 'T');
|
||||
const date = new Date(normalized.endsWith('Z') ? normalized : `${normalized}Z`);
|
||||
return date.toISOString().slice(0, 16);
|
||||
}
|
||||
|
||||
function fromLocalInputValue(value) {
|
||||
return new Date(value).toISOString();
|
||||
}
|
||||
|
||||
function showMessage(message, isError = false, clear = false) {
|
||||
const element = document.getElementById('message');
|
||||
if (clear || !message) {
|
||||
element.textContent = '';
|
||||
element.className = 'message';
|
||||
return;
|
||||
}
|
||||
element.textContent = message;
|
||||
element.className = `message ${isError ? 'error' : 'ok'}`;
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,690 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Drone Flight Requests</title>
|
||||
<link rel="stylesheet" href="admin.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css">
|
||||
<style>
|
||||
.workspace {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(360px, 0.95fr) minmax(520px, 1.35fr);
|
||||
gap: 1rem;
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.toolbar {
|
||||
display: flex;
|
||||
gap: 0.75rem;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.filter-row {
|
||||
display: flex;
|
||||
gap: 0.5rem;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.request-list {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.request-list-body {
|
||||
max-height: calc(100vh - 210px);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.request-row {
|
||||
width: 100%;
|
||||
display: grid;
|
||||
grid-template-columns: 1fr auto;
|
||||
gap: 0.5rem;
|
||||
text-align: left;
|
||||
padding: 0.85rem 1rem;
|
||||
border: 0;
|
||||
border-bottom: 1px solid #e6e9ec;
|
||||
background: white;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.request-row:hover,
|
||||
.request-row.active {
|
||||
background: #eef6fb;
|
||||
}
|
||||
|
||||
.request-ref {
|
||||
font-weight: 700;
|
||||
color: #263645;
|
||||
}
|
||||
|
||||
.request-meta,
|
||||
.detail-meta {
|
||||
color: #5d6d7e;
|
||||
font-size: 0.88rem;
|
||||
line-height: 1.45;
|
||||
}
|
||||
|
||||
.status-pill {
|
||||
align-self: start;
|
||||
border-radius: 999px;
|
||||
color: white;
|
||||
display: inline-flex;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 700;
|
||||
justify-content: center;
|
||||
min-width: 86px;
|
||||
padding: 0.25rem 0.55rem;
|
||||
}
|
||||
|
||||
.status-NEW { background: #3498db; }
|
||||
.status-APPROVED { background: #27ae60; }
|
||||
.status-DENIED { background: #c0392b; }
|
||||
.status-PENDING { background: #f39c12; }
|
||||
.status-CANCELED { background: #7f8c8d; }
|
||||
.status-INFLIGHT { background: #8e44ad; }
|
||||
.status-COMPLETED { background: #2c3e50; }
|
||||
|
||||
.detail-shell {
|
||||
display: grid;
|
||||
grid-template-rows: auto minmax(360px, 52vh) auto;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.detail-panel,
|
||||
.action-panel {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.detail-body,
|
||||
.action-body {
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.detail-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||
gap: 0.85rem;
|
||||
}
|
||||
|
||||
.field-label {
|
||||
color: #607080;
|
||||
font-size: 0.75rem;
|
||||
font-weight: 700;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.field-value {
|
||||
color: #263645;
|
||||
font-weight: 600;
|
||||
margin-top: 0.15rem;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.map-panel {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
||||
overflow: hidden;
|
||||
min-height: 360px;
|
||||
}
|
||||
|
||||
#request-map {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
min-height: 360px;
|
||||
}
|
||||
|
||||
.action-row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(160px, 220px) 1fr auto;
|
||||
gap: 0.75rem;
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
textarea {
|
||||
min-height: 86px;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
select,
|
||||
input,
|
||||
textarea {
|
||||
border: 1px solid #d6dce2;
|
||||
border-radius: 5px;
|
||||
font: inherit;
|
||||
padding: 0.58rem 0.65rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.journal {
|
||||
margin-top: 1rem;
|
||||
border-top: 1px solid #e6e9ec;
|
||||
padding-top: 0.75rem;
|
||||
}
|
||||
|
||||
.journal-entry {
|
||||
border-bottom: 1px solid #eef1f4;
|
||||
padding: 0.55rem 0;
|
||||
}
|
||||
|
||||
.empty-state {
|
||||
color: #607080;
|
||||
padding: 2rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.notification {
|
||||
position: fixed;
|
||||
right: 1rem;
|
||||
top: 1rem;
|
||||
transform: translateY(-120%);
|
||||
transition: transform 0.2s ease;
|
||||
z-index: 3000;
|
||||
}
|
||||
|
||||
.notification.show {
|
||||
transform: translateY(0);
|
||||
}
|
||||
|
||||
@media (max-width: 980px) {
|
||||
.workspace,
|
||||
.detail-grid,
|
||||
.action-row {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.request-list-body {
|
||||
max-height: 360px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="top-bar">
|
||||
<div class="title">
|
||||
<h1 id="tower-title">Swansea Tower</h1>
|
||||
</div>
|
||||
<div class="menu-buttons">
|
||||
<button class="btn btn-secondary" onclick="window.location.href = '/admin'">Tower</button>
|
||||
<button class="btn btn-secondary" onclick="window.location.href = '/journal'">Journal</button>
|
||||
</div>
|
||||
<div class="user-info">
|
||||
Logged in as: <span id="current-user">Loading...</span> |
|
||||
<a href="#" onclick="logout()" style="color: white;">Logout</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="toolbar">
|
||||
<div>
|
||||
<h2>Drone Flight Requests</h2>
|
||||
<div class="detail-meta">Requests from the public drone flight form</div>
|
||||
</div>
|
||||
<div class="filter-row">
|
||||
<select id="status-filter" aria-label="Status filter">
|
||||
<option value="">All statuses</option>
|
||||
<option value="NEW">New</option>
|
||||
<option value="PENDING">Pending</option>
|
||||
<option value="APPROVED">Approved</option>
|
||||
<option value="DENIED">Denied</option>
|
||||
<option value="CANCELED">Canceled</option>
|
||||
<option value="INFLIGHT">Inflight</option>
|
||||
<option value="COMPLETED">Completed</option>
|
||||
</select>
|
||||
<button class="btn btn-primary" onclick="loadRequests()">Refresh</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="workspace">
|
||||
<section class="request-list">
|
||||
<div class="table-header">Request Queue - <span id="request-count">0</span></div>
|
||||
<div id="request-list-body" class="request-list-body">
|
||||
<div class="empty-state">Loading requests...</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="detail-shell">
|
||||
<div class="detail-panel">
|
||||
<div class="table-header">Selected Request</div>
|
||||
<div id="detail-body" class="detail-body">
|
||||
<div class="empty-state">Select a request to view its details.</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="map-panel">
|
||||
<div id="request-map"></div>
|
||||
</div>
|
||||
|
||||
<div class="action-panel">
|
||||
<div class="table-header">Lifecycle</div>
|
||||
<div class="action-body">
|
||||
<div class="action-row">
|
||||
<select id="status-select" aria-label="New status">
|
||||
<option value="NEW">NEW</option>
|
||||
<option value="PENDING">PENDING</option>
|
||||
<option value="APPROVED">APPROVED</option>
|
||||
<option value="DENIED">DENIED</option>
|
||||
<option value="CANCELED">CANCELED</option>
|
||||
<option value="INFLIGHT">INFLIGHT</option>
|
||||
<option value="COMPLETED">COMPLETED</option>
|
||||
</select>
|
||||
<textarea id="operator-comment" placeholder="Comment or request for more information"></textarea>
|
||||
<div style="display: flex; flex-direction: column; gap: 0.5rem;">
|
||||
<button class="btn btn-success" onclick="saveStatus()">Set Status</button>
|
||||
<button class="btn btn-info" onclick="sendComment()">Send Comment</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="journal" class="journal"></div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="notification" class="notification btn"></div>
|
||||
|
||||
<div id="loginModal" class="modal" style="display: none;">
|
||||
<div class="modal-content" style="max-width: 420px;">
|
||||
<div class="modal-header">
|
||||
<h2>Login</h2>
|
||||
</div>
|
||||
<form id="login-form">
|
||||
<div class="form-group">
|
||||
<label for="login-username">Username</label>
|
||||
<input type="text" id="login-username" required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="login-password">Password</label>
|
||||
<input type="password" id="login-password" required>
|
||||
</div>
|
||||
<div id="login-error" class="error-message" style="display: none;"></div>
|
||||
<div class="form-actions">
|
||||
<button id="login-btn" class="btn btn-primary" type="submit">Login</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
||||
<script>
|
||||
let accessToken = null;
|
||||
let currentUser = null;
|
||||
let selectedRequest = null;
|
||||
let requests = [];
|
||||
let map = null;
|
||||
let mapLayers = [];
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
document.getElementById('login-form').addEventListener('submit', handleLogin);
|
||||
document.getElementById('status-filter').addEventListener('change', loadRequests);
|
||||
initializeAuth();
|
||||
initializeMap();
|
||||
connectWebSocket();
|
||||
});
|
||||
|
||||
function initializeMap() {
|
||||
map = L.map('request-map').setView([51.6053, -4.0678], 12);
|
||||
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
maxZoom: 19,
|
||||
attribution: '© OpenStreetMap contributors'
|
||||
}).addTo(map);
|
||||
}
|
||||
|
||||
function initializeAuth() {
|
||||
const token = localStorage.getItem('ppr_access_token');
|
||||
const username = localStorage.getItem('ppr_username');
|
||||
const expiry = localStorage.getItem('ppr_token_expiry');
|
||||
if (token && username && expiry && Date.now() < parseInt(expiry)) {
|
||||
accessToken = token;
|
||||
currentUser = username;
|
||||
document.getElementById('current-user').textContent = username;
|
||||
loadRequests();
|
||||
return;
|
||||
}
|
||||
showLogin();
|
||||
}
|
||||
|
||||
function showLogin() {
|
||||
document.getElementById('loginModal').style.display = 'block';
|
||||
document.getElementById('login-username').focus();
|
||||
}
|
||||
|
||||
function hideLogin() {
|
||||
document.getElementById('loginModal').style.display = 'none';
|
||||
document.getElementById('login-error').style.display = 'none';
|
||||
document.getElementById('login-form').reset();
|
||||
}
|
||||
|
||||
async function handleLogin(event) {
|
||||
event.preventDefault();
|
||||
const username = document.getElementById('login-username').value;
|
||||
const password = document.getElementById('login-password').value;
|
||||
const error = document.getElementById('login-error');
|
||||
const button = document.getElementById('login-btn');
|
||||
button.disabled = true;
|
||||
error.style.display = 'none';
|
||||
|
||||
try {
|
||||
const response = await fetch('/api/v1/auth/login', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
||||
body: `username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}`
|
||||
});
|
||||
const data = await response.json();
|
||||
if (!response.ok) throw new Error(data.detail || 'Login failed');
|
||||
|
||||
const expiry = Date.now() + ((data.expires_in || 1800) * 1000);
|
||||
localStorage.setItem('ppr_access_token', data.access_token);
|
||||
localStorage.setItem('ppr_username', username);
|
||||
localStorage.setItem('ppr_token_expiry', expiry.toString());
|
||||
accessToken = data.access_token;
|
||||
currentUser = username;
|
||||
document.getElementById('current-user').textContent = username;
|
||||
hideLogin();
|
||||
loadRequests();
|
||||
} catch (err) {
|
||||
error.textContent = err.message;
|
||||
error.style.display = 'block';
|
||||
} finally {
|
||||
button.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
function logout() {
|
||||
localStorage.removeItem('ppr_access_token');
|
||||
localStorage.removeItem('ppr_username');
|
||||
localStorage.removeItem('ppr_token_expiry');
|
||||
accessToken = null;
|
||||
currentUser = null;
|
||||
selectedRequest = null;
|
||||
showLogin();
|
||||
}
|
||||
|
||||
async function authenticatedFetch(url, options = {}) {
|
||||
if (!accessToken) {
|
||||
showLogin();
|
||||
throw new Error('No access token');
|
||||
}
|
||||
const response = await fetch(url, {
|
||||
...options,
|
||||
headers: {
|
||||
...(options.headers || {}),
|
||||
'Authorization': `Bearer ${accessToken}`
|
||||
}
|
||||
});
|
||||
if (response.status === 401) {
|
||||
logout();
|
||||
throw new Error('Session expired');
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
async function loadRequests() {
|
||||
if (!accessToken) return;
|
||||
const status = document.getElementById('status-filter').value;
|
||||
const url = status ? `/api/v1/drone-requests/?status=${encodeURIComponent(status)}` : '/api/v1/drone-requests/';
|
||||
const body = document.getElementById('request-list-body');
|
||||
body.innerHTML = '<div class="empty-state">Loading requests...</div>';
|
||||
|
||||
try {
|
||||
const response = await authenticatedFetch(url);
|
||||
if (!response.ok) throw new Error('Failed to load drone requests');
|
||||
requests = await response.json();
|
||||
renderRequestList();
|
||||
if (selectedRequest) {
|
||||
const fresh = requests.find(r => r.id === selectedRequest.id);
|
||||
if (fresh) selectRequest(fresh.id);
|
||||
}
|
||||
} catch (err) {
|
||||
body.innerHTML = `<div class="empty-state">${escapeHtml(err.message)}</div>`;
|
||||
}
|
||||
}
|
||||
|
||||
function renderRequestList() {
|
||||
document.getElementById('request-count').textContent = requests.length;
|
||||
const body = document.getElementById('request-list-body');
|
||||
if (!requests.length) {
|
||||
body.innerHTML = '<div class="empty-state">No requests match the current filter.</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
body.innerHTML = requests.map(req => `
|
||||
<button class="request-row ${selectedRequest && selectedRequest.id === req.id ? 'active' : ''}" onclick="selectRequest(${req.id})">
|
||||
<div>
|
||||
<div class="request-ref">${escapeHtml(req.reference_number)}</div>
|
||||
<div class="request-meta">${escapeHtml(req.operator_name)} · ${formatDateTime(req.estimated_takeoff_at)}</div>
|
||||
<div class="request-meta">${escapeHtml(req.location_description || `${req.location_latitude}, ${req.location_longitude}`)}</div>
|
||||
</div>
|
||||
<span class="status-pill status-${req.status}">${req.status}</span>
|
||||
</button>
|
||||
`).join('');
|
||||
}
|
||||
|
||||
async function selectRequest(id) {
|
||||
selectedRequest = requests.find(req => req.id === id);
|
||||
if (!selectedRequest) return;
|
||||
renderRequestList();
|
||||
renderDetails();
|
||||
renderMap();
|
||||
await loadJournal();
|
||||
}
|
||||
|
||||
function renderDetails() {
|
||||
document.getElementById('status-select').value = selectedRequest.status;
|
||||
document.getElementById('operator-comment').value = selectedRequest.operator_comments || '';
|
||||
document.getElementById('detail-body').innerHTML = `
|
||||
<div style="display: flex; justify-content: space-between; gap: 1rem; align-items: start; margin-bottom: 1rem;">
|
||||
<div>
|
||||
<h2>${escapeHtml(selectedRequest.reference_number)}</h2>
|
||||
<div class="detail-meta">${escapeHtml(selectedRequest.operator_name)} · ${escapeHtml(selectedRequest.email)} · ${escapeHtml(selectedRequest.phone || '-')}</div>
|
||||
</div>
|
||||
<span class="status-pill status-${selectedRequest.status}">${selectedRequest.status}</span>
|
||||
</div>
|
||||
<div class="detail-grid">
|
||||
${field('Operator ID', selectedRequest.operator_id)}
|
||||
${field('Flyer', selectedRequest.flyer_name)}
|
||||
${field('Flyer ID', selectedRequest.flyer_id)}
|
||||
${field('Takeoff', formatDateTime(selectedRequest.estimated_takeoff_at))}
|
||||
${field('Completion', formatDateTime(selectedRequest.estimated_completion_at))}
|
||||
${field('Max Elevation', `${selectedRequest.maximum_elevation_ft_amsl} ft AMSL`)}
|
||||
${field('Inside FRZ', selectedRequest.location_inside_frz === null ? '-' : (selectedRequest.location_inside_frz ? 'Yes' : 'No'))}
|
||||
${field('Latitude', selectedRequest.location_latitude)}
|
||||
${field('Longitude', selectedRequest.location_longitude)}
|
||||
${field('Location', selectedRequest.location_description || '-')}
|
||||
${field('Applicant Notes', selectedRequest.notes || '-')}
|
||||
${field('Operator Comments', selectedRequest.operator_comments || '-')}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
function field(label, value) {
|
||||
return `<div><div class="field-label">${escapeHtml(label)}</div><div class="field-value">${escapeHtml(value == null ? '-' : String(value))}</div></div>`;
|
||||
}
|
||||
|
||||
function renderMap() {
|
||||
clearMapLayers();
|
||||
if (!selectedRequest || !map) return;
|
||||
|
||||
const point = [selectedRequest.location_latitude, selectedRequest.location_longitude];
|
||||
const overlay = selectedRequest.prototype_overlay || {};
|
||||
const arp = overlay.airport_reference_point || { lat: 51.6053, lng: -4.0678 };
|
||||
const radius = overlay.frz_radius_metres || 3704;
|
||||
|
||||
addLayer(L.circle([arp.lat, arp.lng], {
|
||||
radius,
|
||||
color: '#2c3e50',
|
||||
weight: 2,
|
||||
fillColor: '#3498db',
|
||||
fillOpacity: 0.08
|
||||
}).addTo(map));
|
||||
|
||||
addRunwayProtectionRectangles(arp);
|
||||
|
||||
addLayer(L.marker(point).addTo(map).bindPopup(`
|
||||
<strong>${escapeHtml(selectedRequest.reference_number)}</strong><br>
|
||||
${escapeHtml(selectedRequest.operator_name)}<br>
|
||||
${selectedRequest.maximum_elevation_ft_amsl} ft AMSL
|
||||
`));
|
||||
|
||||
const group = L.featureGroup(mapLayers);
|
||||
map.fitBounds(group.getBounds().pad(0.18));
|
||||
setTimeout(() => map.invalidateSize(), 50);
|
||||
}
|
||||
|
||||
function addRunwayProtectionRectangles(arp) {
|
||||
addLayer(L.polygon(rotatedRectangle(arp.lat, arp.lng, 41, 5000, 1000), {
|
||||
color: '#e67e22',
|
||||
weight: 1,
|
||||
fillOpacity: 0.08
|
||||
}).addTo(map));
|
||||
addLayer(L.polygon(rotatedRectangle(arp.lat, arp.lng, 95, 5000, 1000), {
|
||||
color: '#e67e22',
|
||||
weight: 1,
|
||||
fillOpacity: 0.08
|
||||
}).addTo(map));
|
||||
}
|
||||
|
||||
function rotatedRectangle(lat, lng, bearingDeg, lengthM, widthM) {
|
||||
const halfL = lengthM / 2;
|
||||
const halfW = widthM / 2;
|
||||
return [
|
||||
offsetPoint(lat, lng, bearingDeg, halfL, halfW),
|
||||
offsetPoint(lat, lng, bearingDeg, halfL, -halfW),
|
||||
offsetPoint(lat, lng, bearingDeg, -halfL, -halfW),
|
||||
offsetPoint(lat, lng, bearingDeg, -halfL, halfW)
|
||||
];
|
||||
}
|
||||
|
||||
function offsetPoint(lat, lng, bearingDeg, forwardM, rightM) {
|
||||
const bearing = bearingDeg * Math.PI / 180;
|
||||
const northM = Math.cos(bearing) * forwardM + Math.cos(bearing + Math.PI / 2) * rightM;
|
||||
const eastM = Math.sin(bearing) * forwardM + Math.sin(bearing + Math.PI / 2) * rightM;
|
||||
const latOffset = northM / 111320;
|
||||
const lngOffset = eastM / (111320 * Math.cos(lat * Math.PI / 180));
|
||||
return [lat + latOffset, lng + lngOffset];
|
||||
}
|
||||
|
||||
function addLayer(layer) {
|
||||
mapLayers.push(layer);
|
||||
}
|
||||
|
||||
function clearMapLayers() {
|
||||
mapLayers.forEach(layer => map.removeLayer(layer));
|
||||
mapLayers = [];
|
||||
}
|
||||
|
||||
async function saveStatus() {
|
||||
if (!selectedRequest) return showNotification('Select a request first', true);
|
||||
const status = document.getElementById('status-select').value;
|
||||
const comment = document.getElementById('operator-comment').value.trim();
|
||||
|
||||
try {
|
||||
const response = await authenticatedFetch(`/api/v1/drone-requests/${selectedRequest.id}/status`, {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ status, comment: comment || null })
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to update status');
|
||||
selectedRequest = await response.json();
|
||||
showNotification('Status updated');
|
||||
await loadRequests();
|
||||
renderDetails();
|
||||
await loadJournal();
|
||||
} catch (err) {
|
||||
showNotification(err.message, true);
|
||||
}
|
||||
}
|
||||
|
||||
async function sendComment() {
|
||||
if (!selectedRequest) return showNotification('Select a request first', true);
|
||||
const comment = document.getElementById('operator-comment').value.trim();
|
||||
if (!comment) return showNotification('Enter a comment first', true);
|
||||
|
||||
try {
|
||||
const response = await authenticatedFetch(`/api/v1/drone-requests/${selectedRequest.id}/comments`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ comment, email_applicant: true })
|
||||
});
|
||||
if (!response.ok) throw new Error('Failed to send comment');
|
||||
selectedRequest = await response.json();
|
||||
showNotification('Comment sent');
|
||||
await loadRequests();
|
||||
renderDetails();
|
||||
await loadJournal();
|
||||
} catch (err) {
|
||||
showNotification(err.message, true);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadJournal() {
|
||||
const journal = document.getElementById('journal');
|
||||
if (!selectedRequest) {
|
||||
journal.innerHTML = '';
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const response = await authenticatedFetch(`/api/v1/drone-requests/${selectedRequest.id}/journal`);
|
||||
if (!response.ok) throw new Error('Failed to load journal');
|
||||
const entries = await response.json();
|
||||
journal.innerHTML = entries.length ? entries.map(entry => `
|
||||
<div class="journal-entry">
|
||||
<div>${escapeHtml(entry.entry)}</div>
|
||||
<div class="request-meta">${escapeHtml(entry.user)} · ${formatDateTime(entry.entry_dt)}</div>
|
||||
</div>
|
||||
`).join('') : '<div class="request-meta">No journal entries yet.</div>';
|
||||
} catch (err) {
|
||||
journal.innerHTML = `<div class="request-meta">${escapeHtml(err.message)}</div>`;
|
||||
}
|
||||
}
|
||||
|
||||
function connectWebSocket() {
|
||||
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
|
||||
const ws = new WebSocket(`${protocol}//${window.location.host}/ws/tower-updates`);
|
||||
ws.onmessage = event => {
|
||||
if (event.data.startsWith('Heartbeat:')) return;
|
||||
try {
|
||||
const data = JSON.parse(event.data);
|
||||
if (data.type && data.type.startsWith('drone_request_')) loadRequests();
|
||||
} catch (err) {
|
||||
console.warn('WebSocket parse failed', err);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function formatDateTime(value) {
|
||||
if (!value) return '-';
|
||||
const normalized = value.includes('T') ? value : value.replace(' ', 'T');
|
||||
const date = new Date(normalized.endsWith('Z') ? normalized : `${normalized}Z`);
|
||||
return date.toISOString().slice(0, 16).replace('T', ' ');
|
||||
}
|
||||
|
||||
function escapeHtml(value) {
|
||||
return String(value)
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
|
||||
function showNotification(message, isError = false) {
|
||||
const notification = document.getElementById('notification');
|
||||
notification.textContent = message;
|
||||
notification.className = `notification btn ${isError ? 'btn-danger' : 'btn-success'} show`;
|
||||
setTimeout(() => notification.classList.remove('show'), 3000);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user