Allererste Fassung von Gruppen- und Dispatcher-Mobil View

This commit is contained in:
concierge committed 2026-10-28 14:23:15 +01:00
1 parent 47240302d0
commit 8e5f91948f
9 files changed
+1383 -20

No files matched your search

+12
View File
@@ -11,6 +11,18 @@ from cmbnet.utils.helpers import log_transaction
api_groups_bp = Blueprint('api_groups', __name__)
@api_groups_bp.route('/groups/me')
@role_required(['Gruppe'])
def get_my_group(**kwargs):
from cmbnet.services.groups_service import GroupsService
groups = GroupsService.get_all(g.tenant_id)
account_id = g.current_account['id']
for group in groups.values():
if group.get('account_id') == account_id:
return jsonify(group)
return jsonify({'error': 'Gruppe nicht gefunden'}), 404
@api_groups_bp.route('/groups/<int:group_id>/alias', methods=['POST'])
@role_required(['Dispatcher', 'Administrator'])
def update_group_alias(group_id, **kwargs):
+26
View File
@@ -11,6 +11,32 @@ from cmbnet.services.groups_service import GroupsService
api_init_bp = Blueprint('api_init', __name__)
@api_init_bp.route('/init/me')
@login_required
def init_me(**kwargs):
account = getattr(g, 'current_account', None)
if not account:
return jsonify({'id': None, 'role': None, 'name': None})
return jsonify({
'id': account['id'],
'role': account['role'],
'name': account['name'],
'tenant_id': account['tenant_id'],
'tenant_code': account['tenant_code']
})
@api_init_bp.route('/init/groups/<int:group_id>/streets')
@login_required
def init_group_streets(group_id, **kwargs):
from cmbnet.services.groups_service import GroupsService
streets = GroupsService.get_streets_for_group(group_id, g.tenant_id)
result = []
for street in streets:
result.append(dict(street))
return jsonify(result)
@api_init_bp.route('/init/accounts')
@login_required
def init_accounts(**kwargs):
+3
View File
@@ -57,6 +57,9 @@ def login(**kwargs):
if role == 'Administrator':
return redirect(url_for('admin.dashboard', tenant=tenant_selected))
elif role == 'Dispatcher':
ua = (request.headers.get('User-Agent') or '').lower()
if any(x in ua for x in ['android', 'iphone', 'ipod', 'ipad', 'mobile']):
return redirect(url_for('views.dispatcher_mobil', tenant=tenant_selected))
return redirect(url_for('views.dispatcher', tenant=tenant_selected))
elif role == 'Beobachter':
return redirect(url_for('views.beobachter', tenant=tenant_selected))
+6 -3
View File
@@ -1,7 +1,7 @@
"""
Haupt-Views
"""
from flask import Blueprint, render_template, g, redirect, url_for
from flask import Blueprint, render_template, g, redirect, url_for, request
from cmbnet.auth import login_required, role_required
views_bp = Blueprint('views', __name__)
@@ -17,6 +17,9 @@ def index(**kwargs):
if role == 'Administrator':
return redirect(url_for('admin.dashboard', tenant=tenant))
elif role == 'Dispatcher':
ua = (request.headers.get('User-Agent') or '').lower()
if any(x in ua for x in ['android', 'iphone', 'ipod', 'ipad', 'mobile']):
return redirect(url_for('views.dispatcher_mobil', tenant=tenant))
return redirect(url_for('views.dispatcher', tenant=tenant))
elif role == 'Beobachter':
return redirect(url_for('views.beobachter', tenant=tenant))
@@ -41,14 +44,14 @@ def beobachter(**kwargs):
@views_bp.route('/dispatcher_mobil')
@role_required('Dispatcher')
@role_required(['Dispatcher'])
def dispatcher_mobil(**kwargs):
"""Dispatcher-Mobil-View"""
return render_template('dispatcher_mobil.html')
@views_bp.route('/gruppen')
@login_required
@role_required('Gruppe')
def gruppen(**kwargs):
"""Gruppen-View"""
return render_template('gruppen.html')
+40 -10
View File
@@ -232,9 +232,23 @@ class WebSocketBroker:
return bool(group and msg_row['receiver_id'] == group['id'])
return False
# Code 2000: nur Dispatcher und Beobachter.
# Code 2000: Dispatcher, Beobachter und Gruppen.
if code == 2000:
return role in ('Dispatcher', 'Beobachter')
if role in ('Dispatcher', 'Beobachter'):
return True
if role == 'Gruppe':
group = db.execute(
'SELECT id FROM groups WHERE account_id = ? AND tenant_id = ?',
(account_id, tenant_id)
).fetchone()
payload = self._payload(msg_row)
group_id = None
if isinstance(payload, dict):
group_id = payload.get('group_id')
if group_id is None:
group_id = msg_row['receiver_id']
return bool(group and group_id == group['id'])
return False
return False
@@ -762,7 +776,11 @@ class WebSocketBroker:
elif code == 2000:
# Eine Gruppe sendet an Dispatcher und Beobachter.
# Im Gruppen/Mobil-View sollen nur Nachrichten an alle oder an diese Gruppe ankommen.
add_accounts(('Dispatcher', 'Beobachter'))
group_id = self._resolve_group_id(tenant_id, message, sender, payload)
if group_id:
add_group_account(group_id)
elif code == 2:
# Heartbeat-Antworten werden nur an Dispatcher-Views weitergegeben.
@@ -788,15 +806,27 @@ class WebSocketBroker:
@staticmethod
def _payload(message):
"""Liefert den JSON-Payload einer Nachricht oder None."""
if isinstance(message.msg, dict):
return message.msg
if not isinstance(message.msg, str):
return None
try:
data = json.loads(message.msg)
return data if isinstance(data, dict) else None
except (ValueError, TypeError):
if isinstance(message, dict):
msg = message.get('msg')
if isinstance(msg, dict):
return msg
if isinstance(msg, str):
try:
data = json.loads(msg)
return data if isinstance(data, dict) else None
except (ValueError, TypeError):
return None
return None
if hasattr(message, 'msg'):
if isinstance(message.msg, dict):
return message.msg
if isinstance(message.msg, str):
try:
data = json.loads(message.msg)
return data if isinstance(data, dict) else None
except (ValueError, TypeError):
return None
return None
def _resolve_group_id(self, tenant_id, message, sender, payload):
"""Ermittelt die betroffene Gruppen-ID aus Payload, receiver_id oder Absender."""