diff --git a/app/core/config.py b/app/core/config.py index b48b964..e105dd5 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -287,6 +287,9 @@ class Settings(BaseSettings): SMS_USERNAME: str = "" SMS_SENDER: str = "BMC Networks" SMS_WEBHOOK_SECRET: str = "" + + # Bottom bar module + BOTTOM_BAR_ENABLED: bool = False # Dev-only shortcuts DEV_ALLOW_ARCHIVED_IMPORT: bool = False diff --git a/app/emails/frontend/emails.html b/app/emails/frontend/emails.html index 354afc8..e6f643b 100644 --- a/app/emails/frontend/emails.html +++ b/app/emails/frontend/emails.html @@ -1004,6 +1004,8 @@ style="border-radius: 20px;"> diff --git a/app/modules/bottom_bar/__init__.py b/app/modules/bottom_bar/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/modules/bottom_bar/backend/__init__.py b/app/modules/bottom_bar/backend/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/modules/bottom_bar/backend/public_router.py b/app/modules/bottom_bar/backend/public_router.py new file mode 100644 index 0000000..aced919 --- /dev/null +++ b/app/modules/bottom_bar/backend/public_router.py @@ -0,0 +1,121 @@ +import asyncio +import json +import logging +from typing import Optional + +from fastapi import APIRouter, Request, WebSocket, WebSocketDisconnect + +from app.core.auth_service import AuthService +from .service import get_active_timer, get_dashboard_status, get_notifications + +logger = logging.getLogger(__name__) + +router = APIRouter() + + +def _resolve_user_id_from_request(request: Request) -> Optional[int]: + user_id = getattr(request.state, "user_id", None) + if user_id is not None: + try: + return int(user_id) + except (TypeError, ValueError): + return None + + user_id_param = request.query_params.get("user_id") + if user_id_param: + try: + return int(user_id_param) + except (TypeError, ValueError): + return None + + return None + + +def _resolve_ws_payload(websocket: WebSocket) -> Optional[dict]: + token = websocket.query_params.get("token") + auth_header = (websocket.headers.get("authorization") or "").strip() + if not token and auth_header.lower().startswith("bearer "): + token = auth_header.split(" ", 1)[1].strip() + + payload = AuthService.verify_token(token) if token else None + if not payload: + access_cookie_token = (websocket.cookies.get("access_token") or "").strip() or None + payload = AuthService.verify_token(access_cookie_token) if access_cookie_token else None + return payload + + +@router.get("/api/v1/dashboard/status") +async def get_dashboard_status_endpoint() -> dict: + return get_dashboard_status() + + +@router.get("/api/v1/timer/active") +async def get_active_timer_endpoint(request: Request) -> dict: + user_id = _resolve_user_id_from_request(request) + return get_active_timer(user_id) + + +@router.get("/api/v1/notifications") +async def get_notifications_endpoint(request: Request, limit: int = 20) -> dict: + user_id = _resolve_user_id_from_request(request) + return get_notifications(user_id, limit=limit) + + +@router.websocket("/api/v1/bottom-bar/ws") +async def bottom_bar_ws(websocket: WebSocket): + payload = _resolve_ws_payload(websocket) + if not payload: + await websocket.close(code=1008) + return + + try: + user_id = int(payload.get("sub")) if payload.get("sub") is not None else None + except (TypeError, ValueError): + await websocket.close(code=1008) + return + + await websocket.accept() + + initial_status = get_dashboard_status() + initial_notifications = get_notifications(user_id, limit=20) + await websocket.send_json({"event": "status_delta", "data": initial_status}) + await websocket.send_json({"event": "notification_delta", "data": initial_notifications}) + + last_status_json = json.dumps(initial_status, sort_keys=True, default=str) + last_notifications_json = json.dumps(initial_notifications, sort_keys=True, default=str) + last_timer_elapsed = -1 + status_tick = 0 + + try: + while True: + timer = get_active_timer(user_id) + elapsed = int(timer.get("elapsed") or 0) + if elapsed != last_timer_elapsed: + await websocket.send_json({"event": "timer_tick", "data": timer}) + last_timer_elapsed = elapsed + + status_tick += 1 + if status_tick >= 5: + status = get_dashboard_status() + notifications = get_notifications(user_id, limit=20) + + status_json = json.dumps(status, sort_keys=True, default=str) + if status_json != last_status_json: + await websocket.send_json({"event": "status_delta", "data": status}) + last_status_json = status_json + + notifications_json = json.dumps(notifications, sort_keys=True, default=str) + if notifications_json != last_notifications_json: + await websocket.send_json({"event": "notification_delta", "data": notifications}) + last_notifications_json = notifications_json + + status_tick = 0 + + try: + await asyncio.wait_for(websocket.receive_text(), timeout=1.0) + except TimeoutError: + continue + except WebSocketDisconnect: + logger.info("Bottom bar websocket disconnected user_id=%s", user_id) + except Exception as exc: + logger.warning("Bottom bar websocket error user_id=%s error=%s", user_id, exc) diff --git a/app/modules/bottom_bar/backend/router.py b/app/modules/bottom_bar/backend/router.py new file mode 100644 index 0000000..09d74e8 --- /dev/null +++ b/app/modules/bottom_bar/backend/router.py @@ -0,0 +1,288 @@ +from typing import Optional + +from fastapi import APIRouter, Depends, HTTPException, Query, Request +from pydantic import BaseModel + +from app.core.auth_service import AuthService +from app.core.auth_dependencies import get_current_user +from app.core.database import execute_query, execute_query_single + +from .service import build_bottom_bar_state + +router = APIRouter() + + +class BossAssignPayload(BaseModel): + case_id: int + assignee_user_id: int + + +class BossAssignNextPayload(BaseModel): + assignee_user_id: int + + +def _resolve_user_id_from_request(request: Request) -> Optional[int]: + state_user_id = getattr(request.state, "user_id", None) + if state_user_id is not None: + try: + return int(state_user_id) + except (TypeError, ValueError): + pass + + user_id_param = request.query_params.get("user_id") + if user_id_param: + try: + return int(user_id_param) + except (TypeError, ValueError): + pass + + token = (request.cookies.get("access_token") or "").strip() or None + payload = AuthService.verify_token(token) if token else None + sub_claim = payload.get("sub") if payload else None + if sub_claim is not None: + try: + return int(sub_claim) + except (TypeError, ValueError): + return None + return None + +@router.get("/state") +async def get_bottom_bar_state(request: Request, current_user: dict = Depends(get_current_user)): + current_user_id = current_user.get("id") + if current_user_id is None: + raise HTTPException(status_code=401, detail="Not authenticated") + user_id = int(current_user_id) + force_boss_access = bool(current_user.get("is_superadmin") or current_user.get("is_shadow_admin")) + context_path = request.query_params.get("context") or "" + return build_bottom_bar_state(user_id, context_path=context_path, force_boss_access=force_boss_access) + +from app.services.task_routing import TaskRouter +from app.services.m365_calendar import M365CalendarService + + +def _has_boss_access(current_user: dict) -> bool: + if bool(current_user.get("is_superadmin") or current_user.get("is_shadow_admin")): + return True + + current_user_id = current_user.get("id") + if current_user_id is None: + return False + + rows = execute_query( + """ + SELECT LOWER(g.name) AS name + FROM user_groups ug + JOIN groups g ON g.id = ug.group_id + WHERE ug.user_id = %s + """, + (int(current_user_id),), + ) or [] + names = [str(r.get("name") or "") for r in rows] + tokens = ("admin", "manager", "leder", "chef", "teknik", "technician", "support") + return any(any(token in name for token in tokens) for name in names) + + +def _ensure_user_exists(user_id: int) -> None: + user = execute_query_single("SELECT user_id FROM users WHERE user_id = %s", (user_id,)) + if not user: + raise HTTPException(status_code=404, detail="Bruger ikke fundet") + + +def _get_next_unassigned_case() -> Optional[dict]: + return execute_query_single( + """ + SELECT id, titel, priority + FROM sag_sager + WHERE deleted_at IS NULL + AND ansvarlig_bruger_id IS NULL + AND LOWER(COALESCE(status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + ORDER BY + CASE + WHEN LOWER(COALESCE(priority, 'normal')) IN ('urgent', 'critical', 'kritisk') THEN 0 + WHEN LOWER(COALESCE(priority, 'normal')) IN ('high', 'høj') THEN 1 + ELSE 2 + END, + COALESCE(updated_at, created_at) ASC, + id ASC + LIMIT 1 + """ + ) + +@router.post("/next_task") +async def assign_next_task( + request: Request, + user_id: int | None = Query(default=None), + current_user: dict = Depends(get_current_user), +): + # Prefer authenticated user context; allow explicit user_id for controlled testing. + current_user_id = current_user.get("id") + resolved_user_id = user_id + if resolved_user_id is None and current_user_id is not None: + resolved_user_id = int(current_user_id) + if resolved_user_id is None: + raise HTTPException(status_code=401, detail="Authentication required for task assignment") + + # Kombinerer de nye services + router_svc = TaskRouter() + cal = M365CalendarService() + + # Henter hvor meget fri tid medarbejderen har lige nu + free_mins = await cal.get_user_free_time("now", 2) + + # Bed the engine allocate the next best task + task = await router_svc.get_next_best_task(resolved_user_id) + task = task or {} + + return { + "status": "assigned", + "task": task, + "free_time_calculated": free_mins, + "message": f"Fandt Næste Opgave (SLA: {task.get('assigned_reason')} - {task.get('estimated_minutes')}m. Du har {free_mins}m frit). " + } + + +@router.post("/boss/auto-assign-next") +async def boss_auto_assign_next(current_user: dict = Depends(get_current_user)): + if not _has_boss_access(current_user): + raise HTTPException(status_code=403, detail="Insufficient permissions for boss action") + + next_case = _get_next_unassigned_case() + if not next_case: + return { + "status": "noop", + "message": "Ingen ufordelte åbne sager at fordele.", + } + + assignee = execute_query_single( + """ + SELECT + u.user_id, + COALESCE(NULLIF(u.full_name, ''), u.username, ('Bruger #' || u.user_id::text)) AS owner_name, + COUNT(s.id)::int AS open_cases, + COUNT(CASE WHEN LOWER(COALESCE(s.priority, 'normal')) IN ('urgent', 'critical', 'kritisk', 'high', 'høj') THEN 1 END)::int AS hot_cases + FROM users u + JOIN user_groups ug ON ug.user_id = u.user_id + JOIN groups g ON g.id = ug.group_id + LEFT JOIN sag_sager s + ON s.ansvarlig_bruger_id = u.user_id + AND s.deleted_at IS NULL + AND LOWER(COALESCE(s.status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + WHERE LOWER(g.name) LIKE ANY(ARRAY['%admin%', '%manager%', '%leder%', '%chef%', '%teknik%', '%technician%', '%support%']) + GROUP BY u.user_id, u.full_name, u.username + ORDER BY hot_cases ASC, open_cases ASC, owner_name ASC + LIMIT 1 + """ + ) + if not assignee: + raise HTTPException(status_code=409, detail="Ingen kvalificeret medarbejder fundet til auto-fordeling") + + updated = execute_query_single( + """ + UPDATE sag_sager + SET ansvarlig_bruger_id = %s, + updated_at = CURRENT_TIMESTAMP + WHERE id = %s + RETURNING id, titel, priority, ansvarlig_bruger_id + """, + (int(assignee["user_id"]), int(next_case["id"])), + ) + if not updated: + raise HTTPException(status_code=500, detail="Kunne ikke opdatere sag") + + return { + "status": "assigned", + "message": "Sagen blev auto-fordelt.", + "case": { + "id": updated.get("id"), + "title": updated.get("titel") or f"Sag #{updated.get('id')}", + "priority": updated.get("priority") or "normal", + }, + "assignee": { + "user_id": assignee.get("user_id"), + "name": assignee.get("owner_name") or f"Bruger #{assignee.get('user_id')}", + }, + } + + +@router.post("/boss/assign-case") +async def boss_assign_case(payload: BossAssignPayload, current_user: dict = Depends(get_current_user)): + if not _has_boss_access(current_user): + raise HTTPException(status_code=403, detail="Insufficient permissions for boss action") + + _ensure_user_exists(int(payload.assignee_user_id)) + + case_row = execute_query_single( + """ + SELECT id, titel, priority + FROM sag_sager + WHERE id = %s + AND deleted_at IS NULL + AND LOWER(COALESCE(status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + """, + (int(payload.case_id),), + ) + if not case_row: + raise HTTPException(status_code=404, detail="Sag ikke fundet eller er afsluttet") + + updated = execute_query_single( + """ + UPDATE sag_sager + SET ansvarlig_bruger_id = %s, + updated_at = CURRENT_TIMESTAMP + WHERE id = %s + RETURNING id, titel, priority, ansvarlig_bruger_id + """, + (int(payload.assignee_user_id), int(payload.case_id)), + ) + if not updated: + raise HTTPException(status_code=500, detail="Kunne ikke tildele sag") + + return { + "status": "assigned", + "message": "Sagen blev tildelt.", + "case": { + "id": updated.get("id"), + "title": updated.get("titel") or f"Sag #{updated.get('id')}", + "priority": updated.get("priority") or "normal", + }, + "assignee_user_id": int(payload.assignee_user_id), + } + + +@router.post("/boss/assign-next-to-user") +async def boss_assign_next_to_user(payload: BossAssignNextPayload, current_user: dict = Depends(get_current_user)): + if not _has_boss_access(current_user): + raise HTTPException(status_code=403, detail="Insufficient permissions for boss action") + + _ensure_user_exists(int(payload.assignee_user_id)) + + next_case = _get_next_unassigned_case() + if not next_case: + return { + "status": "noop", + "message": "Ingen ufordelte åbne sager at tildele.", + } + + updated = execute_query_single( + """ + UPDATE sag_sager + SET ansvarlig_bruger_id = %s, + updated_at = CURRENT_TIMESTAMP + WHERE id = %s + RETURNING id, titel, priority, ansvarlig_bruger_id + """, + (int(payload.assignee_user_id), int(next_case["id"])), + ) + if not updated: + raise HTTPException(status_code=500, detail="Kunne ikke tildele næste sag") + + return { + "status": "assigned", + "message": "Næste ufordelte sag blev tildelt.", + "case": { + "id": updated.get("id"), + "title": updated.get("titel") or f"Sag #{updated.get('id')}", + "priority": updated.get("priority") or "normal", + }, + "assignee_user_id": int(payload.assignee_user_id), + } diff --git a/app/modules/bottom_bar/backend/service.py b/app/modules/bottom_bar/backend/service.py new file mode 100644 index 0000000..43bb00b --- /dev/null +++ b/app/modules/bottom_bar/backend/service.py @@ -0,0 +1,656 @@ +import logging +from datetime import datetime, timezone +from typing import Any, Dict, List, Optional + +from app.core.database import execute_query, execute_query_single + +logger = logging.getLogger(__name__) + +CLOSED_CASE_STATUSES = ("lukket", "løst", "closed", "resolved") +URGENT_PRIORITIES = ("urgent", "high", "kritisk", "critical") + + +def _safe_count(row: Optional[dict], key: str = "count") -> int: + if not row: + return 0 + try: + return int(row.get(key) or 0) + except (TypeError, ValueError): + return 0 + + +def _format_elapsed(seconds: int) -> str: + total = max(0, int(seconds or 0)) + hours = total // 3600 + minutes = (total % 3600) // 60 + secs = total % 60 + return f"{hours:02d}:{minutes:02d}:{secs:02d}" + + +def _priority_rank(priority: str) -> int: + normalized = str(priority or "").strip().lower() + if normalized in {"urgent", "critical", "kritisk"}: + return 3 + if normalized in {"high", "høj"}: + return 2 + if normalized in {"normal", "medium", "middel"}: + return 1 + return 0 + + +def _get_user_group_names(user_id: Optional[int]) -> List[str]: + if user_id is None: + return [] + rows = execute_query( + """ + SELECT LOWER(g.name) AS name + FROM user_groups ug + JOIN groups g ON g.id = ug.group_id + WHERE ug.user_id = %s + """, + (user_id,), + ) or [] + return [str(r.get("name") or "").strip() for r in rows if r.get("name")] + + +def _can_view_boss_tab(user_id: Optional[int]) -> bool: + if user_id is None: + return False + + group_names = _get_user_group_names(user_id) + if not group_names: + # Fail-open for authenticated users if group mapping is missing. + return True + + leadership_tokens = ( + "admin", + "manager", + "leder", + "chef", + "teknik", + "technician", + "support", + "drift", + "it", + ) + return any( + any(token in group for token in leadership_tokens) + for group in group_names + ) + + +def is_bottom_bar_enabled(user_id: Optional[int]) -> bool: + setting = execute_query_single("SELECT value FROM settings WHERE key = %s", ("bottom_bar_enabled",)) + setting_value = str((setting or {}).get("value") or "").strip().lower() + if setting_value not in {"1", "true", "yes", "on"}: + return False + + if user_id is None: + return True + + pref = execute_query_single( + """ + SELECT enabled + FROM user_module_preferences + WHERE user_id = %s AND module_name = %s + LIMIT 1 + """, + (user_id, "bottom_bar"), + ) + if pref and pref.get("enabled") is not None: + return bool(pref.get("enabled")) + + role = execute_query_single( + """ + SELECT mrs.enabled + FROM module_role_settings mrs + JOIN user_groups ug ON ug.group_id = mrs.group_id + WHERE ug.user_id = %s + AND mrs.module_name = %s + ORDER BY mrs.enabled DESC + LIMIT 1 + """, + (user_id, "bottom_bar"), + ) + if role and role.get("enabled") is not None: + return bool(role.get("enabled")) + + return True + + +def get_dashboard_status() -> Dict[str, int]: + mails_unread = _safe_count( + execute_query_single( + """ + SELECT COUNT(*) AS count + FROM email_messages + WHERE deleted_at IS NULL + AND COALESCE(is_read, FALSE) = FALSE + """ + ) + ) + + sager_open = _safe_count( + execute_query_single( + """ + SELECT COUNT(*) AS count + FROM sag_sager + WHERE deleted_at IS NULL + AND LOWER(COALESCE(status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + """ + ) + ) + + sager_urgent = _safe_count( + execute_query_single( + """ + SELECT COUNT(*) AS count + FROM sag_sager + WHERE deleted_at IS NULL + AND LOWER(COALESCE(status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + AND LOWER(COALESCE(priority, 'normal')) IN ('urgent', 'high', 'kritisk', 'critical') + """ + ) + ) + + sager_unassigned = _safe_count( + execute_query_single( + """ + SELECT COUNT(*) AS count + FROM sag_sager + WHERE deleted_at IS NULL + AND LOWER(COALESCE(status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + AND ansvarlig_bruger_id IS NULL + """ + ) + ) + + return { + "mails_unread": mails_unread, + "sager_open": sager_open, + "sager_urgent": sager_urgent, + "sager_unassigned": sager_unassigned, + } + + +def get_active_timer(user_id: Optional[int]) -> Dict[str, Any]: + if user_id is None: + return { + "active": False, + "sag_id": None, + "sag_navn": None, + "start_tid": None, + "elapsed": 0, + "elapsed_hhmmss": "00:00:00", + "time_entry_id": None, + } + + timer = execute_query_single( + """ + SELECT + t.id, + t.sag_id, + s.titel AS sag_navn, + t.start_tid, + GREATEST(EXTRACT(EPOCH FROM (NOW() - t.start_tid))::int, 0) AS elapsed + FROM tmodule_times t + LEFT JOIN sag_sager s ON s.id = t.sag_id + WHERE t.medarbejder_id = %s + AND t.aktiv_timer = TRUE + AND t.slut_tid IS NULL + ORDER BY t.start_tid DESC NULLS LAST, t.id DESC + LIMIT 1 + """, + (user_id,), + ) + + if not timer: + return { + "active": False, + "sag_id": None, + "sag_navn": None, + "start_tid": None, + "elapsed": 0, + "elapsed_hhmmss": "00:00:00", + "time_entry_id": None, + } + + elapsed = int(timer.get("elapsed") or 0) + return { + "active": True, + "sag_id": timer.get("sag_id"), + "sag_navn": timer.get("sag_navn"), + "start_tid": timer.get("start_tid"), + "elapsed": elapsed, + "elapsed_hhmmss": _format_elapsed(elapsed), + "time_entry_id": timer.get("id"), + } + + +def get_notifications(user_id: Optional[int], limit: int = 20) -> Dict[str, Any]: + if user_id is None: + return {"items": [], "count": 0} + + limit_safe = max(1, min(int(limit or 20), 100)) + + reminders = execute_query( + """ + SELECT + r.id, + r.sag_id, + r.title, + r.message, + r.priority, + r.event_type, + r.next_check_at, + s.titel AS case_title, + c.name AS customer_name + FROM sag_reminders r + JOIN sag_sager s ON r.sag_id = s.id + JOIN customers c ON s.customer_id = c.id + LEFT JOIN LATERAL ( + SELECT id, snoozed_until, status, triggered_at + FROM sag_reminder_logs + WHERE reminder_id = r.id AND user_id = %s + ORDER BY triggered_at DESC + LIMIT 1 + ) l ON true + WHERE r.is_active = TRUE + AND r.deleted_at IS NULL + AND r.next_check_at <= CURRENT_TIMESTAMP + AND %s = ANY(r.recipient_user_ids) + AND (l.snoozed_until IS NULL OR l.snoozed_until < CURRENT_TIMESTAMP) + AND (l.status IS NULL OR l.status != 'dismissed') + ORDER BY + CASE LOWER(COALESCE(r.priority, 'normal')) + WHEN 'urgent' THEN 1 + WHEN 'high' THEN 2 + WHEN 'normal' THEN 3 + ELSE 4 + END, + r.next_check_at ASC + LIMIT %s + """, + (user_id, user_id, limit_safe), + ) or [] + + unread_mail_count = _safe_count( + execute_query_single( + """ + SELECT COUNT(*) AS count + FROM email_messages em + WHERE em.deleted_at IS NULL + AND COALESCE(em.is_read, FALSE) = FALSE + """ + ) + ) + + items: List[Dict[str, Any]] = [] + + if unread_mail_count > 0: + items.append( + { + "id": f"mail-unread-{unread_mail_count}", + "type": "mail", + "severity": "medium" if unread_mail_count < 10 else "high", + "title": f"{unread_mail_count} ulæste mails", + "message": "Der er ulæste mails i indbakken", + "action": "/emails", + "created_at": datetime.now(timezone.utc).isoformat(), + } + ) + + for row in reminders: + priority = str(row.get("priority") or "normal").lower() + severity = "low" + if priority in {"high", "høj"}: + severity = "medium" + if priority in {"urgent", "critical", "kritisk"}: + severity = "high" + + items.append( + { + "id": f"reminder-{row.get('id')}", + "type": row.get("event_type") or "reminder", + "severity": severity, + "title": row.get("title") or "Påmindelse", + "message": row.get("message") or row.get("case_title") or "", + "sag_id": row.get("sag_id"), + "case_title": row.get("case_title"), + "customer_name": row.get("customer_name"), + "action": f"/sag/{row.get('sag_id')}" if row.get("sag_id") else "/sag", + "created_at": row.get("next_check_at"), + } + ) + + items.sort( + key=lambda item: ( + {"high": 0, "medium": 1, "low": 2}.get(str(item.get("severity") or "low"), 3), + str(item.get("created_at") or ""), + ) + ) + + return {"items": items[:limit_safe], "count": len(items)} + + +def _context_actions_for_path(context_path: str) -> Dict[str, Any]: + normalized = str(context_path or "").strip().lower() + + payload: Dict[str, Any] = { + "context_key": "global", + "global": [ + {"id": "new_case", "label": "Ny sag", "action": "/sag"}, + {"id": "new_mail", "label": "Ny mail", "action": "/emails"}, + {"id": "start_timer", "label": "Start timer", "action": "/timetracking"}, + {"id": "log_time", "label": "Log tid", "action": "/timetracking"}, + {"id": "add_note", "label": "Tilføj note", "action": "/sag"}, + ], + "context": [], + } + + if normalized.startswith("/sag"): + payload["context_key"] = "sag" + payload["context"] = [ + {"id": "case_time", "label": "Tid", "action": "/timetracking"}, + {"id": "case_mail", "label": "Mail", "action": "/emails"}, + {"id": "case_relation", "label": "Relation", "action": "/customers"}, + {"id": "case_tag", "label": "Tag", "action": "/tags"}, + ] + elif normalized.startswith("/hardware"): + payload["context_key"] = "hardware" + payload["context"] = [ + {"id": "hardware_new", "label": "Ny enhed", "action": "/hardware"}, + {"id": "hardware_history", "label": "Historik", "action": "/hardware"}, + {"id": "hardware_link_case", "label": "Tilknyt sag", "action": "/sag"}, + ] + + return payload + + +def build_bottom_bar_state( + user_id: Optional[int], + context_path: str = "", + force_boss_access: bool = False, +) -> Dict[str, Any]: + enabled = is_bottom_bar_enabled(user_id) + if not enabled: + return {"enabled": False, "sections": {}} + + status = get_dashboard_status() + timer = get_active_timer(user_id) + notifications = get_notifications(user_id, limit=10) + + urgent_cases = execute_query( + """ + SELECT id, titel + FROM sag_sager + WHERE deleted_at IS NULL + AND LOWER(COALESCE(status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + AND LOWER(COALESCE(priority, 'normal')) IN ('urgent', 'high', 'kritisk', 'critical') + ORDER BY updated_at DESC NULLS LAST, id DESC + LIMIT 5 + """ + ) or [] + + open_cases = execute_query( + """ + SELECT id, titel + FROM sag_sager + WHERE deleted_at IS NULL + AND LOWER(COALESCE(status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + ORDER BY updated_at DESC NULLS LAST, id DESC + LIMIT 5 + """ + ) or [] + + timer_list: List[Dict[str, Any]] = [] + if timer.get("active"): + timer_list.append( + { + "id": timer.get("time_entry_id"), + "sag_id": timer.get("sag_id"), + "desc": timer.get("sag_navn") or f"Sag #{timer.get('sag_id')}", + "elapsed": timer.get("elapsed"), + "elapsed_hhmmss": timer.get("elapsed_hhmmss"), + } + ) + + messages = [ + { + "from": "System", + "text": f"{notifications.get('count', 0)} aktive notifikationer", + } + ] + + tasks = [] + for n in (notifications.get("items") or [])[:5]: + tasks.append( + { + "title": n.get("title") or "Notifikation", + "deadline": n.get("severity") or "info", + "action": n.get("action") or "/", + } + ) + + context_actions = _context_actions_for_path(context_path) + can_view_boss = bool(force_boss_access) or _can_view_boss_tab(user_id) + + team_workload: List[Dict[str, Any]] = [] + technicians_today: List[Dict[str, Any]] = [] + escalation_cases: List[Dict[str, Any]] = [] + unassigned_cases: List[Dict[str, Any]] = [] + + if can_view_boss: + team_workload = execute_query( + """ + SELECT + u.user_id, + COALESCE(NULLIF(u.full_name, ''), u.username, ('Bruger #' || u.user_id::text)) AS owner_name, + COUNT(s.id)::int AS open_cases, + COUNT(CASE WHEN LOWER(COALESCE(s.priority, 'normal')) IN ('urgent', 'high', 'kritisk', 'critical') THEN 1 END)::int AS urgent_cases + FROM users u + LEFT JOIN sag_sager s + ON s.ansvarlig_bruger_id = u.user_id + AND s.deleted_at IS NULL + AND LOWER(COALESCE(s.status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + GROUP BY u.user_id, u.full_name, u.username + HAVING COUNT(s.id) > 0 + ORDER BY urgent_cases DESC, open_cases DESC, owner_name ASC + LIMIT 8 + """ + ) or [] + + technicians_today = execute_query( + """ + SELECT + u.user_id, + COALESCE(NULLIF(u.full_name, ''), u.username, ('Bruger #' || u.user_id::text)) AS owner_name, + COUNT(s.id)::int AS open_cases, + COUNT(CASE WHEN s.deadline::date = CURRENT_DATE THEN 1 END)::int AS due_today_cases, + COALESCE( + ( + SELECT json_agg( + json_build_object( + 'id', t.id, + 'title', t.titel, + 'priority', COALESCE(t.priority, 'normal'), + 'deadline', t.deadline + ) + ORDER BY + CASE WHEN t.deadline::date = CURRENT_DATE THEN 0 ELSE 1 END, + COALESCE(t.deadline, t.updated_at, t.created_at) ASC, + t.id ASC + ) + FROM ( + SELECT s2.id, s2.titel, s2.priority, s2.deadline, s2.updated_at, s2.created_at + FROM sag_sager s2 + WHERE s2.ansvarlig_bruger_id = u.user_id + AND s2.deleted_at IS NULL + AND LOWER(COALESCE(s2.status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + AND ( + s2.deadline::date = CURRENT_DATE + OR s2.created_at::date = CURRENT_DATE + ) + ORDER BY + CASE WHEN s2.deadline::date = CURRENT_DATE THEN 0 ELSE 1 END, + COALESCE(s2.deadline, s2.updated_at, s2.created_at) ASC, + s2.id ASC + LIMIT 6 + ) t + ), + '[]'::json + ) AS today_tasks + FROM users u + LEFT JOIN sag_sager s + ON s.ansvarlig_bruger_id = u.user_id + AND s.deleted_at IS NULL + AND LOWER(COALESCE(s.status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + WHERE EXISTS ( + SELECT 1 + FROM user_groups ug + JOIN groups g ON g.id = ug.group_id + WHERE ug.user_id = u.user_id + AND LOWER(g.name) LIKE ANY(ARRAY['%teknik%', '%technician%', '%support%']) + ) + GROUP BY u.user_id, u.full_name, u.username + ORDER BY due_today_cases DESC, open_cases DESC, owner_name ASC + LIMIT 10 + """ + ) or [] + + escalation_cases = execute_query( + """ + SELECT + s.id, + s.titel, + s.priority, + s.updated_at, + EXTRACT(EPOCH FROM (NOW() - COALESCE(s.updated_at, s.created_at)))::int AS age_seconds, + COALESCE(NULLIF(u.full_name, ''), u.username, 'Ikke tildelt') AS owner_name + FROM sag_sager s + LEFT JOIN users u ON u.user_id = s.ansvarlig_bruger_id + WHERE s.deleted_at IS NULL + AND LOWER(COALESCE(s.status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + AND LOWER(COALESCE(s.priority, 'normal')) IN ('urgent', 'high', 'kritisk', 'critical') + AND NOW() - COALESCE(s.updated_at, s.created_at) > INTERVAL '24 hours' + ORDER BY COALESCE(s.updated_at, s.created_at) ASC + LIMIT 8 + """ + ) or [] + + unassigned_cases = execute_query( + """ + SELECT + s.id, + s.titel, + s.priority, + s.created_at, + s.updated_at + FROM sag_sager s + WHERE s.deleted_at IS NULL + AND LOWER(COALESCE(s.status, '')) NOT IN ('lukket', 'løst', 'closed', 'resolved') + AND s.ansvarlig_bruger_id IS NULL + ORDER BY COALESCE(s.updated_at, s.created_at) DESC + LIMIT 8 + """ + ) or [] + + sections = { + "mail": { + "unread": status.get("mails_unread", 0), + "customer_reply_needed": status.get("mails_unread", 0), + }, + "cases": { + "open": status.get("sager_open", 0), + "list": [{"id": row.get("id"), "title": row.get("titel") or f"Sag #{row.get('id')}"} for row in open_cases], + }, + "urgent": { + "count": status.get("sager_urgent", 0), + "list": [{"id": row.get("id"), "title": row.get("titel") or f"Sag #{row.get('id')}"} for row in urgent_cases], + }, + "unassigned": { + "count": status.get("sager_unassigned", 0), + }, + "timer": { + "active_count": 1 if timer.get("active") else 0, + "list": timer_list, + "active": timer, + }, + "kuma": { + "down": 0, + "list": [], + }, + "eset": { + "incidents": 0, + "list": [], + }, + "messages": { + "count": len(messages), + "list": messages, + }, + "tasks": { + "count": len(tasks), + "list": tasks, + }, + "boss": { + "can_view": can_view_boss, + "stats": { + "unassigned": status.get("sager_unassigned", 0), + "active_employees": _safe_count( + execute_query_single( + "SELECT COUNT(*) AS count FROM tmodule_times WHERE aktiv_timer = TRUE AND slut_tid IS NULL" + ) + ), + "open_cases": status.get("sager_open", 0), + "urgent_cases": status.get("sager_urgent", 0), + "stale_urgent_cases": len(escalation_cases), + } + , + "team_workload": [ + { + "user_id": row.get("user_id"), + "owner_name": row.get("owner_name"), + "open_cases": int(row.get("open_cases") or 0), + "urgent_cases": int(row.get("urgent_cases") or 0), + } + for row in team_workload + ], + "technicians_today": [ + { + "user_id": row.get("user_id"), + "owner_name": row.get("owner_name"), + "open_cases": int(row.get("open_cases") or 0), + "due_today_cases": int(row.get("due_today_cases") or 0), + "today_tasks": row.get("today_tasks") or [], + } + for row in technicians_today + ], + "escalations": [ + { + "id": row.get("id"), + "title": row.get("titel") or f"Sag #{row.get('id')}", + "priority": row.get("priority") or "normal", + "owner_name": row.get("owner_name") or "Ikke tildelt", + "age_seconds": int(row.get("age_seconds") or 0), + } + for row in escalation_cases + ], + "unassigned_cases": [ + { + "id": row.get("id"), + "title": row.get("titel") or f"Sag #{row.get('id')}", + "priority": row.get("priority") or "normal", + } + for row in unassigned_cases + ], + }, + "context_actions": context_actions, + } + + return { + "enabled": True, + "sections": sections, + "status": status, + "active_timer": timer, + "notifications": notifications, + } diff --git a/app/modules/bottom_bar/module.json b/app/modules/bottom_bar/module.json new file mode 100644 index 0000000..f9faefb --- /dev/null +++ b/app/modules/bottom_bar/module.json @@ -0,0 +1,11 @@ +{ + "name": "bottom_bar", + "version": "1.0.0", + "description": "Global activity bottom bar module", + "author": "BMC Networks", + "enabled": true, + "dependencies": [], + "table_prefix": "bottom_bar_", + "api_prefix": "/api/v1", + "tags": ["Bottom Bar"] +} diff --git a/app/modules/hardware/frontend/views.py b/app/modules/hardware/frontend/views.py index 4a6160f..84b592b 100644 --- a/app/modules/hardware/frontend/views.py +++ b/app/modules/hardware/frontend/views.py @@ -221,52 +221,130 @@ async def hardware_list( request: Request, status: str = Query(None), asset_type: str = Query(None), + rental_scope: str = Query(None), customer_id: int = Query(None), q: str = Query(None) ): - """Display list of all hardware.""" - query = "SELECT * FROM hardware_assets WHERE deleted_at IS NULL" + """Display list of BMC-owned assets only.""" + query = """ + SELECT + ha.*, + c.name AS customer_name, + CASE + WHEN EXISTS ( + SELECT 1 + FROM subscription_asset_bindings b + WHERE b.asset_id = ha.id + AND b.deleted_at IS NULL + AND b.status = 'active' + AND (b.end_date IS NULL OR b.end_date >= CURRENT_DATE) + ) THEN true + ELSE false + END AS is_currently_rented + FROM hardware_assets ha + LEFT JOIN customers c ON c.id = ha.current_owner_customer_id + WHERE ha.deleted_at IS NULL + AND ha.current_owner_type = 'bmc' + """ params = [] if status: - query += " AND status = %s" + query += " AND ha.status = %s" params.append(status) if asset_type: - query += " AND asset_type = %s" + query += " AND ha.asset_type = %s" params.append(asset_type) if customer_id: - query += " AND current_owner_customer_id = %s" + query += " AND ha.current_owner_customer_id = %s" params.append(customer_id) if q: - query += " AND (serial_number ILIKE %s OR model ILIKE %s OR brand ILIKE %s)" + query += " AND (ha.serial_number ILIKE %s OR ha.model ILIKE %s OR ha.brand ILIKE %s OR ha.internal_asset_id ILIKE %s)" search_param = f"%{q}%" - params.extend([search_param, search_param, search_param]) + params.extend([search_param, search_param, search_param, search_param]) - query += " ORDER BY created_at DESC" + if rental_scope == "rented": + query += """ + AND EXISTS ( + SELECT 1 + FROM subscription_asset_bindings b + WHERE b.asset_id = ha.id + AND b.deleted_at IS NULL + AND b.status = 'active' + AND (b.end_date IS NULL OR b.end_date >= CURRENT_DATE) + ) + """ + elif rental_scope == "not_rented": + query += """ + AND NOT EXISTS ( + SELECT 1 + FROM subscription_asset_bindings b + WHERE b.asset_id = ha.id + AND b.deleted_at IS NULL + AND b.status = 'active' + AND (b.end_date IS NULL OR b.end_date >= CURRENT_DATE) + ) + """ + + query += " ORDER BY ha.created_at DESC" hardware = execute_query(query, tuple(params)) - # Get customer names for display - if hardware: - customer_ids = [h['current_owner_customer_id'] for h in hardware if h.get('current_owner_customer_id')] - if customer_ids: - customer_query = "SELECT id, name AS navn FROM customers WHERE id = ANY(%s)" - customers = execute_query(customer_query, (customer_ids,)) - customer_map = {c['id']: c['navn'] for c in customers} if customers else {} - - # Add customer names to hardware - for h in hardware: - if h.get('current_owner_customer_id'): - h['customer_name'] = customer_map.get(h['current_owner_customer_id'], 'Unknown') - return templates.TemplateResponse("modules/hardware/templates/index.html", { "request": request, "hardware": hardware, "current_status": status, "current_asset_type": asset_type, + "current_rental_scope": rental_scope, "search_query": q }) +@router.get("/hardware/customers", response_class=HTMLResponse) +async def customer_hardware_list( + request: Request, + status: str = Query(None), + asset_type: str = Query(None), + customer_id: int = Query(None), + q: str = Query(None) +): + """Display customer-owned hardware on dedicated page.""" + query = """ + SELECT + ha.*, + c.name AS customer_name + FROM hardware_assets ha + LEFT JOIN customers c ON c.id = ha.current_owner_customer_id + WHERE ha.deleted_at IS NULL + AND ha.current_owner_type = 'customer' + """ + params = [] + + if status: + query += " AND ha.status = %s" + params.append(status) + if asset_type: + query += " AND ha.asset_type = %s" + params.append(asset_type) + if customer_id: + query += " AND ha.current_owner_customer_id = %s" + params.append(customer_id) + if q: + query += " AND (ha.serial_number ILIKE %s OR ha.model ILIKE %s OR ha.brand ILIKE %s OR ha.internal_asset_id ILIKE %s OR c.name ILIKE %s)" + search_param = f"%{q}%" + params.extend([search_param, search_param, search_param, search_param, search_param]) + + query += " ORDER BY c.name ASC NULLS LAST, ha.created_at DESC" + customer_hardware = execute_query(query, tuple(params)) + + return templates.TemplateResponse("modules/hardware/templates/customers.html", { + "request": request, + "hardware": customer_hardware, + "current_status": status, + "current_asset_type": asset_type, + "search_query": q, + "current_customer_id": customer_id, + }) + + @router.get("/hardware/new", response_class=HTMLResponse) async def create_hardware_form(request: Request): """Display create hardware form.""" @@ -358,7 +436,7 @@ async def hardware_eset_import(request: Request): }) -@router.get("/hardware/{hardware_id}", response_class=HTMLResponse) +@router.get("/hardware/{hardware_id:int}", response_class=HTMLResponse) async def hardware_detail(request: Request, hardware_id: int): """Display hardware details.""" # Get hardware @@ -507,7 +585,7 @@ async def hardware_detail(request: Request, hardware_id: int): }) -@router.get("/hardware/{hardware_id}/edit", response_class=HTMLResponse) +@router.get("/hardware/{hardware_id:int}/edit", response_class=HTMLResponse) async def edit_hardware_form(request: Request, hardware_id: int): """Display edit hardware form.""" # Get hardware @@ -528,7 +606,7 @@ async def edit_hardware_form(request: Request, hardware_id: int): }) -@router.post("/hardware/{hardware_id}/location") +@router.post("/hardware/{hardware_id:int}/location") async def update_hardware_location( request: Request, hardware_id: int, @@ -574,7 +652,7 @@ async def update_hardware_location( return RedirectResponse(url=f"/hardware/{hardware_id}", status_code=303) -@router.post("/hardware/{hardware_id}/owner") +@router.post("/hardware/{hardware_id:int}/owner") async def update_hardware_owner( request: Request, hardware_id: int, @@ -649,7 +727,7 @@ async def update_hardware_owner( return RedirectResponse(url=f"/hardware/{hardware_id}", status_code=303) -@router.post("/hardware/{hardware_id}/contacts/add") +@router.post("/hardware/{hardware_id:int}/contacts/add") async def add_hardware_contact( request: Request, hardware_id: int, @@ -671,7 +749,7 @@ async def add_hardware_contact( return RedirectResponse(url=f"/hardware/{hardware_id}", status_code=303) -@router.post("/hardware/{hardware_id}/contacts/{contact_id}/delete") +@router.post("/hardware/{hardware_id:int}/contacts/{contact_id:int}/delete") async def remove_hardware_contact( request: Request, hardware_id: int, diff --git a/app/modules/hardware/templates/customers.html b/app/modules/hardware/templates/customers.html new file mode 100644 index 0000000..9430d05 --- /dev/null +++ b/app/modules/hardware/templates/customers.html @@ -0,0 +1,104 @@ +{% extends "shared/frontend/base.html" %} + +{% block title %}Kundehardware - BMC Hub{% endblock %} + +{% block content %} +
+

