From b41c3bc3a6d12ee7e5cf9e23336462fb309c6bd4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 29 Oct 2026 08:08:23 +0100 Subject: [PATCH] Mobile Views jetzt als PWA --- CMBNet/cmbnet/__init__.py | 12 + CMBNet/cmbnet/views/main.py | 67 +++- CMBNet/static/css/mobile.css | 54 ++- CMBNet/static/img/apple-touch-icon.png | Bin 0 -> 7362 bytes CMBNet/static/img/icon-192.png | Bin 0 -> 8754 bytes CMBNet/static/img/icon-512.png | Bin 0 -> 31479 bytes CMBNet/static/js/sw.js | 257 +++++++++++++++ CMBNet/static/js/views/mobile.js | 379 ++++++++++++++++++++-- CMBNet/templates/_pwa_install_dialog.html | 21 ++ CMBNet/templates/dispatcher_mobil.html | 16 + CMBNet/templates/gruppen.html | 16 + 11 files changed, 785 insertions(+), 37 deletions(-) create mode 100644 CMBNet/static/img/apple-touch-icon.png create mode 100644 CMBNet/static/img/icon-192.png create mode 100644 CMBNet/static/img/icon-512.png create mode 100644 CMBNet/static/js/sw.js create mode 100644 CMBNet/templates/_pwa_install_dialog.html diff --git a/CMBNet/cmbnet/__init__.py b/CMBNet/cmbnet/__init__.py index dc80294..887c7e8 100644 --- a/CMBNet/cmbnet/__init__.py +++ b/CMBNet/cmbnet/__init__.py @@ -96,6 +96,18 @@ def create_app(config_name=None): app.static_folder, 'favicon.ico', mimetype='image/vnd.microsoft.icon' ) + # Service Worker für die PWA. Er wird bewusst an der App-Wurzel + # ausgeliefert, damit er auch die statischen Assets unter /static + # kontrollieren kann. Der Pfad berücksichtigt ein gesetztes SCRIPT_NAME + # (Reverse-Proxy-Prefix) automatisch. + @app.route('/sw.js') + def service_worker(): + response = send_from_directory( + app.static_folder, 'js/sw.js', mimetype='application/javascript' + ) + response.headers['Cache-Control'] = 'no-cache' + return response + # Root redirect @app.route('/') def index(): diff --git a/CMBNet/cmbnet/views/main.py b/CMBNet/cmbnet/views/main.py index 5228bd5..7f49537 100644 --- a/CMBNet/cmbnet/views/main.py +++ b/CMBNet/cmbnet/views/main.py @@ -1,7 +1,10 @@ """ Haupt-Views """ -from flask import Blueprint, render_template, g, redirect, url_for, request +from flask import ( + Blueprint, render_template, g, redirect, url_for, request, jsonify, + make_response, session +) from cmbnet.auth import login_required, role_required views_bp = Blueprint('views', __name__) @@ -57,6 +60,68 @@ def gruppen(**kwargs): return render_template('gruppen.html') +@views_bp.route('/manifest.webmanifest') +def manifest(tenant=None, **kwargs): + """Liefert das Web-App-Manifest für die mobilen Views.""" + account = getattr(g, 'current_account', None) + role = account['role'] if account else session.get('role') + + if role == 'Dispatcher': + start_url = url_for('views.dispatcher_mobil', tenant=tenant) + name = 'CMBNet Dispatcher' + short_name = 'CMB Dispo' + elif role == 'Gruppe': + start_url = url_for('views.gruppen', tenant=tenant) + name = 'CMBNet Gruppe' + short_name = 'CMB Gruppe' + else: + start_url = url_for('views.index', tenant=tenant) + name = 'CMBNet' + short_name = 'CMBNet' + + icon_192 = url_for('static', filename='img/icon-192.png') + icon_512 = url_for('static', filename='img/icon-512.png') + + payload = { + 'id': start_url, + 'name': name, + 'short_name': short_name, + 'description': 'CMBNet – mobile Einsatzansicht', + 'lang': 'de', + 'start_url': start_url, + 'scope': url_for('views.index', tenant=tenant), + 'display': 'standalone', + 'display_override': ['standalone', 'minimal-ui'], + 'background_color': '#f7f9fc', + 'theme_color': '#2563eb', + 'icons': [ + { + 'src': icon_192, + 'sizes': '192x192', + 'type': 'image/png', + 'purpose': 'any' + }, + { + 'src': icon_512, + 'sizes': '512x512', + 'type': 'image/png', + 'purpose': 'any' + }, + { + 'src': icon_512, + 'sizes': '512x512', + 'type': 'image/png', + 'purpose': 'maskable' + } + ] + } + + response = make_response(jsonify(payload)) + response.headers['Content-Type'] = 'application/manifest+json' + response.headers['Cache-Control'] = 'no-cache' + return response + + @views_bp.route('/praesentation') @login_required def praesentation(**kwargs): diff --git a/CMBNet/static/css/mobile.css b/CMBNet/static/css/mobile.css index 3436254..c036e64 100644 --- a/CMBNet/static/css/mobile.css +++ b/CMBNet/static/css/mobile.css @@ -25,6 +25,17 @@ body.mobile-page { background: var(--mobile-bg); color: var(--mobile-text); font-family: system-ui, -apple-system, BlinkMacSystemFont, sans-serif; + overflow: hidden; + overscroll-behavior: none; +} + +/* Die Basis-Template-Hülle (main.container) darf bei den mobilen Views + keinen Rand und keine Innenabstände belegen. */ +body.mobile-page main.container { + width: 100%; + max-width: none; + margin: 0; + padding: 0; } .mobile-app { @@ -39,6 +50,7 @@ body.mobile-page { background: var(--mobile-card); border-bottom: 1px solid var(--mobile-border); padding: 0.4rem 0.6rem; + padding-top: calc(0.4rem + env(safe-area-inset-top)); } .mobile-header-row { @@ -132,7 +144,7 @@ body.mobile-page { .mobile-fab { position: absolute; right: 0.7rem; - bottom: 5.5rem; + bottom: calc(5.5rem + env(safe-area-inset-bottom)); width: 3rem; height: 3rem; border-radius: 50%; @@ -149,7 +161,7 @@ body.mobile-page { } .mobile-fab-secondary { - bottom: 9rem; + bottom: calc(9rem + env(safe-area-inset-bottom)); background: var(--mobile-card); color: var(--mobile-text); border: 1px solid var(--mobile-border); @@ -160,7 +172,7 @@ body.mobile-page { position: absolute; left: 50%; transform: translateX(-50%); - bottom: 1rem; + bottom: calc(1rem + env(safe-area-inset-bottom)); border-radius: 999px; background: var(--mobile-card); color: var(--mobile-text); @@ -219,6 +231,7 @@ html[data-theme="dark"] .mobile-chat-card.own { display: flex; gap: 0.4rem; padding: 0.5rem 0.6rem; + padding-bottom: calc(0.5rem + env(safe-area-inset-bottom)); background: var(--mobile-card); border-top: 1px solid var(--mobile-border); } @@ -270,6 +283,28 @@ html[data-theme="dark"] .mobile-chat-card.own { font-size: 0.85rem; } +.mobile-settings-row { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.6rem; + margin-bottom: 0.6rem; +} + +.mobile-settings-button { + width: auto; + margin: 0; + padding: 0.35rem 0.8rem; + border-radius: 999px; + font-size: 0.85rem; +} + +.mobile-settings-button.is-active { + background: var(--mobile-accent); + border-color: var(--mobile-accent); + color: #fff; +} + .mobile-user-marker { position: relative; width: 16px; @@ -315,12 +350,19 @@ html[data-theme="dark"] .mobile-chat-card.own { @media (max-width: 420px) { .mobile-work-btn { - bottom: 0.8rem; + bottom: calc(0.8rem + env(safe-area-inset-bottom)); } .mobile-fab { - bottom: 5.2rem; + bottom: calc(5.2rem + env(safe-area-inset-bottom)); } .mobile-fab-secondary { - bottom: 8.6rem; + bottom: calc(8.6rem + env(safe-area-inset-bottom)); + } +} + +/* Im installierten Standalone-Modus keine Browserleisten berücksichtigen. */ +@media (display-mode: standalone) { + body.mobile-page { + height: 100dvh; } } diff --git a/CMBNet/static/img/apple-touch-icon.png b/CMBNet/static/img/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d162919bfd5d1157cdbfd735a67f8069d0f2c00a GIT binary patch literal 7362 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 literal 0 HcmV?d00001 diff --git a/CMBNet/static/img/icon-512.png b/CMBNet/static/img/icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..30ee1d4e199f084bf4431c7e0543dce63af347b9 GIT binary patch literal 31479 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 literal 0 HcmV?d00001 diff --git a/CMBNet/static/js/sw.js b/CMBNet/static/js/sw.js new file mode 100644 index 0000000..39524bc --- /dev/null +++ b/CMBNet/static/js/sw.js @@ -0,0 +1,257 @@ +/* + * CMBNet Service Worker + * + * Wird an der App-Wurzel ausgeliefert (z. B. /sw.js oder /cmbnet/sw.js), + * damit er sowohl die mobilen Views als auch die statischen Assets + * kontrolliert. Der Cache-Name wird pro App-Wurzel gebildet. + */ +const VERSION = 'cmbnet-pwa-v1'; +const BASE = new URL('./', self.location).href; +const SHELL_CACHE = `${VERSION}-shell`; +const TILE_CACHE = `${VERSION}-tiles`; +const MAX_TILES = 400; + +const PRECACHE_PATHS = [ + 'static/css/pico.min.css', + 'static/css/leaflet.css', + 'static/css/style.css', + 'static/css/admin.css', + 'static/css/mobile.css', + 'static/js/leaflet.js', + 'static/js/str2pl.js', + 'static/js/views/mobile.js', + 'static/img/logo.png', + 'static/img/icon-192.png', + 'static/img/icon-512.png', + 'static/img/apple-touch-icon.png', + 'favicon.ico' +]; + +const PRECACHE_URLS = PRECACHE_PATHS.map(path => new URL(path, BASE).href); + +const TILE_HOSTS = new Set([ + 'tile.openstreetmap.org', + 'a.tile.openstreetmap.org', + 'b.tile.openstreetmap.org', + 'c.tile.openstreetmap.org', + 'server.arcgisonline.com', + 'services.arcgisonline.com' +]); + +/* ------------------------------------------------------------------ */ +/* Installation und Aktivierung */ +/* ------------------------------------------------------------------ */ + +self.addEventListener('install', event => { + event.waitUntil((async () => { + const cache = await caches.open(SHELL_CACHE); + await Promise.allSettled( + PRECACHE_URLS.map(async url => { + try { + const response = await fetch(new Request(url, {cache: 'reload'})); + if (response && (response.ok || response.type === 'opaque')) { + await cache.put(url, response); + } + } catch (error) { + // Einzelne fehlende Assets dürfen die Installation nicht + // verhindern. + } + }) + ); + await self.skipWaiting(); + })()); +}); + +self.addEventListener('activate', event => { + event.waitUntil((async () => { + const keys = await caches.keys(); + await Promise.all( + keys + .filter(key => key !== SHELL_CACHE && key !== TILE_CACHE) + .map(key => caches.delete(key)) + ); + await self.clients.claim(); + })()); +}); + +self.addEventListener('message', event => { + if (event.data && event.data.type === 'SKIP_WAITING') { + self.skipWaiting(); + } +}); + +/* ------------------------------------------------------------------ */ +/* Fetch-Strategien */ +/* ------------------------------------------------------------------ */ + +self.addEventListener('fetch', event => { + const request = event.request; + if (request.method !== 'GET') return; + + const url = new URL(request.url); + + // API- und WebSocket-Aufrufe nie cachen. + if (url.pathname.includes('/api/') || url.pathname.includes('/ws')) { + return; + } + + // Das Manifest wird immer frisch vom Server geladen. + if (url.pathname.endsWith('/manifest.webmanifest')) { + return; + } + + if (isTileRequest(url)) { + event.respondWith(handleTile(request)); + return; + } + + if (request.mode === 'navigate') { + event.respondWith(handleNavigation(request)); + return; + } + + if (url.origin === self.location.origin) { + event.respondWith(handleAsset(request)); + } +}); + +function isTileRequest(url) { + if (TILE_HOSTS.has(url.hostname)) return true; + return /\/tile\/\d+\/\d+\/\d+/.test(url.pathname) + || /\/MapServer\/tile\//.test(url.pathname); +} + +async function handleNavigation(request) { + const cache = await caches.open(SHELL_CACHE); + + try { + const response = await fetch(request); + if (response && response.ok) { + cache.put(request, response.clone()).catch(() => {}); + } + return response; + } catch (error) { + const cached = await cache.match(request, {ignoreSearch: true}); + if (cached) return cached; + + return new Response(offlineHtml(), { + status: 503, + headers: {'Content-Type': 'text/html; charset=utf-8'} + }); + } +} + +async function handleAsset(request) { + const cache = await caches.open(SHELL_CACHE); + const cached = await cache.match(request); + + const network = fetch(request) + .then(response => { + if (response && (response.ok || response.type === 'opaque')) { + cache.put(request, response.clone()).catch(() => {}); + } + return response; + }) + .catch(() => null); + + if (cached) { + // Im Hintergrund aktualisieren (stale-while-revalidate). + network.catch(() => {}); + return cached; + } + + const response = await network; + if (response) return response; + + return new Response('', { + status: 504, + statusText: 'Offline' + }); +} + +async function handleTile(request) { + const cache = await caches.open(TILE_CACHE); + const cached = await cache.match(request); + if (cached) return cached; + + try { + const response = await fetch(request); + if (response && (response.ok || response.type === 'opaque')) { + await cache.put(request, response.clone()); + trimTileCache(cache); + } + return response; + } catch (error) { + return new Response('', { + status: 504, + statusText: 'Offline' + }); + } +} + +async function trimTileCache(cache) { + try { + const keys = await cache.keys(); + if (keys.length <= MAX_TILES) return; + const excess = keys.length - MAX_TILES; + for (let i = 0; i < excess; i += 1) { + await cache.delete(keys[i]); + } + } catch (error) { + // Cache-Bereinigung ist optional. + } +} + +function offlineHtml() { + return ` + + + + +CMBNet – offline + + + +
+

