noch mehr UI für den Dispatcher
This commit is contained in:
1 parent
4f87a19ba2
commit
7b8d2ec396
12 files changed
+1170
-70
No files matched your search
@@ -1,5 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
from flask import Flask, g, session
|
from flask import Flask, g, session, send_from_directory
|
||||||
from config import config
|
from config import config
|
||||||
from cmbnet.extensions import sock
|
from cmbnet.extensions import sock
|
||||||
|
|
||||||
@@ -47,6 +47,7 @@ def create_app(config_name=None):
|
|||||||
from cmbnet.admin.api import admin_api_bp
|
from cmbnet.admin.api import admin_api_bp
|
||||||
from cmbnet.api.init import api_init_bp
|
from cmbnet.api.init import api_init_bp
|
||||||
from cmbnet.api.auth import api_auth_bp
|
from cmbnet.api.auth import api_auth_bp
|
||||||
|
from cmbnet.api.groups import api_groups_bp
|
||||||
|
|
||||||
app.register_blueprint(auth_bp, url_prefix='/<tenant>')
|
app.register_blueprint(auth_bp, url_prefix='/<tenant>')
|
||||||
app.register_blueprint(views_bp, url_prefix='/<tenant>')
|
app.register_blueprint(views_bp, url_prefix='/<tenant>')
|
||||||
@@ -59,6 +60,7 @@ def create_app(config_name=None):
|
|||||||
app.register_blueprint(admin_api_bp, url_prefix='/<tenant>/admin/api')
|
app.register_blueprint(admin_api_bp, url_prefix='/<tenant>/admin/api')
|
||||||
app.register_blueprint(api_init_bp, url_prefix='/<tenant>/api')
|
app.register_blueprint(api_init_bp, url_prefix='/<tenant>/api')
|
||||||
app.register_blueprint(api_auth_bp, url_prefix='/<tenant>/api')
|
app.register_blueprint(api_auth_bp, url_prefix='/<tenant>/api')
|
||||||
|
app.register_blueprint(api_groups_bp, url_prefix='/<tenant>/api')
|
||||||
|
|
||||||
# WebSocket Routes laden
|
# WebSocket Routes laden
|
||||||
from cmbnet.ws import routes
|
from cmbnet.ws import routes
|
||||||
@@ -70,10 +72,18 @@ def create_app(config_name=None):
|
|||||||
interval=app.config.get('WS_HEARTBEAT_INTERVAL', 60)
|
interval=app.config.get('WS_HEARTBEAT_INTERVAL', 60)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Favicon explizit bedienen, damit /favicon.ico nicht als Tenant-Pfad
|
||||||
|
# interpretiert wird.
|
||||||
|
@app.route('/favicon.ico')
|
||||||
|
def favicon():
|
||||||
|
return send_from_directory(
|
||||||
|
app.static_folder, 'favicon.ico', mimetype='image/vnd.microsoft.icon'
|
||||||
|
)
|
||||||
|
|
||||||
# Root redirect
|
# Root redirect
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
def index():
|
def index():
|
||||||
from flask import redirect, url_for
|
from flask import redirect, url_for
|
||||||
return redirect(url_for('auth.login_select'))
|
return redirect(url_for('auth.login_select', tenant=app.config['DEFAULT_TENANT']))
|
||||||
|
|
||||||
return app
|
return app
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
"""
|
||||||
|
API-Endpunkte für Gruppen im Dispatcher-View.
|
||||||
|
"""
|
||||||
|
from flask import Blueprint, jsonify, g, request
|
||||||
|
|
||||||
|
from cmbnet.auth import role_required
|
||||||
|
from cmbnet.models.groups import GroupModel
|
||||||
|
from cmbnet.services.groups_service import GroupsService
|
||||||
|
from cmbnet.utils.helpers import log_transaction
|
||||||
|
|
||||||
|
api_groups_bp = Blueprint('api_groups', __name__)
|
||||||
|
|
||||||
|
|
||||||
|
@api_groups_bp.route('/groups/<int:group_id>/alias', methods=['POST'])
|
||||||
|
@role_required(['Dispatcher', 'Administrator'])
|
||||||
|
def update_group_alias(group_id, **kwargs):
|
||||||
|
"""Ändert den Aliasnamen einer Gruppe aus dem Dispatcher-View."""
|
||||||
|
data = request.get_json(silent=True) or {}
|
||||||
|
aliasname = str(data.get('aliasname') or '').strip()
|
||||||
|
|
||||||
|
if len(aliasname) > 120:
|
||||||
|
return jsonify({'error': 'Aliasname ist zu lang (maximal 120 Zeichen)'}), 400
|
||||||
|
|
||||||
|
group = GroupModel.get_by_id(group_id, g.tenant_id)
|
||||||
|
if not group:
|
||||||
|
return jsonify({'error': 'Gruppe nicht gefunden'}), 404
|
||||||
|
|
||||||
|
if group['aliasname'] != aliasname:
|
||||||
|
GroupModel.update(group_id, g.tenant_id, aliasname=aliasname)
|
||||||
|
log_transaction(
|
||||||
|
'group.alias_update', 'group', group_id,
|
||||||
|
{'from': group['aliasname'], 'to': aliasname}
|
||||||
|
)
|
||||||
|
GroupsService.invalidate(g.tenant_id)
|
||||||
|
GroupsService.load_from_db(g.tenant_id)
|
||||||
|
|
||||||
|
return jsonify({'success': True, 'aliasname': aliasname})
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
"""
|
"""
|
||||||
Authentifizierungs-Views
|
Authentifizierungs-Views
|
||||||
"""
|
"""
|
||||||
from flask import Blueprint, render_template, request, redirect, url_for, session, flash, g
|
from flask import Blueprint, render_template, request, redirect, url_for, session, flash, g, current_app
|
||||||
from cmbnet.db import get_db
|
from cmbnet.db import get_db
|
||||||
from cmbnet.auth import verify_password
|
from cmbnet.auth import verify_password
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ def load_tenant():
|
|||||||
tenant = db.execute('SELECT * FROM tenants WHERE code = ?', (tenant_code,)).fetchone()
|
tenant = db.execute('SELECT * FROM tenants WHERE code = ?', (tenant_code,)).fetchone()
|
||||||
if not tenant:
|
if not tenant:
|
||||||
flash('Ungültiger Mandant', 'error')
|
flash('Ungültiger Mandant', 'error')
|
||||||
return redirect(url_for('auth.login_select'))
|
return redirect(url_for('auth.login_select', tenant=current_app.config['DEFAULT_TENANT']))
|
||||||
g.tenant_id = tenant['id']
|
g.tenant_id = tenant['id']
|
||||||
g.tenant_code = tenant['code']
|
g.tenant_code = tenant['code']
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,33 @@
|
|||||||
/* Dispatcher-View: Karte 2/3 links, Kontrollansicht 1/3 rechts */
|
/* Dispatcher-View: Karte 2/3 links, Kontrollansicht 1/3 rechts */
|
||||||
|
|
||||||
body.dispatcher-page {
|
body.dispatcher-page {
|
||||||
|
--dispatcher-shell-bg: #eef1f4;
|
||||||
|
--dispatcher-map-bg: #dce3e8;
|
||||||
|
--dispatcher-border: rgba(0, 0, 0, 0.12);
|
||||||
|
--dispatcher-border-strong: rgba(0, 0, 0, 0.18);
|
||||||
|
--dispatcher-subtle-bg: rgba(0, 0, 0, 0.045);
|
||||||
|
--dispatcher-subtle-bg-hover: rgba(47, 111, 219, 0.13);
|
||||||
|
--dispatcher-chip-bg: rgba(0, 0, 0, 0.07);
|
||||||
|
--dispatcher-own-message-bg: rgba(47, 111, 219, 0.12);
|
||||||
|
--dispatcher-dot-ring: var(--card-background-color, #fff);
|
||||||
|
--dispatcher-dot-outline: rgba(0, 0, 0, 0.2);
|
||||||
margin: 0;
|
margin: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
height: 100dvh;
|
height: 100dvh;
|
||||||
background: #eef1f4;
|
background: var(--dispatcher-shell-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] body.dispatcher-page {
|
||||||
|
--dispatcher-shell-bg: #0b1116;
|
||||||
|
--dispatcher-map-bg: #0d141a;
|
||||||
|
--dispatcher-border: rgba(255, 255, 255, 0.14);
|
||||||
|
--dispatcher-border-strong: rgba(255, 255, 255, 0.2);
|
||||||
|
--dispatcher-subtle-bg: rgba(255, 255, 255, 0.06);
|
||||||
|
--dispatcher-subtle-bg-hover: rgba(88, 166, 255, 0.2);
|
||||||
|
--dispatcher-chip-bg: rgba(255, 255, 255, 0.09);
|
||||||
|
--dispatcher-own-message-bg: rgba(88, 166, 255, 0.18);
|
||||||
|
--dispatcher-dot-outline: rgba(255, 255, 255, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
body.dispatcher-page main.container {
|
body.dispatcher-page main.container {
|
||||||
@@ -30,7 +52,7 @@ body.dispatcher-page main.container {
|
|||||||
position: relative;
|
position: relative;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
background: #dce3e8;
|
background: var(--dispatcher-map-bg);
|
||||||
}
|
}
|
||||||
|
|
||||||
#map {
|
#map {
|
||||||
@@ -54,7 +76,7 @@ body.dispatcher-page main.container {
|
|||||||
min-height: 0;
|
min-height: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background: var(--card-background-color, #fff);
|
background: var(--card-background-color, #fff);
|
||||||
border-left: 1px solid rgba(0, 0, 0, 0.15);
|
border-left: 1px solid var(--dispatcher-border-strong);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- Header ---------- */
|
/* ---------- Header ---------- */
|
||||||
@@ -62,22 +84,44 @@ body.dispatcher-page main.container {
|
|||||||
.control-header {
|
.control-header {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
padding: 0.85rem 1rem 0.6rem;
|
padding: 0.85rem 1rem 0.6rem;
|
||||||
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
border-bottom: 1px solid var(--dispatcher-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.clock-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 0.75rem;
|
||||||
|
margin-bottom: 0.55rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.clock {
|
.clock {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 0.05rem;
|
gap: 0.05rem;
|
||||||
margin-bottom: 0.55rem;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.clock-date {
|
.clock-date {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: 0.35rem;
|
||||||
font-size: 0.78rem;
|
font-size: 0.78rem;
|
||||||
color: var(--muted-color, #5b6771);
|
color: var(--muted-color, #5b6771);
|
||||||
text-transform: capitalize;
|
text-transform: capitalize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.clock-weekday {
|
||||||
|
font-size: 0.95rem;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.clock-day {
|
||||||
|
font-size: 0.72rem;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
.clock-time {
|
.clock-time {
|
||||||
font-size: clamp(1.8rem, 4vw, 2.7rem);
|
font-size: clamp(1.8rem, 4vw, 2.7rem);
|
||||||
line-height: 1.05;
|
line-height: 1.05;
|
||||||
@@ -86,29 +130,62 @@ body.dispatcher-page main.container {
|
|||||||
letter-spacing: 0.03em;
|
letter-spacing: 0.03em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dispatcher-logo {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
width: auto;
|
||||||
|
height: 3rem;
|
||||||
|
}
|
||||||
|
|
||||||
.header-controls {
|
.header-controls {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-end;
|
align-items: flex-end;
|
||||||
gap: 0.6rem;
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-controls > .icon-button {
|
||||||
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.map-layer-label {
|
.map-layer-label {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
|
max-width: 9.5rem;
|
||||||
|
min-width: 0;
|
||||||
margin: 0 !important;
|
margin: 0 !important;
|
||||||
font-size: 0.75rem;
|
font-size: 0.7rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.map-layer-label > span {
|
.map-layer-label > span {
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 0.15rem;
|
margin-bottom: 0.15rem;
|
||||||
color: var(--muted-color, #5b6771);
|
color: var(--muted-color, #5b6771);
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.map-layer-label select {
|
.map-layer-label select {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
height: 2.35rem;
|
height: 1.95rem;
|
||||||
padding-top: 0.25rem;
|
padding: 0.15rem 1.7rem 0.15rem 0.45rem;
|
||||||
padding-bottom: 0.25rem;
|
font-size: 0.72rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.theme-switch {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
gap: 0.35rem;
|
||||||
|
margin: 0 !important;
|
||||||
|
padding-bottom: 0.15rem;
|
||||||
|
color: var(--muted-color, #5b6771);
|
||||||
|
font-size: 0.7rem;
|
||||||
|
white-space: nowrap;
|
||||||
|
cursor: pointer;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.theme-switch input[type="checkbox"][role="switch"] {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
margin: 0;
|
||||||
|
font-size: 0.9rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon-button {
|
.icon-button {
|
||||||
@@ -127,7 +204,7 @@ body.dispatcher-page main.container {
|
|||||||
}
|
}
|
||||||
|
|
||||||
a.icon-button {
|
a.icon-button {
|
||||||
border: 1px solid rgba(0, 0, 0, 0.18);
|
border: 1px solid var(--dispatcher-border-strong);
|
||||||
background: var(--form-element-background-color, #fff);
|
background: var(--form-element-background-color, #fff);
|
||||||
color: inherit;
|
color: inherit;
|
||||||
}
|
}
|
||||||
@@ -170,7 +247,7 @@ a.icon-button {
|
|||||||
|
|
||||||
.group-item {
|
.group-item {
|
||||||
margin: 0 0 0.55rem;
|
margin: 0 0 0.55rem;
|
||||||
border: 1px solid rgba(0, 0, 0, 0.12);
|
border: 1px solid var(--dispatcher-border);
|
||||||
border-radius: 0.65rem;
|
border-radius: 0.65rem;
|
||||||
background: var(--card-background-color, #fff);
|
background: var(--card-background-color, #fff);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@@ -207,7 +284,7 @@ a.icon-button {
|
|||||||
width: 0.8rem;
|
width: 0.8rem;
|
||||||
height: 0.8rem;
|
height: 0.8rem;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.9), 0 0 0 3px rgba(0, 0, 0, 0.2);
|
box-shadow: 0 0 0 2px var(--dispatcher-dot-ring), 0 0 0 3px var(--dispatcher-dot-outline);
|
||||||
}
|
}
|
||||||
|
|
||||||
.group-name {
|
.group-name {
|
||||||
@@ -223,7 +300,7 @@ a.icon-button {
|
|||||||
margin-left: 0.35rem;
|
margin-left: 0.35rem;
|
||||||
padding: 0.1rem 0.45rem;
|
padding: 0.1rem 0.45rem;
|
||||||
border-radius: 999px;
|
border-radius: 999px;
|
||||||
background: rgba(0, 0, 0, 0.07);
|
background: var(--dispatcher-chip-bg);
|
||||||
font-size: 0.7rem;
|
font-size: 0.7rem;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
@@ -265,7 +342,9 @@ a.icon-button {
|
|||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.group-crosshair {
|
.group-crosshair,
|
||||||
|
.group-streets,
|
||||||
|
.group-alias {
|
||||||
width: 2.35rem;
|
width: 2.35rem;
|
||||||
height: 2.35rem;
|
height: 2.35rem;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@@ -273,10 +352,20 @@ a.icon-button {
|
|||||||
font-size: 1.1rem;
|
font-size: 1.1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.group-state-select {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
width: auto;
|
||||||
|
min-width: 0;
|
||||||
|
height: 2.35rem;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0.25rem 1.8rem 0.25rem 0.55rem;
|
||||||
|
font-size: 0.78rem;
|
||||||
|
}
|
||||||
|
|
||||||
.group-message {
|
.group-message {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
background: rgba(0, 0, 0, 0.035);
|
background: var(--dispatcher-subtle-bg);
|
||||||
font-size: 0.82rem;
|
font-size: 0.82rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,7 +381,7 @@ a.icon-button {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 0.55rem;
|
gap: 0.55rem;
|
||||||
padding: 0.7rem 1rem 0.85rem;
|
padding: 0.7rem 1rem 0.85rem;
|
||||||
border-top: 1px solid rgba(0, 0, 0, 0.1);
|
border-top: 1px solid var(--dispatcher-border);
|
||||||
background: var(--card-background-color, #fff);
|
background: var(--card-background-color, #fff);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -312,17 +401,185 @@ a.icon-button {
|
|||||||
height: 1.15rem;
|
height: 1.15rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.footer-bottom {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-end;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 0.5rem;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer-settings {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-end;
|
||||||
|
flex: 1 1 auto;
|
||||||
|
gap: 0.55rem;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.footer-buttons {
|
.footer-buttons {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex: 0 0 auto;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
margin-top: 0.1rem;
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- Dialoge ---------- */
|
/* ---------- Dialoge ---------- */
|
||||||
|
|
||||||
dialog article {
|
dialog article {
|
||||||
max-height: 90dvh;
|
--block-spacing-vertical: 0.85rem;
|
||||||
|
--block-spacing-horizontal: 1rem;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
max-height: min(90dvh, 48rem);
|
||||||
|
padding: var(--block-spacing-vertical) var(--block-spacing-horizontal);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog article > header,
|
||||||
|
dialog article > footer {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog article > footer {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: flex-end;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog article > footer > button {
|
||||||
|
width: auto;
|
||||||
|
margin: 0;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog article > .dialog-body {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
min-height: 0;
|
||||||
|
overflow-y: auto;
|
||||||
|
overscroll-behavior: contain;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Nicht-modaler Straßendialog: bleibt neben der Karte bedienbar. */
|
||||||
|
dialog.group-streets-dialog {
|
||||||
|
position: fixed;
|
||||||
|
top: 4.5rem;
|
||||||
|
left: 1rem;
|
||||||
|
right: auto;
|
||||||
|
bottom: auto;
|
||||||
|
z-index: 1200;
|
||||||
|
width: min(26rem, calc(100vw - 2rem));
|
||||||
|
min-width: 0;
|
||||||
|
max-width: calc(100vw - 2rem);
|
||||||
|
height: auto;
|
||||||
|
min-height: 0;
|
||||||
|
max-height: min(70dvh, 40rem);
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
border: 1px solid var(--dispatcher-border-strong);
|
||||||
|
border-radius: 0.75rem;
|
||||||
|
box-shadow: 0 18px 50px rgba(0, 0, 0, 0.28);
|
||||||
|
background: var(--card-background-color, #fff);
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog[open] {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog article {
|
||||||
|
--block-spacing-vertical: 0.85rem;
|
||||||
|
--block-spacing-horizontal: 1rem;
|
||||||
|
max-height: min(70dvh, 40rem);
|
||||||
|
margin: 0;
|
||||||
|
padding: var(--block-spacing-vertical) var(--block-spacing-horizontal);
|
||||||
|
overflow: hidden;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog article header {
|
||||||
|
cursor: move;
|
||||||
|
touch-action: none;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog.is-dragging {
|
||||||
|
box-shadow: 0 24px 60px rgba(0, 0, 0, 0.34);
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog.is-dragging article header {
|
||||||
|
cursor: grabbing;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-streets-section + .group-streets-section {
|
||||||
|
margin-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-streets-section h4 {
|
||||||
|
margin: 0 0 0.4rem;
|
||||||
|
font-size: 0.72rem;
|
||||||
|
font-weight: 700;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--muted-color, #5b6771);
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-streets-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.25rem;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
list-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-streets-list li {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-street-entry {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 0.6rem;
|
||||||
|
width: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0.42rem 0.55rem;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 0.42rem;
|
||||||
|
background: var(--dispatcher-subtle-bg);
|
||||||
|
color: inherit;
|
||||||
|
font-size: 0.84rem;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-street-entry:hover,
|
||||||
|
.group-street-entry:focus-visible {
|
||||||
|
background: var(--dispatcher-subtle-bg-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-street-name {
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-street-state {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
font-size: 0.68rem;
|
||||||
|
color: var(--muted-color, #5b6771);
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-streets-empty {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0.5rem 0.55rem;
|
||||||
|
border-radius: 0.42rem;
|
||||||
|
background: var(--dispatcher-subtle-bg);
|
||||||
|
color: var(--muted-color, #5b6771);
|
||||||
|
font-size: 0.8rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
#chatModal article,
|
#chatModal article,
|
||||||
@@ -335,7 +592,6 @@ dialog article {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 0.55rem;
|
gap: 0.55rem;
|
||||||
max-height: 58dvh;
|
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
padding: 0.15rem;
|
padding: 0.15rem;
|
||||||
}
|
}
|
||||||
@@ -350,11 +606,11 @@ dialog article {
|
|||||||
.chat-message {
|
.chat-message {
|
||||||
padding: 0.5rem 0.65rem;
|
padding: 0.5rem 0.65rem;
|
||||||
border-radius: 0.55rem;
|
border-radius: 0.55rem;
|
||||||
background: rgba(0, 0, 0, 0.05);
|
background: var(--dispatcher-subtle-bg);
|
||||||
}
|
}
|
||||||
|
|
||||||
.chat-message.own {
|
.chat-message.own {
|
||||||
background: rgba(47, 111, 219, 0.12);
|
background: var(--dispatcher-own-message-bg);
|
||||||
}
|
}
|
||||||
|
|
||||||
.chat-message-header {
|
.chat-message-header {
|
||||||
@@ -374,9 +630,21 @@ dialog article {
|
|||||||
|
|
||||||
/* ---------- Leaflet-Marker ---------- */
|
/* ---------- Leaflet-Marker ---------- */
|
||||||
|
|
||||||
|
/* Leaflet setzt role="button"; Pico würde sonst Button-Padding und Zeilenhöhe
|
||||||
|
anwenden und den Marker gegenüber der gesetzten Position verschieben. */
|
||||||
.group-marker-icon {
|
.group-marker-icon {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: 0;
|
border: 0;
|
||||||
|
line-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-marker-icon.is-marker-hidden {
|
||||||
|
visibility: hidden;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.group-marker-icon span {
|
.group-marker-icon span {
|
||||||
@@ -398,7 +666,7 @@ dialog article {
|
|||||||
|
|
||||||
.control-pane {
|
.control-pane {
|
||||||
border-left: 0;
|
border-left: 0;
|
||||||
border-top: 1px solid rgba(0, 0, 0, 0.15);
|
border-top: 1px solid var(--dispatcher-border-strong);
|
||||||
}
|
}
|
||||||
|
|
||||||
.control-header {
|
.control-header {
|
||||||
@@ -413,6 +681,15 @@ dialog article {
|
|||||||
gap: 0.75rem;
|
gap: 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.clock-row {
|
||||||
|
gap: 0.5rem;
|
||||||
|
margin-bottom: 0.4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dispatcher-logo {
|
||||||
|
height: 2.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
.clock-time {
|
.clock-time {
|
||||||
font-size: 1.55rem;
|
font-size: 1.55rem;
|
||||||
}
|
}
|
||||||
@@ -424,4 +701,80 @@ dialog article {
|
|||||||
.control-footer {
|
.control-footer {
|
||||||
padding: 0.5rem 0.75rem;
|
padding: 0.5rem 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog {
|
||||||
|
top: 0.75rem;
|
||||||
|
left: 0.75rem;
|
||||||
|
width: min(24rem, calc(100vw - 1.5rem));
|
||||||
|
min-width: 0;
|
||||||
|
max-width: calc(100vw - 1.5rem);
|
||||||
|
height: auto;
|
||||||
|
min-height: 0;
|
||||||
|
max-height: 65dvh;
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.group-streets-dialog article {
|
||||||
|
max-height: 65dvh;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---------- Dark-Modus ---------- */
|
||||||
|
|
||||||
|
html[data-theme="dark"] .connection-status.connected {
|
||||||
|
color: #5bd6a2;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .connection-status.disconnected {
|
||||||
|
color: #ff8b8b;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-container {
|
||||||
|
background: var(--dispatcher-map-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* OSM-Kacheln werden nur im Dark-Modus abgedunkelt; Luftbilder bleiben unverändert. */
|
||||||
|
html[data-theme="dark"] #map:not(.is-aerial-base) .leaflet-tile-pane {
|
||||||
|
filter: invert(1) hue-rotate(180deg) brightness(0.82) contrast(0.92);
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-bar a {
|
||||||
|
background-color: #141e26;
|
||||||
|
color: #e1e6eb;
|
||||||
|
border-bottom-color: #2a3944;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-bar a:hover {
|
||||||
|
background-color: #1f2d38;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-control-attribution {
|
||||||
|
background: rgba(11, 17, 22, 0.82);
|
||||||
|
color: var(--muted-color, #8a99a6);
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-control-attribution a {
|
||||||
|
color: var(--primary, #35b9e0);
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-tooltip {
|
||||||
|
background: #141e26;
|
||||||
|
border-color: #141e26;
|
||||||
|
color: var(--color, #c8d1d8);
|
||||||
|
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.55);
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-tooltip-top::before {
|
||||||
|
border-top-color: #141e26;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-tooltip-bottom::before {
|
||||||
|
border-bottom-color: #141e26;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-tooltip-left::before {
|
||||||
|
border-left-color: #141e26;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .leaflet-tooltip-right::before {
|
||||||
|
border-right-color: #141e26;
|
||||||
}
|
}
|
||||||
@@ -10,3 +10,133 @@ article.success {
|
|||||||
border-color: #c3e6cb;
|
border-color: #c3e6cb;
|
||||||
color: #155724;
|
color: #155724;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Login und Mandantenauswahl: kompakte, zentrierte Karte */
|
||||||
|
body.login-page {
|
||||||
|
display: flex;
|
||||||
|
min-height: 100vh;
|
||||||
|
min-height: 100dvh;
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page main.container {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 24rem;
|
||||||
|
margin: auto;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page main.container > article {
|
||||||
|
--block-spacing-vertical: 1rem;
|
||||||
|
--block-spacing-horizontal: 1.25rem;
|
||||||
|
--form-element-spacing-vertical: 0.4rem;
|
||||||
|
--form-element-spacing-horizontal: 0.75rem;
|
||||||
|
margin: 0;
|
||||||
|
padding: var(--block-spacing-vertical) var(--block-spacing-horizontal);
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article > header {
|
||||||
|
margin-bottom: 0.75rem;
|
||||||
|
padding-block: 0.65rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article > header h1 {
|
||||||
|
margin-bottom: 0.2rem;
|
||||||
|
font-size: 1.3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article > header p {
|
||||||
|
margin-bottom: 0;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
line-height: 1.3;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article > p {
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article form {
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article label {
|
||||||
|
margin-bottom: 0.35rem;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article input {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article button {
|
||||||
|
margin-bottom: 0;
|
||||||
|
padding-block: 0.45rem;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article > footer {
|
||||||
|
margin-top: 0.75rem;
|
||||||
|
padding-block: 0.6rem;
|
||||||
|
font-size: 0.8rem;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article > footer a {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Logo auf allen Views oben rechts */
|
||||||
|
.app-logo {
|
||||||
|
position: fixed;
|
||||||
|
top: 0.75rem;
|
||||||
|
right: 0.75rem;
|
||||||
|
z-index: 40;
|
||||||
|
pointer-events: none;
|
||||||
|
line-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.app-logo img {
|
||||||
|
display: block;
|
||||||
|
width: auto;
|
||||||
|
height: 4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 600px) {
|
||||||
|
.app-logo {
|
||||||
|
top: 0.5rem;
|
||||||
|
right: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.app-logo img {
|
||||||
|
height: 2.5rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-height: 560px) {
|
||||||
|
body.login-page {
|
||||||
|
padding: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page main.container > article {
|
||||||
|
--block-spacing-vertical: 0.6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.login-page article > header {
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
padding-block: 0.45rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Dark-Modus */
|
||||||
|
html[data-theme="dark"] article.error {
|
||||||
|
background-color: #4a1f24;
|
||||||
|
border-color: #7a2a32;
|
||||||
|
color: #ffb3ba;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] article.success {
|
||||||
|
background-color: #173d29;
|
||||||
|
border-color: #23633f;
|
||||||
|
color: #9be7b5;
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
@@ -11,11 +11,12 @@ const tenant = window.CMBNET_TENANT || window.location.pathname.split('/')[1];
|
|||||||
const apiBase = `/${tenant}/api`;
|
const apiBase = `/${tenant}/api`;
|
||||||
const wsUrl = `${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${window.location.host}/${tenant}/ws`;
|
const wsUrl = `${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${window.location.host}/${tenant}/ws`;
|
||||||
const storageKey = `cmbnet:${tenant}:map`;
|
const storageKey = `cmbnet:${tenant}:map`;
|
||||||
|
const themeStorageKey = 'cmbnet:theme';
|
||||||
const currentAccountId = Number(window.CMBNET_ACCOUNT_ID) || null;
|
const currentAccountId = Number(window.CMBNET_ACCOUNT_ID) || null;
|
||||||
|
|
||||||
const DEFAULT_SETTINGS = {
|
const DEFAULT_SETTINGS = {
|
||||||
opacity: 0.7,
|
opacity: 0.7,
|
||||||
weight: 20,
|
weight: 20, // Meter
|
||||||
baseLayer: 'osm',
|
baseLayer: 'osm',
|
||||||
center: null,
|
center: null,
|
||||||
zoom: null
|
zoom: null
|
||||||
@@ -23,6 +24,7 @@ const DEFAULT_SETTINGS = {
|
|||||||
|
|
||||||
const STREET_STATES = ['unbearbeitet', 'zugewiesen', 'erledigt'];
|
const STREET_STATES = ['unbearbeitet', 'zugewiesen', 'erledigt'];
|
||||||
const GROUP_STATES = ['offen', 'unterwegs', 'online', 'pausierend', 'fertig'];
|
const GROUP_STATES = ['offen', 'unterwegs', 'online', 'pausierend', 'fertig'];
|
||||||
|
const GROUP_MARKER_MAX_AGE_SECONDS = 30 * 60;
|
||||||
const STREET_COLORS = {
|
const STREET_COLORS = {
|
||||||
unbearbeitet: '#1f6feb',
|
unbearbeitet: '#1f6feb',
|
||||||
zugewiesen: '#d62828',
|
zugewiesen: '#d62828',
|
||||||
@@ -43,6 +45,8 @@ const dispatcherState = {
|
|||||||
reconnectTimer: null,
|
reconnectTimer: null,
|
||||||
crosshairGroupId: null,
|
crosshairGroupId: null,
|
||||||
currentStreetId: null,
|
currentStreetId: null,
|
||||||
|
streetsDialogGroupId: null,
|
||||||
|
aliasGroupId: null,
|
||||||
chatGroupId: null,
|
chatGroupId: null,
|
||||||
chatByGroup: new Map(),
|
chatByGroup: new Map(),
|
||||||
chatKeysByGroup: new Map(),
|
chatKeysByGroup: new Map(),
|
||||||
@@ -81,6 +85,7 @@ async function initDispatcher() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ensureInitialView();
|
ensureInitialView();
|
||||||
|
updateAllPolylineStyles();
|
||||||
placeUnknownGroupMarkers();
|
placeUnknownGroupMarkers();
|
||||||
setConnectionStatus('Verbinde …', '');
|
setConnectionStatus('Verbinde …', '');
|
||||||
connectWebSocket();
|
connectWebSocket();
|
||||||
@@ -154,6 +159,34 @@ function clampNumber(value, min, max, fallback) {
|
|||||||
return Math.min(max, Math.max(min, number));
|
return Math.min(max, Math.max(min, number));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function initTheme() {
|
||||||
|
applyTheme(document.documentElement.dataset.theme, false);
|
||||||
|
|
||||||
|
document.getElementById('darkModeToggle').addEventListener('change', event => {
|
||||||
|
applyTheme(event.target.checked ? 'dark' : 'light', true);
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener('storage', event => {
|
||||||
|
if (event.key === themeStorageKey) applyTheme(event.newValue, false);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyTheme(theme, persist) {
|
||||||
|
const normalized = theme === 'dark' ? 'dark' : 'light';
|
||||||
|
document.documentElement.dataset.theme = normalized;
|
||||||
|
|
||||||
|
const toggle = document.getElementById('darkModeToggle');
|
||||||
|
if (toggle) toggle.checked = normalized === 'dark';
|
||||||
|
|
||||||
|
if (!persist) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
localStorage.setItem(themeStorageKey, normalized);
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('Theme-Einstellung konnte nicht gespeichert werden.', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function indexData() {
|
function indexData() {
|
||||||
dispatcherState.streetById.clear();
|
dispatcherState.streetById.clear();
|
||||||
dispatcherState.streets.forEach(street => {
|
dispatcherState.streets.forEach(street => {
|
||||||
@@ -196,6 +229,7 @@ function initMap() {
|
|||||||
|
|
||||||
setBaseLayer(dispatcherState.settings.baseLayer, false);
|
setBaseLayer(dispatcherState.settings.baseLayer, false);
|
||||||
map.on('moveend zoomend', saveStoredSettings);
|
map.on('moveend zoomend', saveStoredSettings);
|
||||||
|
map.on('zoomend', updateAllPolylineStyles);
|
||||||
map.on('click', handleMapClick);
|
map.on('click', handleMapClick);
|
||||||
|
|
||||||
window.addEventListener('resize', () => map.invalidateSize());
|
window.addEventListener('resize', () => map.invalidateSize());
|
||||||
@@ -211,6 +245,12 @@ function setBaseLayer(name, persist = true) {
|
|||||||
currentBaseLayer.addTo(map);
|
currentBaseLayer.addTo(map);
|
||||||
dispatcherState.settings.baseLayer = name === 'aerial' ? 'aerial' : 'osm';
|
dispatcherState.settings.baseLayer = name === 'aerial' ? 'aerial' : 'osm';
|
||||||
|
|
||||||
|
const mapContainer = map.getContainer();
|
||||||
|
mapContainer.classList.toggle(
|
||||||
|
'is-aerial-base',
|
||||||
|
dispatcherState.settings.baseLayer === 'aerial'
|
||||||
|
);
|
||||||
|
|
||||||
const select = document.getElementById('baseLayerSelect');
|
const select = document.getElementById('baseLayerSelect');
|
||||||
if (select) select.value = dispatcherState.settings.baseLayer;
|
if (select) select.value = dispatcherState.settings.baseLayer;
|
||||||
|
|
||||||
@@ -416,11 +456,38 @@ function squaredCoordinateDistance(latlng, center) {
|
|||||||
return dLat * dLat + dLng * dLng;
|
return dLat * dLat + dLng * dLng;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rechnet eine reale Länge an der Position `latlng` in Pixel beim aktuellen
|
||||||
|
* Zoom der Karte um. Grundlage ist die Längenausdehnung eines Grads am
|
||||||
|
* angegebenen Breitengrad.
|
||||||
|
*/
|
||||||
|
function getPixelsForMeters(mapInstance, latlng, meters) {
|
||||||
|
const value = Number(meters);
|
||||||
|
if (!Number.isFinite(value) || value <= 0) return 1;
|
||||||
|
if (!mapInstance || !latlng) return value;
|
||||||
|
|
||||||
|
const metersPerDegreeLng = 111320 * Math.cos(latlng.lat * Math.PI / 180);
|
||||||
|
if (!Number.isFinite(metersPerDegreeLng) || metersPerDegreeLng <= 0) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lngDelta = value / metersPerDegreeLng;
|
||||||
|
const zoom = mapInstance.getZoom();
|
||||||
|
const p1 = mapInstance.project(latlng, zoom);
|
||||||
|
const p2 = mapInstance.project(L.latLng(latlng.lat, latlng.lng + lngDelta), zoom);
|
||||||
|
return p1.distanceTo(p2);
|
||||||
|
}
|
||||||
|
|
||||||
|
function currentPolylineWeight() {
|
||||||
|
if (!map) return dispatcherState.settings.weight;
|
||||||
|
return getPixelsForMeters(map, map.getCenter(), dispatcherState.settings.weight);
|
||||||
|
}
|
||||||
|
|
||||||
function polylineStyle(state) {
|
function polylineStyle(state) {
|
||||||
return {
|
return {
|
||||||
color: STREET_COLORS[state] || STREET_COLORS.unbearbeitet,
|
color: STREET_COLORS[state] || STREET_COLORS.unbearbeitet,
|
||||||
opacity: dispatcherState.settings.opacity,
|
opacity: dispatcherState.settings.opacity,
|
||||||
weight: dispatcherState.settings.weight,
|
weight: currentPolylineWeight(),
|
||||||
lineCap: 'round',
|
lineCap: 'round',
|
||||||
lineJoin: 'round'
|
lineJoin: 'round'
|
||||||
};
|
};
|
||||||
@@ -435,18 +502,19 @@ function recolorStreet(street) {
|
|||||||
line.setStyle({
|
line.setStyle({
|
||||||
color,
|
color,
|
||||||
opacity: dispatcherState.settings.opacity,
|
opacity: dispatcherState.settings.opacity,
|
||||||
weight: dispatcherState.settings.weight
|
weight: currentPolylineWeight()
|
||||||
});
|
});
|
||||||
line.setTooltipContent(tooltipElement(`${street.name} (${street.state})`));
|
line.setTooltipContent(tooltipElement(`${street.name} (${street.state})`));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateAllPolylineStyles() {
|
function updateAllPolylineStyles() {
|
||||||
|
const weight = currentPolylineWeight();
|
||||||
dispatcherState.polylinesByStreetId.forEach(lines => {
|
dispatcherState.polylinesByStreetId.forEach(lines => {
|
||||||
lines.forEach(line => {
|
lines.forEach(line => {
|
||||||
line.setStyle({
|
line.setStyle({
|
||||||
opacity: dispatcherState.settings.opacity,
|
opacity: dispatcherState.settings.opacity,
|
||||||
weight: dispatcherState.settings.weight
|
weight
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -490,9 +558,36 @@ function createGroupMarker(group, latlng) {
|
|||||||
marker.bindTooltip(tooltipElement(groupDisplayName(group)), {direction: 'top', offset: [0, -12]});
|
marker.bindTooltip(tooltipElement(groupDisplayName(group)), {direction: 'top', offset: [0, -12]});
|
||||||
marker.addTo(map);
|
marker.addTo(map);
|
||||||
dispatcherState.markersByGroupId.set(Number(group.id), marker);
|
dispatcherState.markersByGroupId.set(Number(group.id), marker);
|
||||||
|
updateGroupMarkerOpacity(group);
|
||||||
return marker;
|
return marker;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function markerOpacityForAge(ageSeconds) {
|
||||||
|
if (ageSeconds === null || ageSeconds === undefined || !Number.isFinite(ageSeconds)) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (ageSeconds >= GROUP_MARKER_MAX_AGE_SECONDS) return 0;
|
||||||
|
return Math.max(0, Math.min(
|
||||||
|
1,
|
||||||
|
1 - Math.max(0, ageSeconds) / GROUP_MARKER_MAX_AGE_SECONDS
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateGroupMarkerOpacity(group, now = Date.now()) {
|
||||||
|
const marker = dispatcherState.markersByGroupId.get(Number(group.id));
|
||||||
|
if (!marker) return;
|
||||||
|
|
||||||
|
const ageSeconds = group.last_pos_ts
|
||||||
|
? Math.max(0, (now - group.last_pos_ts) / 1000)
|
||||||
|
: null;
|
||||||
|
const opacity = markerOpacityForAge(ageSeconds);
|
||||||
|
|
||||||
|
marker.setOpacity(opacity);
|
||||||
|
const element = marker.getElement();
|
||||||
|
if (element) element.classList.toggle('is-marker-hidden', opacity <= 0);
|
||||||
|
if (opacity <= 0) marker.closeTooltip();
|
||||||
|
}
|
||||||
|
|
||||||
function placeKnownGroupMarkers() {
|
function placeKnownGroupMarkers() {
|
||||||
dispatcherState.groups.forEach(group => {
|
dispatcherState.groups.forEach(group => {
|
||||||
if (!hasPosition(group)) return;
|
if (!hasPosition(group)) return;
|
||||||
@@ -544,6 +639,7 @@ function updateMarkerPosition(group) {
|
|||||||
} else {
|
} else {
|
||||||
createGroupMarker(group, latlng);
|
createGroupMarker(group, latlng);
|
||||||
}
|
}
|
||||||
|
updateGroupMarkerOpacity(group);
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildGroupAccordion() {
|
function buildGroupAccordion() {
|
||||||
@@ -624,7 +720,39 @@ function createGroupElement(group) {
|
|||||||
crosshairButton.setAttribute('aria-label', 'Position auf der Karte setzen');
|
crosshairButton.setAttribute('aria-label', 'Position auf der Karte setzen');
|
||||||
crosshairButton.addEventListener('click', () => toggleCrosshair(group.id));
|
crosshairButton.addEventListener('click', () => toggleCrosshair(group.id));
|
||||||
|
|
||||||
actions.appendChild(crosshairButton);
|
const streetsButton = document.createElement('button');
|
||||||
|
streetsButton.type = 'button';
|
||||||
|
streetsButton.className = 'icon-button group-streets';
|
||||||
|
streetsButton.dataset.groupId = group.id;
|
||||||
|
streetsButton.textContent = '☑';
|
||||||
|
streetsButton.title = 'Straßen dieser Gruppe anzeigen';
|
||||||
|
streetsButton.setAttribute('aria-label', 'Straßen dieser Gruppe anzeigen');
|
||||||
|
streetsButton.addEventListener('click', () => openGroupStreetsModal(group.id));
|
||||||
|
|
||||||
|
const aliasButton = document.createElement('button');
|
||||||
|
aliasButton.type = 'button';
|
||||||
|
aliasButton.className = 'icon-button group-alias';
|
||||||
|
aliasButton.dataset.groupId = group.id;
|
||||||
|
aliasButton.textContent = '✎';
|
||||||
|
aliasButton.title = 'Aliasnamen ändern';
|
||||||
|
aliasButton.setAttribute('aria-label', 'Aliasnamen ändern');
|
||||||
|
aliasButton.addEventListener('click', () => openGroupAliasModal(group.id));
|
||||||
|
|
||||||
|
const stateSelect = document.createElement('select');
|
||||||
|
stateSelect.className = 'group-state-select';
|
||||||
|
stateSelect.dataset.groupId = group.id;
|
||||||
|
stateSelect.title = 'Status der Gruppe ändern';
|
||||||
|
stateSelect.setAttribute('aria-label', `Status von ${groupDisplayName(group)} ändern`);
|
||||||
|
GROUP_STATES.forEach(state => {
|
||||||
|
const option = document.createElement('option');
|
||||||
|
option.value = state;
|
||||||
|
option.textContent = state;
|
||||||
|
option.selected = state === (group.state || 'offen');
|
||||||
|
stateSelect.appendChild(option);
|
||||||
|
});
|
||||||
|
stateSelect.addEventListener('change', () => changeGroupState(group.id, stateSelect));
|
||||||
|
|
||||||
|
actions.append(crosshairButton, streetsButton, aliasButton, stateSelect);
|
||||||
|
|
||||||
const messageInput = document.createElement('input');
|
const messageInput = document.createElement('input');
|
||||||
messageInput.type = 'text';
|
messageInput.type = 'text';
|
||||||
@@ -642,6 +770,8 @@ function createGroupElement(group) {
|
|||||||
|
|
||||||
function refreshGroupControls(now = Date.now()) {
|
function refreshGroupControls(now = Date.now()) {
|
||||||
dispatcherState.groups.forEach(group => {
|
dispatcherState.groups.forEach(group => {
|
||||||
|
updateGroupMarkerOpacity(group, now);
|
||||||
|
|
||||||
const item = document.querySelector(`.group-item[data-group-id="${group.id}"]`);
|
const item = document.querySelector(`.group-item[data-group-id="${group.id}"]`);
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
|
|
||||||
@@ -670,13 +800,20 @@ function refreshGroupControls(now = Date.now()) {
|
|||||||
progress.value = Math.round(value);
|
progress.value = Math.round(value);
|
||||||
|
|
||||||
if (known) {
|
if (known) {
|
||||||
meta.textContent = `${Number(group.last_lat).toFixed(5)}, ${Number(group.last_lon).toFixed(5)}`;
|
meta.textContent = positionAgeLabel(ageSeconds);
|
||||||
} else {
|
} else {
|
||||||
meta.textContent = 'Position unbekannt';
|
meta.textContent = 'Position unbekannt';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function positionAgeLabel(ageSeconds) {
|
||||||
|
if (ageSeconds === null) return 'unbekannt';
|
||||||
|
if (ageSeconds < 30) return 'live';
|
||||||
|
if (ageSeconds < 120) return 'aktuell';
|
||||||
|
return `${Math.floor(ageSeconds / 60)} min`;
|
||||||
|
}
|
||||||
|
|
||||||
function progressForAge(ageSeconds) {
|
function progressForAge(ageSeconds) {
|
||||||
if (ageSeconds < 60) return 100;
|
if (ageSeconds < 60) return 100;
|
||||||
if (ageSeconds >= 3600) return 0;
|
if (ageSeconds >= 3600) return 0;
|
||||||
@@ -686,8 +823,145 @@ function progressForAge(ageSeconds) {
|
|||||||
function updateGroupSummary(group) {
|
function updateGroupSummary(group) {
|
||||||
const item = document.querySelector(`.group-item[data-group-id="${group.id}"]`);
|
const item = document.querySelector(`.group-item[data-group-id="${group.id}"]`);
|
||||||
if (!item) return;
|
if (!item) return;
|
||||||
|
|
||||||
|
const state = group.state || 'offen';
|
||||||
const badge = item.querySelector('.group-state');
|
const badge = item.querySelector('.group-state');
|
||||||
if (badge) badge.textContent = group.state || 'offen';
|
if (badge) badge.textContent = state;
|
||||||
|
|
||||||
|
const select = item.querySelector('.group-state-select');
|
||||||
|
if (select && select.value !== state) select.value = state;
|
||||||
|
}
|
||||||
|
|
||||||
|
function changeGroupState(groupId, select) {
|
||||||
|
const group = dispatcherState.groupById.get(Number(groupId));
|
||||||
|
if (!group) return;
|
||||||
|
|
||||||
|
const newState = select.value;
|
||||||
|
if (!GROUP_STATES.includes(newState)) {
|
||||||
|
select.value = group.state || 'offen';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (newState === (group.state || 'offen')) return;
|
||||||
|
|
||||||
|
const sent = sendWs({
|
||||||
|
code: 200,
|
||||||
|
msg: JSON.stringify({
|
||||||
|
group_id: group.id,
|
||||||
|
state: newState,
|
||||||
|
actor: currentAccountId
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!sent) {
|
||||||
|
select.value = group.state || 'offen';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
group.state = newState;
|
||||||
|
updateGroupSummary(group);
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyGroupAlias(group) {
|
||||||
|
const item = document.querySelector(`.group-item[data-group-id="${group.id}"]`);
|
||||||
|
if (item) {
|
||||||
|
const name = item.querySelector('.group-name');
|
||||||
|
if (name) name.textContent = groupDisplayName(group);
|
||||||
|
|
||||||
|
const stateSelect = item.querySelector('.group-state-select');
|
||||||
|
if (stateSelect) {
|
||||||
|
stateSelect.setAttribute(
|
||||||
|
'aria-label',
|
||||||
|
`Status von ${groupDisplayName(group)} ändern`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const marker = dispatcherState.markersByGroupId.get(Number(group.id));
|
||||||
|
if (marker) {
|
||||||
|
marker.setTooltipContent(tooltipElement(groupDisplayName(group)));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dispatcherState.streetsDialogGroupId === Number(group.id)
|
||||||
|
&& document.getElementById('groupStreetsModal').open) {
|
||||||
|
renderGroupStreetsDialog(group.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dispatcherState.chatGroupId === Number(group.id)
|
||||||
|
&& document.getElementById('chatModal').open) {
|
||||||
|
renderChat();
|
||||||
|
}
|
||||||
|
|
||||||
|
const streetModal = document.getElementById('streetModal');
|
||||||
|
if (streetModal.open) {
|
||||||
|
const selectedGroupId = document.getElementById('streetGroupSelect').value;
|
||||||
|
fillStreetGroupOptions(selectedGroupId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function openGroupAliasModal(groupId) {
|
||||||
|
const group = dispatcherState.groupById.get(Number(groupId));
|
||||||
|
if (!group) return;
|
||||||
|
|
||||||
|
dispatcherState.aliasGroupId = Number(group.id);
|
||||||
|
document.getElementById('groupAliasTitle').textContent =
|
||||||
|
`Aliasname – ${groupDisplayName(group)}`;
|
||||||
|
|
||||||
|
const input = document.getElementById('groupAliasInput');
|
||||||
|
input.value = group.aliasname || '';
|
||||||
|
|
||||||
|
const dialog = document.getElementById('groupAliasModal');
|
||||||
|
if (!dialog.open) dialog.showModal();
|
||||||
|
input.focus();
|
||||||
|
input.select();
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeGroupAliasModal() {
|
||||||
|
const dialog = document.getElementById('groupAliasModal');
|
||||||
|
if (dialog.open) dialog.close();
|
||||||
|
dispatcherState.aliasGroupId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveGroupAlias() {
|
||||||
|
const group = dispatcherState.groupById.get(Number(dispatcherState.aliasGroupId));
|
||||||
|
if (!group) {
|
||||||
|
closeGroupAliasModal();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const input = document.getElementById('groupAliasInput');
|
||||||
|
const saveButton = document.getElementById('groupAliasSave');
|
||||||
|
const aliasname = input.value.trim();
|
||||||
|
|
||||||
|
if (saveButton.disabled) return;
|
||||||
|
saveButton.disabled = true;
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${apiBase}/groups/${group.id}/alias`, {
|
||||||
|
method: 'POST',
|
||||||
|
credentials: 'same-origin',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify({aliasname})
|
||||||
|
});
|
||||||
|
|
||||||
|
let data = {};
|
||||||
|
try {
|
||||||
|
data = await response.json();
|
||||||
|
} catch (error) {
|
||||||
|
data = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok || !data.success) {
|
||||||
|
throw new Error(data.error || `HTTP ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
group.aliasname = data.aliasname ?? aliasname;
|
||||||
|
applyGroupAlias(group);
|
||||||
|
closeGroupAliasModal();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Aliasname konnte nicht gespeichert werden:', error);
|
||||||
|
alert(`Aliasname konnte nicht gespeichert werden: ${error.message}`);
|
||||||
|
} finally {
|
||||||
|
saveButton.disabled = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function locateGroup(groupId) {
|
function locateGroup(groupId) {
|
||||||
@@ -758,6 +1032,206 @@ function handleMapClick(event) {
|
|||||||
refreshGroupControls();
|
refreshGroupControls();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------ */
|
||||||
|
/* Straßen einer Gruppe */
|
||||||
|
/* ------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
function positionGroupStreetsDialog(dialog, left, top, width = null, height = null) {
|
||||||
|
const rect = dialog.getBoundingClientRect();
|
||||||
|
const dialogWidth = width ?? rect.width;
|
||||||
|
const dialogHeight = height ?? rect.height;
|
||||||
|
const maxLeft = Math.max(0, window.innerWidth - dialogWidth);
|
||||||
|
const maxTop = Math.max(0, window.innerHeight - dialogHeight);
|
||||||
|
|
||||||
|
dialog.style.left = `${Math.min(Math.max(left, 0), maxLeft)}px`;
|
||||||
|
dialog.style.top = `${Math.min(Math.max(top, 0), maxTop)}px`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function initGroupStreetsDialogDrag() {
|
||||||
|
const dialog = document.getElementById('groupStreetsModal');
|
||||||
|
const header = dialog.querySelector('header');
|
||||||
|
let dragState = null;
|
||||||
|
|
||||||
|
const finishDrag = event => {
|
||||||
|
if (!dragState || event.pointerId !== dragState.pointerId) return;
|
||||||
|
if (header.hasPointerCapture?.(event.pointerId)) {
|
||||||
|
header.releasePointerCapture(event.pointerId);
|
||||||
|
}
|
||||||
|
dialog.classList.remove('is-dragging');
|
||||||
|
dragState = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
header.addEventListener('pointerdown', event => {
|
||||||
|
if (event.button !== 0 || event.isPrimary === false) return;
|
||||||
|
if (event.target.closest('button, a, input, select, textarea')) return;
|
||||||
|
|
||||||
|
const rect = dialog.getBoundingClientRect();
|
||||||
|
dragState = {
|
||||||
|
pointerId: event.pointerId,
|
||||||
|
startX: event.clientX,
|
||||||
|
startY: event.clientY,
|
||||||
|
left: rect.left,
|
||||||
|
top: rect.top,
|
||||||
|
width: rect.width,
|
||||||
|
height: rect.height
|
||||||
|
};
|
||||||
|
|
||||||
|
dialog.style.left = `${rect.left}px`;
|
||||||
|
dialog.style.top = `${rect.top}px`;
|
||||||
|
dialog.classList.add('is-dragging');
|
||||||
|
header.setPointerCapture?.(event.pointerId);
|
||||||
|
event.preventDefault();
|
||||||
|
});
|
||||||
|
|
||||||
|
header.addEventListener('pointermove', event => {
|
||||||
|
if (!dragState || event.pointerId !== dragState.pointerId) return;
|
||||||
|
|
||||||
|
positionGroupStreetsDialog(
|
||||||
|
dialog,
|
||||||
|
dragState.left + event.clientX - dragState.startX,
|
||||||
|
dragState.top + event.clientY - dragState.startY,
|
||||||
|
dragState.width,
|
||||||
|
dragState.height
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
header.addEventListener('pointerup', finishDrag);
|
||||||
|
header.addEventListener('pointercancel', finishDrag);
|
||||||
|
|
||||||
|
window.addEventListener('resize', () => {
|
||||||
|
if (!dialog.open) return;
|
||||||
|
const rect = dialog.getBoundingClientRect();
|
||||||
|
positionGroupStreetsDialog(dialog, rect.left, rect.top);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function openGroupStreetsModal(groupId) {
|
||||||
|
const group = dispatcherState.groupById.get(Number(groupId));
|
||||||
|
if (!group) return;
|
||||||
|
|
||||||
|
dispatcherState.streetsDialogGroupId = Number(group.id);
|
||||||
|
renderGroupStreetsDialog(group.id);
|
||||||
|
|
||||||
|
const dialog = document.getElementById('groupStreetsModal');
|
||||||
|
if (!dialog.open) dialog.show();
|
||||||
|
|
||||||
|
const rect = dialog.getBoundingClientRect();
|
||||||
|
positionGroupStreetsDialog(dialog, rect.left, rect.top);
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeGroupStreetsModal() {
|
||||||
|
const dialog = document.getElementById('groupStreetsModal');
|
||||||
|
if (dialog.open) dialog.close();
|
||||||
|
dispatcherState.streetsDialogGroupId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderGroupStreetsDialog(groupId) {
|
||||||
|
const group = dispatcherState.groupById.get(Number(groupId));
|
||||||
|
if (!group) {
|
||||||
|
closeGroupStreetsModal();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
document.getElementById('groupStreetsTitle').textContent =
|
||||||
|
`Straßen – ${groupDisplayName(group)}`;
|
||||||
|
|
||||||
|
const container = document.getElementById('groupStreetsContent');
|
||||||
|
container.innerHTML = '';
|
||||||
|
|
||||||
|
const assigned = dispatcherState.streets
|
||||||
|
.filter(street => Number(street.group_id) === Number(group.id))
|
||||||
|
.sort((a, b) => String(a.name).localeCompare(String(b.name), 'de'));
|
||||||
|
|
||||||
|
if (!assigned.length) {
|
||||||
|
const empty = document.createElement('p');
|
||||||
|
empty.className = 'group-streets-empty';
|
||||||
|
empty.textContent = 'Dieser Gruppe sind noch keine Straßen zugewiesen.';
|
||||||
|
container.appendChild(empty);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const assignedStreets = assigned.filter(street => street.state === 'zugewiesen');
|
||||||
|
const completedStreets = assigned.filter(street => street.state === 'erledigt');
|
||||||
|
const otherStreets = assigned.filter(
|
||||||
|
street => street.state !== 'zugewiesen' && street.state !== 'erledigt'
|
||||||
|
);
|
||||||
|
|
||||||
|
appendGroupStreetSection(container, 'Zugewiesen', assignedStreets, true);
|
||||||
|
if (completedStreets.length) {
|
||||||
|
appendGroupStreetSection(container, 'Erledigt', completedStreets, false);
|
||||||
|
}
|
||||||
|
if (otherStreets.length) {
|
||||||
|
appendGroupStreetSection(container, 'Weitere', otherStreets, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function appendGroupStreetSection(container, title, streets, showEmpty) {
|
||||||
|
const section = document.createElement('section');
|
||||||
|
section.className = 'group-streets-section';
|
||||||
|
|
||||||
|
const heading = document.createElement('h4');
|
||||||
|
heading.textContent = title;
|
||||||
|
section.appendChild(heading);
|
||||||
|
|
||||||
|
if (!streets.length) {
|
||||||
|
if (showEmpty) {
|
||||||
|
const empty = document.createElement('p');
|
||||||
|
empty.className = 'group-streets-empty';
|
||||||
|
empty.textContent = 'Keine Straßen im Zustand „zugewiesen“.';
|
||||||
|
section.appendChild(empty);
|
||||||
|
}
|
||||||
|
container.appendChild(section);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const list = document.createElement('ul');
|
||||||
|
list.className = 'group-streets-list';
|
||||||
|
|
||||||
|
streets.forEach(street => {
|
||||||
|
const item = document.createElement('li');
|
||||||
|
|
||||||
|
const button = document.createElement('button');
|
||||||
|
button.type = 'button';
|
||||||
|
button.className = 'group-street-entry';
|
||||||
|
button.title = `Auf die Bounding Box von ${street.name} zoomen`;
|
||||||
|
|
||||||
|
const name = document.createElement('span');
|
||||||
|
name.className = 'group-street-name';
|
||||||
|
name.textContent = street.name;
|
||||||
|
|
||||||
|
const state = document.createElement('span');
|
||||||
|
state.className = 'group-street-state';
|
||||||
|
state.textContent = street.state;
|
||||||
|
|
||||||
|
button.append(name, state);
|
||||||
|
button.addEventListener('click', () => zoomToStreet(street.id));
|
||||||
|
item.appendChild(button);
|
||||||
|
list.appendChild(item);
|
||||||
|
});
|
||||||
|
|
||||||
|
section.appendChild(list);
|
||||||
|
container.appendChild(section);
|
||||||
|
}
|
||||||
|
|
||||||
|
function zoomToStreet(streetId) {
|
||||||
|
const street = dispatcherState.streetById.get(Number(streetId));
|
||||||
|
if (!street) return;
|
||||||
|
|
||||||
|
let bounds = bboxToBounds(street.bbox);
|
||||||
|
|
||||||
|
if (!bounds || !bounds.isValid()) {
|
||||||
|
const lines = dispatcherState.polylinesByStreetId.get(Number(street.id)) || [];
|
||||||
|
const fallback = L.latLngBounds([]);
|
||||||
|
lines.forEach(line => {
|
||||||
|
line.getLatLngs().forEach(latlng => fallback.extend(latlng));
|
||||||
|
});
|
||||||
|
if (fallback.isValid()) bounds = fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!bounds || !bounds.isValid()) return;
|
||||||
|
map.fitBounds(bounds, {padding: [30, 30], maxZoom: 18});
|
||||||
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
/* Straßen-Dialog */
|
/* Straßen-Dialog */
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
@@ -1140,6 +1614,11 @@ function handleStreetUpdate(message) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
recolorStreet(street);
|
recolorStreet(street);
|
||||||
|
|
||||||
|
const streetsDialog = document.getElementById('groupStreetsModal');
|
||||||
|
if (dispatcherState.streetsDialogGroupId && streetsDialog.open) {
|
||||||
|
renderGroupStreetsDialog(dispatcherState.streetsDialogGroupId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleGroupStateUpdate(message) {
|
function handleGroupStateUpdate(message) {
|
||||||
@@ -1199,15 +1678,21 @@ function updateClock() {
|
|||||||
timeElement.textContent = now.toLocaleTimeString('de-DE', {hour12: false});
|
timeElement.textContent = now.toLocaleTimeString('de-DE', {hour12: false});
|
||||||
}
|
}
|
||||||
|
|
||||||
const dateElement = document.getElementById('clockDate');
|
const weekdayElement = document.getElementById('clockWeekday');
|
||||||
if (dateElement) {
|
if (weekdayElement) {
|
||||||
const weekday = now.toLocaleDateString('de-DE', {weekday: 'long'});
|
weekdayElement.textContent = now
|
||||||
const date = now.toLocaleDateString('de-DE', {
|
.toLocaleDateString('de-DE', {weekday: 'short'})
|
||||||
|
.replace('.', '')
|
||||||
|
.slice(0, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
const dayElement = document.getElementById('clockDay');
|
||||||
|
if (dayElement) {
|
||||||
|
dayElement.textContent = now.toLocaleDateString('de-DE', {
|
||||||
day: '2-digit',
|
day: '2-digit',
|
||||||
month: '2-digit',
|
month: '2-digit',
|
||||||
year: 'numeric'
|
year: 'numeric'
|
||||||
});
|
});
|
||||||
dateElement.textContent = `${weekday}, ${date}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
refreshGroupControls(now.getTime());
|
refreshGroupControls(now.getTime());
|
||||||
@@ -1232,7 +1717,7 @@ function updateOpacityOutput() {
|
|||||||
|
|
||||||
function updateWeightOutput() {
|
function updateWeightOutput() {
|
||||||
const output = document.getElementById('weightValue');
|
const output = document.getElementById('weightValue');
|
||||||
if (output) output.textContent = String(dispatcherState.settings.weight);
|
if (output) output.textContent = `${dispatcherState.settings.weight} m`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseTimestamp(value) {
|
function parseTimestamp(value) {
|
||||||
@@ -1262,6 +1747,8 @@ function normalizeTimestamp(value) {
|
|||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
|
|
||||||
function bindStaticUi() {
|
function bindStaticUi() {
|
||||||
|
initTheme();
|
||||||
|
|
||||||
document.getElementById('baseLayerSelect').addEventListener('change', event => {
|
document.getElementById('baseLayerSelect').addEventListener('change', event => {
|
||||||
setBaseLayer(event.target.value);
|
setBaseLayer(event.target.value);
|
||||||
});
|
});
|
||||||
@@ -1287,6 +1774,12 @@ function bindStaticUi() {
|
|||||||
document.getElementById('fitBoundsButton').addEventListener('click', fitAllStreetBounds);
|
document.getElementById('fitBoundsButton').addEventListener('click', fitAllStreetBounds);
|
||||||
document.getElementById('speakerButton').addEventListener('click', openSpeakerModal);
|
document.getElementById('speakerButton').addEventListener('click', openSpeakerModal);
|
||||||
document.getElementById('streetStateSelect').addEventListener('change', updateStreetGroupVisibility);
|
document.getElementById('streetStateSelect').addEventListener('change', updateStreetGroupVisibility);
|
||||||
|
document.getElementById('groupAliasInput').addEventListener('keydown', event => {
|
||||||
|
if (event.key !== 'Enter') return;
|
||||||
|
event.preventDefault();
|
||||||
|
saveGroupAlias();
|
||||||
|
});
|
||||||
|
initGroupStreetsDialogDrag();
|
||||||
|
|
||||||
document.addEventListener('keydown', event => {
|
document.addEventListener('keydown', event => {
|
||||||
if (event.key === 'Escape' && dispatcherState.crosshairGroupId) {
|
if (event.key === 'Escape' && dispatcherState.crosshairGroupId) {
|
||||||
|
|||||||
@@ -4,12 +4,30 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>{% block title %}CMBNet{% endblock %}</title>
|
<title>{% block title %}CMBNet{% endblock %}</title>
|
||||||
|
<link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}" type="image/x-icon">
|
||||||
|
<script>
|
||||||
|
(() => {
|
||||||
|
try {
|
||||||
|
const theme = localStorage.getItem('cmbnet:theme');
|
||||||
|
if (theme === 'dark' || theme === 'light') {
|
||||||
|
document.documentElement.dataset.theme = theme;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// localStorage ist in manchen Browser-Kontexten nicht verfügbar.
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css">
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css">
|
||||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
|
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
|
<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
|
||||||
{% block head %}{% endblock %}
|
{% block head %}{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
<body class="{% block body_class %}{% endblock %}">
|
<body class="{% block body_class %}{% endblock %}">
|
||||||
|
{% block logo %}
|
||||||
|
<div class="app-logo" aria-hidden="true">
|
||||||
|
<img src="{{ url_for('static', filename='img/logo.png') }}" alt="">
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
<main class="container">
|
<main class="container">
|
||||||
{% with messages = get_flashed_messages(with_categories=true) %}
|
{% with messages = get_flashed_messages(with_categories=true) %}
|
||||||
{% if messages %}
|
{% if messages %}
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
|
|
||||||
{% block body_class %}dispatcher-page{% endblock %}
|
{% block body_class %}dispatcher-page{% endblock %}
|
||||||
|
|
||||||
|
{% block logo %}{% endblock %}
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/dispatcher.css') }}">
|
<link rel="stylesheet" href="{{ url_for('static', filename='css/dispatcher.css') }}">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -16,19 +18,20 @@
|
|||||||
|
|
||||||
<aside class="control-pane" aria-label="Kontrollansicht">
|
<aside class="control-pane" aria-label="Kontrollansicht">
|
||||||
<header class="control-header">
|
<header class="control-header">
|
||||||
<div class="clock" aria-live="off">
|
<div class="clock-row">
|
||||||
<div class="clock-date" id="clockDate"></div>
|
<div class="clock" aria-live="off">
|
||||||
<div class="clock-time" id="clockTime">--:--:--</div>
|
<div class="clock-date" id="clockDate">
|
||||||
|
<span class="clock-weekday" id="clockWeekday"></span>
|
||||||
|
<span class="clock-day" id="clockDay"></span>
|
||||||
|
</div>
|
||||||
|
<div class="clock-time" id="clockTime">--:--:--</div>
|
||||||
|
</div>
|
||||||
|
<img class="dispatcher-logo"
|
||||||
|
src="{{ url_for('static', filename='img/logo.png') }}"
|
||||||
|
alt="CMBNet">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="header-controls">
|
<div class="header-controls">
|
||||||
<label class="map-layer-label">
|
|
||||||
<span>Hintergrundkarte</span>
|
|
||||||
<select id="baseLayerSelect">
|
|
||||||
<option value="osm">OpenStreetMap</option>
|
|
||||||
<option value="aerial">Luftbild</option>
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<button type="button" id="speakerButton" class="icon-button"
|
<button type="button" id="speakerButton" class="icon-button"
|
||||||
title="Nachricht an alle senden" aria-label="Nachricht an alle senden">📢</button>
|
title="Nachricht an alle senden" aria-label="Nachricht an alle senden">📢</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -43,14 +46,30 @@
|
|||||||
<input id="opacitySlider" type="range" min="0" max="1" step="0.05" value="0.7">
|
<input id="opacitySlider" type="range" min="0" max="1" step="0.05" value="0.7">
|
||||||
</label>
|
</label>
|
||||||
<label class="slider-control" for="weightSlider">
|
<label class="slider-control" for="weightSlider">
|
||||||
<span>Markerbreite <output id="weightValue">20</output></span>
|
<span>Markerbreite <output id="weightValue">20 m</output></span>
|
||||||
<input id="weightSlider" type="range" min="1" max="100" step="1" value="20">
|
<input id="weightSlider" type="range" min="1" max="100" step="1" value="20">
|
||||||
</label>
|
</label>
|
||||||
<div class="footer-buttons">
|
<div class="footer-bottom">
|
||||||
<button type="button" id="fitBoundsButton" class="icon-button"
|
<div class="footer-settings">
|
||||||
title="Gesamten Straßenbereich anzeigen" aria-label="Gesamten Straßenbereich anzeigen">🌍</button>
|
<label class="map-layer-label">
|
||||||
<a id="logoutButton" class="icon-button" href="{{ url_for('auth.logout', tenant=session.tenant_code) }}"
|
<span>Hintergrundkarte</span>
|
||||||
title="Session beenden" aria-label="Session beenden">⏻</a>
|
<select id="baseLayerSelect">
|
||||||
|
<option value="osm">OpenStreetMap</option>
|
||||||
|
<option value="aerial">Luftbild</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
<label class="theme-switch" title="Dark-Modus umschalten">
|
||||||
|
<span>Dark</span>
|
||||||
|
<input type="checkbox" id="darkModeToggle" role="switch"
|
||||||
|
aria-label="Dark-Modus">
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="footer-buttons">
|
||||||
|
<button type="button" id="fitBoundsButton" class="icon-button"
|
||||||
|
title="Gesamten Straßenbereich anzeigen" aria-label="Gesamten Straßenbereich anzeigen">🌍</button>
|
||||||
|
<a id="logoutButton" class="icon-button" href="{{ url_for('auth.logout', tenant=session.tenant_code) }}"
|
||||||
|
title="Session beenden" aria-label="Session beenden">⏻</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
</aside>
|
</aside>
|
||||||
@@ -63,9 +82,11 @@
|
|||||||
<button class="close" type="button" aria-label="Schließen" onclick="closeSpeakerModal()"></button>
|
<button class="close" type="button" aria-label="Schließen" onclick="closeSpeakerModal()"></button>
|
||||||
<h3>Nachricht an alle</h3>
|
<h3>Nachricht an alle</h3>
|
||||||
</header>
|
</header>
|
||||||
<label>Freitext
|
<div class="dialog-body">
|
||||||
<textarea id="speakerText" rows="4" placeholder="Nachricht eingeben …"></textarea>
|
<label>Freitext
|
||||||
</label>
|
<textarea id="speakerText" rows="4" placeholder="Nachricht eingeben …"></textarea>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<footer>
|
<footer>
|
||||||
<button type="button" class="secondary" onclick="closeSpeakerModal()">Abbrechen</button>
|
<button type="button" class="secondary" onclick="closeSpeakerModal()">Abbrechen</button>
|
||||||
<button type="button" onclick="sendSpeakerMessage()">Senden</button>
|
<button type="button" onclick="sendSpeakerMessage()">Senden</button>
|
||||||
@@ -80,16 +101,18 @@
|
|||||||
<button class="close" type="button" aria-label="Schließen" onclick="closeStreetModal()"></button>
|
<button class="close" type="button" aria-label="Schließen" onclick="closeStreetModal()"></button>
|
||||||
<h3 id="streetModalTitle">Straße</h3>
|
<h3 id="streetModalTitle">Straße</h3>
|
||||||
</header>
|
</header>
|
||||||
<label>State
|
<div class="dialog-body">
|
||||||
<select id="streetStateSelect">
|
<label>State
|
||||||
<option value="unbearbeitet">unbearbeitet</option>
|
<select id="streetStateSelect">
|
||||||
<option value="zugewiesen">zugewiesen</option>
|
<option value="unbearbeitet">unbearbeitet</option>
|
||||||
<option value="erledigt">erledigt</option>
|
<option value="zugewiesen">zugewiesen</option>
|
||||||
</select>
|
<option value="erledigt">erledigt</option>
|
||||||
</label>
|
</select>
|
||||||
<label id="streetGroupLabel">Gruppe
|
</label>
|
||||||
<select id="streetGroupSelect"></select>
|
<label id="streetGroupLabel">Gruppe
|
||||||
</label>
|
<select id="streetGroupSelect"></select>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<footer>
|
<footer>
|
||||||
<button type="button" class="secondary" onclick="closeStreetModal()">Abbrechen</button>
|
<button type="button" class="secondary" onclick="closeStreetModal()">Abbrechen</button>
|
||||||
<button type="button" onclick="saveStreetState()">Speichern</button>
|
<button type="button" onclick="saveStreetState()">Speichern</button>
|
||||||
@@ -97,6 +120,40 @@
|
|||||||
</article>
|
</article>
|
||||||
</dialog>
|
</dialog>
|
||||||
|
|
||||||
|
<!-- Straßen einer Gruppe -->
|
||||||
|
<dialog id="groupStreetsModal" class="group-streets-dialog" aria-labelledby="groupStreetsTitle">
|
||||||
|
<article>
|
||||||
|
<header>
|
||||||
|
<button class="close" type="button" aria-label="Schließen" onclick="closeGroupStreetsModal()"></button>
|
||||||
|
<h3 id="groupStreetsTitle" title="Zum Verschieben ziehen">Straßen</h3>
|
||||||
|
</header>
|
||||||
|
<div id="groupStreetsContent" class="dialog-body"></div>
|
||||||
|
<footer>
|
||||||
|
<button type="button" class="secondary" onclick="closeGroupStreetsModal()">Schließen</button>
|
||||||
|
</footer>
|
||||||
|
</article>
|
||||||
|
</dialog>
|
||||||
|
|
||||||
|
<!-- Aliasname einer Gruppe -->
|
||||||
|
<dialog id="groupAliasModal" aria-labelledby="groupAliasTitle">
|
||||||
|
<article>
|
||||||
|
<header>
|
||||||
|
<button class="close" type="button" aria-label="Schließen" onclick="closeGroupAliasModal()"></button>
|
||||||
|
<h3 id="groupAliasTitle">Aliasname ändern</h3>
|
||||||
|
</header>
|
||||||
|
<div class="dialog-body">
|
||||||
|
<label>Aliasname
|
||||||
|
<input type="text" id="groupAliasInput" maxlength="120" autocomplete="off"
|
||||||
|
placeholder="Leer lassen für Gruppen-ID">
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<footer>
|
||||||
|
<button type="button" class="secondary" onclick="closeGroupAliasModal()">Abbrechen</button>
|
||||||
|
<button type="button" id="groupAliasSave" onclick="saveGroupAlias()">Speichern</button>
|
||||||
|
</footer>
|
||||||
|
</article>
|
||||||
|
</dialog>
|
||||||
|
|
||||||
<!-- Chatverlauf einer Gruppe -->
|
<!-- Chatverlauf einer Gruppe -->
|
||||||
<dialog id="chatModal">
|
<dialog id="chatModal">
|
||||||
<article class="chat-dialog">
|
<article class="chat-dialog">
|
||||||
@@ -104,7 +161,7 @@
|
|||||||
<button class="close" type="button" aria-label="Schließen" onclick="closeChatModal()"></button>
|
<button class="close" type="button" aria-label="Schließen" onclick="closeChatModal()"></button>
|
||||||
<h3 id="chatTitle">Chat</h3>
|
<h3 id="chatTitle">Chat</h3>
|
||||||
</header>
|
</header>
|
||||||
<div class="chat-messages" id="chatMessages"></div>
|
<div class="chat-messages dialog-body" id="chatMessages"></div>
|
||||||
<footer>
|
<footer>
|
||||||
<button type="button" onclick="closeChatModal()">Schließen</button>
|
<button type="button" onclick="closeChatModal()">Schließen</button>
|
||||||
</footer>
|
</footer>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block title %}Login - CMBNet ({{ tenant_code }}){% endblock %}
|
{% block title %}Login - CMBNet ({{ tenant_code }}){% endblock %}
|
||||||
|
{% block body_class %}login-page{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<article>
|
<article>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block title %}Mandantenauswahl - CMBNet{% endblock %}
|
{% block title %}Mandantenauswahl - CMBNet{% endblock %}
|
||||||
|
{% block body_class %}login-page{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<article>
|
<article>
|
||||||
|
|||||||
Reference in new issue
Block a user