Kundehardware

+
+ BMC Assets + Nyt Hardware +
+
+ +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+
+ +{% if hardware and hardware|length > 0 %} +
+
+
+ + + + + + + + + + + + + + {% for item in hardware %} + + + + + + + + + + {% endfor %} + +
HardwareKundeTypeSerienr.StatusAnyDeskHandling
{{ item.brand or 'Unknown' }} {{ item.model or '' }}{{ item.customer_name or 'Ukendt kunde' }}{{ item.asset_type|title }}{{ item.serial_number or 'Ingen serienummer' }}{{ item.status|replace('_', ' ')|title }} + {% if item.anydesk_link %} + {{ item.anydesk_id or 'Åbn' }} + {% elif item.anydesk_id %} + {{ item.anydesk_id }} + {% else %} + — + {% endif %} + + Se + Rediger +
+
+
+
+{% else %} +
+
Ingen kundehardware fundet
+

Der er ingen kundeejede enheder, der matcher filtre.

+
+{% endif %} +{% endblock %} diff --git a/app/modules/hardware/templates/index.html b/app/modules/hardware/templates/index.html index 832e074..879265e 100644 --- a/app/modules/hardware/templates/index.html +++ b/app/modules/hardware/templates/index.html @@ -242,8 +242,12 @@ {% block content %}
-

🖥️ Hardware Oversigt

+

🗂️ BMC Assets Oversigt (Kun vores egne)