Keine Verbindung

+

CMBNet ist offline nicht erreichbar. Bitte prüfe die Netzwerkverbindung und lade die Seite erneut.

+
+ +`; +} + +/* ------------------------------------------------------------------ */ +/* Benachrichtigungen */ +/* ------------------------------------------------------------------ */ + +self.addEventListener('notificationclick', event => { + event.notification.close(); + + const target = event.notification.data && event.notification.data.url + ? event.notification.data.url + : BASE; + + event.waitUntil((async () => { + const clientList = await self.clients.matchAll({ + type: 'window', + includeUncontrolled: true + }); + + for (const client of clientList) { + if (client.url.startsWith(BASE) && 'focus' in client) { + return client.focus(); + } + } + + if (self.clients.openWindow) { + return self.clients.openWindow(target); + } + return null; + })()); +}); diff --git a/CMBNet/static/js/views/mobile.js b/CMBNet/static/js/views/mobile.js index ccf298c..3a1922e 100644 --- a/CMBNet/static/js/views/mobile.js +++ b/CMBNet/static/js/views/mobile.js @@ -28,6 +28,9 @@ const state = { streetById: new Map(), groups: [], groupById: new Map(), + accounts: [], + accountById: new Map(), + me: null, currentGroupId: null, polylinesByStreetId: new Map(), groupMarkers: new Map(), @@ -55,12 +58,22 @@ async function initMobile() { initMap(); bindTabs(); bindButtons(); + registerServiceWorker(); + initPwaInstall(); + initNotifications(); if (viewMode === 'mobile_dispatcher') { try { - const groups = await fetchJson(`${apiBase}/init/groups`); + const [groups, accounts, me] = await Promise.all([ + fetchJson(`${apiBase}/init/groups`), + fetchJson(`${apiBase}/init/accounts`).catch(() => []), + fetchJson(`${apiBase}/init/me`).catch(() => null) + ]); state.groups = Array.isArray(groups) ? groups : []; + state.accounts = Array.isArray(accounts) ? accounts : []; + state.me = me; indexGroups(); + indexAccounts(); buildGroupSelect(); const firstGroup = state.groups[0]; if (firstGroup) { @@ -71,13 +84,20 @@ async function initMobile() { } } else if (viewMode === 'mobile_group') { try { - const group = await fetchJson(`${apiBase}/groups/me`); + const [group, accounts, me] = await Promise.all([ + fetchJson(`${apiBase}/groups/me`), + fetchJson(`${apiBase}/init/accounts`).catch(() => []), + fetchJson(`${apiBase}/init/me`).catch(() => null) + ]); + state.accounts = Array.isArray(accounts) ? accounts : []; + state.me = me; + indexAccounts(); if (group && group.id) { state.groups = [group]; state.currentGroupId = group.id; indexGroups(); const nameEl = document.getElementById('groupNameDisplay'); - if (nameEl) nameEl.textContent = group.aliasname || group.id || 'Gruppe'; + if (nameEl) nameEl.textContent = groupDisplayName(group); await loadGroupData(group.id); } } catch (e) { @@ -102,6 +122,143 @@ function fetchJson(url, options={}) { }); } +/* ------------------------------------------------------------------ */ +/* Progressive Web App */ +/* ------------------------------------------------------------------ */ + +let deferredInstallPrompt = null; + +function isStandaloneMode() { + return window.matchMedia('(display-mode: standalone)').matches + || window.navigator.standalone === true; +} + +function isIosDevice() { + return /iphone|ipad|ipod/i.test(navigator.userAgent) + || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1); +} + +function registerServiceWorker() { + if (!('serviceWorker' in navigator)) return; + + const swUrl = window.CMBNET_SW_URL || '/sw.js'; + window.addEventListener('load', () => { + navigator.serviceWorker.register(swUrl).catch(error => { + console.warn('Service Worker konnte nicht registriert werden.', error); + }); + }); +} + +function initPwaInstall() { + const button = document.getElementById('mobileInstallBtn'); + if (!button) return; + + if (isStandaloneMode()) { + button.hidden = true; + return; + } + + // Unter iOS gibt es kein beforeinstallprompt. Dort zeigen wir den Button + // dauerhaft an und erklären die Installation über das Teilen-Menü. + if (isIosDevice()) button.hidden = false; + + window.addEventListener('beforeinstallprompt', event => { + event.preventDefault(); + deferredInstallPrompt = event; + button.hidden = false; + }); + + window.addEventListener('appinstalled', () => { + deferredInstallPrompt = null; + button.hidden = true; + }); + + button.addEventListener('click', async () => { + if (deferredInstallPrompt) { + const prompt = deferredInstallPrompt; + deferredInstallPrompt = null; + prompt.prompt(); + try { + const choice = await prompt.userChoice; + if (choice.outcome === 'accepted') button.hidden = true; + } catch (error) { + // Der Dialog kann abgelehnt oder geschlossen werden. + } + return; + } + + const dialog = document.getElementById('mobileInstallDialog'); + const iosHint = document.getElementById('mobileInstallIosHint'); + const genericHint = document.getElementById('mobileInstallGenericHint'); + if (iosHint) iosHint.hidden = !isIosDevice(); + if (genericHint) genericHint.hidden = isIosDevice(); + + if (dialog && typeof dialog.showModal === 'function') { + dialog.showModal(); + } else if (dialog) { + dialog.show(); + } + }); +} + +function closeMobileInstall() { + const dialog = document.getElementById('mobileInstallDialog'); + if (dialog && dialog.open) dialog.close(); +} + +function initNotifications() { + const button = document.getElementById('mobileNotifyBtn'); + if (!button) return; + + button.addEventListener('click', requestNotifications); + updateNotificationUi(); +} + +function updateNotificationUi() { + const button = document.getElementById('mobileNotifyBtn'); + if (!button) return; + + if (!('Notification' in window)) { + button.textContent = 'Nicht verfügbar'; + button.disabled = true; + return; + } + + const permission = Notification.permission; + button.classList.toggle('is-active', permission === 'granted'); + button.disabled = permission === 'denied'; + + if (permission === 'granted') { + button.textContent = 'Aktiv'; + } else if (permission === 'denied') { + button.textContent = 'Blockiert'; + } else { + button.textContent = 'Aktivieren'; + } +} + +async function requestNotifications() { + if (!('Notification' in window)) return; + + try { + const permission = await Notification.requestPermission(); + updateNotificationUi(); + + if (permission === 'granted' && navigator.serviceWorker) { + const registration = await navigator.serviceWorker.getRegistration(); + if (registration && registration.showNotification) { + await registration.showNotification('CMBNet', { + body: 'Benachrichtigungen sind aktiviert.', + icon: window.CMBNET_ICON_URL || undefined, + tag: 'cmbnet-permission' + }); + } + } + } catch (error) { + console.warn('Benachrichtigungen konnten nicht aktiviert werden.', error); + } +} + function loadSettings() { try { const raw = localStorage.getItem(storageKey); @@ -219,6 +376,130 @@ function indexGroups() { }); } +function indexAccounts() { + state.accountById.clear(); + state.accounts.forEach(account => { + const id = Number(account.id); + if (!Number.isFinite(id)) return; + account.id = id; + state.accountById.set(id, account); + }); +} + +function groupDisplayName(group) { + if (!group) return 'Gruppe'; + const alias = group.aliasname && String(group.aliasname).trim(); + return alias || 'Gruppe'; +} + +function findGroupForAccount(accountId) { + const id = Number(accountId); + return state.groups.find(group => Number(group.account_id) === id) || null; +} + +/** + * Formatiert "Accountname" bzw. "Accountname (Gruppe: Alias)". + */ +function formatPersonName(name, role, groupAlias) { + const base = String(name || '').trim() || 'Unbekannt'; + const alias = groupAlias && String(groupAlias).trim(); + if (alias) return `${base} (Gruppe: ${alias})`; + if (role === 'Gruppe') return `${base} (Gruppe)`; + return base; +} + +function getAccount(accountId) { + const id = Number(accountId); + if (!Number.isFinite(id)) return null; + return state.accountById.get(id) || null; +} + +function getAccountDisplayName(accountId) { + const id = Number(accountId); + if (!Number.isFinite(id)) return null; + + const account = getAccount(id); + if (account) { + const group = findGroupForAccount(id); + return formatPersonName(account.name, account.role, group ? group.aliasname : null); + } + + if (state.me && Number(state.me.id) === id) { + const group = findGroupForAccount(id); + return formatPersonName( + state.me.name, + state.me.role, + group ? group.aliasname : null + ); + } + + return null; +} + +function getSenderName(message, payload) { + const payloadSender = payload && typeof payload.sender === 'object' + ? payload.sender + : null; + + if (payloadSender && payloadSender.name) { + return formatPersonName( + payloadSender.name, + payloadSender.role, + payloadSender.group_alias + ); + } + + const senderId = Number(message.sender_id); + const known = getAccountDisplayName(senderId); + if (known) return known; + + if (state.me && senderId === Number(state.me.id)) { + return formatPersonName(state.me.name, state.me.role, null); + } + + return 'Unbekannt'; +} + +function getReceiverName(message, payload) { + const code = Number(message.code); + if (code === 1000 || (payload && payload.broadcast)) return 'alle'; + + const payloadSender = payload && typeof payload.sender === 'object' + ? payload.sender + : null; + const senderRole = payloadSender?.role || getAccount(message.sender_id)?.role; + if (code === 2000 && senderRole === 'Gruppe') { + // Gruppen senden mit Code 2000 an Dispatcher und Beobachter. + return 'Dispatcher'; + } + + let receiverId = Number(message.receiver_id); + if (!Number.isFinite(receiverId) || receiverId <= 0) { + if (payload && payload.group_id !== undefined) { + receiverId = Number(payload.group_id); + } else if (payload && payload.receiver_id !== undefined) { + receiverId = Number(payload.receiver_id); + } + } + + if (!Number.isFinite(receiverId) || receiverId <= 0) return 'alle'; + + let group = state.groupById.get(receiverId); + if (!group && receiverId === Number(state.currentGroupId) && state.groups.length) { + group = state.groups[0]; + } + if (group) { + const accountName = getAccountDisplayName(group.account_id); + return accountName || groupDisplayName(group) || 'Gruppe'; + } + + const accountName = getAccountDisplayName(receiverId); + if (accountName) return accountName; + + return 'Unbekannt'; +} + + function buildGroupSelect() { const sel = document.getElementById('mobileGroupSelect'); if (!sel) return; @@ -599,7 +880,11 @@ function renderChat() { meta.textContent = new Date(entry.ts).toLocaleString('de-DE'); const fromto = document.createElement('div'); fromto.className = 'mobile-chat-fromto'; - fromto.textContent = entry.senderName || `ID ${entry.sender_id}`; + const fromName = entry.fromName + || getSenderName({sender_id: entry.sender_id}, null); + const toName = entry.toName + || (Number(entry.code) === 1000 ? 'alle' : 'Unbekannt'); + fromto.textContent = `${fromName} -> ${toName}`; const text = document.createElement('div'); text.className = 'mobile-chat-text'; text.textContent = entry.text; @@ -625,12 +910,29 @@ function playSound() { } catch(e) {} } -function showChatPopup(text) { - // Try to show notification if possible - if ('Notification' in window && Notification.permission === 'granted') { - try { new Notification('CMBNet Nachricht', {body: text}); } catch(e) {} - } else if ('Notification' in window && Notification.permission !== 'denied') { - Notification.requestPermission(); +async function showChatPopup(text, senderName) { + if (!('Notification' in window) || Notification.permission !== 'granted') return; + + const options = { + body: text, + icon: window.CMBNET_ICON_URL || undefined, + badge: window.CMBNET_ICON_URL || undefined, + tag: 'cmbnet-chat', + renotify: true, + data: {url: window.location.href} + }; + + try { + if (navigator.serviceWorker) { + const registration = await navigator.serviceWorker.getRegistration(); + if (registration && registration.showNotification) { + await registration.showNotification(senderName || 'CMBNet', options); + return; + } + } + new Notification(senderName || 'CMBNet', options); + } catch (error) { + // Benachrichtigungen sind optional. } } @@ -653,6 +955,23 @@ function extractText(msg) { return String(msg); } +function parseMessagePayload(value) { + if (value && typeof value === 'object') return value; + if (typeof value !== 'string') return null; + try { + const parsed = JSON.parse(value); + return parsed && typeof parsed === 'object' ? parsed : null; + } catch (e) { + return null; + } +} + +function normalizeTs(value) { + const number = Number(value); + if (!Number.isFinite(number) || number <= 0) return null; + return number < 1e12 ? number * 1000 : number; +} + function handleWs(event) { let message; try { message = JSON.parse(event.data); } catch(e) { return; } @@ -692,31 +1011,30 @@ function handleWs(event) { } catch(e) {} } else if (message.code === 2000 || message.code === 1000 || message.code === 1100) { // Chat messages - const text = extractText(message.msg); - const entry = { - sender_id: message.sender_id, - code: message.code, - ts: message.ts || Date.now(), - text, - senderName: undefined - }; - // For gruppe view, broker should only send relevant messages; still check + const payload = parseMessagePayload(message.msg); + const text = extractText(payload ?? message.msg); + + // Im Gruppen-View nur Nachrichten an alle oder an die eigene Gruppe. if (viewMode === 'mobile_group') { - const p = typeof message.msg === 'string' ? JSON.parse(message.msg) : message.msg; - const gid = Number(p?.group_id || message.receiver_id); - if (message.code === 1100 && gid && gid !== state.currentGroupId) { - return; // should not happen if broker filters, but be safe - } - if (message.code === 2000 && gid && gid !== state.currentGroupId && message.sender_id !== currentAccountId) { - // Check if it's from our group - const isFromOurGroup = state.groups.some(g => g.account_id && false); // simplified + const gid = Number(payload?.group_id ?? message.receiver_id); + const ownGroupId = Number(state.currentGroupId); + if (Number.isFinite(gid) && gid > 0 && ownGroupId && gid !== ownGroupId) { + return; } } - const wasEmpty = state.chatMessages.length === 0; - addChatEntry(entry); + + addChatEntry({ + sender_id: message.sender_id, + code: message.code, + ts: normalizeTs(message.ts) || Date.now(), + text, + fromName: getSenderName(message, payload), + toName: getReceiverName(message, payload) + }); + if (Number(message.sender_id) !== currentAccountId) { playSound(); - showChatPopup(text); + showChatPopup(text, getSenderName(message, payload)); // Switch to chat tab document.querySelectorAll('.mobile-tab').forEach(b => { if (b.dataset.tab === 'chat') b.click(); @@ -730,3 +1048,4 @@ window.closeMobileStreetSelect = closeMobileStreetSelect; window.closeMobileStreetState = closeMobileStreetState; window.saveMobileStreetState = saveMobileStreetState; window.closeMobileSettings = closeMobileSettings; +window.closeMobileInstall = closeMobileInstall; diff --git a/CMBNet/templates/_pwa_install_dialog.html b/CMBNet/templates/_pwa_install_dialog.html new file mode 100644 index 0000000..654765d --- /dev/null +++ b/CMBNet/templates/_pwa_install_dialog.html @@ -0,0 +1,21 @@ + +
+
+

App installieren

+
+
+

Installiere CMBNet als App auf dem Home-Bildschirm:

+

+ Öffne das Browsermenü und wähle „App installieren“ bzw. + „Zum Home-Bildschirm hinzufügen“. +

+ +
+
+ +
+
+
diff --git a/CMBNet/templates/dispatcher_mobil.html b/CMBNet/templates/dispatcher_mobil.html index 538c3e1..f41c342 100644 --- a/CMBNet/templates/dispatcher_mobil.html +++ b/CMBNet/templates/dispatcher_mobil.html @@ -6,6 +6,13 @@ {% block head %} + + + + + + + @@ -18,6 +25,7 @@
+
@@ -102,12 +110,17 @@ +
+ Benachrichtigungen + +
+{% include "_pwa_install_dialog.html" %} {% endblock %} {% block scripts %} @@ -116,6 +129,9 @@ window.CMBNET_ACCOUNT_ID = {{ session.account_id|tojson }}; window.CMBNET_ROLE = {{ session.role|tojson }}; window.CMBNET_LOGOUT_URL = {{ url_for('auth.logout', tenant=session.tenant_code)|tojson }}; + window.CMBNET_SW_URL = {{ url_for('service_worker')|tojson }}; + window.CMBNET_MANIFEST_URL = {{ url_for('views.manifest', tenant=session.tenant_code)|tojson }}; + window.CMBNET_ICON_URL = {{ url_for('static', filename='img/icon-192.png')|tojson }}; window.CMBNET_VIEW_MODE = 'mobile_dispatcher'; diff --git a/CMBNet/templates/gruppen.html b/CMBNet/templates/gruppen.html index b05005a..58efa06 100644 --- a/CMBNet/templates/gruppen.html +++ b/CMBNet/templates/gruppen.html @@ -6,6 +6,13 @@ {% block head %} + + + + + + + @@ -18,6 +25,7 @@
Gruppe
+
@@ -102,12 +110,17 @@ +
+ Benachrichtigungen + +
+{% include "_pwa_install_dialog.html" %} {% endblock %} {% block scripts %} @@ -116,6 +129,9 @@ window.CMBNET_ACCOUNT_ID = {{ session.account_id|tojson }}; window.CMBNET_ROLE = {{ session.role|tojson }}; window.CMBNET_LOGOUT_URL = {{ url_for('auth.logout', tenant=session.tenant_code)|tojson }}; + window.CMBNET_SW_URL = {{ url_for('service_worker')|tojson }}; + window.CMBNET_MANIFEST_URL = {{ url_for('views.manifest', tenant=session.tenant_code)|tojson }}; + window.CMBNET_ICON_URL = {{ url_for('static', filename='img/icon-192.png')|tojson }}; window.CMBNET_VIEW_MODE = 'mobile_group';