Beobachter View für Beamer
This commit is contained in:
1 parent
79a73ac8da
commit
47240302d0
5 files changed
+642
-54
No files matched your search
@@ -59,7 +59,7 @@ def login(**kwargs):
|
||||
elif role == 'Dispatcher':
|
||||
return redirect(url_for('views.dispatcher', tenant=tenant_selected))
|
||||
elif role == 'Beobachter':
|
||||
return redirect(url_for('views.praesentation', tenant=tenant_selected))
|
||||
return redirect(url_for('views.beobachter', tenant=tenant_selected))
|
||||
elif role == 'Gruppe':
|
||||
return redirect(url_for('views.gruppen', tenant=tenant_selected))
|
||||
else:
|
||||
|
||||
@@ -19,7 +19,7 @@ def index(**kwargs):
|
||||
elif role == 'Dispatcher':
|
||||
return redirect(url_for('views.dispatcher', tenant=tenant))
|
||||
elif role == 'Beobachter':
|
||||
return redirect(url_for('views.praesentation', tenant=tenant))
|
||||
return redirect(url_for('views.beobachter', tenant=tenant))
|
||||
elif role == 'Gruppe':
|
||||
return redirect(url_for('views.gruppen', tenant=tenant))
|
||||
else:
|
||||
@@ -33,6 +33,13 @@ def dispatcher(**kwargs):
|
||||
return render_template('dispatcher.html')
|
||||
|
||||
|
||||
@views_bp.route('/beobachter')
|
||||
@role_required(['Beobachter', 'Dispatcher'])
|
||||
def beobachter(**kwargs):
|
||||
"""Beobachter-View"""
|
||||
return render_template('beobachter.html')
|
||||
|
||||
|
||||
@views_bp.route('/dispatcher_mobil')
|
||||
@role_required('Dispatcher')
|
||||
def dispatcher_mobil(**kwargs):
|
||||
|
||||
@@ -949,6 +949,156 @@ html[data-theme="dark"] .leaflet-tooltip-right::before {
|
||||
border-right-color: #141e26;
|
||||
}
|
||||
|
||||
.beobachter-page .control-pane {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.beobachter-page .control-header {
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.beobachter-page .group-accordion {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-panel {
|
||||
flex: 1 1 auto;
|
||||
min-height: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin: 0 1.25rem 0.75rem;
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 0.75rem;
|
||||
background: var(--card-bg);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-header {
|
||||
flex: 0 0 auto;
|
||||
padding: 0.6rem 0.9rem;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
background: var(--dispatcher-subtle-bg);
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-header h3 {
|
||||
margin: 0;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-messages {
|
||||
flex: 1 1 auto;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
padding: 0.35rem 0.5rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.12rem;
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.15rem;
|
||||
padding: 0.35rem 0.5rem;
|
||||
border-radius: 0.4rem;
|
||||
background: rgba(100, 116, 139, 0.12);
|
||||
border: 1px solid var(--border-color);
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-card--alt {
|
||||
background: rgba(59, 130, 246, 0.12);
|
||||
}
|
||||
|
||||
html[data-theme="dark"] .beobachter-page .observer-chat-card {
|
||||
background: rgba(148, 163, 184, 0.16);
|
||||
}
|
||||
|
||||
html[data-theme="dark"] .beobachter-page .observer-chat-card--alt {
|
||||
background: rgba(59, 130, 246, 0.22);
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-meta {
|
||||
font-size: 0.75rem;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-fromto {
|
||||
font-weight: 600;
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-text {
|
||||
font-size: 0.9rem;
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
.beobachter-page .observer-chat-empty {
|
||||
margin: auto;
|
||||
color: var(--text-secondary);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.beobachter-page .control-footer {
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.group-marker-icon--with-label {
|
||||
background: transparent;
|
||||
border: none;
|
||||
}
|
||||
|
||||
.group-marker-icon--with-label span {
|
||||
position: absolute;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
border-radius: 50%;
|
||||
background: var(--marker-color);
|
||||
border: 2px solid #fff;
|
||||
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.4);
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.group-marker-label {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
bottom: 100%;
|
||||
transform: translate(-50%, -4px);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
line-height: 1.05;
|
||||
white-space: nowrap;
|
||||
padding: 0.12rem 0.45rem;
|
||||
border-radius: 6px;
|
||||
background: rgba(15, 23, 42, 0.85);
|
||||
color: #fff;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.4);
|
||||
pointer-events: auto;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.group-marker-label-name {
|
||||
font-size: 0.78rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.group-marker-label-age {
|
||||
font-size: 0.68rem;
|
||||
font-style: italic;
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
html[data-theme="light"] .group-marker-label {
|
||||
background: rgba(255, 255, 255, 0.95);
|
||||
color: #111;
|
||||
}
|
||||
|
||||
.dispatcher-page .leaflet-control-zoom {
|
||||
border: none;
|
||||
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.4);
|
||||
|
||||
@@ -93,17 +93,40 @@ async function initDispatcher() {
|
||||
dispatcherState.accounts = Array.isArray(accounts) ? accounts : [];
|
||||
indexData();
|
||||
buildPolylines();
|
||||
buildGroupAccordion();
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
const accordion = document.getElementById('groupAccordion');
|
||||
if (accordion) {
|
||||
accordion.innerHTML = '';
|
||||
}
|
||||
} else {
|
||||
buildGroupAccordion();
|
||||
}
|
||||
applySettingsToUi();
|
||||
placeKnownGroupMarkers();
|
||||
} catch (error) {
|
||||
console.error('Initialdaten konnten nicht geladen werden:', error);
|
||||
showAccordionError('Die Straßen und Gruppen konnten nicht geladen werden.');
|
||||
const accordion = document.getElementById('groupAccordion');
|
||||
if (accordion && typeof showAccordionError === 'function') {
|
||||
showAccordionError('Die Straßen und Gruppen konnten nicht geladen werden.');
|
||||
}
|
||||
}
|
||||
|
||||
ensureInitialView();
|
||||
updateAllPolylineStyles();
|
||||
placeUnknownGroupMarkers();
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
setInterval(() => {
|
||||
const now = Date.now();
|
||||
dispatcherState.groups.forEach(group => {
|
||||
updateGroupMarkerOpacity(group, now);
|
||||
const marker = dispatcherState.markersByGroupId.get(Number(group.id));
|
||||
if (marker) {
|
||||
updateGroupMarkerLabel(group, marker);
|
||||
updateGroupMarkerTooltip(group, marker);
|
||||
}
|
||||
});
|
||||
}, 30000);
|
||||
}
|
||||
setConnectionStatus('Verbinde …', '');
|
||||
connectWebSocket();
|
||||
|
||||
@@ -566,21 +589,101 @@ function hasPosition(group) {
|
||||
&& Number.isFinite(Number(group.last_lon));
|
||||
}
|
||||
|
||||
function getGroupAgeInfo(group, now = Date.now()) {
|
||||
if (!group.last_pos_ts) {
|
||||
return {text: 'unbekannt', ageSeconds: null};
|
||||
}
|
||||
const ageSeconds = Math.max(0, (now - group.last_pos_ts) / 1000);
|
||||
if (ageSeconds <= 120) {
|
||||
return {text: 'live', ageSeconds};
|
||||
}
|
||||
if (ageSeconds <= 600) {
|
||||
return {text: 'aktuell', ageSeconds};
|
||||
}
|
||||
const minutes = Math.floor(ageSeconds / 60);
|
||||
if (minutes < 60) {
|
||||
return {text: `${minutes} min`, ageSeconds};
|
||||
}
|
||||
const hours = Math.floor(minutes / 60);
|
||||
const restMinutes = minutes % 60;
|
||||
if (restMinutes === 0) {
|
||||
return {text: `${hours} h`, ageSeconds};
|
||||
}
|
||||
return {text: `${hours} h ${restMinutes} min`, ageSeconds};
|
||||
}
|
||||
|
||||
function getGroupLastMessagePreview(groupId) {
|
||||
const entries = dispatcherState.chatByGroup.get(Number(groupId)) || [];
|
||||
if (!entries.length) return '';
|
||||
const sorted = entries.slice().sort((a, b) => (b.ts || 0) - (a.ts || 0));
|
||||
const latest = sorted[0];
|
||||
const text = extractMessageText(latest.text ?? latest.msg ?? '');
|
||||
if (!text) return '';
|
||||
return text.length > 80 ? `${text.slice(0, 77)}...` : text;
|
||||
}
|
||||
|
||||
function updateGroupMarkerLabel(group, marker) {
|
||||
const ageInfo = getGroupAgeInfo(group);
|
||||
const element = marker.getElement();
|
||||
if (!element) return;
|
||||
let label = element.querySelector('.group-marker-label');
|
||||
if (!label) {
|
||||
label = document.createElement('div');
|
||||
label.className = 'group-marker-label';
|
||||
const name = document.createElement('div');
|
||||
name.className = 'group-marker-label-name';
|
||||
const age = document.createElement('div');
|
||||
age.className = 'group-marker-label-age';
|
||||
label.append(name, age);
|
||||
element.appendChild(label);
|
||||
}
|
||||
const nameEl = label.querySelector('.group-marker-label-name');
|
||||
const ageEl = label.querySelector('.group-marker-label-age');
|
||||
if (nameEl) nameEl.textContent = groupDisplayName(group);
|
||||
if (ageEl) ageEl.textContent = ageInfo.text;
|
||||
}
|
||||
|
||||
function updateGroupMarkerTooltip(group, marker) {
|
||||
if (window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
marker.bindTooltip(tooltipElement(groupDisplayName(group)), {direction: 'top', offset: [0, -12]});
|
||||
return;
|
||||
}
|
||||
const preview = getGroupLastMessagePreview(group.id);
|
||||
if (preview) {
|
||||
marker.bindTooltip(tooltipElement(preview), {direction: 'top', offset: [0, -12]});
|
||||
} else if (marker.getTooltip()) {
|
||||
marker.unbindTooltip();
|
||||
}
|
||||
}
|
||||
|
||||
function createGroupMarker(group, latlng) {
|
||||
const color = groupColor(group);
|
||||
const isObserver = window.CMBNET_VIEW_MODE === 'observer';
|
||||
const marker = L.marker(latlng, {
|
||||
title: groupDisplayName(group),
|
||||
riseOnHover: true,
|
||||
icon: L.divIcon({
|
||||
className: 'group-marker-icon',
|
||||
html: `<span style="--marker-color:${color}"></span>`,
|
||||
iconSize: [22, 22],
|
||||
iconAnchor: [11, 11]
|
||||
className: isObserver ? 'group-marker-icon group-marker-icon--with-label' : 'group-marker-icon',
|
||||
html: `<span style="--marker-color:${color}"></span>${isObserver ? '<div class="group-marker-label"><div class="group-marker-label-name"></div><div class="group-marker-label-age"></div></div>' : ''}`,
|
||||
iconSize: isObserver ? [28, 28] : [22, 22],
|
||||
iconAnchor: isObserver ? [14, 14] : [11, 11]
|
||||
})
|
||||
});
|
||||
marker.bindTooltip(tooltipElement(groupDisplayName(group)), {direction: 'top', offset: [0, -12]});
|
||||
if (isObserver) {
|
||||
updateGroupMarkerTooltip(group, marker);
|
||||
} else {
|
||||
marker.bindTooltip(tooltipElement(groupDisplayName(group)), {direction: 'top', offset: [0, -12]});
|
||||
}
|
||||
marker.on('click', () => {
|
||||
if (isObserver) {
|
||||
openGroupStreetsModal(group.id);
|
||||
}
|
||||
});
|
||||
marker.addTo(map);
|
||||
dispatcherState.markersByGroupId.set(Number(group.id), marker);
|
||||
if (isObserver) {
|
||||
updateGroupMarkerLabel(group, marker);
|
||||
}
|
||||
updateGroupMarkerOpacity(group);
|
||||
return marker;
|
||||
}
|
||||
@@ -605,6 +708,17 @@ function updateGroupMarkerOpacity(group, now = Date.now()) {
|
||||
: null;
|
||||
const opacity = markerOpacityForAge(ageSeconds);
|
||||
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
const element = marker.getElement();
|
||||
if (element) {
|
||||
element.style.opacity = opacity <= 0 ? '0.3' : String(opacity);
|
||||
element.classList.toggle('is-marker-hidden', opacity <= 0);
|
||||
updateGroupMarkerLabel(group, marker);
|
||||
}
|
||||
if (opacity <= 0) marker.closeTooltip();
|
||||
return;
|
||||
}
|
||||
|
||||
marker.setOpacity(opacity);
|
||||
const element = marker.getElement();
|
||||
if (element) element.classList.toggle('is-marker-hidden', opacity <= 0);
|
||||
@@ -658,7 +772,12 @@ function updateMarkerPosition(group) {
|
||||
const existing = dispatcherState.markersByGroupId.get(Number(group.id));
|
||||
if (existing) {
|
||||
existing.setLatLng(latlng);
|
||||
existing.setTooltipContent(tooltipElement(groupDisplayName(group)));
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
updateGroupMarkerTooltip(group, existing);
|
||||
updateGroupMarkerLabel(group, existing);
|
||||
} else {
|
||||
existing.setTooltipContent(tooltipElement(groupDisplayName(group)));
|
||||
}
|
||||
} else {
|
||||
createGroupMarker(group, latlng);
|
||||
}
|
||||
@@ -1757,6 +1876,138 @@ function saveStreetState() {
|
||||
if (sent) closeStreetModal();
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* Beobachter-Modus */
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
const observerChatMessages = [];
|
||||
const observerChatKeys = new Set();
|
||||
|
||||
function playNotificationSound() {
|
||||
try {
|
||||
const AudioContext = window.AudioContext || window.webkitAudioContext;
|
||||
if (!AudioContext) return;
|
||||
const ctx = new AudioContext();
|
||||
const oscillator = ctx.createOscillator();
|
||||
const gain = ctx.createGain();
|
||||
oscillator.connect(gain);
|
||||
gain.connect(ctx.destination);
|
||||
oscillator.frequency.setValueAtTime(880, ctx.currentTime);
|
||||
oscillator.frequency.exponentialRampToValueAtTime(440, ctx.currentTime + 0.15);
|
||||
gain.gain.setValueAtTime(0.1, ctx.currentTime);
|
||||
gain.gain.exponentialRampToValueAtTime(0.01, ctx.currentTime + 0.3);
|
||||
oscillator.start(ctx.currentTime);
|
||||
oscillator.stop(ctx.currentTime + 0.3);
|
||||
} catch (error) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
function formatObserverTime(timestamp) {
|
||||
const ts = normalizeTimestamp(timestamp) || Date.now();
|
||||
const date = new Date(ts);
|
||||
if (Number.isNaN(date.getTime())) return '';
|
||||
return date.toLocaleString('de-DE', {
|
||||
day: '2-digit',
|
||||
month: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit',
|
||||
hour12: false
|
||||
});
|
||||
}
|
||||
|
||||
function addObserverMessage(message) {
|
||||
if (window.CMBNET_VIEW_MODE !== 'observer') return;
|
||||
const code = Number(message.code);
|
||||
if (!Number.isFinite(code) || code < 1000) return;
|
||||
|
||||
const senderInfo = getSenderDisplay(message.sender_id, message);
|
||||
const payload = extractMessagePayload(message.msg);
|
||||
let receiverId = Number(message.receiver_id);
|
||||
if (!Number.isFinite(receiverId) && payload && payload.group_id !== undefined) {
|
||||
receiverId = Number(payload.group_id);
|
||||
}
|
||||
if (!Number.isFinite(receiverId) && payload && payload.receiver_id !== undefined) {
|
||||
receiverId = Number(payload.receiver_id);
|
||||
}
|
||||
|
||||
let receiver = '';
|
||||
if (Number.isFinite(receiverId) && receiverId > 0) {
|
||||
const group = dispatcherState.groupById.get(receiverId);
|
||||
const account = dispatcherState.accountById.get(receiverId);
|
||||
if (group) {
|
||||
receiver = `Gruppe ${groupDisplayName(group)}`;
|
||||
} else if (account) {
|
||||
receiver = account.name;
|
||||
} else {
|
||||
receiver = `ID ${receiverId}`;
|
||||
}
|
||||
} else if (code === 1000 || (payload && payload.broadcast)) {
|
||||
receiver = 'alle';
|
||||
}
|
||||
|
||||
const text = extractMessageText(message.msg);
|
||||
const time = formatObserverTime(message.ts);
|
||||
const key = `${code}|${message.sender_id}|${message.receiver_id}|${time}|${text}`;
|
||||
if (observerChatKeys.has(key)) return;
|
||||
observerChatKeys.add(key);
|
||||
|
||||
observerChatMessages.push({
|
||||
time,
|
||||
sender: senderInfo.name,
|
||||
receiver,
|
||||
text
|
||||
});
|
||||
|
||||
renderObserverChat();
|
||||
playNotificationSound();
|
||||
}
|
||||
|
||||
function renderObserverChat() {
|
||||
const container = document.getElementById('observerChatMessages');
|
||||
if (!container) return;
|
||||
container.innerHTML = '';
|
||||
|
||||
if (!observerChatMessages.length) {
|
||||
const empty = document.createElement('div');
|
||||
empty.className = 'observer-chat-empty';
|
||||
empty.textContent = 'Noch keine Nachrichten.';
|
||||
container.appendChild(empty);
|
||||
container.scrollTop = container.scrollHeight;
|
||||
return;
|
||||
}
|
||||
|
||||
observerChatMessages.forEach((entry, index) => {
|
||||
const card = document.createElement('article');
|
||||
card.className = 'observer-chat-card';
|
||||
if (index % 2 === 1) {
|
||||
card.classList.add('observer-chat-card--alt');
|
||||
}
|
||||
|
||||
const meta = document.createElement('div');
|
||||
meta.className = 'observer-chat-meta';
|
||||
meta.textContent = entry.time;
|
||||
|
||||
const fromTo = document.createElement('div');
|
||||
fromTo.className = 'observer-chat-fromto';
|
||||
if (entry.receiver) {
|
||||
fromTo.textContent = `${entry.sender} -> ${entry.receiver}`;
|
||||
} else {
|
||||
fromTo.textContent = entry.sender;
|
||||
}
|
||||
|
||||
const text = document.createElement('div');
|
||||
text.className = 'observer-chat-text';
|
||||
text.textContent = entry.text;
|
||||
|
||||
card.append(meta, fromTo, text);
|
||||
container.appendChild(card);
|
||||
});
|
||||
|
||||
container.scrollTop = container.scrollHeight;
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* Nachrichten und Chat */
|
||||
/* ------------------------------------------------------------------ */
|
||||
@@ -1950,6 +2201,14 @@ function addChatMessage(groupId, entry) {
|
||||
});
|
||||
updateGroupLastMessagePreview(id);
|
||||
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
const marker = dispatcherState.markersByGroupId.get(Number(id));
|
||||
if (marker) {
|
||||
updateGroupMarkerTooltip(dispatcherState.groupById.get(Number(id)) || {id}, marker);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (dispatcherState.chatGroupId === id
|
||||
&& document.getElementById('chatModal').open) {
|
||||
renderChat();
|
||||
@@ -2297,15 +2556,25 @@ function handleWsMessage(event) {
|
||||
break;
|
||||
case 1000: {
|
||||
const text = extractMessageText(message.msg);
|
||||
dispatcherState.groups.forEach(group => {
|
||||
addChatMessage(group.id, {
|
||||
sender_id: message.sender_id,
|
||||
code: message.code,
|
||||
ts: normalizeTimestamp(message.ts) || Date.now(),
|
||||
text
|
||||
if (window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
dispatcherState.groups.forEach(group => {
|
||||
addChatMessage(group.id, {
|
||||
sender_id: message.sender_id,
|
||||
code: message.code,
|
||||
ts: normalizeTimestamp(message.ts) || Date.now(),
|
||||
text
|
||||
});
|
||||
});
|
||||
});
|
||||
if (Number(message.sender_id) !== currentAccountId) {
|
||||
}
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
addObserverMessage({
|
||||
code: message.code,
|
||||
sender_id: message.sender_id,
|
||||
receiver_id: message.receiver_id,
|
||||
msg: text,
|
||||
ts: message.ts
|
||||
});
|
||||
} else if (Number(message.sender_id) !== currentAccountId) {
|
||||
showInfoMessage({
|
||||
code: message.code,
|
||||
sender_id: message.sender_id,
|
||||
@@ -2319,15 +2588,25 @@ function handleWsMessage(event) {
|
||||
case 1100: {
|
||||
const groupId = Number(message.receiver_id) || Number((message.msg && typeof message.msg === 'object' && message.msg.group_id));
|
||||
const text = extractMessageText(message.msg);
|
||||
if (groupId) {
|
||||
addChatMessage(groupId, {
|
||||
sender_id: message.sender_id,
|
||||
code: message.code,
|
||||
ts: normalizeTimestamp(message.ts) || Date.now(),
|
||||
text
|
||||
});
|
||||
if (window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
if (groupId) {
|
||||
addChatMessage(groupId, {
|
||||
sender_id: message.sender_id,
|
||||
code: message.code,
|
||||
ts: normalizeTimestamp(message.ts) || Date.now(),
|
||||
text
|
||||
});
|
||||
}
|
||||
}
|
||||
if (Number(message.sender_id) !== currentAccountId) {
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
addObserverMessage({
|
||||
code: message.code,
|
||||
sender_id: message.sender_id,
|
||||
receiver_id: groupId || message.receiver_id,
|
||||
msg: text,
|
||||
ts: message.ts
|
||||
});
|
||||
} else if (Number(message.sender_id) !== currentAccountId) {
|
||||
showInfoMessage({
|
||||
code: message.code,
|
||||
sender_id: message.sender_id,
|
||||
@@ -2339,11 +2618,23 @@ function handleWsMessage(event) {
|
||||
break;
|
||||
}
|
||||
case 2000:
|
||||
handleGroupChatMessage(message);
|
||||
if (window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
handleGroupChatMessage(message);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (Number(message.code) >= 1000) {
|
||||
const text = extractMessageText(message.msg);
|
||||
if (window.CMBNET_VIEW_MODE === 'observer') {
|
||||
addObserverMessage({
|
||||
code: message.code,
|
||||
sender_id: message.sender_id,
|
||||
receiver_id: message.receiver_id,
|
||||
msg: text,
|
||||
ts: message.ts
|
||||
});
|
||||
break;
|
||||
}
|
||||
if (Number(message.code) === 1000) {
|
||||
dispatcherState.groups.forEach(group => {
|
||||
addChatMessage(group.id, {
|
||||
@@ -2526,36 +2817,57 @@ function bindStaticUi() {
|
||||
initTheme();
|
||||
initStreetSearch();
|
||||
|
||||
document.getElementById('baseLayerSelect').addEventListener('change', event => {
|
||||
setBaseLayer(event.target.value);
|
||||
});
|
||||
const baseLayerSelect = document.getElementById('baseLayerSelect');
|
||||
if (baseLayerSelect) {
|
||||
baseLayerSelect.addEventListener('change', event => {
|
||||
setBaseLayer(event.target.value);
|
||||
});
|
||||
}
|
||||
|
||||
document.getElementById('opacitySlider').addEventListener('input', event => {
|
||||
dispatcherState.settings.opacity = clampNumber(
|
||||
event.target.value, 0, 1, DEFAULT_SETTINGS.opacity
|
||||
);
|
||||
updateOpacityOutput();
|
||||
updateAllPolylineStyles();
|
||||
saveStoredSettings();
|
||||
});
|
||||
const opacitySlider = document.getElementById('opacitySlider');
|
||||
if (opacitySlider) {
|
||||
opacitySlider.addEventListener('input', event => {
|
||||
dispatcherState.settings.opacity = clampNumber(
|
||||
event.target.value, 0, 1, DEFAULT_SETTINGS.opacity
|
||||
);
|
||||
updateOpacityOutput();
|
||||
updateAllPolylineStyles();
|
||||
saveStoredSettings();
|
||||
});
|
||||
}
|
||||
|
||||
document.getElementById('weightSlider').addEventListener('input', event => {
|
||||
dispatcherState.settings.weight = clampNumber(
|
||||
event.target.value, 1, 100, DEFAULT_SETTINGS.weight
|
||||
);
|
||||
updateWeightOutput();
|
||||
updateAllPolylineStyles();
|
||||
saveStoredSettings();
|
||||
});
|
||||
const weightSlider = document.getElementById('weightSlider');
|
||||
if (weightSlider) {
|
||||
weightSlider.addEventListener('input', event => {
|
||||
dispatcherState.settings.weight = clampNumber(
|
||||
event.target.value, 1, 100, DEFAULT_SETTINGS.weight
|
||||
);
|
||||
updateWeightOutput();
|
||||
updateAllPolylineStyles();
|
||||
saveStoredSettings();
|
||||
});
|
||||
}
|
||||
|
||||
document.getElementById('fitBoundsButton').addEventListener('click', fitAllStreetBounds);
|
||||
document.getElementById('speakerButton').addEventListener('click', openSpeakerModal);
|
||||
document.getElementById('streetStateSelect').addEventListener('change', updateStreetGroupVisibility);
|
||||
document.getElementById('groupAliasInput').addEventListener('keydown', event => {
|
||||
if (event.key !== 'Enter') return;
|
||||
event.preventDefault();
|
||||
saveGroupAlias();
|
||||
});
|
||||
const fitBoundsButton = document.getElementById('fitBoundsButton');
|
||||
if (fitBoundsButton) {
|
||||
fitBoundsButton.addEventListener('click', fitAllStreetBounds);
|
||||
}
|
||||
const speakerButton = document.getElementById('speakerButton');
|
||||
if (speakerButton && window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
speakerButton.addEventListener('click', openSpeakerModal);
|
||||
}
|
||||
const streetStateSelect = document.getElementById('streetStateSelect');
|
||||
if (streetStateSelect && window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
streetStateSelect.addEventListener('change', updateStreetGroupVisibility);
|
||||
}
|
||||
const groupAliasInput = document.getElementById('groupAliasInput');
|
||||
if (groupAliasInput && window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
groupAliasInput.addEventListener('keydown', event => {
|
||||
if (event.key !== 'Enter') return;
|
||||
event.preventDefault();
|
||||
saveGroupAlias();
|
||||
});
|
||||
}
|
||||
initGroupStreetsDialogDrag();
|
||||
|
||||
document.addEventListener('keydown', event => {
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Beobachter - {{ session.tenant_code }} - CMBNet{% endblock %}
|
||||
|
||||
{% block body_class %}dispatcher-page beobachter-page{% endblock %}
|
||||
|
||||
{% block logo %}{% endblock %}
|
||||
|
||||
{% block head %}
|
||||
<link rel="stylesheet" href="{{ url_for('static', filename='css/dispatcher.css') }}">
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="dispatcher-layout">
|
||||
<section class="map-pane" aria-label="Kartenansicht">
|
||||
<div id="map"></div>
|
||||
</section>
|
||||
|
||||
<aside class="control-pane" aria-label="Kontrollansicht">
|
||||
<header class="control-header">
|
||||
<div class="clock-row">
|
||||
<div class="clock" aria-live="off">
|
||||
<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 class="street-search" role="search">
|
||||
<input type="search" id="streetSearchInput"
|
||||
placeholder="Straße oder Straße + Hausnummer"
|
||||
aria-label="Straße suchen"
|
||||
aria-autocomplete="list"
|
||||
aria-controls="streetSearchResults"
|
||||
aria-expanded="false"
|
||||
autocomplete="off" spellcheck="false"
|
||||
enterkeyhint="search">
|
||||
<ul id="streetSearchResults" class="street-search-results"
|
||||
role="listbox" aria-label="Straßenvorschläge" hidden></ul>
|
||||
</div>
|
||||
<div class="street-search-status" id="streetSearchStatus"
|
||||
role="status" aria-live="polite"></div>
|
||||
<div class="connection-status" id="connectionStatus">Verbinde …</div>
|
||||
</header>
|
||||
|
||||
<section class="observer-chat-panel" aria-label="Nachrichtenverlauf">
|
||||
<header class="observer-chat-header">
|
||||
<h3>Nachrichtenverlauf</h3>
|
||||
</header>
|
||||
<div class="observer-chat-messages" id="observerChatMessages" aria-live="polite"></div>
|
||||
</section>
|
||||
|
||||
<footer class="control-footer">
|
||||
<label class="slider-control" for="opacitySlider">
|
||||
<span>Opazität <output id="opacityValue">0.70</output></span>
|
||||
<input id="opacitySlider" type="range" min="0" max="1" step="0.05" value="0.7">
|
||||
</label>
|
||||
<label class="slider-control" for="weightSlider">
|
||||
<span>Markerbreite <output id="weightValue">20 m</output></span>
|
||||
<input id="weightSlider" type="range" min="1" max="100" step="1" value="20">
|
||||
</label>
|
||||
<div class="footer-bottom">
|
||||
<div class="footer-settings">
|
||||
<label class="map-layer-label">
|
||||
<span>Hintergrundkarte</span>
|
||||
<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>
|
||||
</footer>
|
||||
</aside>
|
||||
</div>
|
||||
|
||||
<!-- Straßen einer Gruppe (ToDo) -->
|
||||
<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>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script>
|
||||
window.CMBNET_TENANT = {{ session.tenant_code|tojson }};
|
||||
window.CMBNET_ACCOUNT_ID = {{ session.account_id|tojson }};
|
||||
window.CMBNET_LOGOUT_URL = {{ url_for('auth.logout', tenant=session.tenant_code)|tojson }};
|
||||
window.CMBNET_VIEW_MODE = 'observer';
|
||||
</script>
|
||||
<script src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
|
||||
<script src="{{ url_for('static', filename='js/str2pl.js') }}"></script>
|
||||
<script src="{{ url_for('static', filename='js/views/dispatcher.js') }}"></script>
|
||||
{% endblock %}
|
||||
Reference in new issue
Block a user