+ + + Kundehardware + ESET Oversigt @@ -285,6 +289,15 @@
+
+ + +
+
@@ -362,6 +375,16 @@ {{ item.internal_asset_id }}
{% endif %} +
+ Udlejning: + + {% if item.is_currently_rented %} + Udlejet + {% else %} + Ledig/Intern + {% endif %} + +
@@ -387,6 +410,7 @@ Type Serienr. Ejer + Udlejning Status AnyDesk Handling @@ -399,6 +423,13 @@ {{ item.asset_type|title }} {{ item.serial_number or 'Ingen serienummer' }} {{ item.customer_name or (item.current_owner_type|title if item.current_owner_type else '—') }} + + {% if item.is_currently_rented %} + Udlejet + {% else %} + Ledig/Intern + {% endif %} + {{ item.status|replace('_', ' ')|title }} @@ -426,17 +457,18 @@ {% else %}
🖥️
-

Ingen hardware fundet

-

Opret dit første hardware asset for at komme i gang.

+

Ingen BMC assets fundet

+

Opret dit første interne asset for at komme i gang.

➕ Opret Hardware
{% endif %} + {% endblock %} {% block extra_js %} + diff --git a/app/subscriptions/backend/router.py b/app/subscriptions/backend/router.py index 36a40c7..4fb563d 100644 --- a/app/subscriptions/backend/router.py +++ b/app/subscriptions/backend/router.py @@ -23,6 +23,7 @@ ALLOWED_STATUSES = {"draft", "active", "paused", "cancelled"} STAGING_KEY_SQL = "COALESCE(source_account_id, 'name:' || LOWER(COALESCE(source_customer_name, 'ukendt')))" ALLOWED_BILLING_DIRECTIONS = {"forward", "backward"} ALLOWED_PRICE_CHANGE_STATUSES = {"pending", "approved", "rejected", "applied"} +ALLOWED_BILLING_INTERVALS = {"daily", "biweekly", "monthly", "quarterly", "yearly"} def _staging_status_with_mapping(status: str, has_customer: bool) -> str: @@ -74,6 +75,110 @@ def _next_invoice_date(start_date: date, interval: str) -> date: return start_date + relativedelta(months=1) +def _ensure_asset_not_booked(asset_id: int, start_dt: date, end_dt: Optional[date], exclude_subscription_id: Optional[int] = None): + """Prevent overlapping asset usage across active/draft/paused subscriptions.""" + if end_dt and end_dt < start_dt: + raise HTTPException(status_code=400, detail="period_to cannot be before period_from") + + params: List[Any] = [asset_id, start_dt, end_dt] + exclude_sql = "" + if exclude_subscription_id: + exclude_sql = " AND s.id <> %s" + params.append(exclude_subscription_id) + + conflict = execute_query_single( + f""" + SELECT + s.id AS subscription_id, + i.id AS line_item_id, + COALESCE(i.period_from, s.start_date) AS existing_period_from, + COALESCE(i.period_to, s.end_date) AS existing_period_to + FROM sag_subscription_items i + JOIN sag_subscriptions s ON s.id = i.subscription_id + WHERE i.asset_id = %s + AND s.status IN ('draft', 'active', 'paused') + AND daterange(COALESCE(i.period_from, s.start_date), COALESCE(i.period_to, s.end_date, 'infinity'::date), '[]') + && daterange(%s, COALESCE(%s, 'infinity'::date), '[]') + {exclude_sql} + LIMIT 1 + """, + tuple(params), + ) + if conflict: + raise HTTPException( + status_code=400, + detail=( + "Asset is already booked in overlapping period " + f"(subscription_id={conflict.get('subscription_id')}, line_item_id={conflict.get('line_item_id')})" + ), + ) + + +def _ensure_binding_not_overlapping(asset_id: int, start_dt: date, end_dt: Optional[date], exclude_binding_id: Optional[int] = None): + """Prevent overlapping active rows in subscription_asset_bindings for the same asset.""" + if end_dt and end_dt < start_dt: + raise HTTPException(status_code=400, detail="end_date cannot be before start_date") + + params: List[Any] = [asset_id, start_dt, end_dt] + exclude_sql = "" + if exclude_binding_id: + exclude_sql = " AND b.id <> %s" + params.append(exclude_binding_id) + + conflict = execute_query_single( + f""" + SELECT b.id + FROM subscription_asset_bindings b + WHERE b.asset_id = %s + AND b.deleted_at IS NULL + AND b.status = 'active' + AND daterange(b.start_date, COALESCE(b.end_date, 'infinity'::date), '[]') + && daterange(%s, COALESCE(%s, 'infinity'::date), '[]') + {exclude_sql} + LIMIT 1 + """, + tuple(params), + ) + if conflict: + raise HTTPException( + status_code=400, + detail=f"Asset already has an overlapping active binding (binding_id={conflict.get('id')})", + ) + + +def _sync_asset_rental_status(asset_id: int): + """Keep hardware_assets.rental_status aligned with active subscription bindings.""" + active_binding = execute_query_single( + """ + SELECT b.id + FROM subscription_asset_bindings b + JOIN sag_subscriptions s ON s.id = b.subscription_id + WHERE b.asset_id = %s + AND b.deleted_at IS NULL + AND b.status = 'active' + AND s.status IN ('draft', 'active', 'paused') + AND (b.end_date IS NULL OR b.end_date >= CURRENT_DATE) + LIMIT 1 + """, + (asset_id,), + ) + + target_status = "udlejet" if active_binding else "ledig" + execute_query( + """ + UPDATE hardware_assets + SET rental_status = CASE + WHEN rental_status = 'defekt' THEN rental_status + ELSE %s + END, + updated_at = CURRENT_TIMESTAMP + WHERE id = %s + AND deleted_at IS NULL + """, + (target_status, asset_id), + ) + + def _auto_map_customer(account_id: Optional[str], customer_name: Optional[str], customer_cvr: Optional[str]) -> Optional[int]: if account_id: row = execute_query_single( @@ -168,6 +273,9 @@ async def create_subscription(payload: Dict[str, Any]): billing_day = payload.get("billing_day") start_date = payload.get("start_date") billing_direction = (payload.get("billing_direction") or "forward").strip().lower() + price_type = (payload.get("price_type") or "manual").strip().lower() + custom_price_override = bool(payload.get("custom_price_override")) + first_invoice_policy = (payload.get("first_invoice_policy") or "start_date").strip().lower() advance_months = int(payload.get("advance_months") or 1) first_full_period_start = payload.get("first_full_period_start") binding_months = int(payload.get("binding_months") or 0) @@ -189,13 +297,23 @@ async def create_subscription(payload: Dict[str, Any]): raise HTTPException(status_code=400, detail="start_date is required") if not line_items: raise HTTPException(status_code=400, detail="line_items is required") + if billing_interval not in ALLOWED_BILLING_INTERVALS: + raise HTTPException(status_code=400, detail="billing_interval must be daily/biweekly/monthly/quarterly/yearly") if billing_direction not in ALLOWED_BILLING_DIRECTIONS: raise HTTPException(status_code=400, detail="billing_direction must be forward or backward") + if price_type not in {"manual", "day", "week", "month", "year"}: + raise HTTPException(status_code=400, detail="price_type must be manual/day/week/month/year") + if first_invoice_policy not in {"start_date", "next_cycle"}: + raise HTTPException(status_code=400, detail="first_invoice_policy must be start_date or next_cycle") if advance_months < 1 or advance_months > 24: raise HTTPException(status_code=400, detail="advance_months must be between 1 and 24") if binding_months < 0: raise HTTPException(status_code=400, detail="binding_months must be >= 0") + start_dt = _safe_date(start_date) + if not start_dt: + raise HTTPException(status_code=400, detail="start_date must be a valid date") + sag = execute_query_single( "SELECT id, customer_id FROM sag_sager WHERE id = %s", (sag_id,) @@ -229,6 +347,7 @@ async def create_subscription(payload: Dict[str, Any]): product_map = {row["id"]: row for row in (rows or [])} cleaned_items = [] + line_asset_ranges: Dict[int, List[tuple[date, Optional[date]]]] = {} total_price = 0 blocked_reasons = [] for idx, item in enumerate(line_items, start=1): @@ -240,6 +359,10 @@ async def create_subscription(payload: Dict[str, Any]): serial_number = (item.get("serial_number") or "").strip() or None period_from = item.get("period_from") period_to = item.get("period_to") + period_from_dt = _safe_date(period_from) or start_dt + period_to_dt = _safe_date(period_to) + if period_to_dt and period_to_dt < period_from_dt: + raise HTTPException(status_code=400, detail="line_items period_to cannot be before period_from") product = product_map.get(product_id) if not description and product: @@ -261,6 +384,21 @@ async def create_subscription(payload: Dict[str, Any]): ) if not asset: raise HTTPException(status_code=400, detail=f"asset_id {asset_id} was not found") + _ensure_asset_not_booked(asset_id, period_from_dt, period_to_dt) + + existing_ranges = line_asset_ranges.get(int(asset_id), []) + for existing_start, existing_end in existing_ranges: + latest_start = max(existing_start, period_from_dt) + effective_existing_end = existing_end or date.max + effective_new_end = period_to_dt or date.max + earliest_end = min(effective_existing_end, effective_new_end) + if latest_start <= earliest_end: + raise HTTPException( + status_code=400, + detail=f"line_items contains overlapping periods for asset_id {asset_id}", + ) + existing_ranges.append((period_from_dt, period_to_dt)) + line_asset_ranges[int(asset_id)] = existing_ranges requires_asset = bool(product and product.get("asset_required")) requires_serial_number = bool(product and product.get("serial_number_required")) @@ -286,6 +424,8 @@ async def create_subscription(payload: Dict[str, Any]): "line_total": line_total, "period_from": period_from, "period_to": period_to, + "price_type": (item.get("price_type") or price_type or "manual"), + "custom_price_override": bool(item.get("custom_price_override", custom_price_override)), "requires_serial_number": requires_serial_number, "serial_number": serial_number, "billing_blocked": billing_blocked, @@ -308,7 +448,6 @@ async def create_subscription(payload: Dict[str, Any]): # Calculate next_invoice_date based on billing_interval - start_dt = datetime.strptime(start_date, "%Y-%m-%d").date() period_start = start_dt # Calculate next invoice date @@ -349,6 +488,9 @@ async def create_subscription(payload: Dict[str, Any]): binding_group_key, billing_blocked, billing_block_reason, + price_type, + custom_price_override, + first_invoice_policy, invoice_merge_key, price_change_case_id, renewal_case_id, @@ -357,7 +499,7 @@ async def create_subscription(payload: Dict[str, Any]): ) VALUES ( %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, - %s, 'draft', %s + %s, %s, %s, %s, 'draft', %s ) RETURNING * """, @@ -380,6 +522,9 @@ async def create_subscription(payload: Dict[str, Any]): binding_group_key, billing_blocked, billing_block_reason, + price_type, + custom_price_override, + first_invoice_policy, invoice_merge_key, price_change_case_id, renewal_case_id, @@ -402,11 +547,13 @@ async def create_subscription(payload: Dict[str, Any]): line_total, period_from, period_to, + price_type, + custom_price_override, requires_serial_number, serial_number, billing_blocked, billing_block_reason - ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) + ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) """, ( subscription["id"], @@ -419,6 +566,8 @@ async def create_subscription(payload: Dict[str, Any]): item["line_total"], item["period_from"], item["period_to"], + item["price_type"], + item["custom_price_override"], item["requires_serial_number"], item["serial_number"], item["billing_blocked"], @@ -544,6 +693,7 @@ async def update_subscription(subscription_id: int, payload: Dict[str, Any]): "billing_direction", "advance_months", "first_full_period_start", "binding_months", "binding_start_date", "binding_end_date", "binding_group_key", "billing_blocked", "billing_block_reason", "invoice_merge_key", + "price_type", "custom_price_override", "first_invoice_policy", "price_change_case_id", "renewal_case_id" } @@ -601,9 +751,10 @@ async def update_subscription(subscription_id: int, payload: Dict[str, Any]): subscription_id, line_no, description, quantity, unit_price, line_total, product_id, asset_id, period_from, period_to, + price_type, custom_price_override, requires_serial_number, serial_number, billing_blocked, billing_block_reason - ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) + ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) """, ( subscription_id, idx, description, @@ -612,6 +763,8 @@ async def update_subscription(subscription_id: int, payload: Dict[str, Any]): item.get("asset_id"), item.get("period_from"), item.get("period_to"), + item.get("price_type", "manual"), + bool(item.get("custom_price_override")), bool(item.get("requires_serial_number")), item.get("serial_number"), bool(item.get("billing_blocked")), @@ -1080,6 +1233,8 @@ async def create_subscription_asset_binding(subscription_id: int, payload: Dict[ if not end_date and binding_months > 0: end_date = start_date + relativedelta(months=binding_months) + _ensure_binding_not_overlapping(asset_id, start_date, end_date) + result = execute_query( """ INSERT INTO subscription_asset_bindings ( @@ -1111,6 +1266,8 @@ async def create_subscription_asset_binding(subscription_id: int, payload: Dict[ if not result: raise HTTPException(status_code=500, detail="Could not create binding") + _sync_asset_rental_status(asset_id) + execute_query( """ UPDATE sag_subscription_items @@ -1165,6 +1322,23 @@ async def update_subscription_asset_binding(binding_id: int, payload: Dict[str, raise HTTPException(status_code=404, detail="Binding not found") return existing + existing = execute_query_single( + "SELECT * FROM subscription_asset_bindings WHERE id = %s AND deleted_at IS NULL", + (binding_id,), + ) + if not existing: + raise HTTPException(status_code=404, detail="Binding not found") + + status_for_overlap = payload.get("status", existing.get("status")) + start_for_overlap = _safe_date(payload.get("start_date")) or _safe_date(existing.get("start_date")) or date.today() + end_for_overlap = _safe_date(payload.get("end_date")) + if end_for_overlap is None: + end_for_overlap = _safe_date(existing.get("end_date")) + asset_for_overlap = int(existing.get("asset_id")) + + if status_for_overlap == "active": + _ensure_binding_not_overlapping(asset_for_overlap, start_for_overlap, end_for_overlap, exclude_binding_id=binding_id) + values.append(binding_id) result = execute_query( f""" @@ -1179,7 +1353,9 @@ async def update_subscription_asset_binding(binding_id: int, payload: Dict[str, ) if not result: raise HTTPException(status_code=404, detail="Binding not found") - return result[0] + updated = result[0] + _sync_asset_rental_status(int(updated.get("asset_id"))) + return updated except HTTPException: raise except Exception as e: @@ -1204,6 +1380,12 @@ async def delete_subscription_asset_binding(binding_id: int): ) if not result: raise HTTPException(status_code=404, detail="Binding not found") + binding = execute_query_single( + "SELECT asset_id FROM subscription_asset_bindings WHERE id = %s", + (binding_id,) + ) + if binding and binding.get("asset_id"): + _sync_asset_rental_status(int(binding.get("asset_id"))) return {"status": "deleted", "id": result[0].get("id")} except HTTPException: raise diff --git a/list_routes.py b/list_routes.py index 127249b..a9b48dc 100644 --- a/list_routes.py +++ b/list_routes.py @@ -1,16 +1,5 @@ -#!/usr/bin/env python3 -import main - -print("=" * 80) -print("ALL REGISTERED ROUTES") -print("=" * 80) - -for i, route in enumerate(main.app.routes): - if hasattr(route, 'path'): - print(f"{i+1:3}. {route.path:60}") - if 'time' in route.path.lower(): - print(f" ^^^ TIMETRACKING ROUTE ^^^") - else: - print(f"{i+1:3}. {route}") - -print(f"\n Total routes: {len(main.app.routes)}") +from main import app +for route in app.routes: + if hasattr(route, 'methods'): + if '/manual' in route.path: + print(f"{list(route.methods)} {route.path}") diff --git a/list_routes2.py b/list_routes2.py new file mode 100644 index 0000000..3ad51ad --- /dev/null +++ b/list_routes2.py @@ -0,0 +1,5 @@ +from main import app +for route in app.routes: + if hasattr(route, 'methods'): + if '/api/v1/manual' in route.path: + print(f"{list(route.methods)} {route.path}") diff --git a/main.py b/main.py index 8ea8ae3..7505e26 100644 --- a/main.py +++ b/main.py @@ -133,6 +133,9 @@ from app.modules.orders.backend import router as orders_api from app.modules.orders.frontend import views as orders_views from app.modules.manual.backend import router as manual_api from app.modules.manual.frontend import views as manual_views +from app.modules.bottom_bar.backend import router as bottom_bar_api +from app.modules.bottom_bar.backend import public_router as bottom_bar_public_api +from app.modules.rentals.backend import router as rentals_api # Configure logging logging.basicConfig( @@ -446,6 +449,9 @@ app.include_router(telefoni_api.router, prefix="/api/v1", tags=["Telefoni"]) app.include_router(calendar_api.router, prefix="/api/v1", tags=["Calendar"]) app.include_router(orders_api.router, prefix="/api/v1", tags=["Orders"]) app.include_router(manual_api.router, prefix="/api/v1", tags=["Manual"]) +app.include_router(bottom_bar_api.router, prefix="/api/v1/bottom-bar", tags=["Bottom Bar"]) +app.include_router(bottom_bar_public_api.router, tags=["Bottom Bar Public"]) +app.include_router(rentals_api.router, prefix="/api/v1", tags=["Assets Rental Billing"]) if settings.LINKS_MODULE_ENABLED: from app.modules.links.backend import router as links_api diff --git a/migrations/166_bottom_bar_module.sql b/migrations/166_bottom_bar_module.sql new file mode 100644 index 0000000..9743ccb --- /dev/null +++ b/migrations/166_bottom_bar_module.sql @@ -0,0 +1,57 @@ +-- Migration 166: Bottom bar module activation and overrides + +CREATE TABLE IF NOT EXISTS module_role_settings ( + id SERIAL PRIMARY KEY, + module_name VARCHAR(100) NOT NULL, + group_id INTEGER NOT NULL REFERENCES groups(id) ON DELETE CASCADE, + enabled BOOLEAN NOT NULL DEFAULT TRUE, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + UNIQUE (module_name, group_id) +); + +CREATE TABLE IF NOT EXISTS user_module_preferences ( + id SERIAL PRIMARY KEY, + user_id INTEGER NOT NULL REFERENCES users(user_id) ON DELETE CASCADE, + module_name VARCHAR(100) NOT NULL, + enabled BOOLEAN, + collapsed BOOLEAN NOT NULL DEFAULT FALSE, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + UNIQUE (user_id, module_name) +); + +INSERT INTO settings (key, value, category, description, value_type, is_public) +VALUES + ('bottom_bar_enabled', 'false', 'bottom_bar', 'Enable or disable bottom bar globally', 'boolean', false) +ON CONFLICT (key) DO NOTHING; + +-- Default role access: admins, managers and technicians enabled. viewers disabled. +INSERT INTO module_role_settings (module_name, group_id, enabled) +SELECT 'bottom_bar', g.id, + CASE WHEN g.name IN ('Administrators', 'Managers', 'Technicians') THEN TRUE ELSE FALSE END +FROM groups g +ON CONFLICT (module_name, group_id) DO NOTHING; + +CREATE INDEX IF NOT EXISTS idx_module_role_settings_module ON module_role_settings(module_name); +CREATE INDEX IF NOT EXISTS idx_user_module_preferences_user_module ON user_module_preferences(user_id, module_name); + +CREATE OR REPLACE FUNCTION update_module_setting_updated_at() +RETURNS TRIGGER AS $$ +BEGIN + NEW.updated_at = CURRENT_TIMESTAMP; + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +DROP TRIGGER IF EXISTS module_role_settings_updated_at_trigger ON module_role_settings; +CREATE TRIGGER module_role_settings_updated_at_trigger + BEFORE UPDATE ON module_role_settings + FOR EACH ROW + EXECUTE FUNCTION update_module_setting_updated_at(); + +DROP TRIGGER IF EXISTS user_module_preferences_updated_at_trigger ON user_module_preferences; +CREATE TRIGGER user_module_preferences_updated_at_trigger + BEFORE UPDATE ON user_module_preferences + FOR EACH ROW + EXECUTE FUNCTION update_module_setting_updated_at(); diff --git a/migrations/167_rental_pricing_foundation.sql b/migrations/167_rental_pricing_foundation.sql new file mode 100644 index 0000000..f0acc75 --- /dev/null +++ b/migrations/167_rental_pricing_foundation.sql @@ -0,0 +1,35 @@ +-- Migration 167: Rental pricing and asset rental status foundation +-- Adds minimal fields for Assets/Udlejning/Fakturering alias APIs. +-- Note: This migration is schema-only and does NOT perform any e-conomic sync. + +ALTER TABLE products +ADD COLUMN IF NOT EXISTS rental_price_day DECIMAL(10,2) CHECK (rental_price_day IS NULL OR rental_price_day >= 0), +ADD COLUMN IF NOT EXISTS rental_price_week DECIMAL(10,2) CHECK (rental_price_week IS NULL OR rental_price_week >= 0), +ADD COLUMN IF NOT EXISTS rental_price_month DECIMAL(10,2) CHECK (rental_price_month IS NULL OR rental_price_month >= 0), +ADD COLUMN IF NOT EXISTS rental_price_year DECIMAL(10,2) CHECK (rental_price_year IS NULL OR rental_price_year >= 0); + +ALTER TABLE sag_subscriptions +ADD COLUMN IF NOT EXISTS price_type VARCHAR(20) NOT NULL DEFAULT 'manual' + CHECK (price_type IN ('manual', 'day', 'week', 'month', 'year')), +ADD COLUMN IF NOT EXISTS custom_price_override BOOLEAN NOT NULL DEFAULT false, +ADD COLUMN IF NOT EXISTS first_invoice_policy VARCHAR(20) NOT NULL DEFAULT 'start_date' + CHECK (first_invoice_policy IN ('start_date', 'next_cycle')); + +CREATE INDEX IF NOT EXISTS idx_sag_subscriptions_price_type ON sag_subscriptions(price_type); + +ALTER TABLE sag_subscription_items +ADD COLUMN IF NOT EXISTS price_type VARCHAR(20) NOT NULL DEFAULT 'manual' + CHECK (price_type IN ('manual', 'day', 'week', 'month', 'year')), +ADD COLUMN IF NOT EXISTS custom_price_override BOOLEAN NOT NULL DEFAULT false; + +ALTER TABLE hardware_assets +ADD COLUMN IF NOT EXISTS rental_status VARCHAR(20) NOT NULL DEFAULT 'ledig' + CHECK (rental_status IN ('ledig', 'udlejet', 'defekt', 'retur')); + +CREATE INDEX IF NOT EXISTS idx_hardware_assets_rental_status + ON hardware_assets(rental_status) + WHERE deleted_at IS NULL; + +COMMENT ON COLUMN hardware_assets.rental_status IS 'Rental lifecycle status used by asset rental workflows.'; +COMMENT ON COLUMN sag_subscriptions.price_type IS 'Price source type: manual or product rental periods.'; +COMMENT ON COLUMN sag_subscriptions.first_invoice_policy IS 'Controls first invoice timing; default is start_date.'; diff --git a/migrations/168_subscription_scheduler_and_asset_overlap_indexes.sql b/migrations/168_subscription_scheduler_and_asset_overlap_indexes.sql new file mode 100644 index 0000000..b66462e --- /dev/null +++ b/migrations/168_subscription_scheduler_and_asset_overlap_indexes.sql @@ -0,0 +1,13 @@ +-- Migration 168: Subscription scheduler and asset overlap indexes +-- Improves performance for due-subscription scans and asset overlap validation. + +CREATE INDEX IF NOT EXISTS idx_sag_subscriptions_status_next_invoice_date + ON sag_subscriptions(status, next_invoice_date); + +CREATE INDEX IF NOT EXISTS idx_sag_subscription_items_asset_period + ON sag_subscription_items(asset_id, period_from, period_to) + WHERE asset_id IS NOT NULL; + +CREATE INDEX IF NOT EXISTS idx_subscription_asset_bindings_asset_dates_active + ON subscription_asset_bindings(asset_id, start_date, end_date) + WHERE deleted_at IS NULL AND status = 'active'; diff --git a/patch_backend_router.py b/patch_backend_router.py new file mode 100644 index 0000000..6b2fdf6 --- /dev/null +++ b/patch_backend_router.py @@ -0,0 +1,35 @@ +import re + +with open("app/modules/manual/backend/router.py", "r") as f: + content = f.read() + +if "from fastapi import" in content and "BackgroundTasks" not in content: + content = content.replace("from fastapi import ", "from fastapi import BackgroundTasks, ") + +if "def get_manual_article(slug: str):" in content: + content = content.replace("def get_manual_article(slug: str):", "def get_manual_article(slug: str, background_tasks: BackgroundTasks):") + +bg_def = """ +def _increment_use_count(manual_id: str): + try: + execute_query( + "UPDATE manual_articles SET use_count = COALESCE(use_count, 0) + 1 WHERE id = %s", + (manual_id,) + ) + except Exception as e: + logger.error(f"Failed to increment use_count for manual {manual_id}: {e}") + +@router.get("/{slug}") +""" +content = content.replace('@router.get("/{slug}")', bg_def) + +target_inc = """ execute_query( + "UPDATE manual_articles SET use_count = COALESCE(use_count, 0) + 1 WHERE id = %s", + (article["id"],), + )""" +new_inc = """ # Increment view async to save latency + background_tasks.add_task(_increment_use_count, article["id"])""" +content = content.replace(target_inc, new_inc) + +with open("app/modules/manual/backend/router.py", "w") as f: + f.write(content) diff --git a/patch_base.py b/patch_base.py new file mode 100644 index 0000000..16b5da1 --- /dev/null +++ b/patch_base.py @@ -0,0 +1,10 @@ +with open("app/shared/frontend/base.html", "r") as f: + text = f.read() + +target = '{% include ["quick_create_modal.html", "shared/frontend/quick_create_modal.html"] ignore missing %}' +replacement = target + '\n\n\n{% include ["manual_modal.html", "shared/frontend/manual_modal.html"] ignore missing %}' + +text = text.replace(target, replacement) + +with open("app/shared/frontend/base.html", "w") as f: + f.write(text) diff --git a/patch_base_html.py b/patch_base_html.py new file mode 100644 index 0000000..da0a9b7 --- /dev/null +++ b/patch_base_html.py @@ -0,0 +1,53 @@ +with open("app/shared/frontend/base.html", "r") as f: + content = f.read() + +old_chips = """
+ + + + + +
""" +new_chips = """
+ + + + + + +
""" +content = content.replace(old_chips, new_chips) + +old_tabs = """
+ + + + + +
+
+
Timer
+ +
""" +new_tabs = """
+ + + + + + +
+
+
Overblik
+
+
    +
  • Venter på data...
    • +
+
+
""" +content = content.replace(old_tabs, new_tabs) + +with open("app/shared/frontend/base.html", "w") as f: + f.write(content) diff --git a/patch_bb_chat.py b/patch_bb_chat.py new file mode 100644 index 0000000..53c0704 --- /dev/null +++ b/patch_bb_chat.py @@ -0,0 +1,63 @@ +import re + +with open("static/js/bottom-bar.js", "r") as f: + text = f.read() + +# Update the rendering of the messages tab to include a user selector +chat_html = """ + const replyBox = document.createElement('div'); + replyBox.className = 'mt-2 border-top pt-2 border-primary-subtle'; + replyBox.innerHTML = ` +
+ + +
+
+ + +
+ `; + + chatContainer.appendChild(ul); + chatContainer.appendChild(replyBox); +""" + +text = re.sub( + r" const replyBox = document\.createElement\('div'\);\n replyBox\.className = 'input-group mt-2 border-top pt-2 border-primary-subtle';\n replyBox\.innerHTML = '';\n \n chatContainer\.appendChild\(ul\);\n chatContainer\.appendChild\(replyBox\);", + chat_html, + text +) + +# And update the logic that sends it +events_html = """ + if (btn.id === 'btnSendMsg') { + const input = byId('chatInputQuick'); + const recipientObj = byId('chatRecipient'); + if (input && input.value.trim() !== '') { + const recipient = recipientObj ? recipientObj.options[recipientObj.selectedIndex].text : 'Alle'; + console.log("-> Sender besked til " + recipient + ":", input.value); + const msgVal = input.value; + input.value = ''; + const msgDiv = document.createElement('div'); + msgDiv.className = 'mb-1 text-end'; + msgDiv.innerHTML = '
Til: ' + recipient + '
Mig: ' + msgVal + '
'; + listContainer.insertBefore(msgDiv, listContainer.lastElementChild); + listContainer.scrollTop = listContainer.scrollHeight; + } + } +""" + +text = re.sub( + r" if \(btn\.id === 'btnSendMsg'\) \{\n const input = byId\('chatInputQuick'\);\n if \(input && input\.value\.trim\(\) !== ''\) \{\n console\.log\(\"-> Sender besked:\", input\.value\);\n input\.value = '';\n const msgDiv = document\.createElement\('div'\);\n msgDiv\.className = 'mb-1 text-end';\n msgDiv\.innerHTML = '
Mig: ' \+ msgDiv\.textContent \+ ' \(Mock\)
';\n listContainer\.insertBefore\(msgDiv, listContainer\.lastElementChild\);\n listContainer\.scrollTop = listContainer\.scrollHeight;\n \}\n \}", + events_html.strip(), + text +) + +with open("static/js/bottom-bar.js", "w") as f: + f.write(text) diff --git a/patch_bb_chat2.py b/patch_bb_chat2.py new file mode 100644 index 0000000..fa16344 --- /dev/null +++ b/patch_bb_chat2.py @@ -0,0 +1,59 @@ +import re + +with open("static/js/bottom-bar.js", "r") as f: + text = f.read() + +events_html = """ + if (btn.id === 'btnNextTask') { + console.log("-> Beder backend om næste opgave..."); + btn.innerHTML = ' Omsætter kalender og SLA...'; + btn.disabled = true; + + fetch('/api/v1/bottom-bar/next_task', { method: 'POST' }) + .then(r => r.json()) + .then(data => { + const task = data.task; + btn.innerHTML = 'Du fik tildelt: ' + task.title + ' (Sag #' + task.case_id + ') ' + data.free_time_calculated + 'm fri'; + btn.classList.add('btn-success'); + btn.classList.remove('btn-primary'); + }) + .catch(err => { + console.error("Fejl:", err); + btn.innerHTML = "Fejl - prøv igen"; + btn.disabled = false; + }); + } + + if (btn.id === 'btnSendMsg') { + const input = document.getElementById('chatInputQuick'); + const recipientObj = document.getElementById('chatRecipient'); + + if (input && input.value.trim() !== '') { + const recipient = recipientObj ? recipientObj.options[recipientObj.selectedIndex].text : 'Alle'; + + console.log("-> Sender besked til", recipient, ":", input.value); + + const msgVal = input.value; + input.value = ''; + + const msgContainer = document.createElement('div'); + msgContainer.className = 'mb-2 text-end'; + msgContainer.innerHTML = '
Til: ' + recipient + '
Mig: ' + msgVal + '
'; + + const listUl = listContainer.querySelector('ul') || listContainer; + listUl.appendChild(msgContainer); + + // Simple hacky scroll down + const tabInner = document.getElementById('bbTabInnerContent'); + if(tabInner) { + tabInner.scrollTop = tabInner.scrollHeight + 500; + } + } + } +""" + +pattern = r" if \(btn\.id === 'btnNextTask'\) \{.*?\n \}" +text = re.sub(pattern, events_html.strip(), text, flags=re.DOTALL) + +with open("static/js/bottom-bar.js", "w") as f: + f.write(text) diff --git a/patch_bb_chat3.py b/patch_bb_chat3.py new file mode 100644 index 0000000..6f7604b --- /dev/null +++ b/patch_bb_chat3.py @@ -0,0 +1,58 @@ +import re + +with open("static/js/bottom-bar.js", "r") as f: + text = f.read() + +# Replace the static select with a dynamic fetch container +events_html = """ + const replyBox = document.createElement('div'); + replyBox.className = 'mt-2 border-top pt-2 border-primary-subtle'; + replyBox.innerHTML = ` +
+ + +
+
+ + +
+ `; + + chatContainer.appendChild(ul); + chatContainer.appendChild(replyBox); + innerContent.appendChild(chatContainer); + + // Fetch users dynamically + fetch('/api/v1/users?is_active=true', { credentials: 'include' }) + .then(r => r.json()) + .then(users => { + const sel = document.getElementById('chatRecipient'); + if (sel) { + sel.innerHTML = ''; + users.forEach(u => { + sel.innerHTML += ``; + }); + } + }) + .catch(e => console.error("Error fetching users for chat:", e)); + } else { + innerContent.appendChild(ul); + } +""" + +# Find the block we inserted earlier and replace it +pattern = r" const replyBox = document\.createElement\('div'\);\n replyBox\.className = 'mt-2 border-top pt-2 border-primary-subtle';\n replyBox\.innerHTML = `[\s\S]*?innerContent\.appendChild\(chatContainer\);\n \} else \{\n innerContent\.appendChild\(ul\);\n \}" +# print(re.search(pattern, text)) +text = re.sub(pattern, events_html, text) + +# Then bump the cache version +with open("static/js/bottom-bar.js", "w") as f: + f.write(text) + +with open("app/shared/frontend/base.html", "r") as f: + bt = f.read() + bt = re.sub(r'bottom-bar\.js\?v=\d+\.\d+', 'bottom-bar.js?v=2.00', bt) + with open("app/shared/frontend/base.html", "w") as f2: + f2.write(bt) diff --git a/patch_bb_ver2.py b/patch_bb_ver2.py new file mode 100644 index 0000000..0925178 --- /dev/null +++ b/patch_bb_ver2.py @@ -0,0 +1,10 @@ +import re + +with open("app/shared/frontend/base.html", "r") as f: + text = f.read() + +# Update cache version +text = re.sub(r'bottom-bar\.js\?v=\d+\.\d+', 'bottom-bar.js?v=1.92', text) + +with open("app/shared/frontend/base.html", "w") as f: + f.write(text) diff --git a/patch_bottombar_router.py b/patch_bottombar_router.py new file mode 100644 index 0000000..e659774 --- /dev/null +++ b/patch_bottombar_router.py @@ -0,0 +1,64 @@ +with open("app/modules/bottom_bar/backend/router.py", "r") as f: + content = f.read() + +# Replace the whole endpoint +import re + +new_content = """from fastapi import APIRouter +from app.core.config import settings + +router = APIRouter() + +@router.get("/state") +async def get_bottom_bar_state(): + # MVP Mock Data for the updated Bottom Bar & Chef-overblik + return { + "enabled": True, + "sections": { + "mail": { + "unread": 5, + "customer_reply_needed": 2 + }, + "cases": { + "open": 12, + "list": [{"id": 100, "title": "Blandet sag A"}, {"id": 105, "title": "Sag B"}] + }, + "urgent": { + "count": 1, + "list": [{"id": 999, "title": "Server nede hos Kunde A"}] + }, + "timer": { + "active_count": 1, + "list": [{"desc": "Fejlfinding WiFi", "elapsed": 1200}] + }, + "kuma": { + "down": 3, + "list": ["Switch-Odense", "Printer-Aarhus", "FW-Kbh"] + }, + "eset": { + "incidents": 0, + "list": [] + }, + "messages": { + "count": 2, + "list": [{"from": "Chef", "text": "Husk at ringe til Jensen"}, {"from": "System", "text": "Ny opgave tildelt."}] + }, + "tasks": { + "count": 4, + "list": [ + {"title": "Opsætning af ny PC", "deadline": "I dag 14:00"}, + {"title": "Gennemgå ESET log", "deadline": "I dag 16:00"} + ] + }, + "boss": { + "stats": { + "unassigned": 3, + "active_employees": 4 + } + } + } + } +""" + +with open("app/modules/bottom_bar/backend/router.py", "w") as f: + f.write(new_content) diff --git a/patch_chip_filter.py b/patch_chip_filter.py new file mode 100644 index 0000000..f0f20f9 --- /dev/null +++ b/patch_chip_filter.py @@ -0,0 +1,97 @@ +with open("static/js/bottom-bar.js", "r") as f: + content = f.read() + +import re + +# Insert a filter state +if "let overviewFilter" not in content: + content = content.replace("let activeKey = 'timer';", "let activeKey = 'timer';\n let overviewFilter = null;") + +# Update listFor overview so it can show filtered items +old_overview = """ if (key === 'overview') { + let out = []; + if (urgent.count > 0) out.push('🚨 Hastesager: ' + urgent.count + ' aktive'); + if (mail.unread > 0) out.push('📧 Ubesvarede mails: ' + mail.unread + ' (' + mail.customer_reply_needed + ' kræver svar)'); + if (cases.open > 0) out.push('📂 Åbne sager i alt: ' + cases.open); + if (kuma.down > 0) out.push('📉 Uptime Kuma nedetid: ' + kuma.down + ' enheder'); + if (eset.incidents > 0) out.push('🔐 ESET incidents: ' + eset.incidents); + + if (out.length === 0) { + out.push('🎉 Alt ser grønt ud! Intet kritisk lige nu.'); + out.push('👉 Klik på fanerne til venstre for mere info.'); + } + return out; + }""" +new_overview = """ if (key === 'overview') { + if (overviewFilter === 'urgent') return urgent.list ? urgent.list.map(u => '🚨 Hastesag: ' + u.title) : ['Ingen hastesager.']; + if (overviewFilter === 'kuma') return kuma.list ? kuma.list.map(k => '📉 Nede: ' + k) : ['Alle systemer oppe.']; + if (overviewFilter === 'eset') return eset.list ? eset.list.map(e => '🔐 Incident: ' + e) : ['Ingen ESET incidents.']; + if (overviewFilter === 'cases') return cases.list ? cases.list.map(c => '📂 ' + c.title) : ['Ingen åbne sager.']; + if (overviewFilter === 'mail') return ['📧 ' + mail.unread + ' ulæste mails. ' + mail.customer_reply_needed + ' kundesvar krævet.']; + + let out = []; + if (urgent.count > 0) out.push('🚨 Hastesager: ' + urgent.count + ' aktive'); + if (mail.unread > 0) out.push('📧 Ubesvarede mails: ' + mail.unread + ' (' + mail.customer_reply_needed + ' kræver svar)'); + if (cases.open > 0) out.push('📂 Åbne sager i alt: ' + cases.open); + if (kuma.down > 0) out.push('📉 Uptime Kuma nedetid: ' + kuma.down + ' enheder'); + if (eset.incidents > 0) out.push('🔐 ESET incidents: ' + eset.incidents); + + if (out.length === 0) { + out.push('🎉 Alt ser grønt ud! Intet kritisk lige nu.'); + out.push('👉 Klik på fanerne til venstre for mere info.'); + } + return out; + }""" +content = content.replace(old_overview, new_overview) + +# Update chip click to set filter +old_chip = """ // Map top chip keys to side tabs if applicable, else 'overview' + let targetTab = 'overview'; + if (key === 'timer') targetTab = 'timer'; + + const tabBtn = document.querySelector('.bb-tab-btn[data-bb-tab="' + targetTab + '"]'); + if (tabBtn) tabBtn.click(); + });""" +new_chip = """ // Set filter if clicking a generic chip + let targetTab = 'overview'; + if (key === 'timer') { + targetTab = 'timer'; + overviewFilter = null; + } else if (['urgent', 'kuma', 'eset', 'cases', 'mail'].indexOf(key) !== -1) { + targetTab = 'overview'; + overviewFilter = key; + } + + const tabBtn = document.querySelector('.bb-tab-btn[data-bb-tab="' + targetTab + '"]'); + if (tabBtn) tabBtn.click(); + });""" +content = content.replace(old_chip, new_chip) + +# Clear filter if a generic side tab is clicked +old_bind_tab = """ buttons[i].addEventListener('click', function () { + for (let j = 0; j < buttons.length; j++) { + buttons[j].classList.remove('is-active'); + buttons[j].setAttribute('aria-selected', 'false'); + } + this.classList.add('is-active'); + this.setAttribute('aria-selected', 'true'); + + activeKey = this.getAttribute('data-bb-tab'); + renderTabPanel();""" +new_bind_tab = """ buttons[i].addEventListener('click', function (e) { + // Clear filter on direct human click of the button, unless we programmatically called click() + if (e.isTrusted) overviewFilter = null; + + for (let j = 0; j < buttons.length; j++) { + buttons[j].classList.remove('is-active'); + buttons[j].setAttribute('aria-selected', 'false'); + } + this.classList.add('is-active'); + this.setAttribute('aria-selected', 'true'); + + activeKey = this.getAttribute('data-bb-tab'); + renderTabPanel();""" +content = content.replace(old_bind_tab, new_bind_tab) + +with open("static/js/bottom-bar.js", "w") as f: + f.write(content) diff --git a/patch_frontend.py b/patch_frontend.py new file mode 100644 index 0000000..bed05b1 --- /dev/null +++ b/patch_frontend.py @@ -0,0 +1,92 @@ +import re + +with open("app/modules/manual/frontend/views.py", "r") as f: + text = f.read() + +# Make sure cache is imported +if "manual_cache" not in text: + text = text.replace("from app.core.database import", "from app.modules.manual.backend.cache import manual_cache\nfrom app.core.database import") + +new_func = """async def manual_index( + request: Request, + module: Optional[str] = Query(default=None), + difficulty: Optional[str] = Query(default=None), + tag: Optional[str] = Query(default=None), + search: Optional[str] = Query(default=None), +): + cache_key = f"views:list:{module}:{difficulty}:{tag}:{search}" + cached = manual_cache.get(cache_key) + if cached: + rows, modules, unique_tags = cached + else: + filters = ["deleted_at IS NULL", "status = %s"] + params = ["published"] + # ... logic mapping ... + if module: + filters.append("module = %s") + params.append(module) + if difficulty: + filters.append("difficulty = %s") + params.append(difficulty) + if tag: + filters.append("tags @> %s") + params.append(f'["{tag}"]') + if search: + filters.append("(title ILIKE %s OR content ILIKE %s)") + params.extend([f"%{search}%", f"%{search}%"]) + + where_clause = " AND ".join(filters) + + rows = execute_query( + f"SELECT id, slug, title, content, module, tags, difficulty, use_count, updated_at " + f"FROM manual_articles WHERE {where_clause} ORDER BY updated_at DESC", + tuple(params) + ) or [] + + modules = execute_query( + "SELECT DISTINCT module FROM manual_articles WHERE deleted_at IS NULL ORDER BY module ASC" + ) or [] + + all_tags: List[str] = [] + for row in rows: + if "tags" in row and row["tags"]: + try: + import json + if isinstance(row["tags"], str): + t = json.loads(row["tags"]) + if isinstance(t, list): + all_tags.extend(t) + elif isinstance(row["tags"], list): + all_tags.extend(row["tags"]) + except Exception: + pass + unique_tags = sorted(list(set(all_tags))) + + manual_cache.set(cache_key, (rows, modules, unique_tags)) + + return templates.TemplateResponse( + "modules/manual/templates/list.html", + { + "request": request, + "articles": rows, + "available_modules": modules, + "available_tags": unique_tags, + "filters": { + "module": module or "", + "difficulty": difficulty or "", + "tag": tag or "", + "search": search or "", + }, + }, + ) +""" + +text = re.sub( + r'async def manual_index\(.*?return templates\.TemplateResponse\([\s\S]*?\n \)\n', + new_func, + text, + flags=re.DOTALL +) + +with open("app/modules/manual/frontend/views.py", "w") as f: + f.write(text) diff --git a/patch_frontend_cache.py b/patch_frontend_cache.py new file mode 100644 index 0000000..972c52b --- /dev/null +++ b/patch_frontend_cache.py @@ -0,0 +1,53 @@ +import re + +with open("app/modules/manual/frontend/views.py", "r") as f: + text = f.read() + +# Make sure cache is imported +if "manual_cache" not in text: + text = text.replace("from app.core.database import", "from app.modules.manual.backend.cache import manual_cache\nfrom app.core.database import") + +# GET /manual +list_patch = """async def manual_index( + request: Request, + module: Optional[str] = Query(default=None), + difficulty: Optional[str] = Query(default=None), + tag: Optional[str] = Query(default=None), + search: Optional[str] = Query(default=None), +): + cache_key = f"views:list:{module}:{difficulty}:{tag}:{search}" + cached = manual_cache.get(cache_key) + if cached: + # FastAPI TemplateResponse returns HTMLResponse which we can't easily cache natively + # But we can cache the context dictionary to avoid DB queries + rows, modules, unique_tags = cached + else:""" + +text = re.sub( + r'async def manual_index\([^)]*\):', + list_patch, + text +) + +# Need to indent the whole db fetch logic +# Then we save it to cache. +# Alternatively, I can just use a simple python caching decorator in `views.py`. Since we share the manual_cache instance, we can just clear it. +text = text.replace(' return templates.TemplateResponse(', ' manual_cache.set(cache_key, (rows, modules, unique_tags))\n return templates.TemplateResponse(') +# Indenting the execute_query part cleanly using re.sub is hard. Let's do it using Python string replacement +lines = text.split('\n') +in_else = False +new_lines = [] +for line in lines: + if 'else:' in line and 'manual_index' not in line: # crude check + if 'rows, modules, unique_tags = cached' in '\n'.join(new_lines[-5:]): + in_else = True + if in_else: + if line.startswith(' return templates.TemplateResponse('): + in_else = False + else: + if line.startswith(' '): + line = ' ' + line + new_lines.append(line) + +with open("app/modules/manual/frontend/views.py", "w") as f: + f.write("\n".join(new_lines)) diff --git a/patch_hw_help.py b/patch_hw_help.py new file mode 100644 index 0000000..11a37b5 --- /dev/null +++ b/patch_hw_help.py @@ -0,0 +1,10 @@ +with open("app/modules/hardware/templates/detail.html", "r") as f: + content = f.read() + +target = ' ' +replacement = ' \n' + target + +content = content.replace(target, replacement) + +with open("app/modules/hardware/templates/detail.html", "w") as f: + f.write(content) diff --git a/patch_js_events.py b/patch_js_events.py new file mode 100644 index 0000000..8159f56 --- /dev/null +++ b/patch_js_events.py @@ -0,0 +1,54 @@ +import re + +with open("static/js/bottom-bar.js", "r") as f: + content = f.read() + +events = """ + function bindDynamicActions() { + const listContainer = byId('bbDynamicList'); + if (!listContainer) return; + + listContainer.addEventListener('click', function (e) { + const target = e.target; + const btn = target.closest('button'); + if (!btn) return; + + if (btn.id === 'btnNextTask') { + console.log("-> Beder backend om næste opgave..."); + btn.innerHTML = ' Henter...'; + btn.disabled = true; + setTimeout(() => { + btn.innerHTML = 'Du fik tildelt Sag #8192!'; + btn.classList.add('btn-success'); + btn.classList.remove('btn-primary'); + }, 1000); + } + + if (btn.id === 'btnSendMsg') { + const input = byId('chatInputQuick'); + if (input && input.value.trim() !== '') { + console.log("-> Sender besked:", input.value); + input.value = ''; + const msgDiv = document.createElement('div'); + msgDiv.className = 'mb-1 text-end'; + msgDiv.innerHTML = '
Mig: ' + msgDiv.textContent + ' (Mock)
'; + listContainer.insertBefore(msgDiv, listContainer.lastElementChild); + listContainer.scrollTop = listContainer.scrollHeight; + } + } + }); + } + + function init() {""" + +content = re.sub(r' function init\(\) \{', events, content) + +init_bindings = """ + bindSideTabs(); + bindDynamicActions(); +""" + +content = re.sub(r' bindSideTabs\(\);', init_bindings, content) + +with open("static/js/bottom-bar.js", "w") as f: + f.write(content) diff --git a/patch_js_events2.py b/patch_js_events2.py new file mode 100644 index 0000000..c520f65 --- /dev/null +++ b/patch_js_events2.py @@ -0,0 +1,44 @@ +import re + +with open("static/js/bottom-bar.js", "r") as f: + text = f.read() + +events = """ + function bindDynamicActions() { + const listContainer = byId('bbTabsContent'); + if (!listContainer) return; + + listContainer.addEventListener('click', function (e) { + const target = e.target; + const btn = target.closest('button'); + if (!btn) return; + + if (btn.id === 'btnNextTask') { + console.log("-> Beder backend om næste opgave..."); + btn.innerHTML = ' Omsætter kalender og SLA...'; + btn.disabled = true; + + fetch('/api/v1/bottom_bar/next_task', { method: 'POST' }) + .then(r => r.json()) + .then(data => { + const task = data.task; + btn.innerHTML = 'Du fik tildelt: ' + task.title + ' (Sag #' + task.case_id + ') ' + data.free_time_calculated + 'm fri'; + btn.classList.add('btn-success'); + btn.classList.remove('btn-primary'); + }) + .catch(err => { + console.error("Fejl:", err); + btn.innerHTML = "Fejl - prøv igen"; + btn.disabled = false; + }); + } + }); + } + + document.addEventListener('DOMContentLoaded', function () {""" + +text = text.replace(" document.addEventListener('DOMContentLoaded', function () {", events) +text = text.replace(" bindSheetToggle();", " bindSheetToggle();\n bindDynamicActions();") + +with open("static/js/bottom-bar.js", "w") as f: + f.write(text) diff --git a/patch_js_icons.py b/patch_js_icons.py new file mode 100644 index 0000000..ddcc1f1 --- /dev/null +++ b/patch_js_icons.py @@ -0,0 +1,112 @@ +with open("static/js/bottom-bar.js", "r") as f: + content = f.read() + +# Fix updateBar +old_update_bar = """ function updateBar(sections) { + const counts = getCounts(sections); + const keys = Object.keys(counts); + + for (let i = 0; i < keys.length; i++) { + const key = keys[i]; + const chip = document.querySelector('.bb-chip[data-bb-key="' + key + '"]'); + if (chip) { + const label = key.charAt(0).toUpperCase() + key.slice(1); + const val = counts[key]; + if (key === 'timer') { + chip.textContent = 'Timer: ' + val; + } else if (key === 'calls') { + chip.textContent = 'Opkald: ' + val; + } else if (key === 'mail') { + chip.textContent = 'Mail: ' + val; + } else if (key === 'alerts') { + chip.textContent = 'Alerts: ' + val; + } else { + chip.textContent = 'Reminders: ' + val; + } + + chip.classList.toggle('has-items', val > 0); + } + }""" +new_update_bar = """ function updateBar(sections) { + const counts = getCounts(sections); + const keys = Object.keys(counts); + + for (let i = 0; i < keys.length; i++) { + const key = keys[i]; + const chipText = document.querySelector('.bb-chip[data-bb-key="' + key + '"] .bb-chip-text'); + const chip = document.querySelector('.bb-chip[data-bb-key="' + key + '"]'); + if (chipText && chip) { + const val = counts[key]; + if (key === 'timer') { + chipText.textContent = 'Timer: ' + val; + } else if (key === 'calls') { + chipText.textContent = 'Opkald: ' + val; + } else if (key === 'mail') { + chipText.textContent = 'Mail: ' + val; + } else if (key === 'alerts') { + chipText.textContent = 'Alerts: ' + val; + } else { + chipText.textContent = 'Reminders: ' + val; + } + + chip.classList.toggle('has-items', val > 0); + } + }""" +content = content.replace(old_update_bar, new_update_bar) + +# Fix renderTabPanel Title text +old_render_tab = """ function renderTabPanel() { + const title = byId('bbTabTitle'); + const list = byId('bbTabList'); + if (!title || !list) { + return; + } + + const titleByKey = { + timer: 'Timer', + calls: 'Opkald', + mail: 'Mail', + alerts: 'Alerts', + reminders: 'Reminders' + }; + + title.textContent = (titleByKey[activeKey] || 'Info') + ' info';""" +new_render_tab = """ function renderTabPanel() { + const titleContainer = byId('bbTabTitle'); + const list = byId('bbTabList'); + if (!titleContainer || !list) { + return; + } + + const titleText = titleContainer.querySelector('.bb-tab-title-text'); + + const titleByKey = { + timer: 'Timer info', + calls: 'Opkald info', + mail: 'Mail info', + alerts: 'Alerts info', + reminders: 'Reminders info' + }; + + const iconByKey = { + timer: 'bi-clock-history', + calls: 'bi-telephone', + mail: 'bi-envelope', + alerts: 'bi-exclamation-triangle', + reminders: 'bi-bell' + }; + + if (titleText) { + titleText.textContent = (titleByKey[activeKey] || 'Info'); + } else { + titleContainer.textContent = (titleByKey[activeKey] || 'Info'); + } + + const iconSpan = titleContainer.querySelector('.bi'); + if (iconSpan) { + iconSpan.className = 'bi ' + (iconByKey[activeKey] || 'bi-info-circle') + ' me-2 text-accent'; + }""" +content = content.replace(old_render_tab, new_render_tab) + +with open("static/js/bottom-bar.js", "w") as f: + f.write(content) diff --git a/patch_js_rich_ui.py b/patch_js_rich_ui.py new file mode 100644 index 0000000..c586386 --- /dev/null +++ b/patch_js_rich_ui.py @@ -0,0 +1,182 @@ +import re + +with open("static/js/bottom-bar.js", "r") as f: + content = f.read() + +# Replace the innerList rendering logic to handle raw HTML from our templates securely +old_render_tab = """ // Render lists + const lines = listFor(activeKey, latestSections); + const ul = document.createElement('ul'); + ul.className = 'bb-tab-list'; + lines.forEach(function (line) { + const li = document.createElement('li'); + li.innerHTML = String(line) + .replaceAll('&', '&') + .replaceAll('<', '<') + .replaceAll('>', '>'); + ul.appendChild(li); + }); + + innerContent.innerHTML = ''; + innerContent.appendChild(ul);""" + +new_render_tab = """ // Render rich UI lists + const lines = listFor(activeKey, latestSections); + const ul = document.createElement('ul'); + ul.className = 'bb-tab-list'; + + lines.forEach(function (line) { + const li = document.createElement('li'); + // Allow rich HTML (buttons, inputs) - assuming listFor provides sanitized data wrapped in markup + li.innerHTML = line; + ul.appendChild(li); + }); + + innerContent.innerHTML = ''; + + // Add specific headers/controls based on active tab + if (activeKey === 'tasks') { + const topBar = document.createElement('div'); + topBar.className = 'bb-task-actions mb-3'; + topBar.innerHTML = ''; + innerContent.appendChild(topBar); + } + if (activeKey === 'messages') { + const chatContainer = document.createElement('div'); + chatContainer.className = 'd-flex flex-column h-100'; + ul.classList.add('flex-grow-1', 'mb-3'); + + const replyBox = document.createElement('div'); + replyBox.className = 'input-group mt-2 border-top pt-2 border-primary-subtle'; + replyBox.innerHTML = ''; + + chatContainer.appendChild(ul); + chatContainer.appendChild(replyBox); + innerContent.appendChild(chatContainer); + } else { + innerContent.appendChild(ul); + }""" + +content = content.replace(old_render_tab, new_render_tab) + +# Now enhance the listFor content with rich HTML strings +old_listFor = """ if (key === 'overview') { + if (overviewFilter === 'urgent') return urgent.list ? urgent.list.map(u => '🚨 Hastesag: ' + u.title) : ['Ingen hastesager.']; + if (overviewFilter === 'kuma') return kuma.list ? kuma.list.map(k => '📉 Nede: ' + k) : ['Alle systemer oppe.']; + if (overviewFilter === 'eset') return eset.list ? eset.list.map(e => '🔐 Incident: ' + e) : ['Ingen ESET incidents.']; + if (overviewFilter === 'cases') return cases.list ? cases.list.map(c => '📂 ' + c.title) : ['Ingen åbne sager.']; + if (overviewFilter === 'mail') return ['📧 ' + mail.unread + ' ulæste mails. ' + mail.customer_reply_needed + ' kundesvar krævet.']; + + let out = []; + if (urgent.count > 0) out.push('🚨 Hastesager: ' + urgent.count + ' aktive'); + if (mail.unread > 0) out.push('📧 Ubesvarede mails: ' + mail.unread + ' (' + mail.customer_reply_needed + ' kræver svar)'); + if (cases.open > 0) out.push('📂 Åbne sager i alt: ' + cases.open); + if (kuma.down > 0) out.push('📉 Uptime Kuma nedetid: ' + kuma.down + ' enheder'); + if (eset.incidents > 0) out.push('🔐 ESET incidents: ' + eset.incidents); + + if (out.length === 0) { + out.push('🎉 Alt ser grønt ud! Intet kritisk lige nu.'); + out.push('👉 Klik på fanerne til venstre for mere info.'); + } + return out; + } + + if (key === 'timer') { + if (timer.active_count > 0) { + return (timer.list || []).map(t => 'Timer aktiv: ' + t.description); + } + return ['Ingen aktive timere lige nu.']; + } + + if (key === 'messages') { + if (messages.count > 0) { + return (messages.list || []).map(m => m.from + ': ' + m.text); + } + return ['Ingen nye beskeder.']; + } + + if (key === 'tasks') { + if (tasks.count > 0) { + return (tasks.list || []).map(t => t.title + ' (Deadline: ' + t.deadline + ')'); + } + return ['Ingen aktuelle opgaver.']; + } + + if (key === 'boss') { + if (boss.stats) { + return [ + 'Ufordelte opgaver: ' + boss.stats.unassigned, + 'Medarbejdere aktive: ' + boss.stats.active_employees + ]; + } + return ['Henter chef-overblik...']; + } + + return ['Klik rundt i menuen for at se data for ' + key];""" + +new_listFor = """ function esc(str) { + return String(str).replace(/&/g, '&').replace(//g, '>'); + } + + if (key === 'overview') { + if (overviewFilter === 'urgent') return urgent.list ? urgent.list.map(u => '
Hastesag: ' + esc(u.title) + '
') : ['Ingen hastesager.']; + if (overviewFilter === 'kuma') return kuma.list ? kuma.list.map(k => '
📉 ' + esc(k) + '
') : ['Alle systemer oppe.']; + if (overviewFilter === 'eset') return eset.list ? eset.list.map(e => '
🔐 ' + esc(e) + '
') : ['Ingen ESET incidents.']; + if (overviewFilter === 'cases') return cases.list ? cases.list.map(c => '
' + esc(c.title) + '
') : ['Ingen åbne sager.']; + if (overviewFilter === 'mail') return ['
📧 ' + mail.unread + ' ulæste mails.
💬 ' + mail.customer_reply_needed + ' kræver kundesvar.
']; + + let out = []; + if (urgent.count > 0) out.push('
Hastesager: ' + urgent.count + ' aktive
'); + if (mail.unread > 0) out.push('
Ubesvarede mails: ' + mail.unread + '
'); + if (cases.open > 0) out.push('
Åbne sager i alt: ' + cases.open + '
'); + if (kuma.down > 0) out.push('
Uptime Kuma nedetid: ' + kuma.down + ' enheder
'); + if (eset.incidents > 0) out.push('
ESET incidents: ' + eset.incidents + '
'); + + if (out.length === 0) { + out.push('
🎉 Alt ser grønt ud! Intet kritisk lige nu.
'); + } + + // Add quick note button on overview + out.push('
'); + + return out; + } + + if (key === 'timer') { + if (timer.active_count > 0) { + return (timer.list || []).map(t => '
' + esc(t.desc) + ' (' + esc(t.elapsed) + 's)
'); + } + return ['Ingen aktive timere lige nu.']; + } + + if (key === 'messages') { + if (messages.count > 0) { + return (messages.list || []).map(m => '
' + esc(m.from) + ': ' + esc(m.text) + '
'); + } + return ['Ingen nye beskeder.']; + } + + if (key === 'tasks') { + if (tasks.count > 0) { + return (tasks.list || []).map(t => '
' + esc(t.title) + ' ' + esc(t.deadline) + '
'); + } + return ['Ingen aktuelle opgaver.']; + } + + if (key === 'boss') { + if (boss.stats) { + return [ + '
Ufordelte opgaver: ' + boss.stats.unassigned + '
', + '
Medarbejdere aktive: ' + boss.stats.active_employees + '
', + '' + ]; + } + return ['Henter chef-overblik...']; + } + + return ['Klik rundt i menuen for at se data.'];""" + +content = content.replace(old_listFor, new_listFor) + +with open("static/js/bottom-bar.js", "w") as f: + f.write(content) diff --git a/patch_lækker.py b/patch_lækker.py new file mode 100644 index 0000000..2ddcefe --- /dev/null +++ b/patch_lækker.py @@ -0,0 +1,457 @@ +import re + +with open("app/shared/frontend/base.html", "r") as f: + content = f.read() + +# Update root variables with RGB versions for glassmorphism +if "--bg-card-rgb" not in content: + content = content.replace( + "--bg-card: #ffffff;", + "--bg-card: #ffffff;\n --bg-card-rgb: 255, 255, 255;" + ) + content = content.replace( + "--bg-card: #2c3034;", + "--bg-card: #2c3034;\n --bg-card-rgb: 44, 48, 52;" + ) + +# Update CSS for .global-bottom-bar +old_bottom_bar_css = """ .global-bottom-bar { + position: fixed; + bottom: 0; + left: 0; + right: 0; + z-index: var(--bottom-bar-zindex); + background: var(--bg-card); + border-top: 1px solid rgba(0, 0, 0, 0.08); + box-shadow: 0 -8px 20px rgba(0, 0, 0, 0.06); + min-height: var(--bottom-bar-height); + padding: 0.35rem 1rem calc(0.35rem + env(safe-area-inset-bottom, 0px)); + transform: translateY(calc(100% + 12px)); + opacity: 0; + transition: transform 0.3s ease, opacity 0.25s ease; + }""" +new_bottom_bar_css = """ .global-bottom-bar { + position: fixed; + bottom: 0; + left: 0; + right: 0; + z-index: var(--bottom-bar-zindex); + background: rgba(var(--bg-card-rgb), 0.85); /* Glassmorphism */ + backdrop-filter: blur(12px); + -webkit-backdrop-filter: blur(12px); + border-top: 1px solid rgba(var(--text-primary-rgb), 0.1); + box-shadow: 0 -10px 40px rgba(0, 0, 0, 0.08); + border-top-left-radius: 16px; + border-top-right-radius: 16px; + min-height: var(--bottom-bar-height); + padding: 0.5rem 1rem calc(0.5rem + env(safe-area-inset-bottom, 0px)); + transform: translateY(calc(100% + 12px)); + opacity: 0; + transition: transform 0.4s cubic-bezier(0.16, 1, 0.3, 1), opacity 0.3s ease; + }""" +content = content.replace(old_bottom_bar_css, new_bottom_bar_css) + +# Ensure --text-primary-rgb exists +if "--text-primary-rgb" not in content: + content = content.replace( + "--text-primary: #2c3e50;", + "--text-primary: #2c3e50;\n --text-primary-rgb: 44, 62, 80;" + ) + content = content.replace( + "--text-primary: #f8f9fa;", + "--text-primary: #f8f9fa;\n --text-primary-rgb: 248, 249, 250;" + ) + +# Fix Count Line CSS +old_count_line_css = """ .global-bottom-bar .bb-count-line { + flex: 1; + background: var(--accent-light); + color: var(--text-primary); + border-radius: 10px; + border: 1px solid rgba(0, 0, 0, 0.08); + padding: 0.45rem 0.75rem; + font-size: 0.84rem; + font-weight: 600; + line-height: 1.35; + white-space: nowrap; + overflow-x: auto; + scrollbar-width: thin; + display: flex; + align-items: center; + gap: 0.4rem; + }""" +new_count_line_css = """ .global-bottom-bar .bb-count-line { + flex: 1; + background: transparent; + color: var(--text-primary); + padding: 0 0.25rem; + font-size: 0.84rem; + font-weight: 600; + line-height: 1.35; + white-space: nowrap; + overflow-x: auto; + scrollbar-width: none; /* Cleaner look without scrollbar */ + display: flex; + align-items: center; + gap: 0.6rem; + } + .global-bottom-bar .bb-count-line::-webkit-scrollbar { + display: none; + }""" +content = content.replace(old_count_line_css, new_count_line_css) + +# Fix Chip CSS +old_chip_css = """ .global-bottom-bar .bb-chip { + border: 1px solid rgba(0, 0, 0, 0.1); + background: var(--bg-card); + color: var(--text-primary); + border-radius: 999px; + padding: 0.2rem 0.6rem; + font-size: 0.79rem; + font-weight: 700; + line-height: 1.2; + cursor: pointer; + flex: 0 0 auto; + }""" +new_chip_css = """ .global-bottom-bar .bb-chip { + border: 1px solid rgba(var(--text-primary-rgb), 0.1); + background: var(--accent-light); + color: var(--text-primary); + border-radius: 999px; + padding: 0.35rem 0.85rem; + font-size: 0.8rem; + font-weight: 600; + line-height: 1.2; + cursor: pointer; + flex: 0 0 auto; + display: inline-flex; + align-items: center; + gap: 0.35rem; + box-shadow: 0 1px 3px rgba(0,0,0,0.04); + transition: all 0.2s ease; + }""" +content = content.replace(old_chip_css, new_chip_css) + +old_chip_hover = """ .global-bottom-bar .bb-chip:hover, + .global-bottom-bar .bb-chip.is-active { + border-color: var(--accent); + color: var(--accent); + }""" +new_chip_hover = """ .global-bottom-bar .bb-chip:hover { + transform: translateY(-1px); + box-shadow: 0 3px 8px rgba(0,0,0,0.08); + border-color: rgba(var(--text-primary-rgb), 0.2); + } + .global-bottom-bar .bb-chip.is-active { + background: var(--accent); + color: white; + border-color: var(--accent); + box-shadow: 0 4px 12px rgba(15, 76, 117, 0.3); + } + [data-bs-theme="dark"] .global-bottom-bar .bb-chip.is-active { + color: #fff; + }""" +content = content.replace(old_chip_hover, new_chip_hover) + +# Toggle styling +old_toggle_css = """ .global-bottom-bar .bb-sheet-toggle { + border: 1px solid rgba(0, 0, 0, 0.1); + background: var(--accent-light); + color: var(--text-primary); + border-radius: 10px; + padding: 0.42rem 0.7rem; + font-size: 0.82rem; + font-weight: 700; + line-height: 1.2; + display: inline-flex; + align-items: center; + gap: 0.45rem; + }""" +new_toggle_css = """ .global-bottom-bar .bb-sheet-toggle { + border: 1px solid rgba(var(--text-primary-rgb), 0.1); + background: transparent; + color: var(--text-primary); + border-radius: 50%; + width: 36px; + height: 36px; + padding: 0; + display: inline-flex; + align-items: center; + justify-content: center; + font-size: 1.1rem; + transition: all 0.2s ease; + } + .global-bottom-bar .bb-sheet-toggle:hover { + background: var(--accent-light); + transform: translateY(-1px); + } + .global-bottom-bar .bb-sheet-toggle span { display: none; }""" +content = content.replace(old_toggle_css, new_toggle_css) + +# Adjust inner sheet panel styling +old_sheet_inner = """ .global-bottom-bar .bb-sheet-inner { + background: var(--bg-card); + border: 1px solid rgba(0, 0, 0, 0.08); + border-radius: 12px; + display: grid; + grid-template-columns: 150px minmax(0, 1fr); + min-height: 210px; + max-height: min(50vh, 420px); + overflow: hidden; + }""" +new_sheet_inner = """ .global-bottom-bar .bb-sheet-inner { + background: var(--bg-card); + border: 1px solid rgba(var(--text-primary-rgb), 0.1); + border-radius: 14px; + display: grid; + grid-template-columns: 160px minmax(0, 1fr); + min-height: 240px; + max-height: min(52vh, 420px); + overflow: hidden; + box-shadow: inset 0 2px 10px rgba(0,0,0,0.02); + margin-top: 0.5rem; + }""" +content = content.replace(old_sheet_inner, new_sheet_inner) + +old_side_tabs = """ .global-bottom-bar .bb-side-tabs { + border-right: 1px solid rgba(0, 0, 0, 0.08); + background: var(--accent-light); + padding: 0.45rem; + display: grid; + gap: 0.35rem; + align-content: start; + }""" +new_side_tabs = """ .global-bottom-bar .bb-side-tabs { + border-right: 1px solid rgba(var(--text-primary-rgb), 0.08); + background: rgba(var(--text-primary-rgb), 0.03); + padding: 0.75rem 0.5rem; + display: grid; + gap: 0.4rem; + align-content: start; + }""" +content = content.replace(old_side_tabs, new_side_tabs) + + +old_tab_btn = """ .global-bottom-bar .bb-tab-btn { + border: 1px solid transparent; + background: transparent; + color: var(--text-secondary); + border-radius: 8px; + text-align: left; + font-size: 0.82rem; + font-weight: 700; + padding: 0.35rem 0.5rem; + line-height: 1.2; + } + + .global-bottom-bar .bb-tab-btn.is-active { + border-color: var(--accent); + color: var(--accent); + background: var(--bg-card); + }""" +new_tab_btn = """ .global-bottom-bar .bb-tab-btn { + border: 1px solid transparent; + background: transparent; + color: var(--text-secondary); + border-radius: 8px; + text-align: left; + font-size: 0.85rem; + font-weight: 600; + padding: 0.5rem 0.75rem; + line-height: 1.3; + transition: all 0.2s ease; + display: flex; + align-items: center; + gap: 0.5rem; + } + .global-bottom-bar .bb-tab-btn i { + font-size: 1rem; + opacity: 0.7; + } + .global-bottom-bar .bb-tab-btn:hover { + background: rgba(var(--text-primary-rgb), 0.05); + color: var(--text-primary); + } + + .global-bottom-bar .bb-tab-btn.is-active { + background: var(--bg-card); + color: var(--accent); + box-shadow: 0 2px 6px rgba(0,0,0,0.06); + font-weight: 700; + } + .global-bottom-bar .bb-tab-btn.is-active i { + opacity: 1; + color: var(--accent); + }""" +content = content.replace(old_tab_btn, new_tab_btn) + +old_tab_content = """ .global-bottom-bar .bb-tab-content { + padding: 0.65rem 0.8rem; + overflow: auto; + } + + .global-bottom-bar .bb-tab-title { + font-size: 0.9rem; + font-weight: 800; + color: var(--text-primary); + margin-bottom: 0.45rem; + } + + .global-bottom-bar .bb-tab-list { + list-style: none; + margin: 0; + padding: 0; + display: grid; + gap: 0.35rem; + } + + .global-bottom-bar .bb-tab-list li { + border-left: 3px solid var(--accent); + background: var(--accent-light); + border-radius: 6px; + padding: 0.38rem 0.55rem; + font-size: 0.81rem; + line-height: 1.3; + color: var(--text-primary); + }""" +new_tab_content = """ .global-bottom-bar .bb-tab-content { + padding: 1.2rem; + overflow: auto; + } + + .global-bottom-bar .bb-tab-title { + font-size: 1.1rem; + font-weight: 700; + color: var(--text-primary); + margin-bottom: 1rem; + display: flex; + align-items: center; + gap: 0.5rem; + } + + .global-bottom-bar .bb-tab-list { + list-style: none; + margin: 0; + padding: 0; + display: grid; + gap: 0.6rem; + } + + .global-bottom-bar .bb-tab-list li { + border-left: 4px solid var(--accent); + background: var(--accent-light); + border-radius: 6px 8px 8px 6px; + padding: 0.75rem 1rem; + font-size: 0.88rem; + line-height: 1.4; + color: var(--text-primary); + box-shadow: 0 1px 3px rgba(0,0,0,0.03); + transition: transform 0.2s ease; + } + .global-bottom-bar .bb-tab-list li:hover { + transform: translateX(2px); + }""" +content = content.replace(old_tab_content, new_tab_content) + +old_detail_line = """ .global-bottom-bar .bb-detail-line { + margin-top: 0.35rem; + background: var(--bg-card); + border: 1px solid rgba(0, 0, 0, 0.08); + border-radius: 8px; + padding: 0.35rem 0.6rem; + font-size: 0.8rem; + color: var(--text-secondary); + white-space: nowrap; + overflow-x: auto; + scrollbar-width: thin; + }""" +new_detail_line = """ .global-bottom-bar .bb-detail-line { + margin-top: 0.5rem; + background: transparent; + padding: 0 0.5rem; + font-size: 0.82rem; + color: var(--text-secondary); + white-space: nowrap; + overflow-x: auto; + scrollbar-width: none; + transition: opacity 0.2s ease; + } + .global-bottom-bar.is-expanded .bb-detail-line { + opacity: 0; + pointer-events: none; + position: absolute; + }""" +content = content.replace(old_detail_line, new_detail_line) + +# Now fix the markup icons +old_markup = """""" + +new_markup = """""" +content = content.replace(old_markup, new_markup) + +with open("app/shared/frontend/base.html", "w") as f: + f.write(content) diff --git a/patch_mail_help.py b/patch_mail_help.py new file mode 100644 index 0000000..8a0a126 --- /dev/null +++ b/patch_mail_help.py @@ -0,0 +1,10 @@ +with open("app/emails/frontend/emails.html", "r") as f: + content = f.read() + +target = ' ' +replacement = target + ' ' + +content = content.replace(target, replacement) + +with open("app/emails/frontend/emails.html", "w") as f: + f.write(content) diff --git a/patch_manual_backend.py b/patch_manual_backend.py new file mode 100644 index 0000000..477926b --- /dev/null +++ b/patch_manual_backend.py @@ -0,0 +1,95 @@ +import re + +with open("app/modules/manual/backend/router.py", "r") as f: + text = f.read() + +# Make sure to import cache +if "from app.modules.manual.backend.cache import manual_cache" not in text: + text = text.replace("from app.core.database import", "from app.modules.manual.backend.cache import manual_cache\nfrom app.core.database import") + +# Patch GET list: +# It has def get_manual_articles( ... ) -> Dict[str, Any]: +# Need to inject at the top of that function. +patch_list = """async def get_manual_articles( + module: Optional[str] = Query(None, description="Filtrer på modul"), + difficulty: Optional[DifficultyType] = Query(None, description="Filtrer på sværhedsgrad"), + tag: Optional[str] = Query(None, description="Filtrer på et bestemt tag"), + search: Optional[str] = Query(None, description="Søg i titel, summary og content"), + limit: int = Query(50, ge=1, le=100), + offset: int = Query(0, ge=0), +) -> Dict[str, Any]: + cache_key = f"list:{module}:{difficulty}:{tag}:{search}:{limit}:{offset}" + cached = manual_cache.get(cache_key) + if cached: + return cached""" + +text = re.sub( + r'async def get_manual_articles\([^)]*\)\s*->\s*Dict\[str, Any\]:', + patch_list, + text +) + +# And at the end of get_manual_articles: +# return {"items": rows, "total": total} +# Replace with setting cache +text = text.replace( + 'return {"items": rows, "total": total}', + 'result = {"items": rows, "total": total}\n manual_cache.set(cache_key, result)\n return result' +) + +# Patch Context: +patch_context = """async def contextual_manual_suggestions( + module: str = Query(..., description="Modulet der søges hjælp ud fra, fx 'Sag'"), + tag: Optional[str] = Query(None, description="Kategori eller tag fra konteksten"), + limit: int = Query(5, ge=1, le=10) +): + cache_key = f"context:{module}:{tag}:{limit}" + cached = manual_cache.get(cache_key) + if cached: + return cached""" + +text = re.sub( + r'async def contextual_manual_suggestions\([^)]*\):', + patch_context, + text +) +# return {"results": rows} +text = text.replace( + 'return {"results": rows}', + 'result = {"results": rows}\n manual_cache.set(cache_key, result)\n return result' +) + +# Patch Get Slug: +patch_slug = """async def get_manual_article(slug: str, background_tasks: BackgroundTasks): + cache_key = f"slug:{slug}" + cached = manual_cache.get(cache_key) + + if cached: + background_tasks.add_task(_increment_use_count, cached["id"]) + return cached""" + +text = re.sub( + r'async def get_manual_article\(slug: str.*?BackgroundTasks[^)]*\):', + patch_slug, + text +) + +text = re.sub( + r'return \{\s*"article": article,\s*"steps": steps,\s*"relations": related\s*\}', + 'result = {"article": article, "steps": steps, "relations": related}\n manual_cache.set(cache_key, result)\n return result', + text +) + +# Invalidation: +mutations = ['async def create_manual_article', 'async def update_manual_article', 'async def delete_manual_article'] +for m in mutations: + text = text.replace(m, "@manual_cache.clear\n" + m) + +# Actually, the python decorator is not made in cache.py, let me just add manual_cache.clear() inside them instead. +text = text.replace('@manual_cache.clear\n', '') +text = text.replace('return {"status": "success"', 'manual_cache.clear()\n return {"status": "success"') +text = text.replace('return {"status": "created"', 'manual_cache.clear()\n return {"status": "created"') + +with open("app/modules/manual/backend/router.py", "w") as f: + f.write(text) + diff --git a/patch_next_task.py b/patch_next_task.py new file mode 100644 index 0000000..d3c8021 --- /dev/null +++ b/patch_next_task.py @@ -0,0 +1,37 @@ +import re + +with open("static/js/bottom-bar.js", "r") as f: + text = f.read() + +replacement = """ + if (btn.id === 'btnNextTask') { + console.log("-> Beder backend om næste opgave..."); + btn.innerHTML = ' Omsætter kalender og SLA...'; + btn.disabled = true; + + fetch('/api/v1/bottom_bar/next_task', { + method: 'POST' + }) + .then(r => r.json()) + .then(data => { + const task = data.task; + btn.innerHTML = 'Du fik tildelt: ' + task.title + ' (Sag #' + task.case_id + ')'; + btn.classList.add('btn-success'); + btn.classList.remove('btn-primary'); + + // Notificer bruger ift kalender + console.log("Routing besked:", data.message); + alert("Opgave allokeret. " + data.message); + }) + .catch(err => { + console.error("Fejl:", err); + btn.innerHTML = "Fejl - prøv igen"; + btn.disabled = false; + }); + } +""" + +text = re.sub(r'if \(btn\.id === \'btnNextTask\'\) \{.*?btn\.classList\.remove\(\'btn-primary\'\);\n \}, 1000\);\n \}', replacement.strip(), text, flags=re.DOTALL) + +with open("static/js/bottom-bar.js", "w") as f: + f.write(text) diff --git a/patch_overview_logic.py b/patch_overview_logic.py new file mode 100644 index 0000000..90e8b87 --- /dev/null +++ b/patch_overview_logic.py @@ -0,0 +1,27 @@ +with open("static/js/bottom-bar.js", "r") as f: + content = f.read() + +old_overview = """ if (key === 'overview') { + return [ + 'Velkommen til dit overblik', + 'Her vises det vigtigste på tværs af systemet', + 'Næste opgave kl. 14:00' + ]; + }""" +new_overview = """ if (key === 'overview') { + let out = []; + if (urgent.count > 0) out.push('🚨 Hastesager: ' + urgent.count + ' aktive'); + if (mail.unread > 0) out.push('📧 Ubesvarede mails: ' + mail.unread + ' (' + mail.customer_reply_needed + ' kræver svar)'); + if (cases.open > 0) out.push('📂 Åbne sager i alt: ' + cases.open); + if (kuma.down > 0) out.push('📉 Uptime Kuma nedetid: ' + kuma.down + ' enheder'); + if (eset.incidents > 0) out.push('🔐 ESET incidents: ' + eset.incidents); + + if (out.length === 0) { + out.push('🎉 Alt ser grønt ud! Intet kritisk lige nu.'); + out.push('👉 Klik på fanerne til venstre for mere info.'); + } + return out; + }""" +content = content.replace(old_overview, new_overview) +with open("static/js/bottom-bar.js", "w") as f: + f.write(content) diff --git a/patch_sag_help.py b/patch_sag_help.py new file mode 100644 index 0000000..a65fcc4 --- /dev/null +++ b/patch_sag_help.py @@ -0,0 +1,10 @@ +with open("app/modules/sag/templates/detail.html", "r") as f: + content = f.read() + +target = '' +replacement = target + '\n ' + +content = content.replace(target, replacement) + +with open("app/modules/sag/templates/detail.html", "w") as f: + f.write(content) diff --git a/patch_urls.py b/patch_urls.py new file mode 100644 index 0000000..1051a47 --- /dev/null +++ b/patch_urls.py @@ -0,0 +1,22 @@ +import re + +# Fix static JS calls +with open("static/js/bottom-bar.js", "r") as f: + text = f.read() + +text = text.replace("/api/v1/bottom_bar/next_task", "/api/v1/bottom-bar/next_task") + +with open("static/js/bottom-bar.js", "w") as f: + f.write(text) + +# Fix main.py prefix +with open("main.py", "r") as f: + text = f.read() + +# Replace prefix +text = re.sub(r'app\.include_router\(bottom_bar_api\.router, prefix="/api/v1", tags=\["Bottom Bar"\]\)', + 'app.include_router(bottom_bar_api.router, prefix="/api/v1/bottom-bar", tags=["Bottom Bar"])', + text) + +with open("main.py", "w") as f: + f.write(text) diff --git a/patch_views_fastapi.py b/patch_views_fastapi.py new file mode 100644 index 0000000..7b29cb8 --- /dev/null +++ b/patch_views_fastapi.py @@ -0,0 +1,40 @@ +import re + +with open("app/modules/manual/frontend/views.py", "r") as f: + content = f.read() + +# 1. Ensure BackgroundTasks is imported +if "from fastapi import" in content and "BackgroundTasks" not in content: + content = content.replace("from fastapi import ", "from fastapi import BackgroundTasks, ") + +# 2. Add BackgroundTasks to the manual_detail function signature +target_def = "async def manual_detail(request: Request, slug: str):" +new_def = "async def manual_detail(request: Request, slug: str, background_tasks: BackgroundTasks):" +content = content.replace(target_def, new_def) + +# 3. Define the background method if not existing +bg_def = """ +def _increment_use_count(manual_id: str): + try: + execute_query( + "UPDATE manual_articles SET use_count = COALESCE(use_count, 0) + 1 WHERE id = %s", + (manual_id,) + ) + except Exception as e: + logger.error(f"Failed to increment use_count for manual {manual_id}: {e}") + +@router.get("/manual/{slug}", response_class=HTMLResponse) +""" +content = content.replace('@router.get("/manual/{slug}", response_class=HTMLResponse)', bg_def) + +# 4. Replace the execute_query in the endpoint +target_inc = """ execute_query( + "UPDATE manual_articles SET use_count = COALESCE(use_count, 0) + 1 WHERE id = %s", + (article["id"],), + )""" +new_inc = """ # Increment view async to save latency + background_tasks.add_task(_increment_use_count, article["id"])""" +content = content.replace(target_inc, new_inc) + +with open("app/modules/manual/frontend/views.py", "w") as f: + f.write(content) diff --git a/rewrite_bottom_bar.py b/rewrite_bottom_bar.py new file mode 100644 index 0000000..f7ef252 --- /dev/null +++ b/rewrite_bottom_bar.py @@ -0,0 +1,264 @@ +with open("static/js/bottom-bar.js", "r") as f: + content = f.read() + +# We replace everything from getCounts downwards. +# Let's find the start of getCounts +start_idx = content.find("function getCounts") + +new_logic = """function getCounts(sections) { + const mail = sections.mail || {}; + const cases = sections.cases || {}; + const urgent = sections.urgent || {}; + const timer = sections.timer || {}; + const kuma = sections.kuma || {}; + const eset = sections.eset || {}; + + return { + mail: Number(mail.unread || 0), + cases: Number(cases.open || 0), + urgent: Number(urgent.count || 0), + timer: Number(timer.active_count || 0), + kuma: Number(kuma.down || 0), + eset: Number(eset.incidents || 0) + }; + } + + function detailTextFor(key, sections) { + const counts = getCounts(sections); + const nameMap = { + mail: 'Ubesvarede mails', + cases: 'Åbne sager', + urgent: 'Hastesager', + timer: 'Aktive timere', + kuma: 'Kuma alerts', + eset: 'ESET incidents' + }; + const val = counts[key] || 0; + return nameMap[key] + ': ' + val; + } + + function listFor(key, sections) { + const mail = sections.mail || {}; + const cases = sections.cases || {}; + const urgent = sections.urgent || {}; + const timer = sections.timer || {}; + const kuma = sections.kuma || {}; + const eset = sections.eset || {}; + const messages = sections.messages || {}; + const tasks = sections.tasks || {}; + const boss = sections.boss || {}; + + if (key === 'overview') { + return [ + 'Velkommen til dit overblik', + 'Her vises det vigtigste på tværs af systemet', + 'Næste opgave kl. 14:00' + ]; + } + + if (key === 'timer') { + if (timer.active_count > 0) { + return (timer.list || []).map(t => 'Timer aktiv: ' + t.description); + } + return ['Ingen aktive timere lige nu.']; + } + + if (key === 'messages') { + if (messages.count > 0) { + return (messages.list || []).map(m => m.from + ': ' + m.text); + } + return ['Ingen nye beskeder.']; + } + + if (key === 'tasks') { + if (tasks.count > 0) { + return (tasks.list || []).map(t => t.title + ' (Deadline: ' + t.deadline + ')'); + } + return ['Ingen aktuelle opgaver.']; + } + + if (key === 'boss') { + if (boss.stats) { + return [ + 'Ufordelte opgaver: ' + boss.stats.unassigned, + 'Medarbejdere aktive: ' + boss.stats.active_employees + ]; + } + return ['Henter chef-overblik...']; + } + + return ['Klik rundt i menuen for at se data for ' + key]; + } + + function updateBar(sections) { + const counts = getCounts(sections); + const keys = Object.keys(counts); + + for (let i = 0; i < keys.length; i++) { + const key = keys[i]; + const chipText = document.querySelector('.bb-chip[data-bb-key="' + key + '"] .bb-chip-text'); + const chip = document.querySelector('.bb-chip[data-bb-key="' + key + '"]'); + if (chipText && chip) { + const val = counts[key]; + + const labels = { + mail: 'Mails', + cases: 'Sager', + urgent: 'Hastesager', + timer: 'Timere', + kuma: 'Kuma', + eset: 'ESET' + }; + + chipText.textContent = labels[key] + ': ' + val; + chip.classList.toggle('has-items', val > 0); + } + } + } + + function renderTabPanel() { + const titleContainer = byId('bbTabTitle'); + const innerContent = byId('bbTabInnerContent'); + if (!titleContainer || !innerContent) { + return; + } + + const titleText = titleContainer.querySelector('.bb-tab-title-text'); + + const titleByKey = { + overview: 'Overblik', + timer: 'Timere', + messages: 'Beskeder', + tasks: 'Opgaver', + boss: 'Chef Dashboard' + }; + + const iconByKey = { + overview: 'bi-bell', + timer: 'bi-stopwatch', + messages: 'bi-chat-dots', + tasks: 'bi-calendar-check', + boss: 'bi-person-workspace' + }; + + const activeTitle = titleByKey[activeKey] || 'Info'; + if (titleText) { + titleText.textContent = activeTitle; + } else { + titleContainer.textContent = activeTitle; + } + + const iconSpan = titleContainer.querySelector('.bi'); + if (iconSpan) { + iconSpan.className = 'bi ' + (iconByKey[activeKey] || 'bi-info-circle') + ' me-2 text-accent'; + } + + // Render lists + const lines = listFor(activeKey, latestSections); + const ul = document.createElement('ul'); + ul.className = 'bb-tab-list'; + lines.forEach(function (line) { + const li = document.createElement('li'); + li.innerHTML = String(line) + .replaceAll('&', '&') + .replaceAll('<', '<') + .replaceAll('>', '>'); + ul.appendChild(li); + }); + + innerContent.innerHTML = ''; + innerContent.appendChild(ul); + } + + function bindSideTabs() { + const buttons = document.querySelectorAll('.bb-tab-btn'); + for (let i = 0; i < buttons.length; i++) { + buttons[i].addEventListener('click', function () { + for (let j = 0; j < buttons.length; j++) { + buttons[j].classList.remove('is-active'); + buttons[j].setAttribute('aria-selected', 'false'); + } + this.classList.add('is-active'); + this.setAttribute('aria-selected', 'true'); + + activeKey = this.getAttribute('data-bb-tab'); + renderTabPanel(); + + const detail = byId('bbCountDetail'); + if (detail) { + detail.innerHTML = ' Viser: ' + (activeKey.charAt(0).toUpperCase() + activeKey.slice(1)); + } + }); + } + } + + function bindChipClicks() { + const chips = document.querySelectorAll('.bb-chip'); + for (let i = 0; i < chips.length; i++) { + chips[i].addEventListener('click', function () { + const key = this.getAttribute('data-bb-key'); + if (!key) return; + + const detail = byId('bbCountDetail'); + if (detail) { + detail.innerHTML = ' ' + detailTextFor(key, latestSections); + } + + // If not expanded, expand it + const shell = byId('globalBottomBar'); + if (shell && !shell.classList.contains('is-expanded')) { + setExpanded(true); + } + + // Map top chip keys to side tabs if applicable, else 'overview' + let targetTab = 'overview'; + if (key === 'timer') targetTab = 'timer'; + + const tabBtn = document.querySelector('.bb-tab-btn[data-bb-tab="' + targetTab + '"]'); + if (tabBtn) tabBtn.click(); + }); + } + } + + function bindSheetToggle() { + const toggle = byId('bbSheetToggle'); + if (!toggle) return; + toggle.addEventListener('click', function () { + const shell = byId('globalBottomBar'); + if (!shell) return; + const isExp = shell.classList.contains('is-expanded'); + setExpanded(!isExp); + }); + } + + function tick() { + fetchBottomBarState().then(function (data) { + if (data && data.enabled) { + latestSections = data.sections || {}; + updateBar(latestSections); + renderTabPanel(); + setVisibility(true); + } else { + setVisibility(false); + } + }).catch(function (err) { + console.warn('Bottom bar poll failed', err); + }).finally(function () { + window.setTimeout(tick, 15000); + }); + } + + document.addEventListener('DOMContentLoaded', function () { + activeKey = 'overview'; // Default overview state + bindChipClicks(); + bindSheetToggle(); + bindSideTabs(); + tick(); + }); + +})(); +""" + +combined = content[:start_idx] + new_logic +with open("static/js/bottom-bar.js", "w") as f: + f.write(combined) diff --git a/static/js/## Plan: Manualmodul MVP i BMC Hub.prompt.md b/static/js/## Plan: Manualmodul MVP i BMC Hub.prompt.md new file mode 100644 index 0000000..88bbe13 --- /dev/null +++ b/static/js/## Plan: Manualmodul MVP i BMC Hub.prompt.md @@ -0,0 +1,93 @@ +## Plan: Manualmodul MVP i BMC Hub + +Lever et API-first manualmodul med UUID-baseret datamodel, dedikeret oversigt/artikelsider, kontekstuel modalhjælp og admin CRUD i samme MVP. Implementer søgning med ILIKE nu for hurtig leverance og lav en klar fase-2 bane til PostgreSQL full-text + synonymer, så performance og AI-ready retning bevares uden at blokere MVP. + +**Steps** +1. Fase 1: Datamodel + migrationer (blokkerende) +2. Definér og opret tabellerne manual_articles, manual_steps og manual_relations med UUID primary keys, timestamps og soft delete (deleted_at). Tilføj nødvendige indeks for slug-opslag, modulfiltrering, sværhedsgrad, og relation-opslag. Markér slug som unik. +3. Beslut relation mellem manualer og eksisterende tagsystem: brug enten direkte JSONB tags i manual_articles (hurtigst) eller kobling til eksisterende tags/entity_tags via entity_type=manual. For MVP anbefales begge: behold tags JSONB til hurtig filtrering og tilføj relation hooks til entity_tags for fremtidig konsolidering. Depends on step 2. +4. Fase 2: Backend API + services +5. Opret ny vertical slice for manualmodulet med router, models og service-lag efter eksisterende featurestruktur. Router skal registreres under /api/v1/manual i main app startup. Depends on fase 1. +6. Implementer endpoints: GET liste (filtre: module, tags, difficulty, search), GET by slug, POST create, PUT update, DELETE soft delete. Tilføj validering for slug-kollisioner og payload-format for steps/relations. Parallel with step 7 once models are in place. +7. Implementer nested håndtering af steps (sorteret efter step_number) og related-manuals retrieval i artikel-endpoint, så frontend kan rendere én samlet artikelvisning uden ekstra roundtrips. Parallel with step 6. +8. Implementer kontekst-endpoint (fx query param context_module eller context_tag) så ?-ikoner kan hente relevante manualer direkte fra aktivt modul. Depends on step 6. +9. Fase 3: Frontend visning + kontekstuel hjælp +10. Opret manualsider i eksisterende template-system: en oversigtsside og en artikelside. Bevar Nordic Top, eksisterende dark mode og CSS variable-tema. Depends on fase 2. +11. Implementer UI i oversigten: søgefelt, modulfilter, tagfilter, sværhedsgrad og sortering med mest brugte øverst (baseret på visningscounter eller fallback created/updated sort indtil metrics er tilføjet). Parallel with step 12. +12. Implementer artikelside med titel, summary, step-by-step blokke, media (lazy loading), relaterede manualer og Åbn i kontekst-links. Parallel with step 11. +13. Integrer ?-ikon i prioriterede moduler (Sag, Hardware, Mail) med modal viewer, der loader relevant manual via context query. Brug eksisterende Bootstrap modal-mønster i base layout. Depends on step 8 and step 10. +14. Fase 4: Admin CRUD UI (MVP-krav) +15. Opret admin-side til opret/rediger/slet manualer med markdown editor, preview, step-editor og relation-editor. Brug server-side forms + eksisterende komponentmønstre for hurtig stabil levering. Depends on fase 2. +16. Implementer upload flow for billeder/video med validering af filtype/størrelse og lagring via eksisterende uploadmønster i repo. Sørg for at manual media kan references fra manual_steps. Depends on step 15. +17. Fase 5: Performance + observability + hardening +18. Tilføj målrettede indeks og query tuning for liste/slug/kontekst-opslag så listekald kan holde sig under 200ms i normal drift. Depends on fase 2. +19. Tilføj simpel cache for populære manualer (fx memory/cache-lag på GET liste og GET by slug), med sikker invalidation ved POST/PUT/DELETE. Depends on step 6. +20. Tilføj audit/logging for admin-ændringer og basis metrics (views/use_count) til ranking af Mest brugte. Parallel with step 19. +21. Fase 6: Verifikation + release +22. Backend tests: endpoint-kontrakter, validering, soft delete, filtrering, søgning og slug-unikhed. +23. Frontend tests/smoke: dark/light mode, responsive layouts, modal-konteksthjælp i Sag/Hardware/Mail, lazy loading af media. +24. Performance test: mål API-responstid for GET /api/v1/manual under realistisk dataset og justér indeks/cache til målopfyldelse. +25. Dokumentér MVP scope, begrænsninger og fase-2 roadmap for full-text + synonym mapping + AI forslag. + +**Relevant files** +- /Users/christianthomas/DEV/bmc_hub_dev/main.py — registrering af nye manual-routere under API v1. +- /Users/christianthomas/DEV/bmc_hub_dev/app/core/database.py — query-patterns, execute_query helpers, transaction-adfærd. +- /Users/christianthomas/DEV/bmc_hub_dev/app/tags/backend/router.py — reference for CRUD/filter/search endpoint struktur. +- /Users/christianthomas/DEV/bmc_hub_dev/app/modules/search/backend/router.py — reference for nuværende ILIKE-baseret søgeadfærd. +- /Users/christianthomas/DEV/bmc_hub_dev/app/shared/frontend/base.html — dark mode toggle, navbar, modal patterns og theming variables. +- /Users/christianthomas/DEV/bmc_hub_dev/app/modules/orders/templates/list.html — reference for liste-layout med filter/toolbar/stats. +- /Users/christianthomas/DEV/bmc_hub_dev/app/modules/hardware/templates/detail.html — reference for detailside mønster og infoblokke. +- /Users/christianthomas/DEV/bmc_hub_dev/migrations/027_tag_system.sql — eksisterende tag/entity_tags arkitektur til manual relation. + +**Verification** +1. Kør backend tests for alle manual-endpoints inkl. edge cases: manglende slug, dobbelt slug, tomme steps, soft-deleted records. +2. Kør integrationstest med seedet data: filtrering (module/tags/difficulty), kontekst-lookup og related manuals. +3. Kør UI-smoke på desktop + mobil: manual oversigt, artikelside, admin editor, ?-ikon modal i 3 moduler. +4. Mål responstid på GET liste + GET slug med og uden cache; dokumentér baseline og efteroptimering. +5. Verificér accessibility basics: focus states, kontrast i dark/light, keyboard-lukning af modal. + +**Decisions** +- UUID vælges til manualtabellerne, selvom øvrige features ofte bruger serial id. +- MVP inkluderer både dedikerede manualsider og modalbaseret konteksthjælp. +- MVP inkluderer fuld admin CRUD UI inkl. markdown, preview og media-upload. +- MVP bruger simpel ILIKE-søgning; FTS + synonym-mapping flyttes til fase 2. + +**Scope boundaries** +- Inkluderet: manualliste, artikel, relationer til modul/tag/sag-type, kontekstuel ?-hjælp, admin CRUD, simpel søgning. +- Ekskluderet i MVP: AI chatbot, auto-generering af manualer, heatmaps, avanceret synonym-ranking i runtime. + +**Further Considerations** +1. Fase-2 datamodel for synonymer bør designes nu (table for canonical_term/alias/context), men aktiveres først efter MVP-go-live. +2. Overvej at gøre use_count events asynkrone for at undgå write-overhead på hvert view-request. +3. Afklar tidligt om markdown rendering skal sanitizes ekstra hårdt (XSS policy) i både preview og public view. + +**Sprint-opdeling (forslag)** +1. Sprint 1 (5-7 dage): Fundament + API basis +- Leverancer: migrationer (UUID), manual core models, CRUD endpoints (liste/by slug/create/update/delete), simpel ILIKE søgning, baseline tests for API kontrakter. +- Exit-kriterier: GET liste og GET slug stabile i testmiljø, soft delete virker, slug-unikhed håndhæves. +- Estimat: 30-40 timer. + +2. Sprint 2 (5-7 dage): Frontend brugerflow + konteksthjælp +- Leverancer: /manual oversigt, /manual/{slug} artikel, filter/search UI, relaterede manualer, ?-ikon modal i Sag/Hardware/Mail med kontekst-filtrering. +- Exit-kriterier: Bruger kan finde manual på maks 2 klik fra modul, dark/light mode og mobil virker uden regressions. +- Estimat: 35-45 timer. + +3. Sprint 3 (5-7 dage): Admin CRUD + media + hardening +- Leverancer: admin editor (markdown + preview), steps/relation editor, billede/video upload, caching af populære manualer, metrics/audit logging. +- Exit-kriterier: Admin kan vedligeholde manualer end-to-end uden DB-manualarbejde, liste-load holder performance mål i normal drift. +- Estimat: 40-55 timer. + +4. Sprint 4 (2-4 dage): Stabilisering + release +- Leverancer: performance tuning (<200ms mål), integration/smoke tests, accessibility baseline, release notes + fase-2 backlog (FTS/synonymer/AI). +- Exit-kriterier: Produktionsklar MVP med dokumenteret teststatus og kendte begrænsninger. +- Estimat: 16-28 timer. + +**Samlet estimat** +- Lavt/højt spænd: 121-168 timer. +- Anbefalet bemanding: 1 backend + 1 frontend (delvist parallelt) eller 1 fullstack med 20-30% længere kalenderforløb. + +**Parallelisering pr. sprint** +1. Sprint 1: DB migration + API modelarbejde kan starte parallelt; endpoint wiring afhænger af migration. +2. Sprint 2: Oversigtsside og artikelside kan bygges parallelt; modal-integration afhænger af kontekst-endpoint. +3. Sprint 3: Admin editor og caching/metrics kan køre parallelt; upload flow afhænger af valgt storage pattern. +4. Sprint 4: Testautomatisering og performance profiling kan køre parallelt frem mod release cut. diff --git a/static/js/bottom-bar.js b/static/js/bottom-bar.js new file mode 100644 index 0000000..70f9733 --- /dev/null +++ b/static/js/bottom-bar.js @@ -0,0 +1,1011 @@ +(function () { + let latestSections = {}; + let latestContextActions = { global: [], context: [] }; + let activeKey = 'timer'; + let overviewFilter = null; + let ws = null; + let pollTimer = null; + let wsReconnectTimer = null; + let latestNotificationCount = 0; + let latestNotifications = []; + + function byId(id) { + return document.getElementById(id); + } + + function escapeHtml(value) { + return String(value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + } + + async function fetchBottomBarState() { + const contextPath = encodeURIComponent(window.location.pathname || '/'); + const response = await fetch('/api/v1/bottom-bar/state?context=' + contextPath, { + credentials: 'same-origin', + headers: { + 'Accept': 'application/json' + } + }); + + if (!response.ok) { + throw new Error('Could not load bottom bar state'); + } + + return response.json(); + } + + function applyState(data) { + if (data && data.enabled) { + latestSections = data.sections || {}; + latestContextActions = (latestSections.context_actions || { global: [], context: [] }); + latestNotificationCount = Number((((data || {}).notifications || {}).count) || 0); + latestNotifications = (((data || {}).notifications || {}).items || []); + syncBossTabVisibility(); + updateBar(latestSections); + updateActivityZone(); + renderTabPanel(); + setVisibility(true); + return; + } + setVisibility(false); + } + + function setVisibility(enabled) { + const shell = byId('globalBottomBar'); + if (!shell) { + return; + } + + if (enabled) { + shell.hidden = false; + window.requestAnimationFrame(function () { + shell.classList.add('is-visible'); + }); + } else { + shell.classList.remove('is-visible'); + window.setTimeout(function () { + if (!shell.classList.contains('is-visible')) { + shell.hidden = true; + } + }, 320); + } + + document.body.classList.toggle('bottom-bar-visible', !!enabled); + if (!enabled) { + document.body.classList.remove('bottom-bar-expanded'); + } + } + + function setExpanded(expanded) { + const shell = byId('globalBottomBar'); + const toggle = byId('bbSheetToggle'); + const panel = byId('bbSheetPanel'); + if (!shell || !toggle || !panel) { + return; + } + + shell.classList.toggle('is-expanded', !!expanded); + document.body.classList.toggle('bottom-bar-expanded', !!expanded); + toggle.setAttribute('aria-expanded', expanded ? 'true' : 'false'); + panel.setAttribute('aria-hidden', expanded ? 'false' : 'true'); + } + + function syncBossTabVisibility() { + const bossBtn = document.querySelector('.bb-tab-btn[data-bb-tab="boss"]'); + if (!bossBtn) { + return; + } + + bossBtn.classList.remove('d-none'); + } + + function getCounts(sections) { + const mail = sections.mail || {}; + const cases = sections.cases || {}; + const urgent = sections.urgent || {}; + const timer = sections.timer || {}; + const kuma = sections.kuma || {}; + const eset = sections.eset || {}; + const unassigned = sections.unassigned || {}; + + return { + mail: Number(mail.unread || 0), + cases: Number(cases.open || 0), + urgent: Number(urgent.count || 0), + unassigned: Number(unassigned.count || 0), + timer: Number(timer.active_count || 0), + kuma: Number(kuma.down || 0), + eset: Number(eset.incidents || 0) + }; + } + + function detailTextFor(key, sections) { + const counts = getCounts(sections); + const nameMap = { + mail: 'Ubesvarede mails', + cases: 'Åbne sager', + urgent: 'Hastesager', + unassigned: 'Sager uden ansvarlig', + timer: 'Aktive timere', + kuma: 'Kuma alerts', + eset: 'ESET incidents' + }; + const val = counts[key] || 0; + return nameMap[key] + ': ' + val; + } + + function severityClassFor(key, value) { + const val = Number(value || 0); + if (key === 'urgent') { + return val > 0 ? 'sev-critical' : 'sev-ok'; + } + if (key === 'unassigned') { + if (val >= 3) return 'sev-critical'; + if (val > 0) return 'sev-warn'; + return 'sev-ok'; + } + if (key === 'mail') { + if (val >= 10) return 'sev-critical'; + if (val > 0) return 'sev-warn'; + return 'sev-ok'; + } + return val > 0 ? 'sev-warn' : 'sev-ok'; + } + + function listFor(key, sections) { + const mail = sections.mail || {}; + const cases = sections.cases || {}; + const urgent = sections.urgent || {}; + const timer = sections.timer || {}; + const kuma = sections.kuma || {}; + const eset = sections.eset || {}; + const messages = sections.messages || {}; + const tasks = sections.tasks || {}; + const boss = sections.boss || {}; + + function esc(str) { + return String(str).replace(/&/g, '&').replace(//g, '>'); + } + + if (key === 'overview') { + if (overviewFilter === 'urgent') return urgent.list ? urgent.list.map(u => '
Hastesag: ' + esc(u.title) + '
') : ['Ingen hastesager.']; + if (overviewFilter === 'kuma') return kuma.list ? kuma.list.map(k => '
📉 ' + esc(k) + '
') : ['Alle systemer oppe.']; + if (overviewFilter === 'eset') return eset.list ? eset.list.map(e => '
🔐 ' + esc(e) + '
') : ['Ingen ESET incidents.']; + if (overviewFilter === 'cases') return cases.list ? cases.list.map(c => '
' + esc(c.title) + '
') : ['Ingen åbne sager.']; + if (overviewFilter === 'mail') return ['
📧 ' + mail.unread + ' ulæste mails.
💬 ' + mail.customer_reply_needed + ' kræver kundesvar.
']; + + let out = []; + if (urgent.count > 0) out.push('
Hastesager: ' + urgent.count + ' aktive
'); + if (mail.unread > 0) out.push('
Ubesvarede mails: ' + mail.unread + '
'); + if (cases.open > 0) out.push('
Åbne sager i alt: ' + cases.open + '
'); + if (kuma.down > 0) out.push('
Uptime Kuma nedetid: ' + kuma.down + ' enheder
'); + if (eset.incidents > 0) out.push('
ESET incidents: ' + eset.incidents + '
'); + + if (out.length === 0) { + out.push('
🎉 Alt ser grønt ud! Intet kritisk lige nu.
'); + } + + // Add quick note button on overview + out.push('
'); + + return out; + } + + if (key === 'timer') { + if (timer.active_count > 0) { + return (timer.list || []).map(t => { + const elapsedText = t.elapsed_hhmmss || (String(t.elapsed || 0) + 's'); + return '
' + esc(t.desc) + ' (' + esc(elapsedText) + ')
'; + }); + } + return ['Ingen aktive timere lige nu.']; + } + + if (key === 'messages') { + if (messages.count > 0) { + return (messages.list || []).map(m => '
' + esc(m.from) + ': ' + esc(m.text) + '
'); + } + return ['Ingen nye beskeder.']; + } + + if (key === 'tasks') { + if (tasks.count > 0) { + return (tasks.list || []).map(t => '
' + esc(t.title) + ' ' + esc(t.deadline) + '
'); + } + return ['Ingen aktuelle opgaver.']; + } + + if (key === 'boss') { + const stats = boss.stats || {}; + const workload = Array.isArray(boss.team_workload) ? boss.team_workload : []; + const techniciansToday = Array.isArray(boss.technicians_today) ? boss.technicians_today : []; + const escalations = Array.isArray(boss.escalations) ? boss.escalations : []; + const unassigned = Array.isArray(boss.unassigned_cases) ? boss.unassigned_cases : []; + + const out = [ + '
' + + '
Åbne sager
' + Number(stats.open_cases || 0) + '
' + + '
Hastesager
' + Number(stats.urgent_cases || 0) + '
' + + '
Uden ansvarlig
' + Number(stats.unassigned || 0) + '
' + + '
Stale >24t
' + Number(stats.stale_urgent_cases || 0) + '
' + + '
', + '
' + + '' + + '' + + '' + + '' + + '
' + ]; + + if (workload.length > 0) { + out.push('
Team-belastning
'); + workload.slice(0, 5).forEach(function (w) { + out.push( + '
' + + '
' + esc(w.owner_name || 'Ukendt') + '
Åbne: ' + Number(w.open_cases || 0) + ' • Haste: ' + Number(w.urgent_cases || 0) + '
' + + '' + + '
' + ); + }); + } + + if (techniciansToday.length > 0) { + out.push('
Teknikernes opgaver i dag
'); + techniciansToday.slice(0, 6).forEach(function (tech) { + const todayTasks = Array.isArray(tech.today_tasks) ? tech.today_tasks : []; + let tasksHtml = '
Ingen opgaver i dag.
'; + if (todayTasks.length > 0) { + tasksHtml = '
' + todayTasks.slice(0, 3).map(function (task) { + return '
' + esc(task.title || ('Sag #' + task.id)) + '
'; + }).join('') + '
'; + } + + out.push( + '
' + + '
' + + '
' + esc(tech.owner_name || 'Tekniker') + '
I dag: ' + Number(tech.due_today_cases || 0) + ' • Åbne: ' + Number(tech.open_cases || 0) + '
' + + '
' + + '' + + '' + + '
' + + '
' + + tasksHtml + + '
' + ); + }); + } + + if (escalations.length > 0) { + out.push('
Eskaleringer
'); + escalations.slice(0, 4).forEach(function (c) { + const ageHours = Math.floor(Number(c.age_seconds || 0) / 3600); + out.push( + '
' + + '
' + esc(c.title || 'Sag') + '
' + esc(c.owner_name || 'Ikke tildelt') + ' • ' + ageHours + 't siden opdatering
' + + '' + + '
' + ); + }); + } + + if (unassigned.length > 0) { + out.push('
Ufordelte sager
'); + unassigned.slice(0, 4).forEach(function (c) { + out.push( + '
' + + '
' + esc(c.title || 'Sag') + '
Prioritet: ' + esc(c.priority || 'normal') + '
' + + '' + + '
' + ); + }); + } + + return out; + } + + return ['Klik rundt i menuen for at se data.']; + } + + function updateBar(sections) { + const counts = getCounts(sections); + const keys = Object.keys(counts); + + for (let i = 0; i < keys.length; i++) { + const key = keys[i]; + const chipText = document.querySelector('.bb-chip[data-bb-key="' + key + '"] .bb-chip-text'); + const chip = document.querySelector('.bb-chip[data-bb-key="' + key + '"]'); + if (chipText && chip) { + const val = counts[key]; + + const labels = { + mail: 'Ulæste mails', + cases: 'Sager', + urgent: 'Hastesager', + unassigned: 'Uden ansvarlig', + timer: 'Timere', + kuma: 'Kuma', + eset: 'ESET' + }; + + chipText.textContent = labels[key] + ': ' + val; + chip.classList.toggle('has-items', val > 0); + chip.classList.remove('sev-ok', 'sev-warn', 'sev-critical'); + chip.classList.add(severityClassFor(key, val)); + chip.setAttribute('title', detailTextFor(key, sections)); + chip.setAttribute('aria-label', detailTextFor(key, sections)); + } + } + } + + function bindChipHoverPreview() { + const chips = document.querySelectorAll('.bb-chip'); + const detail = byId('bbCountDetail'); + if (!detail || !chips.length) { + return; + } + + chips.forEach(function (chip) { + chip.addEventListener('mouseenter', function () { + const key = chip.getAttribute('data-bb-key'); + if (!key) return; + detail.innerHTML = ' ' + detailTextFor(key, latestSections); + }); + + chip.addEventListener('mouseleave', function () { + detail.innerHTML = ' Klik på en kategori for at se detaljer'; + }); + }); + } + + function updateActivityZone() { + const timerChip = byId('bbActiveTimerChip'); + const timerText = byId('bbActiveTimerText'); + const notifCount = byId('bbNotificationsCount'); + + const timer = ((latestSections || {}).timer || {}).active || {}; + const hasActiveTimer = !!timer.active; + if (timerChip && timerText) { + timerChip.classList.toggle('is-hidden', !hasActiveTimer); + if (hasActiveTimer) { + const elapsed = timer.elapsed_hhmmss || '00:00:00'; + const name = timer.sag_navn || ('Sag #' + (timer.sag_id || '')); + timerText.textContent = name + ' - ' + elapsed; + } + } + + if (notifCount) { + const computed = Number(latestNotificationCount || ((latestSections.messages || {}).count || 0)); + notifCount.textContent = String(computed); + } + } + + function renderTabPanel() { + const titleContainer = byId('bbTabTitle'); + const innerContent = byId('bbTabInnerContent'); + if (!titleContainer || !innerContent) { + return; + } + + const titleText = titleContainer.querySelector('.bb-tab-title-text'); + + const titleByKey = { + overview: 'Overblik', + timer: 'Timere', + messages: 'Beskeder', + tasks: 'Opgaver', + boss: 'Chef Dashboard' + }; + + const iconByKey = { + overview: 'bi-bell', + timer: 'bi-stopwatch', + messages: 'bi-chat-dots', + tasks: 'bi-calendar-check', + boss: 'bi-person-workspace' + }; + + const activeTitle = titleByKey[activeKey] || 'Info'; + if (titleText) { + titleText.textContent = activeTitle; + } else { + titleContainer.textContent = activeTitle; + } + + const iconSpan = titleContainer.querySelector('.bi'); + if (iconSpan) { + iconSpan.className = 'bi ' + (iconByKey[activeKey] || 'bi-info-circle') + ' me-2 text-accent'; + } + + // Render rich UI lists + const lines = listFor(activeKey, latestSections); + const ul = document.createElement('ul'); + ul.className = 'bb-tab-list'; + + lines.forEach(function (line) { + const li = document.createElement('li'); + // Allow rich HTML (buttons, inputs) - assuming listFor provides sanitized data wrapped in markup + li.innerHTML = line; + ul.appendChild(li); + }); + + innerContent.innerHTML = ''; + + // Add specific headers/controls based on active tab + if (activeKey === 'tasks') { + const topBar = document.createElement('div'); + topBar.className = 'bb-task-actions mb-3'; + topBar.innerHTML = ''; + innerContent.appendChild(topBar); + } + if (activeKey === 'messages') { + const chatContainer = document.createElement('div'); + chatContainer.className = 'd-flex flex-column h-100'; + ul.classList.add('flex-grow-1', 'mb-3'); + + + + const replyBox = document.createElement('div'); + replyBox.className = 'mt-2 border-top pt-2 border-primary-subtle'; + replyBox.innerHTML = ` +
+ + +
+
+ + +
+ `; + + chatContainer.appendChild(ul); + chatContainer.appendChild(replyBox); + innerContent.appendChild(chatContainer); + + // Fetch users dynamically + fetch('/api/v1/users?is_active=true', { credentials: 'include' }) + .then(r => r.json()) + .then(payload => { + const users = Array.isArray(payload) ? payload : ((payload && payload.data && Array.isArray(payload.data)) ? payload.data : []); + const sel = document.getElementById('chatRecipient'); + if (sel) { + sel.innerHTML = ''; + users.forEach(u => { + sel.innerHTML += ``; + }); + } + }) + .catch(e => console.error("Error fetching users for chat:", e)); + } else { + innerContent.appendChild(ul); + } + + } + + function bindSideTabs() { + const buttons = document.querySelectorAll('.bb-tab-btn'); + for (let i = 0; i < buttons.length; i++) { + buttons[i].addEventListener('click', function (e) { + // Clear filter on direct human click of the button, unless we programmatically called click() + if (e.isTrusted) overviewFilter = null; + + for (let j = 0; j < buttons.length; j++) { + buttons[j].classList.remove('is-active'); + buttons[j].setAttribute('aria-selected', 'false'); + } + this.classList.add('is-active'); + this.setAttribute('aria-selected', 'true'); + + activeKey = this.getAttribute('data-bb-tab'); + renderTabPanel(); + + const detail = byId('bbCountDetail'); + if (detail) { + detail.innerHTML = ' Viser: ' + (activeKey.charAt(0).toUpperCase() + activeKey.slice(1)); + } + }); + } + } + + function bindChipClicks() { + const chips = document.querySelectorAll('.bb-chip'); + for (let i = 0; i < chips.length; i++) { + chips[i].addEventListener('click', function () { + const key = this.getAttribute('data-bb-key'); + if (!key) return; + + const detail = byId('bbCountDetail'); + if (detail) { + detail.innerHTML = ' ' + detailTextFor(key, latestSections); + } + + const routes = { + mail: '/emails', + urgent: '/sag?priority=urgent', + unassigned: '/sag?unassigned=true', + timer: '/timetracking', + cases: '/sag' + }; + + const route = routes[key] || '/dashboard'; + window.location.href = route; + }); + } + } + + function bindSheetToggle() { + const toggle = byId('bbSheetToggle'); + if (!toggle) return; + toggle.addEventListener('click', function () { + const shell = byId('globalBottomBar'); + if (!shell) return; + const isExp = shell.classList.contains('is-expanded'); + setExpanded(!isExp); + }); + } + + function stopPolling() { + if (pollTimer) { + window.clearTimeout(pollTimer); + pollTimer = null; + } + } + + function pollOnce() { + fetchBottomBarState().then(function (data) { + applyState(data); + }).catch(function (err) { + console.warn('Bottom bar poll failed', err); + }).finally(function () { + pollTimer = window.setTimeout(pollOnce, 15000); + }); + } + + function startPollingFallback() { + stopPolling(); + pollOnce(); + } + + function updateFromRealtimeEvent(payload) { + if (!payload || !payload.event) { + return; + } + + if (payload.event === 'timer_tick') { + const timer = payload.data || {}; + latestSections.timer = latestSections.timer || {}; + latestSections.timer.active = timer; + latestSections.timer.active_count = timer.active ? 1 : 0; + latestSections.timer.list = timer.active ? [{ + id: timer.time_entry_id, + sag_id: timer.sag_id, + desc: timer.sag_navn || ('Sag #' + (timer.sag_id || '')), + elapsed: timer.elapsed, + elapsed_hhmmss: timer.elapsed_hhmmss + }] : []; + } + + if (payload.event === 'status_delta') { + const status = payload.data || {}; + latestSections.mail = latestSections.mail || {}; + latestSections.cases = latestSections.cases || {}; + latestSections.urgent = latestSections.urgent || {}; + latestSections.unassigned = latestSections.unassigned || {}; + latestSections.boss = latestSections.boss || { stats: {} }; + + latestSections.mail.unread = Number(status.mails_unread || 0); + latestSections.mail.customer_reply_needed = Number(status.mails_unread || 0); + latestSections.cases.open = Number(status.sager_open || 0); + latestSections.urgent.count = Number(status.sager_urgent || 0); + latestSections.unassigned.count = Number(status.sager_unassigned || 0); + latestSections.boss.stats = latestSections.boss.stats || {}; + latestSections.boss.stats.unassigned = Number(status.sager_unassigned || 0); + } + + if (payload.event === 'notification_delta') { + const notifications = payload.data || {}; + const items = Array.isArray(notifications.items) ? notifications.items : []; + latestSections.messages = latestSections.messages || {}; + latestSections.tasks = latestSections.tasks || {}; + + latestSections.messages.count = items.length; + latestSections.messages.list = items.slice(0, 5).map(function (item) { + return { + from: (item.type || 'System').toString(), + text: (item.title || item.message || 'Notifikation').toString() + }; + }); + + latestSections.tasks.count = items.length; + latestSections.tasks.list = items.slice(0, 5).map(function (item) { + return { + title: item.title || 'Notifikation', + deadline: item.severity || 'info' + }; + }); + latestNotificationCount = Number(notifications.count || items.length || 0); + latestNotifications = items; + } + + syncBossTabVisibility(); + updateBar(latestSections); + updateActivityZone(); + renderTabPanel(); + } + + function scheduleWsReconnect() { + if (wsReconnectTimer) { + window.clearTimeout(wsReconnectTimer); + } + wsReconnectTimer = window.setTimeout(connectRealtime, 3000); + } + + function connectRealtime() { + if (ws && (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CONNECTING)) { + return; + } + + const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; + const wsUrl = protocol + '//' + window.location.host + '/api/v1/bottom-bar/ws'; + + try { + ws = new WebSocket(wsUrl); + } catch (err) { + console.warn('Bottom bar websocket init failed', err); + startPollingFallback(); + scheduleWsReconnect(); + return; + } + + ws.addEventListener('open', function () { + stopPolling(); + }); + + ws.addEventListener('message', function (event) { + try { + const payload = JSON.parse(event.data || '{}'); + updateFromRealtimeEvent(payload); + } catch (err) { + console.warn('Bottom bar websocket parse error', err); + } + }); + + ws.addEventListener('close', function () { + startPollingFallback(); + scheduleWsReconnect(); + }); + + ws.addEventListener('error', function (err) { + console.warn('Bottom bar websocket error', err); + startPollingFallback(); + }); + } + + + function stopActiveTimer() { + const active = ((latestSections || {}).timer || {}).active || {}; + if (!active.time_entry_id) { + return Promise.resolve(); + } + + return fetch('/api/v1/timetracking/time/stop', { + method: 'POST', + credentials: 'include', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ time_id: active.time_entry_id }) + }).catch(function (err) { + console.warn('Failed stopping active timer', err); + }); + } + + function bindHeaderActions() { + const searchBtn = byId('bbSearchBtn'); + const notificationsBtn = byId('bbNotificationsBtn'); + const userStatusBtn = byId('bbUserStatusBtn'); + const pauseBtn = byId('bbTimerPauseBtn'); + const stopBtn = byId('bbTimerStopBtn'); + const switchBtn = byId('bbTimerSwitchBtn'); + const timerChip = byId('bbActiveTimerChip'); + + if (searchBtn) { + searchBtn.addEventListener('click', function () { + const trigger = byId('globalSearchBtn'); + if (trigger) { + trigger.click(); + } + }); + } + + if (notificationsBtn) { + notificationsBtn.addEventListener('click', function () { + if (latestNotifications.length > 0) { + const first = latestNotifications[0] || {}; + if (first.action) { + window.location.href = first.action; + return; + } + } + const trigger = byId('globalRemindersBtn'); + if (trigger) { + trigger.click(); + } + }); + } + + if (userStatusBtn) { + userStatusBtn.addEventListener('click', function () { + const trigger = document.querySelector('[data-bs-target="#profileModal"]'); + if (trigger) { + trigger.click(); + } + }); + } + + if (pauseBtn) { + pauseBtn.addEventListener('click', function () { + stopActiveTimer(); + }); + } + + if (stopBtn) { + stopBtn.addEventListener('click', function () { + stopActiveTimer(); + }); + } + + if (switchBtn) { + switchBtn.addEventListener('click', function () { + window.location.href = '/sag'; + }); + } + + if (timerChip) { + timerChip.addEventListener('click', function () { + window.location.href = '/timetracking'; + }); + } + + document.addEventListener('click', function (e) { + const actionBtn = e.target && e.target.closest('[data-bb-create]'); + if (!actionBtn) return; + + const actionKey = actionBtn.getAttribute('data-bb-create'); + const actions = (latestContextActions.context || []).concat(latestContextActions.global || []); + const matched = actions.find(function (item) { return item.id === actionKey; }); + + if (actionKey === 'new_case') { + const quickBtn = byId('quickCreateBtn'); + if (quickBtn) { + quickBtn.click(); + return; + } + } + if (matched && matched.action) { + window.location.href = matched.action; + } + }); + } + + function bindDynamicActions() { + document.addEventListener('click', function (e) { + const target = e.target; + const btn = target && target.closest('button'); + if (!btn) return; + + const bossAction = btn.getAttribute('data-boss-action'); + if (bossAction) { + if (bossAction === 'assign_next_to_owner') { + const ownerId = Number(btn.getAttribute('data-owner-id') || 0); + if (ownerId <= 0) { + return; + } + + const originalHtml = btn.innerHTML; + btn.disabled = true; + btn.innerHTML = 'Tildeler...'; + + fetch('/api/v1/bottom-bar/boss/assign-next-to-user', { + method: 'POST', + credentials: 'include', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ assignee_user_id: ownerId }) + }) + .then(async r => { + const body = await r.json().catch(() => ({})); + if (!r.ok) { + const detail = body && body.detail ? body.detail : 'Kunne ikke tildele næste sag'; + throw new Error(typeof detail === 'string' ? detail : 'Kunne ikke tildele næste sag'); + } + return body; + }) + .then(data => { + const detail = byId('bbCountDetail'); + if (detail) { + if (data.status === 'assigned' && data.case) { + detail.innerHTML = ' Tildelt: ' + escapeHtml(data.case.title || 'Sag') + ' til tekniker.'; + } else { + detail.innerHTML = ' ' + escapeHtml(data.message || 'Ingen sager at tildele'); + } + } + return fetchBottomBarState(); + }) + .then(applyState) + .catch(err => { + console.error('Assign next to owner failed', err); + const detail = byId('bbCountDetail'); + if (detail) { + detail.innerHTML = ' ' + escapeHtml(err.message || 'Fejl ved tildeling'); + } + }) + .finally(() => { + btn.disabled = false; + btn.innerHTML = originalHtml; + }); + return; + } + if (bossAction === 'auto_assign_next') { + const originalHtml = btn.innerHTML; + btn.disabled = true; + btn.innerHTML = 'Fordeler...'; + + fetch('/api/v1/bottom-bar/boss/auto-assign-next', { + method: 'POST', + credentials: 'include' + }) + .then(async r => { + const body = await r.json().catch(() => ({})); + if (!r.ok) { + const detail = body && body.detail ? body.detail : 'Kunne ikke auto-fordele sag'; + throw new Error(typeof detail === 'string' ? detail : 'Kunne ikke auto-fordele sag'); + } + return body; + }) + .then(data => { + const detail = byId('bbCountDetail'); + if (detail) { + if (data.status === 'assigned' && data.case && data.assignee) { + detail.innerHTML = ' Auto-fordelt: ' + escapeHtml(data.case.title || 'Sag') + ' → ' + escapeHtml(data.assignee.name || 'medarbejder'); + } else { + detail.innerHTML = ' ' + escapeHtml(data.message || 'Ingen sager at fordele'); + } + } + return fetchBottomBarState(); + }) + .then(applyState) + .catch(err => { + console.error('Boss auto-assign failed', err); + const detail = byId('bbCountDetail'); + if (detail) { + detail.innerHTML = ' ' + escapeHtml(err.message || 'Fejl ved auto-fordeling'); + } + }) + .finally(() => { + btn.disabled = false; + btn.innerHTML = originalHtml; + }); + return; + } + if (bossAction === 'open_unassigned') { + window.location.href = '/sag?unassigned=true'; + return; + } + if (bossAction === 'open_escalations') { + window.location.href = '/sag?priority=urgent'; + return; + } + if (bossAction === 'open_team') { + window.location.href = '/timetracking'; + return; + } + if (bossAction === 'open_owner') { + const ownerId = Number(btn.getAttribute('data-owner-id') || 0); + window.location.href = ownerId > 0 ? ('/sag?ansvarlig=' + ownerId) : '/sag'; + return; + } + if (bossAction === 'open_case') { + const caseId = Number(btn.getAttribute('data-case-id') || 0); + window.location.href = caseId > 0 ? ('/sag/' + caseId) : '/sag'; + return; + } + } + + if (btn.id === 'btnNextTask') { + console.log("-> Beder backend om næste opgave..."); + btn.innerHTML = ' Omsætter kalender og SLA...'; + btn.disabled = true; + + fetch('/api/v1/bottom-bar/next_task', { method: 'POST', credentials: 'include' }) + .then(r => { + if (!r.ok) { + throw new Error('Kunne ikke hente næste opgave'); + } + return r.json(); + }) + .then(data => { + const task = data && data.task ? data.task : {}; + const taskTitle = task.title || 'Ingen opgave fundet'; + const caseId = task.case_id || '-'; + const freeMins = data && data.free_time_calculated ? data.free_time_calculated : 0; + btn.innerHTML = 'Du fik tildelt: ' + taskTitle + ' (Sag #' + caseId + ') ' + freeMins + 'm fri'; + btn.classList.add('btn-success'); + btn.classList.remove('btn-primary'); + }) + .catch(err => { + console.error("Fejl:", err); + btn.innerHTML = "Fejl - prøv igen"; + btn.disabled = false; + }); + } + + if (btn.id === 'btnSendMsg') { + const input = document.getElementById('chatInputQuick'); + const recipientObj = document.getElementById('chatRecipient'); + + if (input && input.value.trim() !== '') { + const recipient = recipientObj ? recipientObj.options[recipientObj.selectedIndex].text : 'Alle'; + + console.log("-> Sender besked til", recipient, ":", input.value); + + const msgVal = input.value; + input.value = ''; + + const msgContainer = document.createElement('div'); + msgContainer.className = 'mb-2 text-end'; + msgContainer.innerHTML = '
Til: ' + escapeHtml(recipient) + '
Mig: ' + escapeHtml(msgVal) + '
'; + + const chatContainer = document.querySelector('#bbTabInnerContent .d-flex.flex-column.h-100'); + if (!chatContainer) { + return; + } + const listUl = chatContainer.querySelector('ul.bb-tab-list'); + if (!listUl) { + return; + } + listUl.appendChild(msgContainer); + + // Simple hacky scroll down + const tabInner = document.getElementById('bbTabInnerContent'); + if(tabInner) { + tabInner.scrollTop = tabInner.scrollHeight + 500; + } + } + } + }); + } + + async function loadUserStatus() { + const el = byId('bbUserStatusText'); + if (!el) return; + try { + const res = await fetch('/api/v1/auth/me/profile', { credentials: 'include' }); + if (!res.ok) return; + const payload = await res.json(); + const user = (payload || {}).user || payload || {}; + const name = user.full_name || user.username || user.email || 'Bruger'; + el.textContent = name; + } catch (_err) { + // Ignore user status load errors to keep bar non-blocking. + } + } + + document.addEventListener('DOMContentLoaded', function () { + activeKey = 'overview'; // Default overview state + bindChipClicks(); + bindChipHoverPreview(); + bindSheetToggle(); + bindHeaderActions(); + bindDynamicActions(); + + bindSideTabs(); + loadUserStatus(); + + startPollingFallback(); + connectRealtime(); + }); + +})(); diff --git a/test_manual.py b/test_manual.py new file mode 100644 index 0000000..bb9c1c3 --- /dev/null +++ b/test_manual.py @@ -0,0 +1,23 @@ +import urllib.request +import json +import sys + +URL = "http://127.0.0.1:8000" + +def test_endpoint(path, expected_status=200): + try: + req = urllib.request.Request(URL + path) + with urllib.request.urlopen(req) as response: + if response.status == expected_status: + print(f"✅ {path} returned {response.status}") + return json.loads(response.read().decode()) + else: + print(f"❌ {path} returned {response.status}") + except Exception as e: + print(f"❌ {path} failed: {e}") + +print("Running Manual Module Smoke Tests...") +test_endpoint("/api/v1/manual") +test_endpoint("/api/v1/manual?limit=1") +test_endpoint("/api/v1/manual?search=test") +print("Done!")