diff --git a/app/modules/sag/backend/router.py b/app/modules/sag/backend/router.py index 47a50f0..67762d2 100644 --- a/app/modules/sag/backend/router.py +++ b/app/modules/sag/backend/router.py @@ -169,6 +169,43 @@ def _validate_customer_id(customer_id: Optional[int], field_name: str = "custome if not exists: raise HTTPException(status_code=400, detail=f"Invalid {field_name}") + +def _activate_waiting_cases_by_status(trigger_case_id: int, status_value: Optional[str]) -> None: + """Set start_date for waiting cases when their status dependency is met.""" + normalized_status = str(status_value or "").strip() + if not normalized_status: + return + + try: + updated_rows = execute_query( + """ + UPDATE sag_sager + SET start_date = NOW(), updated_at = NOW() + WHERE deleted_at IS NULL + AND deferred_until_case_id = %s + AND deferred_until_status IS NOT NULL + AND start_date IS NULL + AND LOWER(TRIM(deferred_until_status)) = LOWER(TRIM(%s)) + RETURNING id + """, + (trigger_case_id, normalized_status), + ) or [] + + if updated_rows: + logger.info( + "✅ Activated %s waiting case(s) from trigger case %s with status '%s'", + len(updated_rows), + trigger_case_id, + normalized_status, + ) + except Exception as exc: + logger.warning( + "⚠️ Could not activate waiting cases for trigger case %s and status '%s': %s", + trigger_case_id, + normalized_status, + exc, + ) + # ============================================================================ # QUICKCREATE AI ANALYSIS # ============================================================================ @@ -577,6 +614,7 @@ async def list_sager( if not include_deferred: query += " AND (deferred_until IS NULL OR deferred_until <= NOW())" + query += " AND (start_date IS NULL OR start_date <= NOW())" if status: query += " AND s.status = %s" @@ -717,6 +755,8 @@ async def create_sag(data: dict): logger.info("✅ Case created: %s", result[0]["id"]) return result[0] raise HTTPException(status_code=500, detail="Failed to create case") + except HTTPException: + raise except Exception as e: logger.error("❌ Error creating case: %s", e) raise HTTPException(status_code=500, detail="Failed to create case") @@ -957,9 +997,14 @@ async def update_sag(sag_id: int, updates: dict): """Update a case.""" try: # Check if case exists - check = execute_query("SELECT id FROM sag_sager WHERE id = %s AND deleted_at IS NULL", (sag_id,)) + check = execute_query( + "SELECT id, status 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") + + previous_status = str((check[0] or {}).get("status") or "").strip().lower() # Backwards compatibility: frontend sends "type", DB stores "template_key" if "type" in updates and "template_key" not in updates: @@ -1018,6 +1063,10 @@ async def update_sag(sag_id: int, updates: dict): result = execute_query(query, tuple(params)) if result: + if "status" in updates: + new_status = str((result[0] or {}).get("status") or "").strip().lower() + if new_status and new_status != previous_status: + _activate_waiting_cases_by_status(sag_id, new_status) logger.info("✅ Case updated: %s", sag_id) return result[0] raise HTTPException(status_code=500, detail="Failed to update case") @@ -1387,6 +1436,74 @@ async def list_case_customers(sag_id: int): logger.error("❌ Error listing case customers: %s", e) raise HTTPException(status_code=500, detail="Failed to list case customers") + +@router.post("/sag/{sag_id}/customer/replace") +async def replace_case_customer(sag_id: int, payload: dict): + """Replace the primary customer on a case and keep relations synchronized.""" + try: + existing_case = execute_query_single( + "SELECT id FROM sag_sager WHERE id = %s AND deleted_at IS NULL", + (sag_id,), + ) + if not existing_case: + raise HTTPException(status_code=404, detail="Case not found") + + customer_id = _coerce_optional_int((payload or {}).get("customer_id"), "customer_id") + if customer_id is None: + raise HTTPException(status_code=400, detail="customer_id is required") + + _validate_customer_id(customer_id) + + if table_has_column("sag_sager", "customer_id"): + execute_query( + "UPDATE sag_sager SET customer_id = %s WHERE id = %s", + (customer_id, sag_id), + ) + + if _table_exists("sag_kunder"): + execute_query( + """ + UPDATE sag_kunder + SET deleted_at = NOW() + WHERE sag_id = %s + AND customer_id <> %s + AND deleted_at IS NULL + AND LOWER(COALESCE(role, '')) = 'kunde' + """, + (sag_id, customer_id), + ) + + existing_link = execute_query_single( + """ + SELECT id + FROM sag_kunder + WHERE sag_id = %s + AND customer_id = %s + AND deleted_at IS NULL + LIMIT 1 + """, + (sag_id, customer_id), + ) + + if existing_link: + execute_query( + "UPDATE sag_kunder SET role = %s WHERE id = %s", + ("Kunde", existing_link["id"]), + ) + else: + execute_query( + "INSERT INTO sag_kunder (sag_id, customer_id, role) VALUES (%s, %s, %s)", + (sag_id, customer_id, "Kunde"), + ) + + logger.info("✅ Primary customer replaced for case %s -> customer %s", sag_id, customer_id) + return {"status": "ok", "sag_id": sag_id, "customer_id": customer_id} + except HTTPException: + raise + except Exception as e: + logger.error("❌ Error replacing case customer: %s", e) + raise HTTPException(status_code=500, detail="Failed to replace case customer") + @router.post("/sag/{sag_id}/customers") async def add_case_customer(sag_id: int, data: dict): """Add a customer to a case.""" diff --git a/app/modules/sag/frontend/views.py b/app/modules/sag/frontend/views.py index a2f53fc..e713222 100644 --- a/app/modules/sag/frontend/views.py +++ b/app/modules/sag/frontend/views.py @@ -237,6 +237,7 @@ async def sager_liste( query += " OR s.deferred_until <= NOW()" query += " OR (s.deferred_until_case_id IS NOT NULL AND s.deferred_until_status IS NOT NULL AND ds.status = s.deferred_until_status)" query += ")" + query += " AND (s.start_date IS NULL OR s.start_date <= NOW())" if status: query += " AND s.status = %s" @@ -289,6 +290,10 @@ async def sager_liste( """ fallback_params = [] + if not include_deferred: + fallback_query += " AND (s.deferred_until IS NULL OR s.deferred_until <= NOW())" + fallback_query += " AND (s.start_date IS NULL OR s.start_date <= NOW())" + if status: fallback_query += " AND s.status = %s" fallback_params.append(status) @@ -498,9 +503,50 @@ async def sag_detaljer(request: Request, sag_id: int): except Exception as e: logger.error(f"Error building relation tree: {e}") relation_tree = [] - except Exception as e: - logger.error(f"Error building relation tree: {e}") - relation_tree = [] + + # Fallback: if tree builder fails/returns empty but relations exist, render a minimal flat tree. + if not relation_tree and relationer: + try: + root_node = { + "case": { + "id": sag.get("id"), + "titel": sag.get("titel"), + "status": sag.get("status"), + "type": sag.get("type"), + "template_key": sag.get("template_key"), + }, + "relation_type": None, + "relation_id": None, + "is_current": True, + "children": [], + } + + seen_related = set() + for rel in relationer or []: + source_id = rel.get("kilde_sag_id") + target_id = rel.get("målsag_id") + related_id = target_id if source_id == sag_id else source_id + if not related_id or related_id in seen_related: + continue + seen_related.add(related_id) + + root_node["children"].append({ + "case": { + "id": related_id, + "titel": rel.get("mål_titel") if source_id == sag_id else rel.get("kilde_titel"), + "status": None, + "type": None, + "template_key": None, + }, + "relation_type": rel.get("relationstype") or "Relateret til", + "relation_id": rel.get("id"), + "is_current": False, + "children": [], + }) + + relation_tree = [root_node] + except Exception as fallback_err: + logger.warning("⚠️ Could not build fallback relation tree: %s", fallback_err) # Fetch customer info if customer_id exists customer = None diff --git a/app/modules/sag/services/relation_service.py b/app/modules/sag/services/relation_service.py index 33a4df8..2eebc93 100644 --- a/app/modules/sag/services/relation_service.py +++ b/app/modules/sag/services/relation_service.py @@ -4,6 +4,11 @@ from app.core.database import execute_query class RelationService: """Service for handling case relations (Sager)""" + @staticmethod + def _normalize_relation_type(value: Optional[str]) -> str: + text = str(value or "").strip() + return text or "Relateret til" + @staticmethod def get_relation_tree(root_id: int) -> List[Dict]: """ @@ -33,7 +38,16 @@ class RelationService: # 2. Fetch details for these cases placeholders = ','.join(['%s'] * len(tree_ids)) - tree_cases_query = f"SELECT id, titel, status, type, template_key FROM sag_sager WHERE id IN ({placeholders})" + tree_cases_query = f""" + SELECT + id, + titel, + status, + template_key, + COALESCE(template_key, 'ticket') AS type + FROM sag_sager + WHERE id IN ({placeholders}) + """ tree_cases = {c['id']: c for c in execute_query(tree_cases_query, tuple(tree_ids))} # 3. Fetch all edges between these cases @@ -53,7 +67,8 @@ class RelationService: # Helper to normalize relation types # Now that we cleaned DB, we expect standard Danish terms, but good to be safe def get_direction(k, m, rtype): - rtype_lower = rtype.lower() + normalized_type = RelationService._normalize_relation_type(rtype) + rtype_lower = normalized_type.lower() if rtype_lower in ['afledt af', 'derived from']: return m, k # m is parent of k if rtype_lower in ['årsag til', 'cause of']: @@ -66,7 +81,8 @@ class RelationService: processed_edges = set() for edge in tree_edges: - k, m, rtype = edge['kilde_sag_id'], edge['målsag_id'], edge['relationstype'] + k, m = edge['kilde_sag_id'], edge['målsag_id'] + rtype = RelationService._normalize_relation_type(edge.get('relationstype')) # Dedup edges (bi-directional check) edge_key = tuple(sorted((k,m))) + (rtype,) @@ -119,7 +135,7 @@ class RelationService: path_visited.add(cid) # Sort children for consistent display - children_data = sorted(children_map.get(cid, []), key=lambda x: x['type']) + children_data = sorted(children_map.get(cid, []), key=lambda x: str(x.get('type') or '').lower()) children_nodes = [] for child_info in children_data: diff --git a/app/modules/sag/templates/detail.html b/app/modules/sag/templates/detail.html index e8d7c41..ead3d4e 100644 --- a/app/modules/sag/templates/detail.html +++ b/app/modules/sag/templates/detail.html @@ -1463,17 +1463,53 @@ color: var(--accent); } - .relation-type-badge { + .relation-type-pill { display: inline-flex; align-items: center; - gap: 0.25rem; - font-size: 0.75rem; - color: var(--accent); - background: rgba(15, 76, 117, 0.1); - padding: 2px 6px; - border-radius: 4px; - margin-right: 8px; - font-weight: 500; + gap: 0.3rem; + font-size: 0.72rem; + font-weight: 700; + padding: 0.22rem 0.5rem; + border-radius: 999px; + border: 1px solid transparent; + line-height: 1.2; + white-space: nowrap; + } + + .relation-type-pill.is-root { + background: rgba(15, 76, 117, 0.12); + color: #0f4c75; + border-color: rgba(15, 76, 117, 0.25); + } + + .relation-type-pill.is-related { + background: rgba(100, 116, 139, 0.12); + color: #334155; + border-color: rgba(100, 116, 139, 0.25); + } + + .relation-type-pill.is-derived { + background: rgba(59, 130, 246, 0.12); + color: #1d4ed8; + border-color: rgba(59, 130, 246, 0.25); + } + + .relation-type-pill.is-cause { + background: rgba(16, 185, 129, 0.13); + color: #047857; + border-color: rgba(16, 185, 129, 0.3); + } + + .relation-type-pill.is-block { + background: rgba(239, 68, 68, 0.12); + color: #b91c1c; + border-color: rgba(239, 68, 68, 0.3); + } + + .relation-type-subtext { + font-size: 0.68rem; + color: var(--text-secondary, #6b7280); + margin-top: 0.2rem; } .right-modules-grid { @@ -1684,6 +1720,41 @@ color: var(--accent); } + .topbar-company-row { + display: inline-flex; + align-items: center; + gap: 0.42rem; + max-width: 100%; + } + + .topbar-company-name { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .topbar-company-edit-btn { + display: inline-flex; + align-items: center; + justify-content: center; + width: 1.5rem; + height: 1.5rem; + padding: 0; + border-radius: 999px; + border: 1px solid rgba(15,76,117,0.35); + background: #0d6efd; + color: #ffffff; + box-shadow: 0 1px 4px rgba(13,110,253,0.25); + } + + .topbar-company-edit-btn:hover, + .topbar-company-edit-btn:focus-visible { + background: #0b5ed7; + border-color: rgba(11,94,215,0.85); + color: #ffffff; + } + .topbar-primary .case-inline-select { background: rgba(255,255,255,0.78); border-color: rgba(15,76,117,0.3); @@ -1764,6 +1835,11 @@ color: #d9ebf7; } + [data-bs-theme="dark"] .topbar-company-edit-btn { + border-color: rgba(170,205,245,0.5); + box-shadow: 0 1px 6px rgba(75,145,255,0.35); + } + .case-tabs-topbar.topbar-secondary { grid-template-columns: repeat(8, minmax(145px, 1fr)); } @@ -1923,6 +1999,31 @@ text-align: left; } + .topbar-deferred-shortcuts { + display: flex; + gap: 0.35rem; + margin-top: 0.45rem; + flex-wrap: wrap; + } + + .topbar-mini-trigger { + border: 1px solid rgba(0,0,0,0.14); + background: rgba(255,255,255,0.75); + color: var(--text-primary); + border-radius: 999px; + font-size: 0.7rem; + font-weight: 700; + line-height: 1; + padding: 0.35rem 0.55rem; + letter-spacing: 0.01em; + } + + .topbar-mini-trigger:hover { + border-color: var(--accent); + color: var(--accent); + background: rgba(255,255,255,0.95); + } + .topbar-secondary-action:hover { border-color: var(--accent); color: var(--accent); @@ -1979,6 +2080,17 @@ background: rgba(20, 27, 38, 0.78); } + [data-bs-theme="dark"] .topbar-mini-trigger { + background: rgba(20, 27, 38, 0.78); + border-color: rgba(170, 190, 216, 0.4); + color: #dce8f4; + } + + [data-bs-theme="dark"] .topbar-mini-trigger:hover { + border-color: #9fc4e8; + color: #9fc4e8; + } + .case-add-side-backdrop { position: fixed; inset: 0; @@ -2198,7 +2310,12 @@
Firma
-
{{ customer.name if customer else 'Ingen kunde' }}
+
+ {{ customer.name if customer else 'Ingen kunde' }} + +
Kontakt
@@ -2272,7 +2389,7 @@
{{ case.created_at.strftime('%d/%m/%Y') if case.created_at else '-' }}
-
Start arbejde
+
Arbejdsstart
-
Start inden denne dato
+
Start senest
+
+ + +
Deadline dato
@@ -2357,6 +2478,9 @@
+ {{ case.created_at.strftime('%d. %b %Y') if case.created_at else '—' }} @@ -2618,9 +2742,6 @@

{{ case.titel }}

-
@@ -2878,7 +2999,22 @@ {{ node.case.template_key or node.case.type or 'ticket' }} - {{ node.relation_type or ( 'Rodsag' if node.is_current else '-' ) }} + {% set rel_raw = (node.relation_type or '')|trim %} + {% set rel_key = rel_raw|lower %} + {% if node.is_current %} + Rodsag + {% elif rel_key == 'afledt af' %} + Kommer fra +
(Afledt af)
+ {% elif rel_key == 'årsag til' %} + Skaber følge-sag +
(Årsag til)
+ {% elif rel_key == 'blokkerer' %} + Blokerer + {% else %} + Koblet til +
(Relateret til)
+ {% endif %} {% if node.is_repeated %} {% endif %} @@ -2886,14 +3022,14 @@
{% if node.relation_id %} - {% endif %} - -
@@ -2916,7 +3052,7 @@ Titel Status Type - Relation + Sammenhæng Handling @@ -3051,10 +3187,10 @@
@@ -3062,9 +3198,9 @@
Betydning i praksis
-
Relateret til: Bruges når sager hænger sammen, men ingen af dem afhænger direkte af den anden.
-
Afledt af: Bruges når denne sag er afledt af et tidligere problem/arbejde.
-
Årsag til: Bruges når denne sag skaber behovet for den anden.
+
Koblet til (Relateret): Faglig sammenhæng, men ingen direkte afhængighed.
+
Kommer fra (Afledt af): Sagen er opstået pga. en anden sag.
+
Skaber følge-sag (Årsag til): Sagen skaber behovet for en anden sag.
Blokkerer: Bruges når løsning i én sag er nødvendig før den anden kan videre.
@@ -3221,7 +3357,7 @@
- + +
+ + +
@@ -3444,7 +3584,7 @@ 'reminders': 'Påmindelser', 'calendar': 'Kalender' }; - let caseTypeModuleDefaults = {}; + caseTypeModuleDefaults = window.caseTypeModuleDefaults || {}; // Modal instances let contactSearchModal, customerSearchModal, relationModal, contactInfoModal, createRelatedCaseModalInstance, caseAnyDeskModal; @@ -3573,9 +3713,22 @@ } function showRelationModal() { + const modalEl = document.getElementById('relationModal'); + if (!modalEl) { + console.error('relationModal element not found'); + return; + } + + if (!relationModal) { + relationModal = bootstrap.Modal.getOrCreateInstance(modalEl); + } + relationModal.show(); updateRelationTypeHint(); - setTimeout(() => document.getElementById('relationCaseSearch').focus(), 300); + setTimeout(() => { + const input = document.getElementById('relationCaseSearch'); + if (input) input.focus(); + }, 300); } async function openAuthenticatedPrintView(url, fallbackTitle) { @@ -3836,6 +3989,14 @@ } function showCreateRelatedModal() { + if (!createRelatedCaseModalInstance) { + const modalEl = document.getElementById('createRelatedCaseModal'); + if (!modalEl) { + console.error('createRelatedCaseModal element not found'); + return; + } + createRelatedCaseModalInstance = bootstrap.Modal.getOrCreateInstance(modalEl); + } createRelatedCaseModalInstance.show(); updateNewCaseRelationTypeHint(); } @@ -3844,15 +4005,15 @@ const map = { 'Relateret til': { icon: '🔗', - text: 'Sagerne hænger fagligt sammen, men ingen af dem er direkte afhængig af den anden.' + text: 'Koblet til: Sagerne hænger fagligt sammen, men ingen af dem er direkte afhængig af den anden.' }, 'Afledt af': { icon: '↪', - text: 'Denne sag er opstået på baggrund af den anden sag (den anden er ophav/forløber).' + text: 'Kommer fra: Denne sag er opstået på baggrund af den anden sag (den anden er ophav/forløber).' }, 'Årsag til': { icon: '➡', - text: 'Denne sag er årsag til den anden sag (du peger frem mod en konsekvens/opfølgning).' + text: 'Skaber følge-sag: Denne sag er årsag til den anden sag (du peger frem mod en konsekvens/opfølgning).' }, 'Blokkerer': { icon: '⛔', @@ -3885,11 +4046,11 @@ const selected = select.value; if (selected === 'Afledt af') { - hint.innerHTML = '↪ Effekt: Nuværende sag markeres som afledt af den nye sag.'; + hint.innerHTML = '↪ Effekt: Nuværende sag markeres som kommer fra den nye sag.'; return; } if (selected === 'Årsag til') { - hint.innerHTML = '➡ Effekt: Nuværende sag markeres som årsag til den nye sag.'; + hint.innerHTML = '➡ Effekt: Nuværende sag markeres som at den skaber den nye følge-sag.'; return; } if (selected === 'Blokkerer') { @@ -3897,19 +4058,25 @@ return; } - hint.innerHTML = '🔗 Effekt: Sagerne kobles fagligt uden direkte afhængighed.'; + hint.innerHTML = '🔗 Effekt: Sagerne kobles fagligt uden direkte afhængighed (Koblet til).'; } async function createRelatedCase() { const title = document.getElementById('newCaseTitle').value; const relationType = document.getElementById('newCaseRelationType').value; const description = document.getElementById('newCaseDescription').value; + const customerId = (caseCustomerId || wikiCustomerId || null); if (!title) { alert('Titel er påkrævet'); return; } + if (!customerId) { + alert('Sagen mangler kunde. Tilknyt kunde først, før du opretter relateret sag.'); + return; + } + // 1. Create the new case try { const caseResponse = await fetch('/api/v1/sag', { @@ -3918,12 +4085,15 @@ body: JSON.stringify({ titel: title, beskrivelse: description, - customer_id: {{ case.customer_id }}, + customer_id: customerId, status: 'åben' }) }); - - if (!caseResponse.ok) throw new Error('Kunne ikke oprette sag'); + + if (!caseResponse.ok) { + const payload = await caseResponse.json().catch(() => ({})); + throw new Error(payload.detail || 'Kunne ikke oprette sag'); + } const newCase = await caseResponse.json(); // 2. Create the relation @@ -3936,7 +4106,10 @@ }) }); - if (!relationResponse.ok) throw new Error('Kunne ikke oprette relation'); + if (!relationResponse.ok) { + const payload = await relationResponse.json().catch(() => ({})); + throw new Error(payload.detail || 'Kunne ikke oprette relation'); + } // 3. Reload to show new relation window.location.reload(); @@ -4044,7 +4217,7 @@ } else { resultsDiv.innerHTML = customers.map(c => `
+ onclick="selectCustomerFromSearch(${caseId}, ${c.id})"> ${c.name}
${c.email || ''} ${c.cvr_number ? '(CVR: ' + c.cvr_number + ')' : ''}
@@ -4057,7 +4230,7 @@ }); } - async function selectCustomerFromSearch(caseId, customerId, customerName) { + async function selectCustomerFromSearch(caseId, customerId, customerName = '') { if (customerSearchMode === 'replace') { await replaceCaseCustomer(caseId, customerId, customerName); return; @@ -4067,12 +4240,21 @@ async function replaceCaseCustomer(caseId, customerId, customerName) { try { - const response = await fetch(`/api/v1/sag/${caseId}`, { - method: 'PATCH', + let response = await fetch(`/api/v1/sag/${caseId}/customer/replace`, { + method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({customer_id: customerId}) }); + // Backwards compatibility with older API nodes. + if (response.status === 404 || response.status === 405) { + response = await fetch(`/api/v1/sag/${caseId}`, { + method: 'PATCH', + headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({customer_id: customerId}) + }); + } + if (response.ok) { customerSearchModal.hide(); window.location.reload(); @@ -8863,7 +9045,7 @@ }; try { - const res = await fetch(`/api/v1/cases/${sagId}/time`, { + const res = await fetch('/api/v1/timetracking/time/manual', { method: 'POST', headers: {'Content-Type':'application/json'}, body: JSON.stringify(payload) @@ -9213,7 +9395,6 @@ let caseAddActiveAction = null; let caseAddOriginalShowRelModal = null; const CASE_ADD_ACTIONS = [ - { action: 'assign', label: 'Tildel sag', icon: 'bi-person-check', moduleKey: null, relFn: 'openRelAssignModal' }, { action: 'time', label: 'Tidregistrering', icon: 'bi-clock', moduleKey: 'time', relFn: 'openRelTimeModal' }, { action: 'note', label: 'Kommentar', icon: 'bi-chat-left-text', moduleKey: 'solution', relFn: 'openRelNoteModal' }, { action: 'reminder', label: 'Pamindelse', icon: 'bi-bell', moduleKey: 'reminders', relFn: 'openRelReminderModal' }, @@ -9734,6 +9915,41 @@ modal.show(); } + function findDeferredStatusOptionValue(primaryStatus, fallbackContains) { + const statusSelect = document.getElementById('deferredStatusSelect'); + if (!statusSelect) return null; + + const targetPrimary = String(primaryStatus || '').trim().toLowerCase(); + const targetFallback = String(fallbackContains || '').trim().toLowerCase(); + const options = Array.from(statusSelect.options || []); + + const primary = options.find((opt) => String(opt.value || '').trim().toLowerCase() === targetPrimary); + if (primary && primary.value) return primary.value; + + const fallback = options.find((opt) => String(opt.value || '').trim().toLowerCase().includes(targetFallback)); + if (fallback && fallback.value) return fallback.value; + + return null; + } + + function openDeferredModalWithPresetStatus(statusKey) { + const target = String(statusKey || '').trim().toLowerCase(); + const fallback = target === 'lukket' ? 'luk' : target; + const value = findDeferredStatusOptionValue(target, fallback); + + openDeferredModal(); + + if (!value) { + showToast(`Status "${statusKey}" findes ikke i listen`, 'warning'); + return; + } + + const statusSelect = document.getElementById('deferredStatusSelect'); + if (statusSelect) { + statusSelect.value = value; + } + } + async function updateDeferredCaseAndStatus(caseId, status) { try { const res = await fetch(`/api/v1/sag/${caseIds}`, { @@ -9761,6 +9977,37 @@ updateDeferredCaseAndStatus(caseSelect.value || null, statusSelect.value || null); } + function applyDeferredStatusTrigger(primaryStatus, fallbackContains, missingMessage) { + const caseSelect = document.getElementById('deferredCaseSelect'); + const statusSelect = document.getElementById('deferredStatusSelect'); + if (!caseSelect || !statusSelect) return; + + if (!caseSelect.value) { + showToast('Vælg først en relateret sag', 'warning'); + return; + } + + const targetPrimary = String(primaryStatus || '').trim().toLowerCase(); + const targetFallback = String(fallbackContains || '').trim().toLowerCase(); + const matchValue = findDeferredStatusOptionValue(targetPrimary, targetFallback); + + if (!matchValue) { + showToast(missingMessage || 'Status findes ikke i listen', 'warning'); + return; + } + + statusSelect.value = matchValue; + saveDeferredAll(); + } + + function applyDeferredCloseTrigger() { + applyDeferredStatusTrigger('lukket', 'luk', 'Status "Lukket" findes ikke i listen'); + } + + function applyDeferredResolvedTrigger() { + applyDeferredStatusTrigger('løst', 'løs', 'Status "Løst" findes ikke i listen'); + } + function clearDeferredCase() { const caseSelect = document.getElementById('deferredCaseSelect'); const statusSelect = document.getElementById('deferredStatusSelect'); @@ -12377,6 +12624,127 @@ }); + + - + diff --git a/static/js/tag-picker.js b/static/js/tag-picker.js index 48a9a30..eade6f1 100644 --- a/static/js/tag-picker.js +++ b/static/js/tag-picker.js @@ -9,6 +9,7 @@ class TagPicker { this.searchInput = null; this.resultsContainer = null; this.allTags = []; + this.tagGroups = []; this.filteredTags = []; this.selectedIndex = 0; this.onSelectCallback = null; @@ -155,7 +156,9 @@ class TagPicker { const response = await fetch('/api/v1/tags?is_active=true'); if (!response.ok) throw new Error('Failed to load tags'); this.allTags = await response.json(); - this.tagGroups = await this.loadTagGroups(); + // Tag groups are optional metadata. Some hubs do not expose the endpoint, + // so keep picker resilient by not depending on a second API call. + this.tagGroups = []; console.log('🏷️ Loaded tags:', this.allTags.length); this.filteredTags = [...this.allTags]; this.renderResults(); @@ -164,17 +167,6 @@ class TagPicker { } } - async loadTagGroups() { - try { - const response = await fetch('/api/v1/tags/groups'); - if (!response.ok) return []; - return await response.json(); - } catch (error) { - console.error('🏷️ Error loading tag groups:', error); - return []; - } - } - filterTags(query) { if (!query.trim()) { this.filteredTags = [...this.allTags];