Backup/Restore + Nadel mit QR, Debug Firebase

This commit is contained in:
concierge committed 2026-11-09 05:33:39 +01:00
1 parent 4c8b11c4d5
commit c51ef02f88
16 files changed
+634 -7

No files matched your search

+11
View File
@@ -85,5 +85,16 @@ if (createApiTokenBtn) {
createApiTokenBtn.addEventListener('click', createApiToken);
}
const restoreBackupForm = document.getElementById('restoreBackupForm');
if (restoreBackupForm) {
restoreBackupForm.addEventListener('submit', event => {
const confirmed = confirm(
'Die aktuelle Datenbank wird vollständig durch das Backup ersetzt. '
+ 'Dabei gehen alle Änderungen seit dem Backup verloren. Fortfahren?'
);
if (!confirmed) event.preventDefault();
});
}
loadBrokerStatus();
setInterval(loadBrokerStatus, 5000);
+113 -1
View File
@@ -26,6 +26,9 @@ const DEFAULT_SETTINGS = {
const STREET_STATES = ['unbearbeitet', 'zugewiesen', 'erledigt'];
const GROUP_STATES = ['offen', 'unterwegs', 'online', 'pausierend', 'fertig'];
const GROUP_MARKER_MAX_AGE_SECONDS = 30 * 60;
const GROUP_POSITION_ZOOM_DEFAULT = 18;
const GROUP_POSITION_ZOOM_MIN = 1;
const GROUP_POSITION_ZOOM_MAX = 22;
const GROUP_STREET_HOVER_COLOR = '#f5c518';
const STREET_COLORS = {
unbearbeitet: '#1f6feb',
@@ -1417,10 +1420,119 @@ async function saveGroupAssignments() {
}
}
function groupPositionZoomLevel() {
const configured = Number(window.CMBNET_GROUP_POSITION_ZOOM);
if (!Number.isFinite(configured)) return GROUP_POSITION_ZOOM_DEFAULT;
return Math.min(
GROUP_POSITION_ZOOM_MAX,
Math.max(GROUP_POSITION_ZOOM_MIN, Math.round(configured))
);
}
function buildGroupPositionShare(group) {
const lat = Number(group.last_lat);
const lon = Number(group.last_lon);
const mapsUrl = `https://www.google.com/maps?q=${lat.toFixed(6)},${lon.toFixed(6)}`;
const text = `Position von ${groupDisplayName(group)}: ${mapsUrl}`;
return {
lat,
lon,
mapsUrl,
whatsappUrl: `https://api.whatsapp.com/send?text=${encodeURIComponent(text)}`
};
}
function openGroupPositionSharePopup(group) {
let marker = dispatcherState.markersByGroupId.get(Number(group.id));
if (!marker) {
marker = createGroupMarker(group, [
Number(group.last_lat),
Number(group.last_lon)
]);
}
if (!marker) return;
const share = buildGroupPositionShare(group);
const container = document.createElement('div');
container.className = 'group-position-share';
const title = document.createElement('div');
title.className = 'group-position-share-title';
title.textContent = groupDisplayName(group);
const coordinates = document.createElement('div');
coordinates.className = 'group-position-share-coords';
coordinates.textContent = `${share.lat.toFixed(5)}, ${share.lon.toFixed(5)}`;
const canvas = document.createElement('canvas');
canvas.className = 'group-position-share-qr';
canvas.width = 200;
canvas.height = 200;
canvas.setAttribute(
'aria-label',
`QR-Code zum Teilen der Position von ${groupDisplayName(group)} über WhatsApp`
);
let qrRendered = false;
if (typeof QRious !== 'undefined') {
try {
new QRious({
element: canvas,
value: share.whatsappUrl,
size: 200,
level: 'M'
});
qrRendered = true;
} catch (error) {
console.error('QRious error', error);
}
}
const links = document.createElement('div');
links.className = 'group-position-share-links';
const whatsappLink = document.createElement('a');
whatsappLink.href = share.whatsappUrl;
whatsappLink.target = '_blank';
whatsappLink.rel = 'noopener';
whatsappLink.textContent = 'Per WhatsApp teilen';
const separator = document.createTextNode(' · ');
const mapsLink = document.createElement('a');
mapsLink.href = share.mapsUrl;
mapsLink.target = '_blank';
mapsLink.rel = 'noopener';
mapsLink.textContent = 'Kartenlink';
links.append(whatsappLink, separator, mapsLink);
container.append(title, coordinates);
if (qrRendered) {
container.appendChild(canvas);
} else {
const fallback = document.createElement('p');
fallback.textContent = 'QR-Code nicht verfügbar.';
container.appendChild(fallback);
}
container.appendChild(links);
marker.bindPopup(container, {
className: 'group-position-share-popup',
minWidth: 210,
maxWidth: 250,
autoClose: false,
closeOnClick: false,
closeButton: true,
offset: [0, -6]
});
marker.openPopup();
}
function locateGroup(groupId) {
const group = dispatcherState.groupById.get(Number(groupId));
if (!group || !hasPosition(group)) return;
map.setView([Number(group.last_lat), Number(group.last_lon)], 15);
map.setView(
[Number(group.last_lat), Number(group.last_lon)],
groupPositionZoomLevel()
);
openGroupPositionSharePopup(group);
}
function toggleCrosshair(groupId) {
+68 -3
View File
@@ -19,7 +19,9 @@ const DEFAULT_SETTINGS = {
opacity: 0.7,
weight: 20,
baseLayer: 'osm',
autoSendPosition: true
// Die automatische Übertragung der Eigenposition ist bewusst opt-in.
// Bestehende gespeicherte Einstellungen bleiben unverändert.
autoSendPosition: false
};
const AUTO_POSITION_INTERVAL_MS = 30000;
@@ -386,6 +388,9 @@ async function initFirebasePush(registration = null, force = false) {
&& payload.data.reason
? payload.data.reason
: 'wake';
// Debugging: Jede im Vordergrund empfangene Firebase-Nachricht
// wird sichtbar angezeigt, bevor die Synchronisierung läuft.
showFirebaseDebugPopup(reason, payload);
handlePushWake(reason);
});
}
@@ -438,10 +443,70 @@ function initPushWakeListener() {
navigator.serviceWorker.addEventListener('message', event => {
if (!event.data || event.data.type !== 'cmbnet-wake') return;
const port = event.ports && event.ports[0];
handlePushWake(event.data.reason || 'wake', port);
const reason = event.data.reason || 'wake';
// Ein Klick auf eine Benachrichtigung ist kein neuer Firebase-Empfang.
if (reason !== 'notification') {
showFirebaseDebugPopup(reason, event.data);
}
handlePushWake(reason, port);
});
}
function showFirebaseDebugPopup(reason, payload) {
let dialog = document.getElementById('firebaseDebugDialog');
if (!dialog) {
dialog = document.createElement('dialog');
dialog.id = 'firebaseDebugDialog';
dialog.setAttribute('aria-labelledby', 'firebaseDebugTitle');
const article = document.createElement('article');
const header = document.createElement('header');
const title = document.createElement('h3');
title.id = 'firebaseDebugTitle';
title.textContent = 'Firebase-Nachricht';
header.appendChild(title);
const body = document.createElement('div');
body.className = 'dialog-body';
const reasonEl = document.createElement('p');
reasonEl.id = 'firebaseDebugReason';
const payloadEl = document.createElement('pre');
payloadEl.id = 'firebaseDebugPayload';
payloadEl.className = 'firebase-debug-payload';
body.append(reasonEl, payloadEl);
const footer = document.createElement('footer');
const closeButton = document.createElement('button');
closeButton.type = 'button';
closeButton.className = 'secondary';
closeButton.textContent = 'Schließen';
closeButton.addEventListener('click', () => dialog.close());
footer.appendChild(closeButton);
article.append(header, body, footer);
dialog.appendChild(article);
document.body.appendChild(dialog);
}
const reasonEl = dialog.querySelector('#firebaseDebugReason');
const payloadEl = dialog.querySelector('#firebaseDebugPayload');
if (reasonEl) reasonEl.textContent = `Grund: ${reason || 'wake'}`;
if (payloadEl) {
let text = '';
try {
text = payload ? JSON.stringify(payload, null, 2) : '';
} catch (error) {
text = String(payload || '');
}
payloadEl.textContent = text;
}
if (!dialog.open) {
if (typeof dialog.showModal === 'function') dialog.showModal();
else if (typeof dialog.show === 'function') dialog.show();
}
}
function waitForWsAuthentication(timeoutMs = PUSH_WAKE_AUTH_TIMEOUT_MS) {
if (state.authenticated) return Promise.resolve(true);
return new Promise(resolve => {
@@ -586,7 +651,7 @@ function loadSettings() {
state.settings.opacity = typeof saved.opacity === 'number' ? saved.opacity : DEFAULT_SETTINGS.opacity;
state.settings.weight = typeof saved.weight === 'number' ? saved.weight : DEFAULT_SETTINGS.weight;
state.settings.baseLayer = saved.baseLayer === 'aerial' ? 'aerial' : 'osm';
state.settings.autoSendPosition = saved.autoSendPosition !== false;
state.settings.autoSendPosition = saved.autoSendPosition === true;
}
} catch(e) {}
}