From 0831715d3a0fc9a92ff4a8284089f6757708c659 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 14 Feb 2026 02:26:29 +0100 Subject: [PATCH] feat: add SMS service and frontend integration - Implement SmsService class for sending SMS via CPSMS API. - Add SMS sending functionality in the frontend with validation and user feedback. - Create database migrations for SMS message storage and telephony features. - Introduce telephony settings and user-specific configurations for click-to-call functionality. - Enhance user experience with toast notifications for incoming calls and actions. --- .env.example | 6 + .env.prod.example | 4 + app/auth/backend/admin.py | 30 +- app/auth/backend/router.py | 9 +- app/auth/backend/views.py | 11 + app/auth/frontend/2fa_setup.html | 145 +++ app/auth/frontend/login.html | 8 +- app/contacts/backend/router_simple.py | 52 + app/contacts/frontend/contact_detail.html | 299 +++++- app/contacts/frontend/contacts.html | 57 +- app/core/auth_service.py | 84 +- app/core/config.py | 5 + app/customers/backend/router.py | 87 ++ app/customers/frontend/customer_detail.html | 190 +++- app/models/schemas.py | 38 +- app/modules/calendar/backend/router.py | 341 +++++++ app/modules/calendar/frontend/views.py | 26 + app/modules/calendar/templates/index.html | 888 ++++++++++++++++++ app/modules/hardware/backend/router.py | 55 ++ app/modules/hardware/frontend/views.py | 122 ++- app/modules/hardware/templates/detail.html | 35 +- .../hardware/templates/eset_overview.html | 21 +- app/modules/hardware/templates/index.html | 197 ++-- app/modules/sag/backend/reminders.py | 25 +- app/modules/sag/backend/router.py | 297 +++++- app/modules/sag/frontend/views.py | 23 + app/modules/sag/templates/create.html | 82 ++ app/modules/sag/templates/detail.html | 535 ++++++++++- app/modules/telefoni/__init__.py | 1 + app/modules/telefoni/backend/__init__.py | 1 + app/modules/telefoni/backend/router.py | 667 +++++++++++++ app/modules/telefoni/backend/schemas.py | 28 + app/modules/telefoni/backend/service.py | 111 +++ app/modules/telefoni/backend/utils.py | 102 ++ app/modules/telefoni/backend/websocket.py | 67 ++ app/modules/telefoni/frontend/__init__.py | 1 + app/modules/telefoni/frontend/views.py | 14 + app/modules/telefoni/templates/log.html | 512 ++++++++++ app/services/eset_service.py | 99 +- app/services/sms_service.py | 96 ++ app/settings/frontend/settings.html | 513 +++++++++- app/shared/frontend/base.html | 41 + ...ESET_SOFTWARE_INVENTORY_SUPPORT_REQUEST.md | 57 ++ main.py | 12 + migrations/120_telefoni_module.sql | 34 + migrations/121_telefoni_settings.sql | 8 + migrations/122_telefoni_user_phone_ip.sql | 6 + .../123_telefoni_user_phone_credentials.sql | 5 + .../124_telefoni_shared_secret_setting.sql | 6 + migrations/125_sms_messages.sql | 16 + migrations/126_sag_reminders_event_type.sql | 10 + migrations/127_sag_todo_steps.sql | 18 + static/js/sms.js | 150 +++ static/js/telefoni.js | 169 ++++ 54 files changed, 6244 insertions(+), 172 deletions(-) create mode 100644 app/auth/frontend/2fa_setup.html create mode 100644 app/modules/calendar/backend/router.py create mode 100644 app/modules/calendar/frontend/views.py create mode 100644 app/modules/calendar/templates/index.html create mode 100644 app/modules/telefoni/__init__.py create mode 100644 app/modules/telefoni/backend/__init__.py create mode 100644 app/modules/telefoni/backend/router.py create mode 100644 app/modules/telefoni/backend/schemas.py create mode 100644 app/modules/telefoni/backend/service.py create mode 100644 app/modules/telefoni/backend/utils.py create mode 100644 app/modules/telefoni/backend/websocket.py create mode 100644 app/modules/telefoni/frontend/__init__.py create mode 100644 app/modules/telefoni/frontend/views.py create mode 100644 app/modules/telefoni/templates/log.html create mode 100644 app/services/sms_service.py create mode 100644 docs/ESET_SOFTWARE_INVENTORY_SUPPORT_REQUEST.md create mode 100644 migrations/120_telefoni_module.sql create mode 100644 migrations/121_telefoni_settings.sql create mode 100644 migrations/122_telefoni_user_phone_ip.sql create mode 100644 migrations/123_telefoni_user_phone_credentials.sql create mode 100644 migrations/124_telefoni_shared_secret_setting.sql create mode 100644 migrations/125_sms_messages.sql create mode 100644 migrations/126_sag_reminders_event_type.sql create mode 100644 migrations/127_sag_todo_steps.sql create mode 100644 static/js/sms.js create mode 100644 static/js/telefoni.js diff --git a/.env.example b/.env.example index 1be8381..a808ac3 100644 --- a/.env.example +++ b/.env.example @@ -22,6 +22,12 @@ ENABLE_RELOAD=false # Set to true for live code reload (causes log spam in Dock SECRET_KEY=change-this-in-production-use-random-string CORS_ORIGINS=http://localhost:8000,http://localhost:3000 +# Telefoni (Yealink) callbacks security (MUST set at least one) +# Option A: Shared secret token (recommended) +TELEFONI_SHARED_SECRET= +# Option B: IP whitelist (LAN only) - supports IPs and CIDRs +TELEFONI_IP_WHITELIST=127.0.0.1 + # Shadow Admin (Emergency Access) SHADOW_ADMIN_ENABLED=false SHADOW_ADMIN_USERNAME=shadowadmin diff --git a/.env.prod.example b/.env.prod.example index 4de5d29..2e23242 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -49,6 +49,10 @@ API_RELOAD=false # Brug: python -c "import secrets; print(secrets.token_urlsafe(32))" SECRET_KEY=CHANGEME_GENERATE_RANDOM_SECRET_KEY +# Telefoni (Yealink) callbacks security (MUST set at least one) +TELEFONI_SHARED_SECRET= +TELEFONI_IP_WHITELIST= + # CORS origins - IP adresse med port CORS_ORIGINS=http://172.16.31.183:8001 diff --git a/app/auth/backend/admin.py b/app/auth/backend/admin.py index e44de9b..1d0b8b1 100644 --- a/app/auth/backend/admin.py +++ b/app/auth/backend/admin.py @@ -5,7 +5,7 @@ from fastapi import APIRouter, HTTPException, status, Depends from app.core.auth_dependencies import require_permission from app.core.auth_service import AuthService from app.core.database import execute_query, execute_query_single, execute_insert, execute_update -from app.models.schemas import UserAdminCreate, UserGroupsUpdate, GroupCreate, GroupPermissionsUpdate +from app.models.schemas import UserAdminCreate, UserGroupsUpdate, GroupCreate, GroupPermissionsUpdate, UserTwoFactorResetRequest import logging logger = logging.getLogger(__name__) @@ -19,6 +19,7 @@ async def list_users(): """ SELECT u.user_id, u.username, u.email, u.full_name, u.is_active, u.is_superadmin, u.is_2fa_enabled, + u.telefoni_extension, u.telefoni_aktiv, u.telefoni_phone_ip, u.telefoni_phone_username, u.created_at, u.last_login_at, COALESCE(array_remove(array_agg(g.name), NULL), ARRAY[]::varchar[]) AS groups FROM users u @@ -93,6 +94,33 @@ async def update_user_groups(user_id: int, payload: UserGroupsUpdate): return {"message": "Groups updated"} +@router.post("/admin/users/{user_id}/2fa/reset") +async def reset_user_2fa( + user_id: int, + payload: UserTwoFactorResetRequest, + current_user: dict = Depends(require_permission("users.manage")) +): + ok = AuthService.admin_reset_user_2fa(user_id) + if not ok: + raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found") + + reason = (payload.reason or "").strip() + if reason: + logger.info( + "✅ Admin reset 2FA for user_id=%s by %s (reason: %s)", + user_id, + current_user.get("username"), + reason + ) + else: + logger.info( + "✅ Admin reset 2FA for user_id=%s by %s", + user_id, + current_user.get("username") + ) + return {"message": "2FA reset"} + + @router.get("/admin/groups", dependencies=[Depends(require_permission("users.manage"))]) async def list_groups(): groups = execute_query( diff --git a/app/auth/backend/router.py b/app/auth/backend/router.py index 3a0041e..ebede4c 100644 --- a/app/auth/backend/router.py +++ b/app/auth/backend/router.py @@ -24,6 +24,7 @@ class LoginResponse(BaseModel): access_token: str token_type: str = "bearer" user: dict + requires_2fa_setup: bool = False class LogoutRequest(BaseModel): @@ -70,6 +71,11 @@ async def login(request: Request, credentials: LoginRequest, response: Response) is_superadmin=user['is_superadmin'], is_shadow_admin=user.get('is_shadow_admin', False) ) + + requires_2fa_setup = ( + not user.get("is_shadow_admin", False) + and not user.get("is_2fa_enabled", False) + ) response.set_cookie( key="access_token", @@ -81,7 +87,8 @@ async def login(request: Request, credentials: LoginRequest, response: Response) return LoginResponse( access_token=access_token, - user=user + user=user, + requires_2fa_setup=requires_2fa_setup ) diff --git a/app/auth/backend/views.py b/app/auth/backend/views.py index c38d17f..baf580b 100644 --- a/app/auth/backend/views.py +++ b/app/auth/backend/views.py @@ -18,3 +18,14 @@ async def login_page(request: Request): "auth/frontend/login.html", {"request": request} ) + + +@router.get("/2fa/setup", response_class=HTMLResponse) +async def two_factor_setup_page(request: Request): + """ + Render 2FA setup page + """ + return templates.TemplateResponse( + "auth/frontend/2fa_setup.html", + {"request": request} + ) diff --git a/app/auth/frontend/2fa_setup.html b/app/auth/frontend/2fa_setup.html new file mode 100644 index 0000000..97211bd --- /dev/null +++ b/app/auth/frontend/2fa_setup.html @@ -0,0 +1,145 @@ +{% extends "shared/frontend/base.html" %} + +{% block title %}2FA Setup - BMC Hub{% endblock %} + +{% block content %} +
+
+
+
+
+
+

2FA Setup

+

Opsaet tofaktor for din konto

+
+ + + +
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ +
+ Spring over for nu +
+
+
+
+
+
+ + +{% endblock %} diff --git a/app/auth/frontend/login.html b/app/auth/frontend/login.html index 61ed97e..3462e35 100644 --- a/app/auth/frontend/login.html +++ b/app/auth/frontend/login.html @@ -124,7 +124,13 @@ document.getElementById('loginForm').addEventListener('submit', async (e) => { const d = new Date(); d.setTime(d.getTime() + (24*60*60*1000)); document.cookie = `access_token=${data.access_token};expires=${d.toUTCString()};path=/;SameSite=Lax`; - + + if (data.requires_2fa_setup) { + const goSetup = confirm('2FA er ikke opsat. Vil du opsaette 2FA nu?'); + window.location.href = goSetup ? '/2fa/setup' : '/'; + return; + } + // Redirect to dashboard window.location.href = '/'; } else { diff --git a/app/contacts/backend/router_simple.py b/app/contacts/backend/router_simple.py index 21e32b7..0bcc023 100644 --- a/app/contacts/backend/router_simple.py +++ b/app/contacts/backend/router_simple.py @@ -406,3 +406,55 @@ async def get_contact_subscription_billing_matrix( if not customer_id: raise HTTPException(status_code=404, detail="Kontakt har ingen tilknyttet kunde") return await get_subscription_billing_matrix(customer_id, months) + + +@router.get("/contacts/{contact_id}/kontakt") +async def get_contact_kontakt_history(contact_id: int, limit: int = Query(default=200, ge=1, le=1000)): + try: + exists = execute_query("SELECT id FROM contacts WHERE id = %s", (contact_id,)) + if not exists: + raise HTTPException(status_code=404, detail="Contact not found") + + query = """ + SELECT * FROM ( + SELECT + 'call' AS type, + t.id::text AS event_id, + t.started_at AS happened_at, + t.direction, + t.ekstern_nummer AS number, + NULL::text AS message, + t.duration_sec, + COALESCE(u.full_name, u.username) AS user_name, + NULL::text AS sms_status + FROM telefoni_opkald t + LEFT JOIN users u ON u.user_id = t.bruger_id + WHERE t.kontakt_id = %s + + UNION ALL + + SELECT + 'sms' AS type, + s.id::text AS event_id, + s.created_at AS happened_at, + NULL::text AS direction, + s.recipient AS number, + s.message, + NULL::int AS duration_sec, + COALESCE(u.full_name, u.username) AS user_name, + s.status AS sms_status + FROM sms_messages s + LEFT JOIN users u ON u.user_id = s.bruger_id + WHERE s.kontakt_id = %s + ) z + ORDER BY z.happened_at DESC NULLS LAST + LIMIT %s + """ + + rows = execute_query(query, (contact_id, contact_id, limit)) or [] + return {"items": rows} + except HTTPException: + raise + except Exception as e: + logger.error(f"Failed to fetch kontakt history for contact {contact_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) diff --git a/app/contacts/frontend/contact_detail.html b/app/contacts/frontend/contact_detail.html index 1348764..223cecf 100644 --- a/app/contacts/frontend/contact_detail.html +++ b/app/contacts/frontend/contact_detail.html @@ -205,8 +205,8 @@
  • - - Aktivitet + + Kontakt
  • @@ -489,11 +489,16 @@
    Hardware
    - Hardware knyttet til kontaktens firmaer + Kun hardware knyttet direkte til denne kontakt +
    +
    + + Nyt hardware + +
    - - Åbn kundedetalje -
    @@ -519,6 +524,28 @@
    Ingen hardware fundet for denne kontakt
    + +
    +
    Hardware uden ejer
    +
    Gennemgå og tilknyt hardware til denne kontakt.
    +
    +
    + + + + + + + + + + +
    HardwareTypeSerienr.StatusHandling
    +
    +
    + Ingen hardware uden ejer fundet +
    + @@ -583,10 +610,17 @@ - -
    -
    Aktivitet
    -
    + +
    +
    +
    Kontakt historik
    +
    + + + +
    +
    +
    @@ -754,6 +788,8 @@ const contactId = parseInt(window.location.pathname.split('/').pop()); let contactData = null; let primaryCustomerId = null; +let kontaktHistoryItems = []; +let kontaktHistoryFilter = 'all'; document.addEventListener('DOMContentLoaded', () => { loadContact(); @@ -820,10 +856,10 @@ document.addEventListener('DOMContentLoaded', () => { }); } - const activityTab = document.querySelector('a[href="#activity"]'); - if (activityTab) { - activityTab.addEventListener('shown.bs.tab', () => { - loadActivity(); + const kontaktTab = document.querySelector('a[href="#kontakt"]'); + if (kontaktTab) { + kontaktTab.addEventListener('shown.bs.tab', () => { + loadKontaktHistory(); }); } @@ -869,8 +905,8 @@ function displayContact(contact) { // Contact Information document.getElementById('fullName').textContent = `${contact.first_name} ${contact.last_name}`; document.getElementById('email').textContent = contact.email || '-'; - document.getElementById('phone').textContent = contact.phone || '-'; - document.getElementById('mobile').textContent = contact.mobile || '-'; + document.getElementById('phone').innerHTML = renderNumberActions(contact.phone, false, contact); + document.getElementById('mobile').innerHTML = renderNumberActions(contact.mobile, true, contact); // Role & Position document.getElementById('title').textContent = contact.title || '-'; @@ -897,6 +933,61 @@ function displayContact(contact) { } } +function renderNumberActions(number, allowSms = false, contact = null) { + const clean = String(number || '').trim(); + if (!clean) return '-'; + const contactLabel = contact ? `${contact.first_name || ''} ${contact.last_name || ''}`.trim() : ''; + return ` +
    + ${escapeHtml(clean)} + + ${allowSms ? `` : ''} +
    + `; +} + +let contactDetailCurrentUserId = null; + +async function ensureContactDetailCurrentUserId() { + if (contactDetailCurrentUserId !== null) return contactDetailCurrentUserId; + try { + const res = await fetch('/api/v1/auth/me', { credentials: 'include' }); + if (!res.ok) return null; + const me = await res.json(); + contactDetailCurrentUserId = Number(me?.id) || null; + return contactDetailCurrentUserId; + } catch (e) { + return null; + } +} + +async function contactDetailCallViaYealink(number) { + const clean = String(number || '').trim(); + if (!clean || clean === '-') { + alert('Intet gyldigt nummer at ringe til'); + return; + } + + const userId = await ensureContactDetailCurrentUserId(); + try { + const res = await fetch('/api/v1/telefoni/click-to-call', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ number: clean, user_id: userId }) + }); + + if (!res.ok) { + const t = await res.text(); + alert('Ring ud fejlede: ' + t); + return; + } + alert('Ringer ud via Yealink...'); + } catch (e) { + alert('Kunne ikke starte opkald'); + } +} + function populateSessionCompanySelect(contact) { const select = document.getElementById('sessionCompanySelect'); if (!select) return; @@ -1034,12 +1125,15 @@ async function loadRelatedContacts() { tableBody.innerHTML = contacts.map(c => { const name = `${c.first_name || ''} ${c.last_name || ''}`.trim(); const companies = (c.company_names || []).join(', '); + const phoneOrMobile = c.mobile + ? `
    ${escapeHtml(c.mobile)}
    ` + : escapeHtml(c.phone || '—'); return ` ${escapeHtml(name || 'Ukendt')} ${escapeHtml(c.title || '—')} ${escapeHtml(c.email || '—')} - ${escapeHtml(c.phone || c.mobile || '—')} + ${phoneOrMobile} ${escapeHtml(companies || '—')} `; @@ -1438,6 +1532,82 @@ async function loadContactHardware() { } } +async function loadUnassignedHardware() { + const tableBody = document.getElementById('unassignedHardwareTable'); + const empty = document.getElementById('unassignedHardwareEmpty'); + const container = document.getElementById('unassignedHardwareContainer'); + + if (!tableBody || !empty || !container) return; + + container.classList.remove('d-none'); + empty.classList.add('d-none'); + tableBody.innerHTML = ` + + + + + + `; + + try { + const response = await fetch('/api/v1/hardware/unassigned?limit=200'); + if (!response.ok) throw new Error('Kunne ikke hente hardware uden ejer'); + const items = await response.json(); + + if (!Array.isArray(items) || items.length === 0) { + container.classList.add('d-none'); + empty.classList.remove('d-none'); + return; + } + + tableBody.innerHTML = items.map(item => { + const label = [item.brand, item.model].filter(Boolean).join(' ') || item.asset_type || '—'; + const serial = item.serial_number || '—'; + const status = item.status || '—'; + return ` + + ${escapeHtml(label)} + ${escapeHtml(item.asset_type || '—')} + ${escapeHtml(serial)} + ${escapeHtml(status)} + + + + + `; + }).join(''); + } catch (error) { + console.error('Failed to load unassigned hardware:', error); + container.classList.add('d-none'); + empty.classList.remove('d-none'); + empty.textContent = 'Kunne ikke hente hardware uden ejer'; + } +} + +async function relateUnassignedHardware(hardwareId) { + try { + const response = await fetch(`/api/v1/hardware/${hardwareId}/assign-contact`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ contact_id: contactId }) + }); + + if (!response.ok) { + const err = await response.text(); + alert('Kunne ikke tilknytte hardware: ' + err); + return; + } + + await loadContactHardware(); + await loadUnassignedHardware(); + } catch (error) { + console.error('Failed to relate hardware:', error); + alert('Kunne ikke tilknytte hardware'); + } +} + async function loadBillingMatrix() { const loading = document.getElementById('billingMatrixLoading'); const container = document.getElementById('billingMatrixContainer'); @@ -1660,14 +1830,99 @@ async function loadNextcloudStatus() { } } -async function loadActivity() { - const container = document.getElementById('activityContainer'); +async function loadKontaktHistory() { + const container = document.getElementById('kontaktContainer'); if (!container) return; container.innerHTML = '
    '; - setTimeout(() => { - container.innerHTML = '
    Ingen aktivitet at vise
    '; - }, 400); + try { + const response = await fetch(`/api/v1/contacts/${contactId}/kontakt?limit=200`); + if (!response.ok) throw new Error('Kunne ikke hente kontakt historik'); + const data = await response.json(); + kontaktHistoryItems = data.items || []; + renderKontaktHistoryTable(); + } catch (error) { + console.error('Failed to load kontakt history:', error); + container.innerHTML = '
    Kunne ikke hente kontakt historik
    '; + } +} + +function setKontaktFilter(filter) { + kontaktHistoryFilter = filter; + document.getElementById('kontaktFilterAll')?.classList.toggle('active', filter === 'all'); + document.getElementById('kontaktFilterSms')?.classList.toggle('active', filter === 'sms'); + document.getElementById('kontaktFilterCall')?.classList.toggle('active', filter === 'call'); + renderKontaktHistoryTable(); +} + +function renderKontaktHistoryTable() { + const container = document.getElementById('kontaktContainer'); + if (!container) return; + + const filteredItems = (kontaktHistoryItems || []).filter(item => { + if (kontaktHistoryFilter === 'all') return true; + return item.type === kontaktHistoryFilter; + }); + + if (!filteredItems.length) { + const msg = kontaktHistoryItems.length + ? 'Ingen hændelser matcher filteret' + : 'Ingen opkald eller SMS fundet'; + container.innerHTML = `
    ${msg}
    `; + return; + } + + container.innerHTML = ` +
    + + + + + + + + + + + + + + ${filteredItems.map(renderKontaktHistoryRow).join('')} + +
    TidTypeRetning/StatusNummerIndholdVarighedBruger
    +
    + `; +} + +function renderKontaktHistoryRow(item) { + const ts = item.happened_at ? new Date(item.happened_at).toLocaleString('da-DK') : '-'; + const typeBadge = item.type === 'sms' + ? 'SMS' + : 'Opkald'; + + const dirOrStatus = item.type === 'sms' + ? (item.sms_status || '-') + : (item.direction === 'outbound' ? 'Udgående' : 'Indgående'); + + const message = item.type === 'sms' + ? escapeHtml(item.message || '-') + : '-'; + + const duration = item.duration_sec && Number(item.duration_sec) > 0 + ? `${Math.floor(Number(item.duration_sec) / 60)}:${String(Number(item.duration_sec) % 60).padStart(2, '0')}` + : '-'; + + return ` + + ${ts} + ${typeBadge} + ${escapeHtml(dirOrStatus || '-')} + ${escapeHtml(item.number || '-')} + ${message} + ${duration} + ${escapeHtml(item.user_name || '-')} + + `; } async function loadConversations() { diff --git a/app/contacts/frontend/contacts.html b/app/contacts/frontend/contacts.html index a4b404f..e0c4331 100644 --- a/app/contacts/frontend/contacts.html +++ b/app/contacts/frontend/contacts.html @@ -376,6 +376,19 @@ function displayContacts(contacts) { const companyDisplay = companyNames.length > 0 ? companyNames.slice(0, 2).join(', ') + (companyNames.length > 2 ? '...' : '') : '-'; + const fullName = `${contact.first_name || ''} ${contact.last_name || ''}`.trim(); + const mobileLine = contact.mobile + ? `
    ${escapeHtml(contact.mobile)} + + +
    ` + : ''; + const phoneLine = !contact.mobile + ? `
    ${escapeHtml(contact.phone || '-')} + ${contact.phone ? `` : ''} +
    ` + : ''; + const smsLine = mobileLine || phoneLine; return ` @@ -390,7 +403,7 @@ function displayContacts(contacts) {
    ${contact.email || '-'}
    -
    ${contact.mobile || contact.phone || '-'}
    + ${smsLine} ${contact.title || '-'} @@ -451,6 +464,48 @@ function editContact(contactId) { loadContactForEdit(contactId); } +let contactsCurrentUserId = null; + +async function ensureContactsCurrentUserId() { + if (contactsCurrentUserId !== null) return contactsCurrentUserId; + try { + const res = await fetch('/api/v1/auth/me', { credentials: 'include' }); + if (!res.ok) return null; + const me = await res.json(); + contactsCurrentUserId = Number(me?.id) || null; + return contactsCurrentUserId; + } catch (e) { + return null; + } +} + +async function contactsCallViaYealink(number) { + const clean = String(number || '').trim(); + if (!clean || clean === '-') { + alert('Intet gyldigt nummer at ringe til'); + return; + } + + const userId = await ensureContactsCurrentUserId(); + try { + const res = await fetch('/api/v1/telefoni/click-to-call', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ number: clean, user_id: userId }) + }); + + if (!res.ok) { + const t = await res.text(); + alert('Ring ud fejlede: ' + t); + return; + } + alert('Ringer ud via Yealink...'); + } catch (e) { + alert('Kunne ikke starte opkald'); + } +} + async function loadContactForEdit(contactId) { try { const response = await fetch(`/api/v1/contacts/${contactId}`); diff --git a/app/core/auth_service.py b/app/core/auth_service.py index c08f66a..99567ae 100644 --- a/app/core/auth_service.py +++ b/app/core/auth_service.py @@ -139,6 +139,23 @@ class AuthService: (user_id,) ) return True + + @staticmethod + def admin_reset_user_2fa(user_id: int) -> bool: + """Admin reset: disable 2FA and remove TOTP secret without OTP""" + user = execute_query_single( + "SELECT user_id FROM users WHERE user_id = %s", + (user_id,) + ) + + if not user: + return False + + execute_update( + "UPDATE users SET is_2fa_enabled = FALSE, totp_secret = NULL, updated_at = CURRENT_TIMESTAMP WHERE user_id = %s", + (user_id,) + ) + return True @staticmethod def create_access_token( @@ -234,34 +251,9 @@ class AuthService: Returns: User dict if successful, None otherwise """ - # Shadow Admin shortcut + # Normalize username once (used by both normal and shadow login paths) shadow_username = (settings.SHADOW_ADMIN_USERNAME or "shadowadmin").strip().lower() request_username = (username or "").strip().lower() - if settings.SHADOW_ADMIN_ENABLED and request_username == shadow_username: - if not settings.SHADOW_ADMIN_PASSWORD or not settings.SHADOW_ADMIN_TOTP_SECRET: - logger.error("❌ Shadow admin enabled but not configured") - return None, "Shadow admin not configured" - - if not secrets.compare_digest(password, settings.SHADOW_ADMIN_PASSWORD): - logger.warning(f"❌ Shadow admin login failed from IP: {ip_address}") - return None, "Invalid username or password" - - if not otp_code: - return None, "2FA code required" - - if not AuthService.verify_totp_code(settings.SHADOW_ADMIN_TOTP_SECRET, otp_code): - logger.warning(f"❌ Shadow admin 2FA failed from IP: {ip_address}") - return None, "Invalid 2FA code" - - logger.warning(f"⚠️ Shadow admin login used from IP: {ip_address}") - return { - "user_id": 0, - "username": settings.SHADOW_ADMIN_USERNAME, - "email": settings.SHADOW_ADMIN_EMAIL, - "full_name": settings.SHADOW_ADMIN_FULL_NAME, - "is_superadmin": True, - "is_shadow_admin": True - }, None # Get user user = execute_query_single( @@ -273,6 +265,38 @@ class AuthService: (username, username)) if not user: + # Shadow Admin fallback (only when no regular user matches) + if settings.SHADOW_ADMIN_ENABLED and request_username == shadow_username: + if not settings.SHADOW_ADMIN_PASSWORD or not settings.SHADOW_ADMIN_TOTP_SECRET: + logger.error("❌ Shadow admin enabled but not configured") + return None, "Shadow admin not configured" + + if not secrets.compare_digest(password, settings.SHADOW_ADMIN_PASSWORD): + logger.warning(f"❌ Shadow admin login failed from IP: {ip_address}") + return None, "Invalid username or password" + + if not settings.AUTH_DISABLE_2FA: + if not otp_code: + return None, "2FA code required" + + if not AuthService.verify_totp_code(settings.SHADOW_ADMIN_TOTP_SECRET, otp_code): + logger.warning(f"❌ Shadow admin 2FA failed from IP: {ip_address}") + return None, "Invalid 2FA code" + else: + logger.warning(f"⚠️ 2FA disabled via settings for shadow admin login from IP: {ip_address}") + + logger.warning(f"⚠️ Shadow admin login used from IP: {ip_address}") + return { + "user_id": 0, + "username": settings.SHADOW_ADMIN_USERNAME, + "email": settings.SHADOW_ADMIN_EMAIL, + "full_name": settings.SHADOW_ADMIN_FULL_NAME, + "is_superadmin": True, + "is_shadow_admin": True, + "is_2fa_enabled": True, + "has_2fa_configured": True + }, None + logger.warning(f"❌ Login failed: User not found - {username}") return None, "Invalid username or password" @@ -323,7 +347,9 @@ class AuthService: return None, "Invalid username or password" # 2FA check (only once per grace window) - if user.get('is_2fa_enabled'): + if settings.AUTH_DISABLE_2FA: + logger.warning(f"⚠️ 2FA disabled via settings for login: {username}") + elif user.get('is_2fa_enabled'): if not user.get('totp_secret'): return None, "2FA not configured" @@ -364,7 +390,9 @@ class AuthService: 'email': user['email'], 'full_name': user['full_name'], 'is_superadmin': bool(user['is_superadmin']), - 'is_shadow_admin': False + 'is_shadow_admin': False, + 'is_2fa_enabled': bool(user.get('is_2fa_enabled')), + 'has_2fa_configured': bool(user.get('totp_secret')) }, None @staticmethod diff --git a/app/core/config.py b/app/core/config.py index 9d132a7..da4a43b 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -49,6 +49,7 @@ class Settings(BaseSettings): # 2FA grace period (hours) before re-prompting TWO_FA_GRACE_HOURS: int = 24 + AUTH_DISABLE_2FA: bool = False # Logging LOG_LEVEL: str = "INFO" @@ -212,6 +213,10 @@ class Settings(BaseSettings): ANYDESK_DRY_RUN: bool = True # SAFETY: Log without executing API calls ANYDESK_TIMEOUT_SECONDS: int = 30 ANYDESK_AUTO_START_SESSION: bool = True # Auto-start session when requested + + # Telefoni (Yealink) Integration + TELEFONI_SHARED_SECRET: str = "" # If set, required as ?token=... + TELEFONI_IP_WHITELIST: str = "172.16.31.0/24" # CSV of IPs/CIDRs, e.g. "192.168.1.0/24,10.0.0.10" # ESET Integration ESET_ENABLED: bool = False diff --git a/app/customers/backend/router.py b/app/customers/backend/router.py index ea85e38..0377a9d 100644 --- a/app/customers/backend/router.py +++ b/app/customers/backend/router.py @@ -969,6 +969,93 @@ async def get_customer_contacts(customer_id: int): return rows or [] +@router.get("/customers/{customer_id}/kontakt") +async def get_customer_kontakt_history(customer_id: int, limit: int = Query(default=300, ge=1, le=2000)): + """Get unified contact communication history (calls + SMS) for all company contacts.""" + customer = execute_query_single("SELECT id FROM customers WHERE id = %s", (customer_id,)) + if not customer: + raise HTTPException(status_code=404, detail="Customer not found") + + sms_table_exists = execute_query_single("SELECT to_regclass('public.sms_messages') AS name") + has_sms_table = bool(sms_table_exists and sms_table_exists.get("name")) + + if has_sms_table: + query = """ + SELECT * FROM ( + SELECT + 'call' AS type, + t.id::text AS event_id, + t.started_at AS happened_at, + t.direction, + COALESCE( + NULLIF(TRIM(t.ekstern_nummer), ''), + NULLIF(TRIM(t.raw_payload->>'caller'), ''), + NULLIF(TRIM(t.raw_payload->>'callee'), '') + ) AS number, + NULL::text AS message, + t.duration_sec, + COALESCE(u.full_name, u.username) AS user_name, + c.id AS contact_id, + TRIM(CONCAT(COALESCE(c.first_name, ''), ' ', COALESCE(c.last_name, ''))) AS contact_name, + NULL::text AS sms_status + FROM telefoni_opkald t + JOIN contacts c ON c.id = t.kontakt_id + JOIN contact_companies cc ON cc.contact_id = c.id AND cc.customer_id = %s + LEFT JOIN users u ON u.user_id = t.bruger_id + + UNION ALL + + SELECT + 'sms' AS type, + s.id::text AS event_id, + s.created_at AS happened_at, + NULL::text AS direction, + s.recipient AS number, + s.message, + NULL::int AS duration_sec, + COALESCE(u.full_name, u.username) AS user_name, + c.id AS contact_id, + TRIM(CONCAT(COALESCE(c.first_name, ''), ' ', COALESCE(c.last_name, ''))) AS contact_name, + s.status AS sms_status + FROM sms_messages s + JOIN contacts c ON c.id = s.kontakt_id + JOIN contact_companies cc ON cc.contact_id = c.id AND cc.customer_id = %s + LEFT JOIN users u ON u.user_id = s.bruger_id + ) x + ORDER BY x.happened_at DESC NULLS LAST + LIMIT %s + """ + rows = execute_query(query, (customer_id, customer_id, limit)) + else: + query = """ + SELECT + 'call' AS type, + t.id::text AS event_id, + t.started_at AS happened_at, + t.direction, + COALESCE( + NULLIF(TRIM(t.ekstern_nummer), ''), + NULLIF(TRIM(t.raw_payload->>'caller'), ''), + NULLIF(TRIM(t.raw_payload->>'callee'), '') + ) AS number, + NULL::text AS message, + t.duration_sec, + COALESCE(u.full_name, u.username) AS user_name, + c.id AS contact_id, + TRIM(CONCAT(COALESCE(c.first_name, ''), ' ', COALESCE(c.last_name, ''))) AS contact_name, + NULL::text AS sms_status + FROM telefoni_opkald t + JOIN contacts c ON c.id = t.kontakt_id + JOIN contact_companies cc ON cc.contact_id = c.id AND cc.customer_id = %s + LEFT JOIN users u ON u.user_id = t.bruger_id + ORDER BY t.started_at DESC NULLS LAST + LIMIT %s + """ + rows = execute_query(query, (customer_id, limit)) + + return {"items": rows or []} + + @router.post("/customers/{customer_id}/contacts") async def create_customer_contact(customer_id: int, contact: ContactCreate): """Create a new contact for a customer""" diff --git a/app/customers/frontend/customer_detail.html b/app/customers/frontend/customer_detail.html index f5da03c..cb6a70c 100644 --- a/app/customers/frontend/customer_detail.html +++ b/app/customers/frontend/customer_detail.html @@ -303,6 +303,11 @@ Kontakter
    • +
  • + + Kontakt + +
  • Fakturaer @@ -508,6 +513,23 @@ + +
    +
    +
    Kontakt historik
    +
    + + + +
    +
    +
    +
    + +
    +
    +
    +
    Fakturaer
    @@ -1171,6 +1193,8 @@ const customerId = parseInt(window.location.pathname.split('/').pop()); let customerData = null; let pipelineStages = []; let allTagsCache = []; +let customerKontaktItems = []; +let customerKontaktFilter = 'all'; let eventListenersAdded = false; @@ -1189,6 +1213,13 @@ document.addEventListener('DOMContentLoaded', () => { loadContacts(); }, { once: false }); } + + const kontaktTab = document.querySelector('a[href="#kontakt"]'); + if (kontaktTab) { + kontaktTab.addEventListener('shown.bs.tab', () => { + loadCustomerKontakt(); + }, { once: false }); + } // Load subscriptions when tab is shown const subscriptionsTab = document.querySelector('a[href="#subscriptions"]'); @@ -1336,7 +1367,7 @@ function displayCustomer(customer) { ? `${customer.postal_code} ${customer.city}` : customer.city || '-'; document.getElementById('email').textContent = customer.email || '-'; - document.getElementById('phone').textContent = customer.phone || '-'; + document.getElementById('phone').innerHTML = renderCustomerCallNumber(customer.phone); document.getElementById('website').textContent = customer.website || '-'; const wikiEl = document.getElementById('wikiLink'); @@ -1374,6 +1405,59 @@ function displayCustomer(customer) { document.getElementById('createdAt').textContent = new Date(customer.created_at).toLocaleString('da-DK'); } +function renderCustomerCallNumber(number) { + const clean = String(number || '').trim(); + if (!clean) return '-'; + return ` +
    + ${escapeHtml(clean)} + +
    + `; +} + +let customerDetailCurrentUserId = null; + +async function ensureCustomerDetailCurrentUserId() { + if (customerDetailCurrentUserId !== null) return customerDetailCurrentUserId; + try { + const res = await fetch('/api/v1/auth/me', { credentials: 'include' }); + if (!res.ok) return null; + const me = await res.json(); + customerDetailCurrentUserId = Number(me?.id) || null; + return customerDetailCurrentUserId; + } catch (e) { + return null; + } +} + +async function customerDetailCallViaYealink(number) { + const clean = String(number || '').trim(); + if (!clean || clean === '-') { + alert('Intet gyldigt nummer at ringe til'); + return; + } + + const userId = await ensureCustomerDetailCurrentUserId(); + try { + const res = await fetch('/api/v1/telefoni/click-to-call', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + credentials: 'include', + body: JSON.stringify({ number: clean, user_id: userId }) + }); + + if (!res.ok) { + const t = await res.text(); + alert('Ring ud fejlede: ' + t); + return; + } + alert('Ringer ud via Yealink...'); + } catch (e) { + alert('Kunne ikke starte opkald'); + } +} + async function loadCustomerTags() { try { const response = await fetch(`/api/v1/tags/entity/customer/${customerId}`); @@ -2175,7 +2259,9 @@ async function loadContacts() { const rows = contacts.map(contact => { const email = contact.email ? `    ${escapeHtml(contact.email)}` : '—'; const phone = contact.phone ? `${escapeHtml(contact.phone)}` : '—'; - const mobile = contact.mobile ? `${escapeHtml(contact.mobile)}` : '—'; + const mobile = contact.mobile + ? `
    ${escapeHtml(contact.mobile)}
    ` + : '—'; const title = contact.title ? escapeHtml(contact.title) : '—'; const primaryBadge = contact.is_primary ? 'Primær' : '—'; @@ -2992,6 +3078,106 @@ async function loadActivity() { }, 500); } +async function loadCustomerKontakt() { + const container = document.getElementById('customerKontaktContainer'); + if (!container) return; + + container.innerHTML = '
    '; + + try { + const response = await fetch(`/api/v1/customers/${customerId}/kontakt?limit=300`); + if (!response.ok) throw new Error('Kunne ikke hente kontakt historik'); + + const data = await response.json(); + customerKontaktItems = data.items || []; + renderCustomerKontaktTable(); + } catch (error) { + console.error('Failed to load customer kontakt history:', error); + container.innerHTML = '
    Kunne ikke hente kontakt historik
    '; + } +} + +function setCustomerKontaktFilter(filter) { + customerKontaktFilter = filter; + document.getElementById('customerKontaktFilterAll')?.classList.toggle('active', filter === 'all'); + document.getElementById('customerKontaktFilterSms')?.classList.toggle('active', filter === 'sms'); + document.getElementById('customerKontaktFilterCall')?.classList.toggle('active', filter === 'call'); + renderCustomerKontaktTable(); +} + +function renderCustomerKontaktTable() { + const container = document.getElementById('customerKontaktContainer'); + if (!container) return; + + const filtered = (customerKontaktItems || []).filter(item => { + if (customerKontaktFilter === 'all') return true; + return item.type === customerKontaktFilter; + }); + + if (!filtered.length) { + const msg = customerKontaktItems.length + ? 'Ingen hændelser matcher filteret' + : 'Ingen opkald eller SMS fundet for virksomhedens kontakter'; + container.innerHTML = `
    ${msg}
    `; + return; + } + + container.innerHTML = ` +
    + + + + + + + + + + + + + + + ${filtered.map(renderCustomerKontaktRow).join('')} + +
    TidKontaktTypeRetning/StatusNummerIndholdVarighedBruger
    +
    + `; +} + +function renderCustomerKontaktRow(item) { + const ts = item.happened_at ? new Date(item.happened_at).toLocaleString('da-DK') : '-'; + const typeBadge = item.type === 'sms' + ? 'SMS' + : 'Opkald'; + + const dirOrStatus = item.type === 'sms' + ? (item.sms_status || '-') + : (item.direction === 'outbound' ? 'Udgående' : 'Indgående'); + + const message = item.type === 'sms' ? escapeHtml(item.message || '-') : '-'; + const duration = item.duration_sec && Number(item.duration_sec) > 0 + ? `${Math.floor(Number(item.duration_sec) / 60)}:${String(Number(item.duration_sec) % 60).padStart(2, '0')}` + : '-'; + + const contactName = item.contact_id + ? `${escapeHtml(item.contact_name || 'Ukendt')}` + : escapeHtml(item.contact_name || '-'); + + return ` + + ${ts} + ${contactName} + ${typeBadge} + ${escapeHtml(dirOrStatus || '-')} + ${escapeHtml(item.number || '-')} + ${message} + ${duration} + ${escapeHtml(item.user_name || '-')} + + `; +} + async function loadConversations() { const container = document.getElementById('conversationsContainer'); container.innerHTML = '
    '; diff --git a/app/models/schemas.py b/app/models/schemas.py index 544b2f3..dbe96dc 100644 --- a/app/models/schemas.py +++ b/app/models/schemas.py @@ -4,7 +4,7 @@ Pydantic Models and Schemas from pydantic import BaseModel, ConfigDict from typing import Optional, List -from datetime import datetime +from datetime import datetime, date class CustomerBase(BaseModel): @@ -194,6 +194,10 @@ class GroupPermissionsUpdate(BaseModel): permission_ids: List[int] +class UserTwoFactorResetRequest(BaseModel): + reason: Optional[str] = None + + # ===================================================== # AnyDesk Remote Support Integration Schemas # ===================================================== @@ -254,6 +258,38 @@ class AnyDeskSessionWithWorklog(BaseModel): suggested_worklog: AnyDeskWorklogSuggestion +class TodoStepBase(BaseModel): + """Base schema for case todo steps""" + title: str + description: Optional[str] = None + due_date: Optional[date] = None + + +class TodoStepCreate(TodoStepBase): + """Schema for creating a todo step""" + pass + + +class TodoStepUpdate(BaseModel): + """Schema for updating a todo step""" + is_done: Optional[bool] = None + + +class TodoStep(TodoStepBase): + """Full todo step schema""" + id: int + sag_id: int + is_done: bool + created_by_user_id: Optional[int] = None + created_by_name: Optional[str] = None + created_at: datetime + completed_by_user_id: Optional[int] = None + completed_by_name: Optional[str] = None + completed_at: Optional[datetime] = None + + model_config = ConfigDict(from_attributes=True) + + class AnyDeskSessionHistory(BaseModel): """Session history response""" sessions: List[AnyDeskSessionDetail] diff --git a/app/modules/calendar/backend/router.py b/app/modules/calendar/backend/router.py new file mode 100644 index 0000000..189cfe5 --- /dev/null +++ b/app/modules/calendar/backend/router.py @@ -0,0 +1,341 @@ +import logging +from datetime import datetime, timedelta +from fastapi import APIRouter, HTTPException, Query, Request +from fastapi.responses import Response + +from app.core.database import execute_query + +logger = logging.getLogger(__name__) +router = APIRouter() + + +def _parse_iso_datetime(value: str, fallback: datetime) -> datetime: + if not value: + return fallback + try: + return datetime.fromisoformat(value) + except ValueError: + return fallback + + +def _get_user_id(request: Request, user_id: int | None, only_mine: bool) -> int | None: + if user_id is not None: + return user_id + state_user_id = getattr(request.state, "user_id", None) + if state_user_id is not None: + return int(state_user_id) + if only_mine: + raise HTTPException(status_code=401, detail="User not authenticated") + return None + + +def _build_event(event_type: str, title: str, start_dt: datetime, url: str, extra: dict) -> dict: + payload = { + "id": f"{event_type}:{extra.get('reference_id')}", + "title": title, + "start": start_dt.isoformat(), + "url": url, + "event_type": event_type, + } + payload.update(extra) + return payload + + +def _escape_ical(value: str) -> str: + return ( + value.replace("\\", "\\\\") + .replace(";", "\\;") + .replace(",", "\\,") + .replace("\n", "\\n") + ) + + +def _format_ical_dt(value: datetime) -> str: + return value.strftime("%Y%m%dT%H%M%S") + + +def _get_calendar_events( + request: Request, + start_dt: datetime, + end_dt: datetime, + only_mine: bool, + user_id: int | None, + customer_id: int | None, + types: str | None, +) -> list[dict]: + allowed_types = { + "case_deadline", + "case_deferred", + "case_reminder", + "deadline", + "deferred", + "reminder", + "meeting", + "technician_visit", + "obs", + } + requested_types = { + t.strip() for t in (types.split(",") if types else []) if t.strip() + } + if requested_types and not requested_types.issubset(allowed_types): + raise HTTPException(status_code=400, detail="Invalid event types") + + type_map = { + "case_deadline": "deadline", + "case_deferred": "deferred", + "case_reminder": "reminder", + } + normalized_types = {type_map.get(t, t) for t in requested_types} + reminder_kinds = {"reminder", "meeting", "technician_visit", "obs", "deadline"} + + include_deadline = not normalized_types or "deadline" in normalized_types + include_deferred = not normalized_types or "deferred" in normalized_types + include_reminder = not normalized_types or bool(reminder_kinds.intersection(normalized_types)) + + resolved_user_id = _get_user_id(request, user_id, only_mine) + events: list[dict] = [] + + + if include_deadline: + query = """ + SELECT s.id, s.titel, s.deadline, s.customer_id, c.name as customer_name, + s.ansvarlig_bruger_id, s.created_by_user_id + FROM sag_sager s + LEFT JOIN customers c ON s.customer_id = c.id + WHERE s.deleted_at IS NULL + AND s.deadline IS NOT NULL + AND s.deadline BETWEEN %s AND %s + """ + params: list = [start_dt, end_dt] + + if only_mine and resolved_user_id is not None: + query += " AND (s.ansvarlig_bruger_id = %s OR s.created_by_user_id = %s)" + params.extend([resolved_user_id, resolved_user_id]) + + if customer_id: + query += " AND s.customer_id = %s" + params.append(customer_id) + + rows = execute_query(query, tuple(params)) or [] + for row in rows: + start_value = row.get("deadline") + if not start_value: + continue + title = f"Deadline: {row.get('titel', 'Sag')}" + events.append( + _build_event( + "case_deadline", + title, + start_value, + f"/sag/{row.get('id')}", + { + "reference_id": row.get("id"), + "reference_type": "case", + "event_kind": "deadline", + "customer_id": row.get("customer_id"), + "customer_name": row.get("customer_name"), + "status": "deadline", + }, + ) + ) + + if include_deferred: + query = """ + SELECT s.id, s.titel, s.deferred_until, s.customer_id, c.name as customer_name, + s.ansvarlig_bruger_id, s.created_by_user_id + FROM sag_sager s + LEFT JOIN customers c ON s.customer_id = c.id + WHERE s.deleted_at IS NULL + AND s.deferred_until IS NOT NULL + AND s.deferred_until BETWEEN %s AND %s + """ + params = [start_dt, end_dt] + + if only_mine and resolved_user_id is not None: + query += " AND (s.ansvarlig_bruger_id = %s OR s.created_by_user_id = %s)" + params.extend([resolved_user_id, resolved_user_id]) + + if customer_id: + query += " AND s.customer_id = %s" + params.append(customer_id) + + rows = execute_query(query, tuple(params)) or [] + for row in rows: + start_value = row.get("deferred_until") + if not start_value: + continue + title = f"Defer: {row.get('titel', 'Sag')}" + events.append( + _build_event( + "case_deferred", + title, + start_value, + f"/sag/{row.get('id')}", + { + "reference_id": row.get("id"), + "reference_type": "case", + "event_kind": "deferred", + "customer_id": row.get("customer_id"), + "customer_name": row.get("customer_name"), + "status": "deferred", + }, + ) + ) + + if include_reminder: + query = """ + SELECT r.id, r.title, r.message, r.priority, r.event_type, r.next_check_at, r.scheduled_at, + r.sag_id, s.titel as sag_title, s.customer_id, c.name as customer_name, + r.recipient_user_ids, r.created_by_user_id + FROM sag_reminders r + JOIN sag_sager s ON s.id = r.sag_id + LEFT JOIN customers c ON s.customer_id = c.id + WHERE r.deleted_at IS NULL + AND r.is_active = true + AND s.deleted_at IS NULL + AND COALESCE(r.next_check_at, r.scheduled_at) BETWEEN %s AND %s + """ + params = [start_dt, end_dt] + + requested_reminder_types = sorted(reminder_kinds.intersection(normalized_types)) + if requested_reminder_types: + query += " AND r.event_type = ANY(%s)" + params.append(requested_reminder_types) + + if only_mine and resolved_user_id is not None: + query += " AND ((r.recipient_user_ids IS NOT NULL AND %s = ANY(r.recipient_user_ids)) OR r.created_by_user_id = %s)" + params.extend([resolved_user_id, resolved_user_id]) + + if customer_id: + query += " AND s.customer_id = %s" + params.append(customer_id) + + rows = execute_query(query, tuple(params)) or [] + for row in rows: + start_value = row.get("next_check_at") or row.get("scheduled_at") + if not start_value: + continue + title = f"Reminder: {row.get('title', 'Reminder')}" + case_title = row.get("sag_title") + if case_title: + title = f"{title} · {case_title}" + events.append( + _build_event( + "case_reminder", + title, + start_value, + f"/sag/{row.get('sag_id')}", + { + "reference_id": row.get("id"), + "reference_type": "reminder", + "case_id": row.get("sag_id"), + "event_kind": row.get("event_type") or "reminder", + "customer_id": row.get("customer_id"), + "customer_name": row.get("customer_name"), + "event_type": row.get("event_type"), + "priority": row.get("priority"), + }, + ) + ) + + events.sort(key=lambda item: item.get("start") or "") + + return events + + +@router.get("/calendar/events") +async def get_calendar_events( + request: Request, + start: str = Query(None), + end: str = Query(None), + only_mine: bool = Query(True), + user_id: int | None = Query(None), + customer_id: int | None = Query(None), + types: str | None = Query(None), +): + """Aggregate calendar events from sag deadlines, deferred dates, and reminders.""" + now = datetime.now() + start_dt = _parse_iso_datetime(start, now - timedelta(days=14)) + end_dt = _parse_iso_datetime(end, now + timedelta(days=60)) + + if end_dt < start_dt: + raise HTTPException(status_code=400, detail="Invalid date range") + + events = _get_calendar_events( + request=request, + start_dt=start_dt, + end_dt=end_dt, + only_mine=only_mine, + user_id=user_id, + customer_id=customer_id, + types=types, + ) + + return {"events": events} + + +@router.get("/calendar/ical") +async def get_calendar_ical( + request: Request, + start: str = Query(None), + end: str = Query(None), + only_mine: bool = Query(True), + user_id: int | None = Query(None), + customer_id: int | None = Query(None), + types: str | None = Query(None), +): + """Serve calendar events as an iCal feed.""" + now = datetime.now() + start_dt = _parse_iso_datetime(start, now - timedelta(days=14)) + end_dt = _parse_iso_datetime(end, now + timedelta(days=60)) + + if end_dt < start_dt: + raise HTTPException(status_code=400, detail="Invalid date range") + + events = _get_calendar_events( + request=request, + start_dt=start_dt, + end_dt=end_dt, + only_mine=only_mine, + user_id=user_id, + customer_id=customer_id, + types=types, + ) + + lines = [ + "BEGIN:VCALENDAR", + "VERSION:2.0", + "PRODID:-//BMC Hub//Calendar//DA", + "CALSCALE:GREGORIAN", + "X-WR-CALNAME:BMC Hub Kalender", + ] + + for event in events: + start_value = datetime.fromisoformat(event.get("start")) + summary = _escape_ical(event.get("title", "")) + description_parts = [] + if event.get("customer_name"): + description_parts.append(f"Kunde: {event.get('customer_name')}") + if event.get("event_type"): + description_parts.append(f"Type: {event.get('event_type')}") + if event.get("url"): + description_parts.append(f"Link: {event.get('url')}") + description = _escape_ical("\n".join(description_parts)) + uid = _escape_ical(f"{event.get('id')}@bmc-hub") + + lines.extend([ + "BEGIN:VEVENT", + f"UID:{uid}", + f"DTSTAMP:{_format_ical_dt(now)}", + f"DTSTART:{_format_ical_dt(start_value)}", + f"SUMMARY:{summary}", + f"DESCRIPTION:{description}", + "END:VEVENT", + ]) + + lines.append("END:VCALENDAR") + + return Response( + content="\r\n".join(lines), + media_type="text/calendar; charset=utf-8", + ) diff --git a/app/modules/calendar/frontend/views.py b/app/modules/calendar/frontend/views.py new file mode 100644 index 0000000..d54492c --- /dev/null +++ b/app/modules/calendar/frontend/views.py @@ -0,0 +1,26 @@ +import logging +from fastapi import APIRouter, Request +from fastapi.responses import HTMLResponse +from fastapi.templating import Jinja2Templates +from fastapi import Depends + +from app.core.auth_dependencies import get_optional_user + +logger = logging.getLogger(__name__) +router = APIRouter() + +templates = Jinja2Templates(directory="app") + + +@router.get("/calendar", response_class=HTMLResponse) +async def calendar_overview( + request: Request, + current_user: dict | None = Depends(get_optional_user), +): + return templates.TemplateResponse( + "modules/calendar/templates/index.html", + { + "request": request, + "current_user": current_user, + }, + ) diff --git a/app/modules/calendar/templates/index.html b/app/modules/calendar/templates/index.html new file mode 100644 index 0000000..3eb4a41 --- /dev/null +++ b/app/modules/calendar/templates/index.html @@ -0,0 +1,888 @@ +{% extends "shared/frontend/base.html" %} + +{% block title %}Kalender - BMC Hub{% endblock %} + +{% block extra_css %} + + +{% endblock %} + +{% block content %} +
    +
    +
    +
    BMC Hub Kalender
    +

    Kalender for drift og overblik

    +

    Samlet visning af sag-deadlines, deferred datoer og reminders. Brug det som et kontrolpanel, ikke som pynt.

    +
    +
    Events i interval: 0
    +
    |
    +
    Status: Klar
    +
    +
    + iCal: {{ request.base_url }}api/v1/calendar/ical +
    +
    +
    +
    Filtre og fokus
    +
    + + +
    +
    +
    + + + +
    +
    + +
    + + + + + + +
    +
    +
    +
    +
    Opret aftaler direkte i kalenderen.
    + +
    +
    +
    + +
    +
    +
    + + + + +
    +
    Indlaeser periode...
    +
    +
    +
    +
    Deadline
    +
    Deferred
    +
    Moede
    +
    Teknikerbesoeg
    +
    OBS
    +
    Reminder
    +
    +
    +
    + + +{% endblock %} + +{% block extra_js %} + + +{% endblock %} diff --git a/app/modules/hardware/backend/router.py b/app/modules/hardware/backend/router.py index cb09824..ecca455 100644 --- a/app/modules/hardware/backend/router.py +++ b/app/modules/hardware/backend/router.py @@ -203,6 +203,61 @@ async def list_hardware_by_contact(contact_id: int): return all_results +@router.get("/hardware/unassigned", response_model=List[dict]) +async def list_unassigned_hardware(limit: int = 200): + """List hardware assets not linked to any contact.""" + query = """ + SELECT h.id, h.asset_type, h.brand, h.model, h.serial_number, h.status + FROM hardware_assets h + WHERE h.deleted_at IS NULL + AND NOT EXISTS ( + SELECT 1 FROM hardware_contacts hc WHERE hc.hardware_id = h.id + ) + ORDER BY h.created_at DESC + LIMIT %s + """ + result = execute_query(query, (limit,)) + return result or [] + + +@router.post("/hardware/{hardware_id}/assign-contact", response_model=dict) +async def assign_hardware_to_contact(hardware_id: int, payload: dict): + """Link hardware asset to a contact.""" + contact_id = payload.get("contact_id") + if not contact_id: + raise HTTPException(status_code=422, detail="contact_id is required") + + hardware = execute_query("SELECT id FROM hardware_assets WHERE id = %s AND deleted_at IS NULL", (hardware_id,)) + if not hardware: + raise HTTPException(status_code=404, detail="Hardware not found") + + contact = execute_query("SELECT id FROM contacts WHERE id = %s", (contact_id,)) + if not contact: + raise HTTPException(status_code=404, detail="Contact not found") + + execute_query( + """ + INSERT INTO hardware_contacts (hardware_id, contact_id, role, source) + VALUES (%s, %s, %s, %s) + ON CONFLICT (hardware_id, contact_id) DO NOTHING + """, + (hardware_id, contact_id, "primary", "manual"), + ) + + customer_id = _get_contact_customer(int(contact_id)) + if customer_id: + execute_query( + """ + UPDATE hardware_assets + SET current_owner_customer_id = COALESCE(current_owner_customer_id, %s) + WHERE id = %s + """, + (customer_id, hardware_id), + ) + + return {"status": "ok"} + + @router.post("/hardware", response_model=dict) async def create_hardware(data: dict): """Create a new hardware asset.""" diff --git a/app/modules/hardware/frontend/views.py b/app/modules/hardware/frontend/views.py index eaa09eb..8a08c3c 100644 --- a/app/modules/hardware/frontend/views.py +++ b/app/modules/hardware/frontend/views.py @@ -1,5 +1,5 @@ import logging -from typing import Optional +from typing import Optional, Any from fastapi import APIRouter, HTTPException, Query, Request, Form, Depends from fastapi.responses import HTMLResponse, RedirectResponse from fastapi.templating import Jinja2Templates @@ -101,16 +101,96 @@ def extract_eset_specs_summary(hardware: dict) -> dict: adapter_names = [n.get("caption") for n in network_adapters if isinstance(n, dict) and n.get("caption")] macs = [n.get("macAddress") for n in network_adapters if isinstance(n, dict) and n.get("macAddress")] - deployed_components = [] + installed_software = [] + + def _normalize_version(value: Any) -> str: + if isinstance(value, dict): + name = str(value.get("name") or "").strip() + if name: + return name + version_id = str(value.get("id") or "").strip() + if version_id: + return version_id + major = value.get("major") + minor = value.get("minor") + patch = value.get("patch") + if major is not None and minor is not None and patch is not None: + return f"{major}.{minor}.{patch}" + return "" + if value is None: + return "" + return str(value).strip() + + def _add_software_item(name: Optional[str], version: Any = None) -> None: + if not name: + return + item_name = str(name).strip() + item_version = _normalize_version(version) + if not item_name: + return + if item_version: + installed_software.append(f"{item_name} {item_version}") + else: + installed_software.append(item_name) + + # ESET standard format for comp in specs.get("deployedComponents") or []: if not isinstance(comp, dict): continue - name = comp.get("displayName") or comp.get("name") - version = (comp.get("version") or {}).get("name") - if name and version: - deployed_components.append(f"{name} {version}") - elif name: - deployed_components.append(name) + _add_software_item( + comp.get("displayName") or comp.get("name"), + comp.get("version"), + ) + + # Alternative common payload names + for comp in specs.get("installedSoftware") or []: + if isinstance(comp, dict): + _add_software_item(comp.get("displayName") or comp.get("name") or comp.get("softwareName"), comp.get("version")) + elif isinstance(comp, str): + _add_software_item(comp) + + for comp in specs.get("applications") or []: + if isinstance(comp, dict): + _add_software_item(comp.get("displayName") or comp.get("name") or comp.get("applicationName"), comp.get("version")) + elif isinstance(comp, str): + _add_software_item(comp) + + for comp in specs.get("activeProducts") or []: + if isinstance(comp, dict): + _add_software_item( + comp.get("displayName") or comp.get("name") or comp.get("productName") or comp.get("product"), + comp.get("version") or comp.get("productVersion"), + ) + elif isinstance(comp, str): + _add_software_item(comp) + + for key in ("applicationInventory", "softwareInventory"): + for comp in specs.get(key) or []: + if isinstance(comp, dict): + _add_software_item( + comp.get("displayName") or comp.get("name") or comp.get("applicationName") or comp.get("softwareName"), + comp.get("version") or comp.get("applicationVersion") or comp.get("softwareVersion"), + ) + elif isinstance(comp, str): + _add_software_item(comp) + + # Keep ordering but remove duplicates + seen = set() + deduped_installed_software = [] + for item in installed_software: + key = item.lower() + if key in seen: + continue + seen.add(key) + deduped_installed_software.append(item) + + installed_software_details = [] + for item in deduped_installed_software: + match = item.rsplit(" ", 1) + if len(match) == 2 and any(ch.isdigit() for ch in match[1]): + installed_software_details.append({"name": match[0], "version": match[1]}) + else: + installed_software_details.append({"name": item, "version": ""}) return { "os_name": os_name, @@ -131,7 +211,8 @@ def extract_eset_specs_summary(hardware: dict) -> dict: "functionality_status": specs.get("functionalityStatus"), "last_sync_time": specs.get("lastSyncTime"), "device_type": specs.get("deviceType"), - "deployed_components": deployed_components, + "deployed_components": deduped_installed_software, + "installed_software_details": installed_software_details, } @@ -232,11 +313,24 @@ async def hardware_eset_overview( matches = execute_query(matches_query) incidents_query = """ - SELECT * - FROM eset_incidents - WHERE LOWER(COALESCE(severity, '')) IN ('critical', 'high', 'severe') - ORDER BY updated_at DESC NULLS LAST - LIMIT 200 + SELECT + i.*, + hw.id AS hardware_id, + hw.current_owner_customer_id AS customer_id, + cust.name AS customer_name + FROM eset_incidents i + LEFT JOIN LATERAL ( + SELECT h.id, h.current_owner_customer_id + FROM hardware_assets h + WHERE h.deleted_at IS NULL + AND LOWER(COALESCE(h.eset_uuid, '')) = LOWER(COALESCE(i.device_uuid, '')) + ORDER BY h.updated_at DESC NULLS LAST, h.id DESC + LIMIT 1 + ) hw ON TRUE + LEFT JOIN customers cust ON cust.id = hw.current_owner_customer_id + WHERE LOWER(COALESCE(i.severity, '')) IN ('critical', 'high', 'severe') + ORDER BY i.updated_at DESC NULLS LAST + LIMIT 5 """ incidents = execute_query(incidents_query) diff --git a/app/modules/hardware/templates/detail.html b/app/modules/hardware/templates/detail.html index 08c0a9f..ac24109 100644 --- a/app/modules/hardware/templates/detail.html +++ b/app/modules/hardware/templates/detail.html @@ -454,7 +454,7 @@
    Specifikationer
    - {% if eset_specs and (eset_specs.os_name or eset_specs.primary_local_ip or eset_specs.cpu_models) %} + {% if eset_specs and (eset_specs.os_name or eset_specs.primary_local_ip or eset_specs.cpu_models or eset_specs.deployed_components) %}
    @@ -512,7 +512,38 @@ - +
    Installeret{{ eset_specs.deployed_components | join(', ') if eset_specs.deployed_components else '-' }} + {% if eset_specs.installed_software_details %} +
    + + + + + + + + + {% for app in eset_specs.installed_software_details %} + + + + + {% endfor %} + +
    AppVersion
    {{ app.name }}{{ app.version or '-' }}
    +
    + {% elif eset_specs.deployed_components %} +
    +
      + {% for app in eset_specs.deployed_components %} +
    • {{ app }}
      • + {% endfor %} +
    +
    + {% else %} + - + {% endif %} +
    diff --git a/app/modules/hardware/templates/eset_overview.html b/app/modules/hardware/templates/eset_overview.html index e264dbf..b085161 100644 --- a/app/modules/hardware/templates/eset_overview.html +++ b/app/modules/hardware/templates/eset_overview.html @@ -129,7 +129,7 @@
    -
    🚨 Kritiske incidents
    +
    🚨 Kritiske incidents (seneste 5)
    {% if incidents %}
    @@ -140,6 +140,7 @@ + @@ -155,6 +156,24 @@ + {% endfor %} diff --git a/app/modules/hardware/templates/index.html b/app/modules/hardware/templates/index.html index 16b7fc6..832e074 100644 --- a/app/modules/hardware/templates/index.html +++ b/app/modules/hardware/templates/index.html @@ -299,74 +299,129 @@ {% if hardware and hardware|length > 0 %} -
    - {% for item in hardware %} -
    -
    -
    - {% if item.asset_type == 'pc' %}🖥️ - {% elif item.asset_type == 'laptop' %}💻 - {% elif item.asset_type == 'printer' %}🖨️ - {% elif item.asset_type == 'skærm' %}🖥️ - {% elif item.asset_type == 'telefon' %}📱 - {% elif item.asset_type == 'server' %}🗄️ - {% elif item.asset_type == 'netværk' %}🌐 - {% else %}📦 +
    +
    + + +
    +
    + +
    +
    + {% for item in hardware %} +
    +
    +
    + {% if item.asset_type == 'pc' %}🖥️ + {% elif item.asset_type == 'laptop' %}💻 + {% elif item.asset_type == 'printer' %}🖨️ + {% elif item.asset_type == 'skærm' %}🖥️ + {% elif item.asset_type == 'telefon' %}📱 + {% elif item.asset_type == 'server' %}🗄️ + {% elif item.asset_type == 'netværk' %}🌐 + {% else %}📦 + {% endif %} +
    +
    +
    {{ item.brand or 'Unknown' }} {{ item.model or '' }}
    +
    {{ item.serial_number or 'Ingen serienummer' }}
    +
    +
    + +
    +
    + Type: + {{ item.asset_type|title }} +
    + {% if item.anydesk_id or item.anydesk_link %} +
    + AnyDesk: + + {% if item.anydesk_link %} + {{ item.anydesk_id or 'Åbn' }} + {% elif item.anydesk_id %} + {{ item.anydesk_id }} + {% endif %} + +
    + {% endif %} + {% if item.customer_name %} +
    + Ejer: + {{ item.customer_name }} +
    + {% elif item.current_owner_type %} +
    + Ejer: + {{ item.current_owner_type|title }} +
    + {% endif %} + {% if item.internal_asset_id %} +
    + Asset ID: + {{ item.internal_asset_id }} +
    {% endif %}
    -
    -
    {{ item.brand or 'Unknown' }} {{ item.model or '' }}
    -
    {{ item.serial_number or 'Ingen serienummer' }}
    -
    -
    -
    -
    - Type: - {{ item.asset_type|title }} -
    - {% if item.anydesk_id or item.anydesk_link %} -
    - AnyDesk: - - {% if item.anydesk_link %} - {{ item.anydesk_id or 'Åbn' }} - {% elif item.anydesk_id %} - {{ item.anydesk_id }} - {% endif %} +
    + + {{ item.status|replace('_', ' ')|title }} -
    - {% endif %} - {% if item.customer_name %} -
    - Ejer: - {{ item.customer_name }} -
    - {% elif item.current_owner_type %} -
    - Ejer: - {{ item.current_owner_type|title }} -
    - {% endif %} - {% if item.internal_asset_id %} -
    - Asset ID: - {{ item.internal_asset_id }} -
    - {% endif %} -
    - -
    - - {{ item.status|replace('_', ' ')|title }} - -
    - 👁️ Se - ✏️ Rediger +
    + 👁️ Se + ✏️ Rediger +
    + {% endfor %} +
    +
    + +
    +
    +
    Device UUID Detected Last SeenHandling
    {{ inc.device_uuid or '-' }} {{ inc.detected_at or '-' }} {{ inc.last_seen or '-' }} + {% set case_title = 'ESET incident ' ~ (inc.severity or 'critical') ~ ' - ' ~ (inc.device_uuid or 'ukendt enhed') %} + {% set case_description = + 'Kilde: ESET incidents | ' ~ + 'Severity: ' ~ (inc.severity or '-') ~ ' | ' ~ + 'Status: ' ~ (inc.status or '-') ~ ' | ' ~ + 'Device UUID: ' ~ (inc.device_uuid or '-') ~ ' | ' ~ + 'Incident UUID: ' ~ (inc.incident_uuid or '-') ~ ' | ' ~ + 'Detected: ' ~ (inc.detected_at or '-') ~ ' | ' ~ + 'Last Seen: ' ~ (inc.last_seen or '-') + %} + + Opret sag + +
    + + + + + + + + + + + + + {% for item in hardware %} + + + + + + + + + + {% endfor %} + +
    HardwareTypeSerienr.EjerStatusAnyDeskHandling
    {{ item.brand or 'Unknown' }} {{ item.model or '' }}{{ 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 '—') }} + + {{ item.status|replace('_', ' ')|title }} + + + {% if item.anydesk_link %} + {{ item.anydesk_id or 'Åbn' }} + {% elif item.anydesk_id %} + {{ item.anydesk_id }} + {% else %} + — + {% endif %} + + 👁️ Se + ✏️ Rediger +
    - {% endfor %}
    {% else %}
    @@ -386,5 +441,25 @@ select.form.submit(); }); }); + + function setHardwareView(view) { + const cards = document.getElementById('hardwareCardsView'); + const table = document.getElementById('hardwareTableView'); + const cardsBtn = document.getElementById('viewCardsBtn'); + const tableBtn = document.getElementById('viewTableBtn'); + if (!cards || !table || !cardsBtn || !tableBtn) return; + + const showTable = view === 'table'; + cards.classList.toggle('d-none', showTable); + table.classList.toggle('d-none', !showTable); + cardsBtn.classList.toggle('active', !showTable); + tableBtn.classList.toggle('active', showTable); + localStorage.setItem('hardwareViewMode', showTable ? 'table' : 'cards'); + } + + const savedView = localStorage.getItem('hardwareViewMode'); + if (savedView === 'table') { + setHardwareView('table'); + } {% endblock %} diff --git a/app/modules/sag/backend/reminders.py b/app/modules/sag/backend/reminders.py index 5a7561a..e885b87 100644 --- a/app/modules/sag/backend/reminders.py +++ b/app/modules/sag/backend/reminders.py @@ -60,6 +60,7 @@ class ReminderCreate(BaseModel): title: str = Field(..., min_length=3, max_length=255) message: Optional[str] = None priority: str = Field(default="normal", pattern="^(low|normal|high|urgent)$") + event_type: str = Field(default="reminder", pattern="^(reminder|meeting|technician_visit|obs|deadline)$") trigger_type: str = Field(pattern="^(status_change|deadline_approaching|time_based)$") trigger_config: dict # JSON config for trigger recipient_user_ids: List[int] = [] @@ -79,6 +80,7 @@ class ReminderUpdate(BaseModel): title: Optional[str] = None message: Optional[str] = None priority: Optional[str] = None + event_type: Optional[str] = Field(default=None, pattern="^(reminder|meeting|technician_visit|obs|deadline)$") notify_mattermost: Optional[bool] = None notify_email: Optional[bool] = None notify_frontend: Optional[bool] = None @@ -93,6 +95,7 @@ class ReminderResponse(BaseModel): title: str message: Optional[str] priority: str + event_type: Optional[str] trigger_type: str recurrence_type: str is_active: bool @@ -108,6 +111,7 @@ class ReminderProfileResponse(BaseModel): title: str message: Optional[str] priority: str + event_type: Optional[str] trigger_type: str recurrence_type: str is_active: bool @@ -251,7 +255,7 @@ async def list_sag_reminders(sag_id: int): """List all reminders for a case""" query = """ - SELECT id, sag_id, title, message, priority, trigger_type, + SELECT id, sag_id, title, message, priority, event_type, trigger_type, recurrence_type, is_active, next_check_at, last_sent_at, created_at FROM sag_reminders WHERE sag_id = %s AND deleted_at IS NULL @@ -267,6 +271,7 @@ async def list_sag_reminders(sag_id: int): title=r['title'], message=r['message'], priority=r['priority'], + event_type=r.get('event_type'), trigger_type=r['trigger_type'], recurrence_type=r['recurrence_type'], is_active=r['is_active'], @@ -284,7 +289,7 @@ async def list_my_reminders(request: Request): user_id = _get_user_id_from_request(request) query = """ - SELECT r.id, r.sag_id, r.title, r.message, r.priority, r.trigger_type, + SELECT r.id, r.sag_id, r.title, r.message, r.priority, r.event_type, r.trigger_type, r.recurrence_type, r.is_active, r.next_check_at, r.last_sent_at, r.created_at, s.titel as case_title, c.name as customer_name FROM sag_reminders r @@ -304,6 +309,7 @@ async def list_my_reminders(request: Request): title=r['title'], message=r['message'], priority=r['priority'], + event_type=r.get('event_type'), trigger_type=r['trigger_type'], recurrence_type=r['recurrence_type'], is_active=r['is_active'], @@ -339,7 +345,7 @@ async def create_sag_reminder(sag_id: int, request: Request, reminder: ReminderC import json query = """ INSERT INTO sag_reminders ( - sag_id, title, message, priority, trigger_type, trigger_config, + sag_id, title, message, priority, event_type, trigger_type, trigger_config, recipient_user_ids, recipient_emails, notify_mattermost, notify_email, notify_frontend, override_user_preferences, @@ -348,7 +354,7 @@ async def create_sag_reminder(sag_id: int, request: Request, reminder: ReminderC is_active, created_by_user_id ) VALUES ( - %s, %s, %s, %s, %s, %s, + %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, @@ -356,12 +362,12 @@ async def create_sag_reminder(sag_id: int, request: Request, reminder: ReminderC %s, %s, true, %s ) - RETURNING id, sag_id, title, message, priority, trigger_type, + RETURNING id, sag_id, title, message, priority, event_type, trigger_type, recurrence_type, is_active, next_check_at, last_sent_at, created_at """ result = execute_insert(query, ( - sag_id, reminder.title, reminder.message, reminder.priority, + sag_id, reminder.title, reminder.message, reminder.priority, reminder.event_type, reminder.trigger_type, json.dumps(reminder.trigger_config), reminder.recipient_user_ids, reminder.recipient_emails, reminder.notify_mattermost, reminder.notify_email, reminder.notify_frontend, @@ -380,7 +386,7 @@ async def create_sag_reminder(sag_id: int, request: Request, reminder: ReminderC else: reminder_id = int(raw_row) fetch_query = """ - SELECT id, sag_id, title, message, priority, trigger_type, + SELECT id, sag_id, title, message, priority, event_type, trigger_type, recurrence_type, is_active, next_check_at, last_sent_at, created_at FROM sag_reminders WHERE id = %s @@ -398,6 +404,7 @@ async def create_sag_reminder(sag_id: int, request: Request, reminder: ReminderC title=r['title'], message=r['message'], priority=r['priority'], + event_type=r.get('event_type'), trigger_type=r['trigger_type'], recurrence_type=r['recurrence_type'], is_active=r['is_active'], @@ -430,6 +437,10 @@ async def update_sag_reminder(reminder_id: int, update: ReminderUpdate): if update.priority is not None: updates.append("priority = %s") params.append(update.priority) + + if update.event_type is not None: + updates.append("event_type = %s") + params.append(update.event_type) if update.notify_mattermost is not None: updates.append("notify_mattermost = %s") diff --git a/app/modules/sag/backend/router.py b/app/modules/sag/backend/router.py index d0d2967..1837806 100644 --- a/app/modules/sag/backend/router.py +++ b/app/modules/sag/backend/router.py @@ -6,9 +6,10 @@ from datetime import datetime from typing import List, Optional from uuid import uuid4 -from fastapi import APIRouter, HTTPException, Query, UploadFile, File +from fastapi import APIRouter, HTTPException, Query, UploadFile, File, Request from fastapi.responses import FileResponse from app.core.database import execute_query, execute_query_single +from app.models.schemas import TodoStep, TodoStepCreate, TodoStepUpdate from app.core.config import settings from app.services.email_service import EmailService @@ -22,6 +23,24 @@ from email.header import decode_header logger = logging.getLogger(__name__) router = APIRouter() + +def _get_user_id_from_request(request: Request) -> int: + user_id = getattr(request.state, "user_id", None) + if user_id is not None: + try: + return int(user_id) + except ValueError: + raise HTTPException(status_code=400, detail="Invalid user_id format") + + user_id = request.query_params.get("user_id") + if user_id: + try: + return int(user_id) + except ValueError: + raise HTTPException(status_code=400, detail="Invalid user_id format") + + raise HTTPException(status_code=401, detail="User not authenticated - provide user_id query parameter") + # ============================================================================ # SAGER - CRUD Operations # ============================================================================ @@ -33,6 +52,9 @@ async def list_sager( customer_id: Optional[int] = Query(None), ansvarlig_bruger_id: Optional[int] = Query(None), include_deferred: bool = Query(False), + q: Optional[str] = Query(None), + limit: Optional[int] = Query(None, ge=1, le=200), + offset: int = Query(0, ge=0), ): """List all cases with optional filtering.""" try: @@ -51,8 +73,17 @@ async def list_sager( if ansvarlig_bruger_id: query += " AND ansvarlig_bruger_id = %s" params.append(ansvarlig_bruger_id) + + if q: + query += " AND (LOWER(titel) LIKE %s OR CAST(id AS TEXT) LIKE %s)" + q_like = f"%{q.lower()}%" + params.extend([q_like, q_like]) query += " ORDER BY created_at DESC" + + if limit is not None: + query += " LIMIT %s OFFSET %s" + params.extend([limit, offset]) cases = execute_query(query, tuple(params)) @@ -216,6 +247,147 @@ async def set_case_module_pref(sag_id: int, data: dict): logger.error("❌ Error setting module pref: %s", e) raise HTTPException(status_code=500, detail="Failed to set module pref") + +# ========================================================================= +# SAG TODO STEPS +# ========================================================================= + +@router.get("/sag/{sag_id}/todo-steps", response_model=List[TodoStep]) +async def list_todo_steps(sag_id: int): + try: + query = """ + SELECT + t.*, + COALESCE(u_created.full_name, u_created.username) AS created_by_name, + COALESCE(u_completed.full_name, u_completed.username) AS completed_by_name + FROM sag_todo_steps t + LEFT JOIN users u_created ON u_created.user_id = t.created_by_user_id + LEFT JOIN users u_completed ON u_completed.user_id = t.completed_by_user_id + WHERE t.sag_id = %s AND t.deleted_at IS NULL + ORDER BY t.is_done ASC, t.due_date NULLS LAST, t.created_at DESC + """ + return execute_query(query, (sag_id,)) or [] + except Exception as e: + logger.error("❌ Error listing todo steps: %s", e) + raise HTTPException(status_code=500, detail="Failed to list todo steps") + + +@router.post("/sag/{sag_id}/todo-steps", response_model=TodoStep) +async def create_todo_step(sag_id: int, request: Request, data: TodoStepCreate): + try: + user_id = _get_user_id_from_request(request) + if not data.title: + raise HTTPException(status_code=400, detail="title is required") + + insert_query = """ + INSERT INTO sag_todo_steps + (sag_id, title, description, due_date, created_by_user_id) + VALUES (%s, %s, %s, %s, %s) + RETURNING id + """ + result = execute_query(insert_query, ( + sag_id, + data.title, + data.description, + data.due_date, + user_id + )) + if not result: + raise HTTPException(status_code=500, detail="Failed to create todo step") + + step_id = result[0]["id"] + return execute_query( + """ + SELECT + t.*, + COALESCE(u_created.full_name, u_created.username) AS created_by_name, + COALESCE(u_completed.full_name, u_completed.username) AS completed_by_name + FROM sag_todo_steps t + LEFT JOIN users u_created ON u_created.user_id = t.created_by_user_id + LEFT JOIN users u_completed ON u_completed.user_id = t.completed_by_user_id + WHERE t.id = %s + """, + (step_id,) + )[0] + except HTTPException: + raise + except Exception as e: + logger.error("❌ Error creating todo step: %s", e) + raise HTTPException(status_code=500, detail="Failed to create todo step") + + +@router.patch("/sag/todo-steps/{step_id}", response_model=TodoStep) +async def update_todo_step(step_id: int, request: Request, data: TodoStepUpdate): + try: + if data.is_done is None: + raise HTTPException(status_code=400, detail="is_done is required") + + user_id = _get_user_id_from_request(request) + if data.is_done: + update_query = """ + UPDATE sag_todo_steps + SET is_done = TRUE, + completed_by_user_id = %s, + completed_at = CURRENT_TIMESTAMP + WHERE id = %s AND deleted_at IS NULL + RETURNING id + """ + result = execute_query(update_query, (user_id, step_id)) + else: + update_query = """ + UPDATE sag_todo_steps + SET is_done = FALSE, + completed_by_user_id = NULL, + completed_at = NULL + WHERE id = %s AND deleted_at IS NULL + RETURNING id + """ + result = execute_query(update_query, (step_id,)) + + if not result: + raise HTTPException(status_code=404, detail="Todo step not found") + + return execute_query( + """ + SELECT + t.*, + COALESCE(u_created.full_name, u_created.username) AS created_by_name, + COALESCE(u_completed.full_name, u_completed.username) AS completed_by_name + FROM sag_todo_steps t + LEFT JOIN users u_created ON u_created.user_id = t.created_by_user_id + LEFT JOIN users u_completed ON u_completed.user_id = t.completed_by_user_id + WHERE t.id = %s + """, + (step_id,) + )[0] + except HTTPException: + raise + except Exception as e: + logger.error("❌ Error updating todo step: %s", e) + raise HTTPException(status_code=500, detail="Failed to update todo step") + + +@router.delete("/sag/todo-steps/{step_id}") +async def delete_todo_step(step_id: int): + try: + result = execute_query( + """ + UPDATE sag_todo_steps + SET deleted_at = CURRENT_TIMESTAMP + WHERE id = %s AND deleted_at IS NULL + RETURNING id + """, + (step_id,) + ) + if not result: + raise HTTPException(status_code=404, detail="Todo step not found") + return {"status": "deleted"} + except HTTPException: + raise + except Exception as e: + logger.error("❌ Error deleting todo step: %s", e) + raise HTTPException(status_code=500, detail="Failed to delete todo step") + @router.patch("/sag/{sag_id}") async def update_sag(sag_id: int, updates: dict): """Update a case.""" @@ -974,6 +1146,129 @@ async def get_varekob_salg(sag_id: int, include_subcases: bool = True): logger.error("❌ Error aggregating case data: %s", e) raise HTTPException(status_code=500, detail="Failed to aggregate case data") + +@router.get("/sag/{sag_id}/calendar-events") +async def get_case_calendar_events(sag_id: int, include_children: bool = True): + """Return calendar events for a case and optionally its child cases.""" + try: + check = execute_query("SELECT id FROM sag_sager WHERE id = %s AND deleted_at IS NULL", (sag_id,)) + if not check: + raise HTTPException(status_code=404, detail="Case not found") + + if include_children: + case_tree_query = """ + WITH RECURSIVE normalized_relations AS ( + SELECT + CASE + WHEN LOWER(relationstype) IN ('afledt af', 'afledt_af') THEN målsag_id + WHEN LOWER(relationstype) IN ('årsag til', 'årsag_til') THEN kilde_sag_id + ELSE kilde_sag_id + END AS parent_id, + CASE + WHEN LOWER(relationstype) IN ('afledt af', 'afledt_af') THEN kilde_sag_id + WHEN LOWER(relationstype) IN ('årsag til', 'årsag_til') THEN målsag_id + ELSE målsag_id + END AS child_id + FROM sag_relationer + WHERE deleted_at IS NULL + ), + case_tree AS ( + SELECT id FROM sag_sager WHERE id = %s AND deleted_at IS NULL + UNION + SELECT nr.child_id + FROM normalized_relations nr + JOIN case_tree ct ON nr.parent_id = ct.id + ) + SELECT s.id, s.titel + FROM sag_sager s + JOIN case_tree ct ON s.id = ct.id + WHERE s.deleted_at IS NULL + ORDER BY s.id + """ + case_rows = execute_query(case_tree_query, (sag_id,)) or [] + else: + case_rows = execute_query( + "SELECT id, titel FROM sag_sager WHERE id = %s AND deleted_at IS NULL", + (sag_id,) + ) or [] + + case_ids = [row["id"] for row in case_rows] + case_titles = {row["id"]: row.get("titel") for row in case_rows} + + if not case_ids: + return {"current": [], "children": []} + + placeholders = ",".join(["%s"] * len(case_ids)) + + reminder_query = f""" + SELECT r.id, r.sag_id, r.title, r.message, r.event_type, r.priority, + r.next_check_at, r.scheduled_at + FROM sag_reminders r + WHERE r.deleted_at IS NULL + AND r.is_active = true + AND r.sag_id IN ({placeholders}) + """ + reminders = execute_query(reminder_query, tuple(case_ids)) or [] + + case_query = f""" + SELECT id, titel, deadline, deferred_until + FROM sag_sager + WHERE deleted_at IS NULL + AND id IN ({placeholders}) + """ + case_dates = execute_query(case_query, tuple(case_ids)) or [] + + events_by_case: dict[int, list] = {cid: [] for cid in case_ids} + + for row in reminders: + start_value = row.get("next_check_at") or row.get("scheduled_at") + if not start_value: + continue + events_by_case[row["sag_id"]].append({ + "id": f"reminder:{row['id']}", + "title": row.get("title"), + "message": row.get("message"), + "event_kind": row.get("event_type") or "reminder", + "start": start_value.isoformat(), + "url": f"/sag/{row['sag_id']}" + }) + + for row in case_dates: + if row.get("deadline"): + events_by_case[row["id"]].append({ + "id": f"deadline:{row['id']}", + "title": f"Deadline: {row.get('titel')}", + "event_kind": "deadline", + "start": row["deadline"].isoformat(), + "url": f"/sag/{row['id']}" + }) + if row.get("deferred_until"): + events_by_case[row["id"]].append({ + "id": f"deferred:{row['id']}", + "title": f"Deferred: {row.get('titel')}", + "event_kind": "deferred", + "start": row["deferred_until"].isoformat(), + "url": f"/sag/{row['id']}" + }) + + current_events = events_by_case.get(sag_id, []) + children = [] + for cid in case_ids: + if cid == sag_id: + continue + children.append({ + "case_id": cid, + "case_title": case_titles.get(cid) or f"Sag #{cid}", + "events": events_by_case.get(cid, []) + }) + + return {"current": current_events, "children": children} + except HTTPException: + raise + except Exception as e: + logger.error("❌ Error loading case calendar events: %s", e) + raise HTTPException(status_code=500, detail="Failed to load calendar events") + # ============================================================================ # VAREKØB & SALG - CRUD (Case-linked sale items) # ============================================================================ diff --git a/app/modules/sag/frontend/views.py b/app/modules/sag/frontend/views.py index e35699f..e1d9c00 100644 --- a/app/modules/sag/frontend/views.py +++ b/app/modules/sag/frontend/views.py @@ -396,6 +396,28 @@ async def sag_detaljer(request: Request, sag_id: int): time_query = "SELECT * FROM tmodule_times WHERE sag_id = %s ORDER BY worked_date DESC" time_entries = execute_query(time_query, (sag_id,)) + # Fetch linked telephony call history + call_history_query = """ + SELECT + t.id, + t.callid, + t.direction, + t.ekstern_nummer, + t.started_at, + t.ended_at, + t.duration_sec, + u.username, + u.full_name, + CONCAT(COALESCE(c.first_name, ''), ' ', COALESCE(c.last_name, '')) AS contact_name + FROM telefoni_opkald t + LEFT JOIN users u ON u.user_id = t.bruger_id + LEFT JOIN contacts c ON c.id = t.kontakt_id + WHERE t.sag_id = %s + ORDER BY t.started_at DESC + LIMIT 200 + """ + call_history = execute_query(call_history_query, (sag_id,)) + # Check for nextcloud integration (case-insensitive, insensitive to whitespace) logger.info(f"Checking tags for Nextcloud on case {sag_id}: {tags}") is_nextcloud = any(t['tag_navn'] and t['tag_navn'].strip().lower() == 'nextcloud' for t in tags) @@ -434,6 +456,7 @@ async def sag_detaljer(request: Request, sag_id: int): "comments": comments, "solution": solution, "time_entries": time_entries, + "call_history": call_history, "is_nextcloud": is_nextcloud, "nextcloud_instance": nextcloud_instance, "related_case_options": related_case_options, diff --git a/app/modules/sag/templates/create.html b/app/modules/sag/templates/create.html index 063ac53..380ab6c 100644 --- a/app/modules/sag/templates/create.html +++ b/app/modules/sag/templates/create.html @@ -296,6 +296,7 @@ let selectedContactsCompanies = {}; let customerSearchTimeout; let contactSearchTimeout; + let telefoniPrefill = { contactId: null, title: null, callId: null, customerId: null, description: null }; // --- Character Counter --- const beskrInput = document.getElementById('beskrivelse'); @@ -450,6 +451,70 @@ loadHardwareForContacts(); } + function readTelefoniPrefill() { + const params = new URLSearchParams(window.location.search || ''); + const contactIdRaw = params.get('contact_id'); + const titleRaw = params.get('title'); + const callIdRaw = params.get('telefoni_opkald_id'); + const customerIdRaw = params.get('customer_id'); + const descriptionRaw = params.get('description'); + + const contactId = contactIdRaw ? parseInt(contactIdRaw) : null; + const customerId = customerIdRaw ? parseInt(customerIdRaw) : null; + telefoniPrefill.contactId = Number.isFinite(contactId) ? contactId : null; + telefoniPrefill.customerId = Number.isFinite(customerId) ? customerId : null; + telefoniPrefill.title = titleRaw ? String(titleRaw) : null; + telefoniPrefill.callId = callIdRaw ? String(callIdRaw) : null; + telefoniPrefill.description = descriptionRaw ? String(descriptionRaw) : null; + } + + async function applyTelefoniPrefill() { + readTelefoniPrefill(); + + if (telefoniPrefill.title) { + const titelInput = document.getElementById('titel'); + if (titelInput && !titelInput.value.trim()) { + titelInput.value = telefoniPrefill.title; + } + } + + if (telefoniPrefill.description) { + const beskrInput = document.getElementById('beskrivelse'); + if (beskrInput && !beskrInput.value.trim()) { + beskrInput.value = telefoniPrefill.description; + const charCount = document.getElementById('charCount'); + if (charCount) { + charCount.textContent = beskrInput.value.length + " tegn"; + } + } + } + + if (telefoniPrefill.customerId && !selectedCustomer) { + try { + const customerRes = await fetch(`/api/v1/customers/${telefoniPrefill.customerId}`); + if (customerRes.ok) { + const customer = await customerRes.json(); + const customerName = customer.name || `Kunde #${telefoniPrefill.customerId}`; + selectCustomer(telefoniPrefill.customerId, customerName); + } + } catch (e) { + console.error('Customer prefill failed', e); + } + } + + if (telefoniPrefill.contactId) { + try { + const res = await fetch(`/api/v1/contacts/${telefoniPrefill.contactId}`); + if (!res.ok) return; + const c = await res.json(); + const name = `${c.first_name || ''} ${c.last_name || ''}`.trim() || `Kontakt #${telefoniPrefill.contactId}`; + await selectContact(telefoniPrefill.contactId, name); + } catch (e) { + console.error('Telefoni prefill failed', e); + } + } + } + function removeContact(id) { delete selectedContacts[id]; delete selectedContactsCompanies[id]; @@ -706,6 +771,7 @@ document.addEventListener('DOMContentLoaded', () => { initializeSearch(); loadCaseTypesSelect(); + applyTelefoniPrefill(); }); // --- Form Submission --- @@ -798,6 +864,22 @@ await Promise.all(contactPromises); + // Link telephony call -> case (best-effort) + if (telefoniPrefill.callId) { + try { + await fetch(`/api/v1/telefoni/calls/${encodeURIComponent(telefoniPrefill.callId)}`, { + method: 'PATCH', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + sag_id: result.id, + kontakt_id: telefoniPrefill.contactId || null + }) + }); + } catch (e) { + console.warn('Telefoni link failed', e); + } + } + // Ensure contact-company link exists if (selectedCustomer) { const linkPromises = Object.keys(selectedContacts).map(cid => diff --git a/app/modules/sag/templates/detail.html b/app/modules/sag/templates/detail.html index 3c70353..a3adcbc 100644 --- a/app/modules/sag/templates/detail.html +++ b/app/modules/sag/templates/detail.html @@ -741,11 +741,118 @@
    + +
    +
    +
    +
    +
    📞 Call historik
    + + + +
    +
    + {% if call_history and call_history|length > 0 %} +
    + + + + + + + + + + + + {% for call in call_history %} + + + + + + + + {% endfor %} + +
    DatoRetningNummerBrugerVarighed
    {{ call.started_at.strftime('%d/%m/%Y %H:%M') if call.started_at else '-' }}{{ 'Udgående' if call.direction == 'outbound' else 'Indgående' }} + {% if call.ekstern_nummer %} +
    + {{ call.ekstern_nummer }} + +
    + {% else %} + - + {% endif %} +     		{{ call.full_name or call.username or '-' }} + {% if call.duration_sec is not none %} + {{ (call.duration_sec // 60)|int }}:{{ '%02d'|format((call.duration_sec % 60)|int) }} + {% elif call.ended_at %} + - + {% else %} + I gang + {% endif %} +
    +
    + {% else %} +
    Ingen opkald linket til denne sag
    + {% endif %} +
    +
    +
    +
    + + +
    -
    -
    +
    +
    📁 Filer & Dokumenter
    @@ -756,19 +863,19 @@
    - -

    Træk filer hertil for at uploade

    + +

    Træk filer hertil for at uploade

    -
    Ingen filer fundet...
    +
    Ingen filer fundet...
    -
    +
    -
    -
    +
    +
    📧 Linkede Emails
    @@ -785,12 +892,10 @@
    Ingen emails linket...
    -
    +
    - - `).join('')} `; + setModuleContentState('locations', true); } catch (e) { console.error("Error loading locations:", e); document.getElementById('locations-list').innerHTML = '
    Fejl ved hentning
    '; + setModuleContentState('locations', true); } } @@ -1728,6 +1862,7 @@ if (!wikiCustomerId) { container.innerHTML = '
    Ingen kunde tilknyttet
    '; + setModuleContentState('wiki', false); return; } @@ -1749,6 +1884,7 @@ const payload = await res.json(); if (payload.errors && payload.errors.length) { container.innerHTML = '
    Wiki API fejlede
    '; + setModuleContentState('wiki', true); return; } @@ -1756,6 +1892,7 @@ if (!pages.length) { container.innerHTML = '
    Ingen sider fundet
    '; + setModuleContentState('wiki', false); return; } @@ -1770,9 +1907,185 @@ `; }).join(''); + setModuleContentState('wiki', true); } catch (e) { console.error('Error loading Wiki:', e); container.innerHTML = '
    Fejl ved hentning
    '; + setModuleContentState('wiki', true); + } + } + + let todoUserId = null; + + function getTodoUserId() { + if (todoUserId) return todoUserId; + const token = localStorage.getItem('access_token') || sessionStorage.getItem('access_token'); + if (token) { + try { + const payload = JSON.parse(atob(token.split('.')[1])); + todoUserId = payload.sub || payload.user_id; + return todoUserId; + } catch (e) { + console.warn('Could not decode token for todo user_id'); + } + } + const metaTag = document.querySelector('meta[name="user-id"]'); + if (metaTag) { + todoUserId = metaTag.getAttribute('content'); + } + return todoUserId; + } + + function formatTodoDate(value) { + if (!value) return '-'; + const date = new Date(value); + if (Number.isNaN(date.getTime())) return '-'; + return date.toLocaleDateString('da-DK'); + } + + function formatTodoDateTime(value) { + if (!value) return '-'; + const date = new Date(value); + if (Number.isNaN(date.getTime())) return '-'; + return date.toLocaleString('da-DK', { hour: '2-digit', minute: '2-digit', hour12: false }); + } + + function renderTodoSteps(steps) { + const list = document.getElementById('todo-steps-list'); + if (!list) return; + + if (!steps || steps.length === 0) { + list.innerHTML = '
    Ingen steps endnu
    '; + setModuleContentState('todo-steps', false); + return; + } + + list.innerHTML = steps.map(step => { + const createdBy = step.created_by_name || 'Ukendt'; + const completedBy = step.completed_by_name || 'Ukendt'; + const dueLabel = step.due_date ? formatTodoDate(step.due_date) : '-'; + const createdLabel = formatTodoDateTime(step.created_at); + const completedLabel = step.completed_at ? formatTodoDateTime(step.completed_at) : null; + const statusBadge = step.is_done + ? 'Ferdig' + : 'Aaben'; + const toggleLabel = step.is_done ? 'Genaabn' : 'Ferdig'; + const toggleClass = step.is_done ? 'btn-outline-secondary' : 'btn-outline-success'; + + return ` +
    +
    +
    +
    ${step.title}
    + ${step.description ? `
    ${step.description}
    ` : ''} +
    Forfald: ${dueLabel}
    +
    Oprettet af ${createdBy} · ${createdLabel}
    + ${step.is_done && completedLabel ? `
    Ferdiggjort af ${completedBy} · ${completedLabel}
    ` : ''} +
    +
    + ${statusBadge} +
    + + +
    +
    +
    +
    + `; + }).join(''); + setModuleContentState('todo-steps', true); + } + + async function loadTodoSteps() { + const list = document.getElementById('todo-steps-list'); + if (!list) return; + list.innerHTML = '
    Henter steps...
    '; + + try { + const res = await fetch(`/api/v1/sag/${caseId}/todo-steps`); + if (!res.ok) throw new Error('Kunne ikke hente steps'); + const steps = await res.json(); + renderTodoSteps(steps || []); + } catch (e) { + console.error('Error loading todo steps:', e); + list.innerHTML = '
    Fejl ved hentning
    '; + setModuleContentState('todo-steps', true); + } + } + + async function createTodoStep(event) { + event.preventDefault(); + const titleInput = document.getElementById('todoStepTitle'); + const descInput = document.getElementById('todoStepDescription'); + const dueInput = document.getElementById('todoStepDueDate'); + if (!titleInput) return; + + const title = titleInput.value.trim(); + if (!title) { + alert('Titel er paakraevet'); + return; + } + + const userId = getTodoUserId(); + if (!userId) { + alert('Mangler bruger-id. Log ind igen.'); + return; + } + + try { + const res = await fetch(`/api/v1/sag/${caseId}/todo-steps?user_id=${userId}`, + { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + title, + description: descInput.value.trim() || null, + due_date: dueInput.value || null + }) + } + ); + if (!res.ok) { + const err = await res.json(); + throw new Error(err.detail || 'Kunne ikke oprette step'); + } + titleInput.value = ''; + descInput.value = ''; + dueInput.value = ''; + await loadTodoSteps(); + } catch (e) { + alert('Fejl: ' + e.message); + } + } + + async function toggleTodoStep(stepId, isDone) { + const userId = getTodoUserId(); + if (!userId) { + alert('Mangler bruger-id. Log ind igen.'); + return; + } + try { + const res = await fetch(`/api/v1/sag/todo-steps/${stepId}?user_id=${userId}`, + { + method: 'PATCH', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ is_done: isDone }) + } + ); + if (!res.ok) throw new Error('Kunne ikke opdatere step'); + await loadTodoSteps(); + } catch (e) { + alert('Fejl: ' + e.message); + } + } + + async function deleteTodoStep(stepId) { + if (!confirm('Slet dette step?')) return; + try { + const res = await fetch(`/api/v1/sag/todo-steps/${stepId}`, { method: 'DELETE' }); + if (!res.ok) throw new Error('Kunne ikke slette step'); + await loadTodoSteps(); + } catch (e) { + alert('Fejl: ' + e.message); } } @@ -1971,6 +2284,25 @@
    +
    +
    +
    ✅ Todo steps
    +
    +
    +
    + + +
    + + +
    +
    +
    +
    Ingen steps endnu
    +
    +
    +
    +
    Tid & Fakturering
    @@ -2481,6 +2813,28 @@
    +
    +
    +
    Kalenderaftaler
    + +
    +
    +
    +
    Denne sag
    +
    +
    Indlæser aftaler...
    +
    +
    +
    +
    Børnesager
    +
    +
    Indlæser børnesager...
    +
    +
    +
    +
    @@ -2525,6 +2879,16 @@
    +
    + + +
    @@ -2729,6 +3093,8 @@ saleItemsCache = data.sale_items || []; renderSaleItems(saleItemsCache); renderTimeEntries(data.time_entries || []); + const hasSalesData = (data.sale_items || []).length > 0 || (data.time_entries || []).length > 0; + setModuleContentState('sales', hasSalesData); } catch (error) { console.error(error); const saleBody = document.getElementById('saleItemsBody'); @@ -2739,6 +3105,7 @@ if (timeBody) { timeBody.innerHTML = 'Kunne ikke hente data'; } + setModuleContentState('sales', true); } } @@ -2927,7 +3294,7 @@ if (!value) return '-'; const date = new Date(value); if (Number.isNaN(date.getTime())) return '-'; - return date.toLocaleString('da-DK'); + return date.toLocaleString('da-DK', { hour12: false }); } function updateReminderTriggerFields() { @@ -2954,7 +3321,7 @@ domWrap.classList.toggle('d-none', recurrenceType !== 'monthly'); } - function openCreateReminderModal() { + function openCreateReminderModal(defaultEventType) { reminderUserId = getReminderUserId(); const warning = document.getElementById('rem_user_warning'); if (warning) warning.classList.toggle('d-none', !!reminderUserId); @@ -2963,6 +3330,7 @@ if (form) form.reset(); document.getElementById('rem_notify_frontend').checked = true; document.getElementById('rem_priority').value = 'normal'; + document.getElementById('rem_event_type').value = defaultEventType || 'reminder'; document.getElementById('rem_trigger_type').value = 'time_based'; document.getElementById('rem_recurrence_type').value = 'once'; updateReminderTriggerFields(); @@ -2977,6 +3345,7 @@ if (!reminderUserId) { list.innerHTML = '
    Kunne ikke finde bruger-id.
    '; + setModuleContentState('reminders', true); return; } @@ -2990,6 +3359,7 @@ } catch (e) { console.error(e); list.innerHTML = '
    Fejl ved hentning af reminders
    '; + setModuleContentState('reminders', true); } } @@ -2998,6 +3368,7 @@ if (!list) return; if (!reminders || reminders.length === 0) { list.innerHTML = '
    Ingen reminders endnu.
    '; + setModuleContentState('reminders', false); return; } @@ -3007,6 +3378,14 @@ deadline_approaching: 'Deadline' }; + const eventTypeLabels = { + reminder: 'Reminder', + meeting: 'Moede', + technician_visit: 'Teknikerbesoeg', + obs: 'OBS', + deadline: 'Deadline' + }; + const recurrenceLabels = { once: 'Én gang', daily: 'Dagligt', @@ -3029,7 +3408,7 @@
    ${reminder.title}
    ${reminder.message || '-'}
    - Trigger: ${triggerLabels[reminder.trigger_type] || reminder.trigger_type} · Gentagelse: ${recurrenceLabels[reminder.recurrence_type] || reminder.recurrence_type} + Type: ${eventTypeLabels[reminder.event_type] || reminder.event_type || 'Reminder'} · Trigger: ${triggerLabels[reminder.trigger_type] || reminder.trigger_type} · Gentagelse: ${recurrenceLabels[reminder.recurrence_type] || reminder.recurrence_type}
    Næste: ${nextCheck} · Oprettet: ${createdAt}
    @@ -3043,6 +3422,7 @@
    `; }).join(''); + setModuleContentState('reminders', true); } async function saveReminder() { @@ -3055,6 +3435,7 @@ const title = document.getElementById('rem_title').value.trim(); const message = document.getElementById('rem_message').value.trim(); const priority = document.getElementById('rem_priority').value; + const eventType = document.getElementById('rem_event_type').value; const triggerType = document.getElementById('rem_trigger_type').value; const scheduledAtValue = document.getElementById('rem_scheduled_at').value; const targetStatus = document.getElementById('rem_target_status').value; @@ -3092,6 +3473,7 @@ title, message: message || null, priority, + event_type: eventType, trigger_type: triggerType, trigger_config: triggerConfig, recipient_user_ids: [Number(reminderUserId)], @@ -3118,6 +3500,7 @@ } bootstrap.Modal.getInstance(document.getElementById('createReminderModal')).hide(); await loadReminders(); + await loadCaseCalendar(); } catch (e) { alert('Fejl: ' + e.message); } @@ -3129,15 +3512,93 @@ const res = await fetch(`/api/v1/sag/reminders/${reminderId}`, { method: 'DELETE' }); if (!res.ok) throw new Error('Kunne ikke slette reminder'); await loadReminders(); + await loadCaseCalendar(); } catch (e) { alert('Fejl: ' + e.message); } } + function formatCalendarEvent(event) { + const dateLabel = formatReminderDate(event.start); + const typeLabelMap = { + reminder: 'Reminder', + meeting: 'Moede', + technician_visit: 'Teknikerbesoeg', + obs: 'OBS', + deadline: 'Deadline', + deferred: 'Deferred' + }; + const typeLabel = typeLabelMap[event.event_kind] || event.event_kind || 'Reminder'; + return ` + +
    +
    +
    ${event.title || 'Aftale'}
    +
    ${typeLabel} · ${dateLabel}
    +
    +
    +     + `; + } + + async function loadCaseCalendar() { + const currentList = document.getElementById('caseCalendarCurrent'); + const childrenList = document.getElementById('caseCalendarChildren'); + if (!currentList || !childrenList) return; + + currentList.innerHTML = '
    Indlæser aftaler...
    '; + childrenList.innerHTML = '
    Indlæser børnesager...
    '; + + try { + const res = await fetch(`/api/v1/sag/${caseIds}/calendar-events?include_children=true`); + if (!res.ok) throw new Error('Kunne ikke hente kalenderaftaler'); + const data = await res.json(); + + const currentEvents = data.current || []; + const childGroups = data.children || []; + const childCount = childGroups.reduce((sum, child) => sum + (child.events || []).length, 0); + const hasAnyEvents = currentEvents.length > 0 || childCount > 0; + + if (!currentEvents.length) { + currentList.innerHTML = '
    Ingen aftaler for denne sag.
    '; + } else { + currentList.innerHTML = currentEvents + .map(formatCalendarEvent) + .join(''); + } + + if (!childGroups.length) { + childrenList.innerHTML = '
    Ingen børnesager.
    '; + } else { + childrenList.innerHTML = childGroups.map(child => { + const eventsHtml = (child.events || []).length + ? child.events.map(formatCalendarEvent).join('') + : '
    Ingen aftaler.
    '; + return ` +
    +
    ${child.case_title}
    +
    + ${eventsHtml} +
    +
    + `; + }).join(''); + } + + setModuleContentState('calendar', hasAnyEvents); + } catch (e) { + console.error(e); + currentList.innerHTML = '
    Fejl ved hentning af aftaler.
    '; + childrenList.innerHTML = ''; + setModuleContentState('calendar', true); + } + } + document.addEventListener('DOMContentLoaded', function() { updateReminderTriggerFields(); updateReminderRecurrenceFields(); loadReminders(); + loadCaseCalendar(); }); @@ -3619,9 +4080,12 @@
    {% if hovedkontakt.mobile %} - - {{ hovedkontakt.mobile }} - +
    + + {{ hovedkontakt.mobile }} + + +
    {% else %} Ingen mobil {% endif %} @@ -4162,26 +4626,35 @@ // ========================================== let modulePrefs = {}; + let currentCaseView = 'Sag-detalje'; function moduleHasContent(el) { const attr = el.getAttribute('data-has-content'); if (attr === 'true') return true; if (attr === 'false') return false; - if (attr === 'unknown') return true; + if (attr === 'unknown') return false; if (el.querySelector('.person-card')) return true; if (el.querySelector('.list-group-item')) return true; return true; } + function setModuleContentState(moduleKey, hasContent) { + const el = document.querySelector(`[data-module="${moduleKey}"]`); + if (!el) return; + el.setAttribute('data-has-content', hasContent ? 'true' : 'false'); + applyViewLayout(currentCaseView); + } + function applyViewLayout(viewName) { if (!viewName) return; + currentCaseView = viewName; document.body.setAttribute('data-case-view', viewName); const viewDefaults = { 'Pipeline': ['relations', 'sales', 'time'], 'Kundevisning': ['customers', 'contacts', 'locations', 'wiki'], - 'Sag-detalje': ['hardware', 'locations', 'contacts', 'customers', 'wiki', 'relations', 'files', 'emails', 'solution', 'time', 'sales', 'reminders'] + 'Sag-detalje': ['hardware', 'locations', 'contacts', 'customers', 'wiki', 'todo-steps', 'relations', 'files', 'emails', 'solution', 'time', 'sales', 'reminders'] }; const standardModules = viewDefaults[viewName] || []; @@ -4203,7 +4676,7 @@ return; } - if (!standardModules.includes(moduleName) && !hasContent) { + if (!hasContent) { el.classList.add('d-none'); if (tabButton) tabButton.classList.add('d-none'); } else { @@ -4320,10 +4793,12 @@ renderFiles(files); } else { container.innerHTML = '
    Fejl ved hentning af filer
    '; + setModuleContentState('files', true); } } catch(e) { console.error(e); container.innerHTML = '
    Fejl ved hentning af filer
    '; + setModuleContentState('files', true); } } @@ -4331,8 +4806,10 @@ const container = document.getElementById('files-list'); if(!files || files.length === 0) { container.innerHTML = '
    Ingen filer fundet...
    '; + setModuleContentState('files', false); return; } + setModuleContentState('files', true); container.innerHTML = files.map(f => { const size = (f.size_bytes / 1024 / 1024).toFixed(2) + ' MB'; return ` @@ -4503,16 +4980,25 @@ if(res.ok) { const emails = await res.json(); renderLinkedEmails(emails); + } else { + container.innerHTML = '
    Fejl ved hentning af emails
    '; + setModuleContentState('emails', true); } - } catch(e) { console.error(e); } + } catch(e) { + console.error(e); + container.innerHTML = '
    Fejl ved hentning af emails
    '; + setModuleContentState('emails', true); + } } function renderLinkedEmails(emails) { const container = document.getElementById('linked-emails-list'); if(!emails || emails.length === 0) { container.innerHTML = '
    Ingen linkede emails...
    '; + setModuleContentState('emails', false); return; } + setModuleContentState('emails', true); container.innerHTML = emails.map(e => `
    @@ -4973,6 +5459,7 @@ const res = await fetch(`/api/v1/subscriptions/by-sag/${subscriptionCaseId}`); if (res.status === 404) { showSubscriptionCreateForm(); + setModuleContentState('subscription', false); return; } if (!res.ok) { @@ -4980,9 +5467,11 @@ } const subscription = await res.json(); renderSubscription(subscription); + setModuleContentState('subscription', true); } catch (e) { console.error('Error loading subscription:', e); showSubscriptionCreateForm(); + setModuleContentState('subscription', true); } } diff --git a/app/modules/telefoni/__init__.py b/app/modules/telefoni/__init__.py new file mode 100644 index 0000000..89c5eb1 --- /dev/null +++ b/app/modules/telefoni/__init__.py @@ -0,0 +1 @@ +"""Telefoni module package.""" diff --git a/app/modules/telefoni/backend/__init__.py b/app/modules/telefoni/backend/__init__.py new file mode 100644 index 0000000..2fc9824 --- /dev/null +++ b/app/modules/telefoni/backend/__init__.py @@ -0,0 +1 @@ +"""Telefoni backend package.""" diff --git a/app/modules/telefoni/backend/router.py b/app/modules/telefoni/backend/router.py new file mode 100644 index 0000000..84fb8fd --- /dev/null +++ b/app/modules/telefoni/backend/router.py @@ -0,0 +1,667 @@ +import json +import logging +import base64 +from datetime import datetime +from typing import Optional +from urllib.error import URLError, HTTPError +from urllib.request import Request as UrlRequest, urlopen +from urllib.parse import urlsplit, urlunsplit + +from fastapi import APIRouter, Depends, HTTPException, Query, Request, WebSocket, WebSocketDisconnect + +from app.core.auth_service import AuthService +from app.core.auth_dependencies import require_permission +from app.core.config import settings +from app.core.database import execute_query, execute_query_single +from app.services.sms_service import SmsService + +from .schemas import TelefoniCallLinkUpdate, TelefoniUserMappingUpdate, TelefoniClickToCallRequest, SmsSendRequest +from .service import TelefoniService +from .utils import ( + digits_only, + extract_extension, + ip_in_whitelist, + is_outbound_call, + normalize_e164, + phone_suffix_8, +) +from .websocket import manager + +logger = logging.getLogger(__name__) +router = APIRouter() + + +@router.post("/sms/send") +async def send_sms(payload: SmsSendRequest, request: Request): + user_id = getattr(request.state, "user_id", None) + logger.info("📨 SMS send requested by user_id=%s", user_id) + + contact_id = payload.contact_id + if not contact_id: + suffix8 = phone_suffix_8(payload.to) + contact = TelefoniService.find_contact_by_phone_suffix(suffix8) + contact_id = int(contact["id"]) if contact and contact.get("id") else None + + if not contact_id: + raise HTTPException(status_code=400, detail="SMS skal knyttes til en kontakt") + + try: + result = SmsService.send_sms(payload.to, payload.message, payload.sender) + execute_query( + """ + INSERT INTO sms_messages (kontakt_id, bruger_id, recipient, sender, message, status, provider_response) + VALUES (%s, %s, %s, %s, %s, %s, %s::jsonb) + """, + ( + contact_id, + user_id, + result.get("recipient") or payload.to, + payload.sender or settings.SMS_SENDER, + payload.message, + "sent", + json.dumps(result.get("result") or {}), + ), + ) + except ValueError as e: + raise HTTPException(status_code=400, detail=str(e)) + except RuntimeError as e: + execute_query( + """ + INSERT INTO sms_messages (kontakt_id, bruger_id, recipient, sender, message, status, provider_response) + VALUES (%s, %s, %s, %s, %s, %s, %s::jsonb) + """, + ( + contact_id, + user_id, + payload.to, + payload.sender or settings.SMS_SENDER, + payload.message, + "failed", + json.dumps({"error": str(e)}), + ), + ) + raise HTTPException(status_code=502, detail=str(e)) + except Exception as e: + logger.error("❌ SMS send failed: %s", e) + raise HTTPException(status_code=500, detail="SMS send failed") + + return { + "status": "ok", + **result, + } + + +def _get_client_ip(request: Request) -> str: + cf_ip = request.headers.get("cf-connecting-ip") + if cf_ip: + return cf_ip.strip() + + x_real_ip = request.headers.get("x-real-ip") + if x_real_ip: + return x_real_ip.strip() + + xff = request.headers.get("x-forwarded-for") + if xff: + return xff.split(",")[0].strip() + return request.client.host if request.client else "" + + +def _validate_yealink_request(request: Request, token: Optional[str]) -> None: + env_secret = (getattr(settings, "TELEFONI_SHARED_SECRET", "") or "").strip() + db_secret = (_get_setting_value("telefoni_shared_secret", "") or "").strip() + accepted_tokens = {s for s in (env_secret, db_secret) if s} + whitelist = (getattr(settings, "TELEFONI_IP_WHITELIST", "") or "").strip() + + if not accepted_tokens and not whitelist: + logger.error("❌ Telefoni callbacks are not secured (no TELEFONI_SHARED_SECRET or TELEFONI_IP_WHITELIST set)") + raise HTTPException(status_code=403, detail="Telefoni callbacks not configured") + + if token and token.strip() in accepted_tokens: + return + + if whitelist: + client_ip = _get_client_ip(request) + if ip_in_whitelist(client_ip, whitelist): + return + + raise HTTPException(status_code=403, detail="Forbidden") + + +@router.get("/telefoni/established") +async def yealink_established( + request: Request, + callid: Optional[str] = Query(None), + call_id: Optional[str] = Query(None), + caller: Optional[str] = Query(None), + callee: Optional[str] = Query(None), + remote: Optional[str] = Query(None), + local: Optional[str] = Query(None), + active_user: Optional[str] = Query(None), + called_number: Optional[str] = Query(None), + token: Optional[str] = Query(None), +): + """Yealink Action URL: Established""" + _validate_yealink_request(request, token) + + resolved_callid = (callid or call_id or "").strip() + if not resolved_callid: + raise HTTPException(status_code=422, detail="Missing callid/call_id") + + def _sanitize(value: Optional[str]) -> Optional[str]: + if value is None: + return None + v = value.strip() + if not v: + return None + if v.startswith("$"): + return None + return v + + def _is_external_number(value: Optional[str]) -> bool: + d = digits_only(value) + return len(d) >= 8 + + def _is_internal_number(value: Optional[str], local_ext: Optional[str]) -> bool: + d = digits_only(value) + if not d: + return False + local_d = digits_only(local_ext) + if local_d and d.endswith(local_d): + return True + return len(d) <= 6 + + local_value = _sanitize(local) or _sanitize(active_user) + caller_value = _sanitize(caller) or _sanitize(remote) + callee_value = _sanitize(callee) + called_number_value = _sanitize(called_number) + + local_extension = extract_extension(local_value) or local_value + + is_outbound = False + if called_number_value and _is_external_number(called_number_value): + is_outbound = True + elif caller_value and local_extension: + if not _is_internal_number(caller_value, local_extension): + is_outbound = is_outbound_call(caller_value, local_extension) + + direction = "outbound" if is_outbound else "inbound" + candidates = [ + callee_value, + called_number_value, + _sanitize(remote), + caller_value, + ] if direction == "outbound" else [ + caller_value, + _sanitize(remote), + callee_value, + called_number_value, + ] + + ekstern_raw = None + for candidate in candidates: + if candidate and _is_external_number(candidate): + ekstern_raw = candidate + break + + if not ekstern_raw: + for candidate in candidates: + if candidate: + ekstern_raw = candidate + break + ekstern_e164 = normalize_e164(ekstern_raw) + ekstern_value = ekstern_e164 or ((ekstern_raw or "").strip() or None) + suffix8 = phone_suffix_8(ekstern_raw) + + user_id = TelefoniService.find_user_by_extension(local_extension) + + kontakt = TelefoniService.find_contact_by_phone_suffix(suffix8) + kontakt_id = kontakt.get("id") if kontakt else None + + payload = { + "callid": resolved_callid, + "call_id": call_id, + "caller": caller_value, + "callee": callee_value, + "remote": remote, + "local": local_value, + "active_user": active_user, + "called_number": called_number_value, + "direction": direction, + "client_ip": _get_client_ip(request), + "user_agent": request.headers.get("user-agent"), + "received_at": datetime.utcnow().isoformat(), + } + + row = TelefoniService.upsert_call( + callid=resolved_callid, + user_id=user_id, + direction=direction, + ekstern_nummer=ekstern_value, + intern_extension=(local_extension or "")[:16] or None, + kontakt_id=kontakt_id, + raw_payload=json.dumps(payload), + started_at=datetime.utcnow(), + ) + + if user_id: + await manager.send_to_user( + user_id, + "incoming_call", + { + "call_id": str(row.get("id") or resolved_callid), + "number": ekstern_e164 or (ekstern_raw or ""), + "direction": direction, + "contact": kontakt, + }, + ) + else: + logger.info("⚠️ Telefoni established: no mapped user for extension=%s (callid=%s)", local_extension, resolved_callid) + + return {"status": "ok"} + + +@router.get("/telefoni/terminated") +async def yealink_terminated( + request: Request, + callid: Optional[str] = Query(None), + call_id: Optional[str] = Query(None), + duration: Optional[str] = Query(None), + call_duration: Optional[str] = Query(None), + token: Optional[str] = Query(None), +): + """Yealink Action URL: Terminated""" + _validate_yealink_request(request, token) + + resolved_callid = (callid or call_id or "").strip() + if not resolved_callid: + raise HTTPException(status_code=422, detail="Missing callid/call_id") + + duration_raw = (duration or call_duration or "").strip() or None + duration_value: Optional[int] = None + if duration_raw: + try: + duration_value = int(duration_raw) + except ValueError: + # Accept common timer formats from PBX/phones: mm:ss or hh:mm:ss + if ":" in duration_raw: + parts = duration_raw.split(":") + try: + nums = [int(p) for p in parts] + if len(nums) == 2: + duration_value = nums[0] * 60 + nums[1] + elif len(nums) == 3: + duration_value = nums[0] * 3600 + nums[1] * 60 + nums[2] + except ValueError: + duration_value = None + + if duration_value is None: + logger.info("⚠️ Telefoni terminated with unparseable duration='%s' (callid=%s)", duration_raw, resolved_callid) + + updated = TelefoniService.terminate_call(resolved_callid, duration_value) + if not updated: + logger.info("⚠️ Telefoni terminated without established (callid=%s)", resolved_callid) + return {"status": "ok"} + + +@router.websocket("/telefoni/ws") +async def telefoni_ws(websocket: WebSocket): + 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() + if not token: + token = (websocket.cookies.get("access_token") or "").strip() or None + + payload = AuthService.verify_token(token) if token else None + if not payload: + env_secret = (getattr(settings, "TELEFONI_SHARED_SECRET", "") or "").strip() + db_secret = (_get_setting_value("telefoni_shared_secret", "") or "").strip() + accepted_tokens = {s for s in (env_secret, db_secret) if s} + if token and token.strip() in accepted_tokens: + user_id_param = websocket.query_params.get("user_id") + try: + user_id = int(user_id_param) if user_id_param else None + except (TypeError, ValueError): + user_id = None + + if not user_id: + logger.info("⚠️ Telefoni WS rejected: shared secret requires user_id") + await websocket.close(code=1008) + return + else: + logger.info("⚠️ Telefoni WS rejected: invalid or missing token") + await websocket.close(code=1008) + return + else: + user_id_value = payload.get("sub") or payload.get("user_id") + try: + user_id = int(user_id_value) + except (TypeError, ValueError): + logger.info("⚠️ Telefoni WS rejected: invalid user id in token") + await websocket.close(code=1008) + return + + await manager.connect(user_id, websocket) + logger.info("✅ Telefoni WS connected for user_id=%s", user_id) + try: + while True: + # Keep alive / ignore client messages + await websocket.receive_text() + except WebSocketDisconnect: + logger.info("ℹ️ Telefoni WS disconnected for user_id=%s", user_id) + await manager.disconnect(user_id, websocket) + except Exception: + logger.info("ℹ️ Telefoni WS disconnected (exception) for user_id=%s", user_id) + await manager.disconnect(user_id, websocket) + + +@router.post("/telefoni/test-popup") +async def telefoni_test_popup( + request: Request, + token: Optional[str] = Query(None), + user_id: Optional[int] = Query(None), + extension: Optional[str] = Query(None), +): + """Trigger test popup for currently authenticated user.""" + target_user_id = getattr(request.state, "user_id", None) + + env_secret = (getattr(settings, "TELEFONI_SHARED_SECRET", "") or "").strip() + db_secret = (_get_setting_value("telefoni_shared_secret", "") or "").strip() + accepted_tokens = {s for s in (env_secret, db_secret) if s} + token_valid = bool(token and token.strip() in accepted_tokens) + + if not target_user_id: + if not token_valid: + raise HTTPException(status_code=401, detail="Not authenticated") + + if user_id: + target_user_id = int(user_id) + elif extension: + target_user_id = TelefoniService.find_user_by_extension(extension) + + if not target_user_id: + raise HTTPException(status_code=422, detail="Provide user_id or extension when using token auth") + + conn_count = await manager.connection_count_for_user(int(target_user_id)) + await manager.send_to_user( + int(target_user_id), + "incoming_call", + { + "call_id": f"test-{int(datetime.utcnow().timestamp())}", + "number": "+4511223344", + "direction": "inbound", + "contact": { + "id": None, + "name": "Test popup", + "company": "BMC Hub", + }, + }, + ) + return { + "status": "ok", + "message": "Test popup event sent", + "user_id": int(target_user_id), + "ws_connections": conn_count, + "auth_mode": "token" if token_valid and not getattr(request.state, "user_id", None) else "session", + } + + +@router.get("/telefoni/users") +async def list_telefoni_users(): + """List users for log filtering (auth-protected by middleware).""" + rows = execute_query( + """ + SELECT user_id, username, full_name, telefoni_extension, telefoni_aktiv, telefoni_phone_ip, telefoni_phone_username + FROM users + ORDER BY COALESCE(full_name, username) ASC + """, + (), + ) + return rows or [] + + +@router.patch("/telefoni/admin/users/{user_id}", dependencies=[Depends(require_permission("users.manage"))]) +async def update_telefoni_user_mapping(user_id: int, data: TelefoniUserMappingUpdate): + existing = execute_query_single("SELECT user_id FROM users WHERE user_id = %s", (user_id,)) + if not existing: + raise HTTPException(status_code=404, detail="User not found") + + rows = execute_query( + """ + UPDATE users + SET + telefoni_extension = COALESCE(%s, telefoni_extension), + telefoni_aktiv = COALESCE(%s, telefoni_aktiv), + telefoni_phone_ip = COALESCE(%s, telefoni_phone_ip), + telefoni_phone_username = COALESCE(%s, telefoni_phone_username), + telefoni_phone_password = CASE + WHEN %s IS NULL OR %s = '' THEN telefoni_phone_password + ELSE %s + END + WHERE user_id = %s + RETURNING user_id, username, full_name, telefoni_extension, telefoni_aktiv, telefoni_phone_ip, telefoni_phone_username + """, + ( + data.telefoni_extension, + data.telefoni_aktiv, + data.telefoni_phone_ip, + data.telefoni_phone_username, + data.telefoni_phone_password, + data.telefoni_phone_password, + data.telefoni_phone_password, + user_id, + ), + ) + return rows[0] if rows else {"status": "ok"} + + +def _get_setting_value(key: str, default: Optional[str] = None) -> Optional[str]: + row = execute_query_single("SELECT value FROM settings WHERE key = %s", (key,)) + if not row: + return default + value = row.get("value") + if value is None or value == "": + return default + return str(value) + + +@router.post("/telefoni/click-to-call") +async def click_to_call(payload: TelefoniClickToCallRequest): + enabled = (_get_setting_value("telefoni_click_to_call_enabled", "false") or "false").lower() == "true" + if not enabled: + raise HTTPException(status_code=400, detail="Click-to-call is disabled") + + template = _get_setting_value("telefoni_action_url_template", "") or "" + if not template: + raise HTTPException(status_code=400, detail="telefoni_action_url_template is not configured") + + number_normalized = normalize_e164(payload.number) or payload.number.strip() + extension_value = (payload.extension or "").strip() + phone_ip_value = "" + phone_username_value = "" + phone_password_value = "" + + if payload.user_id: + user_row = execute_query_single( + """ + SELECT telefoni_extension, telefoni_phone_ip, telefoni_phone_username, telefoni_phone_password + FROM users + WHERE user_id = %s + """, + (payload.user_id,), + ) + if user_row: + if not extension_value: + extension_value = (user_row.get("telefoni_extension") or "").strip() + phone_ip_value = (user_row.get("telefoni_phone_ip") or "").strip() + phone_username_value = (user_row.get("telefoni_phone_username") or "").strip() + phone_password_value = (user_row.get("telefoni_phone_password") or "").strip() + + if "{number}" not in template and "{raw_number}" not in template: + raise HTTPException(status_code=400, detail="Template must contain {number} or {raw_number}") + + if "{phone_ip}" in template and not phone_ip_value: + raise HTTPException(status_code=400, detail="Template requires {phone_ip}, but selected user has no phone IP") + if "{phone_username}" in template and not phone_username_value: + raise HTTPException(status_code=400, detail="Template requires {phone_username}, but selected user has no phone username") + if "{phone_password}" in template and not phone_password_value: + raise HTTPException(status_code=400, detail="Template requires {phone_password}, but selected user has no phone password") + + resolved_url = ( + template + .replace("{number}", number_normalized) + .replace("{raw_number}", payload.number.strip()) + .replace("{extension}", extension_value) + .replace("{phone_ip}", phone_ip_value) + .replace("{phone_username}", phone_username_value) + .replace("{phone_password}", phone_password_value) + ) + + auth_header: Optional[str] = None + if "@" in resolved_url: + parsed = urlsplit(resolved_url) + if not parsed.scheme or not parsed.netloc: + raise HTTPException(status_code=400, detail="Action URL template resolves to invalid URL") + + netloc = parsed.netloc + if "@" in netloc: + userinfo, host_part = netloc.rsplit("@", 1) + if ":" in userinfo: + username, password = userinfo.split(":", 1) + else: + username, password = userinfo, "" + + credentials = f"{username}:{password}".encode("utf-8") + auth_header = "Basic " + base64.b64encode(credentials).decode("ascii") + resolved_url = urlunsplit((parsed.scheme, host_part, parsed.path, parsed.query, parsed.fragment)) + + logger.info("📞 Click-to-call trigger: number=%s extension=%s", number_normalized, extension_value or "-") + + try: + request = UrlRequest(resolved_url, method="GET") + if auth_header: + request.add_header("Authorization", auth_header) + with urlopen(request, timeout=8) as response: + status = getattr(response, "status", 200) + except HTTPError as e: + logger.error("❌ Click-to-call HTTP error: %s", e) + raise HTTPException(status_code=502, detail=f"Action URL returned HTTP {e.code}") + except URLError as e: + logger.error("❌ Click-to-call URL error: %s", e) + raise HTTPException(status_code=502, detail="Could not reach Action URL") + except Exception as e: + logger.error("❌ Click-to-call failed: %s", e) + raise HTTPException(status_code=500, detail="Click-to-call failed") + + display_url = resolved_url + if auth_header: + display_url = "[basic-auth] " + resolved_url + + return { + "status": "ok", + "action_url": display_url, + "http_status": status, + "number": number_normalized, + } + + +@router.get("/telefoni/calls") +async def list_calls( + user_id: Optional[int] = Query(None), + date_from: Optional[str] = Query(None), + date_to: Optional[str] = Query(None), + without_case: bool = Query(False), + limit: int = Query(200, ge=1, le=2000), + offset: int = Query(0, ge=0), +): + where = [] + params = [] + + if user_id is not None: + where.append("t.bruger_id = %s") + params.append(user_id) + if date_from: + where.append("t.started_at >= %s") + params.append(date_from) + if date_to: + where.append("t.started_at <= %s") + params.append(date_to) + if without_case: + where.append("t.sag_id IS NULL") + + where_sql = ("WHERE " + " AND ".join(where)) if where else "" + + query = f""" + SELECT + t.id, + t.callid, + t.bruger_id, + t.direction, + t.ekstern_nummer, + COALESCE( + NULLIF(TRIM(t.ekstern_nummer), ''), + NULLIF(TRIM(t.raw_payload->>'caller'), ''), + NULLIF(TRIM(t.raw_payload->>'callee'), '') + ) AS display_number, + t.intern_extension, + t.kontakt_id, + t.sag_id, + t.started_at, + t.ended_at, + t.duration_sec, + t.created_at, + u.username, + u.full_name, + CONCAT(COALESCE(c.first_name, ''), ' ', COALESCE(c.last_name, '')) AS contact_name, + ( + SELECT cu.name + FROM contact_companies cc + JOIN customers cu ON cu.id = cc.customer_id + WHERE cc.contact_id = c.id + ORDER BY cc.is_primary DESC NULLS LAST, cc.id ASC + LIMIT 1 + ) AS contact_company, + s.titel AS sag_titel + FROM telefoni_opkald t + LEFT JOIN users u ON u.user_id = t.bruger_id + LEFT JOIN contacts c ON c.id = t.kontakt_id + LEFT JOIN sag_sager s ON s.id = t.sag_id + {where_sql} + ORDER BY t.started_at DESC + LIMIT %s OFFSET %s + """ + params.extend([limit, offset]) + + rows = execute_query(query, tuple(params)) + return rows or [] + + +@router.patch("/telefoni/calls/{call_id}") +async def update_call_links(call_id: int, data: TelefoniCallLinkUpdate): + existing = execute_query_single("SELECT id FROM telefoni_opkald WHERE id = %s", (call_id,)) + if not existing: + raise HTTPException(status_code=404, detail="Call not found") + + fields = [] + params = [] + + if "sag_id" in data.model_fields_set: + fields.append("sag_id = %s") + params.append(data.sag_id) + if "kontakt_id" in data.model_fields_set: + fields.append("kontakt_id = %s") + params.append(data.kontakt_id) + + if not fields: + raise HTTPException(status_code=400, detail="No fields provided") + + query = f""" + UPDATE telefoni_opkald + SET {", ".join(fields)} + WHERE id = %s + RETURNING * + """ + params.append(call_id) + + rows = execute_query(query, tuple(params)) + return rows[0] if rows else {"status": "ok"} diff --git a/app/modules/telefoni/backend/schemas.py b/app/modules/telefoni/backend/schemas.py new file mode 100644 index 0000000..e93ff47 --- /dev/null +++ b/app/modules/telefoni/backend/schemas.py @@ -0,0 +1,28 @@ +from pydantic import BaseModel +from typing import Optional + + +class TelefoniCallLinkUpdate(BaseModel): + sag_id: Optional[int] = None + kontakt_id: Optional[int] = None + + +class TelefoniUserMappingUpdate(BaseModel): + telefoni_extension: Optional[str] = None + telefoni_aktiv: Optional[bool] = None + telefoni_phone_ip: Optional[str] = None + telefoni_phone_username: Optional[str] = None + telefoni_phone_password: Optional[str] = None + + +class TelefoniClickToCallRequest(BaseModel): + number: str + extension: Optional[str] = None + user_id: Optional[int] = None + + +class SmsSendRequest(BaseModel): + to: str + message: str + sender: Optional[str] = None + contact_id: Optional[int] = None diff --git a/app/modules/telefoni/backend/service.py b/app/modules/telefoni/backend/service.py new file mode 100644 index 0000000..0069f87 --- /dev/null +++ b/app/modules/telefoni/backend/service.py @@ -0,0 +1,111 @@ +import logging +from datetime import datetime +from typing import Any, Optional + +from app.core.database import execute_query, execute_query_single + +logger = logging.getLogger(__name__) + + +class TelefoniService: + @staticmethod + def find_user_by_extension(extension: Optional[str]) -> Optional[int]: + if not extension: + return None + row = execute_query_single( + "SELECT user_id FROM users WHERE telefoni_aktiv = TRUE AND telefoni_extension = %s LIMIT 1", + (extension,), + ) + return int(row["user_id"]) if row and row.get("user_id") is not None else None + + @staticmethod + def find_contact_by_phone_suffix(suffix8: Optional[str]) -> Optional[dict]: + if not suffix8: + return None + + query = """ + SELECT + c.id, + c.first_name, + c.last_name, + ( + SELECT cu.name + FROM contact_companies cc + JOIN customers cu ON cu.id = cc.customer_id + WHERE cc.contact_id = c.id + ORDER BY cc.is_primary DESC NULLS LAST, cc.id ASC + LIMIT 1 + ) AS company + FROM contacts c + WHERE RIGHT(regexp_replace(COALESCE(c.phone, ''), '\\D', '', 'g'), 8) = %s + OR RIGHT(regexp_replace(COALESCE(c.mobile, ''), '\\D', '', 'g'), 8) = %s + ORDER BY c.id ASC + LIMIT 1 + """ + row = execute_query_single(query, (suffix8, suffix8)) + if not row: + return None + return { + "id": row["id"], + "name": f"{(row.get('first_name') or '').strip()} {(row.get('last_name') or '').strip()}".strip(), + "company": row.get("company"), + } + + @staticmethod + def upsert_call( + *, + callid: str, + user_id: Optional[int], + direction: str, + ekstern_nummer: Optional[str], + intern_extension: Optional[str], + kontakt_id: Optional[int], + raw_payload: Any, + started_at: datetime, + ) -> dict: + query = """ + INSERT INTO telefoni_opkald + (callid, bruger_id, direction, ekstern_nummer, intern_extension, kontakt_id, started_at, raw_payload) + VALUES + (%s, %s, %s, %s, %s, %s, %s, %s::jsonb) + ON CONFLICT (callid) + DO UPDATE SET + raw_payload = EXCLUDED.raw_payload, + direction = EXCLUDED.direction, + intern_extension = COALESCE(telefoni_opkald.intern_extension, EXCLUDED.intern_extension), + ekstern_nummer = COALESCE(telefoni_opkald.ekstern_nummer, EXCLUDED.ekstern_nummer), + bruger_id = COALESCE(telefoni_opkald.bruger_id, EXCLUDED.bruger_id), + kontakt_id = COALESCE(telefoni_opkald.kontakt_id, EXCLUDED.kontakt_id), + started_at = LEAST(telefoni_opkald.started_at, EXCLUDED.started_at) + RETURNING * + """ + rows = execute_query( + query, + ( + callid, + user_id, + direction, + ekstern_nummer, + intern_extension, + kontakt_id, + started_at, + raw_payload, + ), + ) + return rows[0] if rows else {} + + @staticmethod + def terminate_call(callid: str, duration_sec: Optional[int]) -> bool: + if not callid: + return False + rows = execute_query( + """ + UPDATE telefoni_opkald + SET ended_at = NOW(), + duration_sec = %s + WHERE callid = %s + RETURNING id + """, + (duration_sec, callid), + ) + return bool(rows) diff --git a/app/modules/telefoni/backend/utils.py b/app/modules/telefoni/backend/utils.py new file mode 100644 index 0000000..499f443 --- /dev/null +++ b/app/modules/telefoni/backend/utils.py @@ -0,0 +1,102 @@ +import ipaddress +import re +from typing import Optional + + +def digits_only(value: Optional[str]) -> str: + if not value: + return "" + return re.sub(r"\D+", "", value) + + +def normalize_e164(number: Optional[str]) -> Optional[str]: + if not number: + return None + + raw = number.strip().replace(" ", "").replace("-", "") + if not raw: + return None + + if raw.startswith("+"): + n = "+" + digits_only(raw) + return n if len(n) >= 9 else None + + if raw.startswith("0045"): + rest = digits_only(raw[4:]) + return "+45" + rest if len(rest) == 8 else ("+" + digits_only(raw) if len(digits_only(raw)) >= 9 else None) + + d = digits_only(raw) + if len(d) == 8: + return "+45" + d + + if d.startswith("45") and len(d) == 10: + return "+" + d + + # Generic international (best-effort) + if len(d) >= 9: + return "+" + d + + return None + + +def phone_suffix_8(number: Optional[str]) -> Optional[str]: + d = digits_only(number) + if len(d) < 8: + return None + return d[-8:] + + +def is_outbound_call(caller: Optional[str], local_extension: Optional[str]) -> bool: + caller_d = digits_only(caller) + local_d = digits_only(local_extension) + if not caller_d or not local_d: + return False + return caller_d.endswith(local_d) + + +def extract_extension(local_value: Optional[str]) -> Optional[str]: + if not local_value: + return None + + raw = local_value.strip() + if not raw: + return None + + if raw.isdigit(): + return raw + + # Common SIP format: sip:204_99773@pbx.sipserver.dk -> 204 + sip_match = re.search(r"sip:([0-9]+)", raw, flags=re.IGNORECASE) + if sip_match: + return sip_match.group(1) + + # Fallback: first digit run (at least 2 chars) + generic = re.search(r"([0-9]{2,})", raw) + if generic: + return generic.group(1) + + return None + + +def ip_in_whitelist(client_ip: str, whitelist_csv: str) -> bool: + if not client_ip or not whitelist_csv: + return False + + try: + ip_obj = ipaddress.ip_address(client_ip) + except ValueError: + return False + + for entry in [e.strip() for e in whitelist_csv.split(",") if e.strip()]: + try: + if "/" in entry: + net = ipaddress.ip_network(entry, strict=False) + if ip_obj in net: + return True + else: + if ip_obj == ipaddress.ip_address(entry): + return True + except ValueError: + continue + + return False diff --git a/app/modules/telefoni/backend/websocket.py b/app/modules/telefoni/backend/websocket.py new file mode 100644 index 0000000..b358969 --- /dev/null +++ b/app/modules/telefoni/backend/websocket.py @@ -0,0 +1,67 @@ +import asyncio +import json +import logging +from typing import Dict, Set + +from fastapi import WebSocket + +logger = logging.getLogger(__name__) + + +class TelefoniConnectionManager: + def __init__(self) -> None: + self._lock = asyncio.Lock() + self._connections: Dict[int, Set[WebSocket]] = {} + + async def connect(self, user_id: int, websocket: WebSocket) -> None: + await websocket.accept() + async with self._lock: + self._connections.setdefault(user_id, set()).add(websocket) + logger.info("📞 WS manager: user_id=%s now has %s connection(s)", user_id, len(self._connections.get(user_id, set()))) + + async def disconnect(self, user_id: int, websocket: WebSocket) -> None: + async with self._lock: + ws_set = self._connections.get(user_id) + if not ws_set: + return + ws_set.discard(websocket) + if not ws_set: + self._connections.pop(user_id, None) + logger.info("📞 WS manager: user_id=%s disconnected (0 connections)", user_id) + else: + logger.info("📞 WS manager: user_id=%s now has %s connection(s)", user_id, len(ws_set)) + + async def active_users(self) -> list[int]: + async with self._lock: + return sorted(self._connections.keys()) + + async def connection_count_for_user(self, user_id: int) -> int: + async with self._lock: + return len(self._connections.get(user_id, set())) + + async def send_to_user(self, user_id: int, event: str, payload: dict) -> None: + message = json.dumps({"event": event, "data": payload}, default=str) + async with self._lock: + targets = list(self._connections.get(user_id, set())) + + if not targets: + active = await self.active_users() + logger.info("⚠️ WS send skipped: no active connections for user_id=%s (active users=%s)", user_id, active) + return + + dead: list[WebSocket] = [] + for ws in targets: + try: + await ws.send_text(message) + except Exception as e: + logger.warning("⚠️ WS send failed for user %s: %s", user_id, e) + dead.append(ws) + + if dead: + async with self._lock: + ws_set = self._connections.get(user_id, set()) + for ws in dead: + ws_set.discard(ws) + + +manager = TelefoniConnectionManager() diff --git a/app/modules/telefoni/frontend/__init__.py b/app/modules/telefoni/frontend/__init__.py new file mode 100644 index 0000000..2bfc9e0 --- /dev/null +++ b/app/modules/telefoni/frontend/__init__.py @@ -0,0 +1 @@ +"""Telefoni frontend package.""" diff --git a/app/modules/telefoni/frontend/views.py b/app/modules/telefoni/frontend/views.py new file mode 100644 index 0000000..04fa62d --- /dev/null +++ b/app/modules/telefoni/frontend/views.py @@ -0,0 +1,14 @@ +import logging + +from fastapi import APIRouter, Request +from fastapi.responses import HTMLResponse +from fastapi.templating import Jinja2Templates + +logger = logging.getLogger(__name__) +router = APIRouter() +templates = Jinja2Templates(directory="app") + + +@router.get("/telefoni", response_class=HTMLResponse) +async def telefoni_log_page(request: Request): + return templates.TemplateResponse("modules/telefoni/templates/log.html", {"request": request}) diff --git a/app/modules/telefoni/templates/log.html b/app/modules/telefoni/templates/log.html new file mode 100644 index 0000000..27ec684 --- /dev/null +++ b/app/modules/telefoni/templates/log.html @@ -0,0 +1,512 @@ +{% extends "shared/frontend/base.html" %} + +{% block title %}Telefoni - BMC Hub{% endblock %} + +{% block content %} +
    +
    +
    +

    Telefoni

    +
    Opkaldslog fra Yealink Action URL (Established/Terminated)
    +
    +
    + +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + +
    DatoBrugerRetningNummerKontaktSagVarighed
    Indlæser...
    +
    +
    +
    +
    + + + + +{% endblock %} diff --git a/app/services/eset_service.py b/app/services/eset_service.py index 9269fd3..2edc075 100644 --- a/app/services/eset_service.py +++ b/app/services/eset_service.py @@ -4,7 +4,7 @@ ESET PROTECT Integration Service import logging import time import httpx -from typing import Dict, Optional, Any +from typing import Dict, Optional, Any, List, Mapping, Sequence, Tuple, Union from app.core.config import settings logger = logging.getLogger(__name__) @@ -80,7 +80,12 @@ class EsetService: return self._access_token return await self._authenticate(client) - async def _get_json(self, client: httpx.AsyncClient, url: str, params: Optional[dict] = None) -> Optional[Dict[str, Any]]: + async def _get_json( + self, + client: httpx.AsyncClient, + url: str, + params: Optional[Union[Mapping[str, Any], Sequence[Tuple[str, str]]]] = None, + ) -> Optional[Dict[str, Any]]: token = await self._get_access_token(client) if not token: return None @@ -142,4 +147,94 @@ class EsetService: logger.error(f"ESET API error: {str(e)}") return None + async def get_devices_batch(self, device_uuids: List[str]) -> Optional[Dict[str, Any]]: + """Fetch multiple devices in one call via /v1/devices:batchGet.""" + if not self.enabled: + logger.warning("ESET not enabled") + return None + + uuids = [str(u).strip() for u in (device_uuids or []) if str(u).strip()] + if not uuids: + return {"devices": []} + + url = f"{self.base_url}/v1/devices:batchGet" + params = [("devicesUuids", u) for u in uuids] + + async with httpx.AsyncClient(verify=self.verify_ssl, timeout=settings.ESET_TIMEOUT_SECONDS) as client: + payload = await self._get_json(client, url, params=params) + if not payload: + logger.warning("ESET batchGet payload empty") + return payload + + @staticmethod + def extract_installed_software(device_payload: Dict[str, Any]) -> List[str]: + """Extract installed software names/versions from ESET device payload.""" + if not isinstance(device_payload, dict): + return [] + + device_raw = device_payload.get("device") if isinstance(device_payload.get("device"), dict) else device_payload + if not isinstance(device_raw, dict): + return [] + def _normalize_version(value: Any) -> str: + if isinstance(value, dict): + name = str(value.get("name") or "").strip() + if name: + return name + version_id = str(value.get("id") or "").strip() + if version_id: + return version_id + major = value.get("major") + minor = value.get("minor") + patch = value.get("patch") + if major is not None and minor is not None and patch is not None: + return f"{major}.{minor}.{patch}" + return "" + if value is None: + return "" + return str(value).strip() + + result: List[str] = [] + + def _add_item(name: Any, version: Any = None) -> None: + item_name = str(name or "").strip() + if not item_name: + return + item_version = _normalize_version(version) + result.append(f"{item_name} {item_version}".strip() if item_version else item_name) + + for comp in device_raw.get("deployedComponents") or []: + if isinstance(comp, dict): + _add_item(comp.get("displayName") or comp.get("name"), comp.get("version")) + elif isinstance(comp, str): + _add_item(comp) + + for key in ("installedSoftware", "applications", "applicationInventory", "softwareInventory", "activeProducts"): + for comp in device_raw.get(key) or []: + if isinstance(comp, dict): + _add_item( + comp.get("displayName") + or comp.get("name") + or comp.get("softwareName") + or comp.get("applicationName") + or comp.get("productName") + or comp.get("product"), + comp.get("version") + or comp.get("applicationVersion") + or comp.get("softwareVersion") + or comp.get("productVersion"), + ) + elif isinstance(comp, str): + _add_item(comp) + + # keep order, remove duplicates + deduped: List[str] = [] + seen = set() + for item in result: + key = item.lower() + if key in seen: + continue + seen.add(key) + deduped.append(item) + return deduped + eset_service = EsetService() diff --git a/app/services/sms_service.py b/app/services/sms_service.py new file mode 100644 index 0000000..43c18c2 --- /dev/null +++ b/app/services/sms_service.py @@ -0,0 +1,96 @@ +import base64 +import json +import logging +import re +from typing import Dict, Any +from urllib.error import HTTPError, URLError +from urllib.request import Request as UrlRequest, urlopen + +from app.core.config import settings + +logger = logging.getLogger(__name__) + + +class SmsService: + API_URL = "https://api.cpsms.dk/v2/send" + + @staticmethod + def normalize_recipient(number: str) -> str: + cleaned = re.sub(r"[^0-9+]", "", (number or "").strip()) + if not cleaned: + raise ValueError("Mobilnummer mangler") + + if cleaned.startswith("+"): + cleaned = cleaned[1:] + if cleaned.startswith("00"): + cleaned = cleaned[2:] + + if not cleaned.isdigit(): + raise ValueError("Ugyldigt mobilnummer") + + if len(cleaned) == 8: + cleaned = "45" + cleaned + + if len(cleaned) < 8: + raise ValueError("Ugyldigt mobilnummer") + + return cleaned + + @staticmethod + def _authorization_header() -> str: + username = (settings.SMS_USERNAME or "").strip() + api_key = (settings.SMS_API_KEY or "").strip() + + if not username or not api_key: + raise ValueError("SMS er ikke konfigureret (SMS_USERNAME/SMS_API_KEY mangler)") + + raw = f"{username}:{api_key}".encode("utf-8") + token = base64.b64encode(raw).decode("ascii") + return f"Basic {token}" + + @classmethod + def send_sms(cls, to: str, message: str, sender: str | None = None) -> Dict[str, Any]: + sms_message = (message or "").strip() + if not sms_message: + raise ValueError("SMS-besked må ikke være tom") + if len(sms_message) > 1530: + raise ValueError("SMS-besked er for lang (max 1530 tegn)") + + recipient = cls.normalize_recipient(to) + sms_sender = (sender or settings.SMS_SENDER or "").strip() + if not sms_sender: + raise ValueError("SMS afsender mangler (SMS_SENDER)") + + payload = { + "to": recipient, + "message": sms_message, + "from": sms_sender, + } + + body = json.dumps(payload).encode("utf-8") + request = UrlRequest(cls.API_URL, data=body, method="POST") + request.add_header("Content-Type", "application/json") + request.add_header("Authorization", cls._authorization_header()) + + try: + with urlopen(request, timeout=15) as response: + response_body = response.read().decode("utf-8") + response_data = json.loads(response_body) if response_body else {} + return { + "http_status": getattr(response, "status", 200), + "provider": "cpsms", + "recipient": recipient, + "result": response_data, + } + except HTTPError as e: + error_body = "" + try: + error_body = e.read().decode("utf-8") + except Exception: + error_body = "" + + logger.error("❌ CPSMS HTTP error: status=%s body=%s", e.code, error_body) + raise RuntimeError(f"CPSMS fejl ({e.code})") + except URLError as e: + logger.error("❌ CPSMS connection error: %s", e) + raise RuntimeError("Kunne ikke kontakte CPSMS") diff --git a/app/settings/frontend/settings.html b/app/settings/frontend/settings.html index 9a9567a..3d60e3a 100644 --- a/app/settings/frontend/settings.html +++ b/app/settings/frontend/settings.html @@ -83,6 +83,9 @@ Integrationer + + Telefoni + Notifikationer @@ -200,6 +203,137 @@
    + +
    +
    +
    +
    +
    Click-to-Call (Action URL)
    +

    Konfigurer URL-template til at starte opkald via telefon/PBX endpoint.

    +
    +
    + +
    +
    + +
    + + +
    + Bruges som ?token=... på established/terminated callback URLs. +
    + +
    + +
    + +
    +
    + +
    + + + Bruges som fallback i test og i senere call-knapper. +
    + +
    + +
    + + + +
    +
    + +
    + + + Pladsholdere: {number} (påkrævet), {raw_number}, {extension}, {phone_ip}, {phone_username}, {phone_password}. +
    + +
    + +
    -
    +
    + +
    + +
    +
    +
    + +
    +
    Yealink URL Builder
    +

    Generér de præcise URL-strenge til telefonernes Action URL felter (Established + Terminated).

    +
    + Brug Yealink variable values (fx $call_id, $remote, $local, $active_user). Ikke-dokumenterede placeholders som $callid/$caller/$callee bliver ofte ikke erstattet. +
    + +
    +
    + + + Eksempel: http://hub.local eller https://hub.bmcnetworks.dk +
    +
    + + + Hvis udfyldt, tilføjes ?token=... automatisk. +
    + +
    + +
    + + +
    +
    + +
    + +
    + + +
    +
    +
    +
    + +
    +
    Test opkald
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    -
    +
    +
    +
    @@ -295,13 +429,18 @@ Email Grupper Status + Telefoni ext. + Telefoni IP + Telefoni bruger + Telefoni kode + Telefoni aktiv Oprettet Handlinger - + @@ -314,7 +453,7 @@
    -
    Grupper
    +
    Grupper & Rettigheder

    Opret grupper og tildel rettigheder

    +
    • +
  • + + Kalender + +
  • Arkiverede Tickets
  • Hardware Assets
  • ESET Oversigt
    • +
  • Telefoni
  • Lokaliteter
  • Prepaid Cards
    • @@ -517,6 +523,8 @@ + + + + +