feat: Add rental statistics and pricing tabs to hardware detail view
This commit is contained in:
Christian
parent
4a52bdb5d6
commit
fcc7192015
@ -1183,6 +1183,25 @@ async def create_sag_from_email(email_id: int, payload: CreateSagFromEmailReques
|
||||
(sag_id, email_id)
|
||||
)
|
||||
|
||||
attachments_linked = 0
|
||||
try:
|
||||
# Reuse workflow helper so attachments become real sag_files entries.
|
||||
attachments_linked = int(email_workflow_service._copy_email_attachments_to_case(email_id, sag_id, None) or 0)
|
||||
if attachments_linked > 0:
|
||||
logger.info(
|
||||
"📎 Linked %s attachment(s) from email %s to SAG-%s during create-sag",
|
||||
attachments_linked,
|
||||
email_id,
|
||||
sag_id,
|
||||
)
|
||||
except Exception as attach_exc:
|
||||
logger.warning(
|
||||
"⚠️ Could not auto-link attachments from email %s to SAG-%s: %s",
|
||||
email_id,
|
||||
sag_id,
|
||||
attach_exc,
|
||||
)
|
||||
|
||||
if payload.contact_id:
|
||||
execute_update(
|
||||
"""
|
||||
@ -1201,6 +1220,7 @@ async def create_sag_from_email(email_id: int, payload: CreateSagFromEmailReques
|
||||
"success": True,
|
||||
"email_id": email_id,
|
||||
"sag": sag,
|
||||
"attachments_linked": attachments_linked,
|
||||
"message": "SAG oprettet fra e-mail"
|
||||
}
|
||||
|
||||
|
||||
@ -568,6 +568,103 @@ async def hardware_detail(request: Request, hardware_id: int):
|
||||
all_locations_flat = execute_query(all_locations_query)
|
||||
location_tree = build_location_tree(all_locations_flat)
|
||||
|
||||
# Rental statistics for this hardware asset
|
||||
rental_overview_query = """
|
||||
SELECT
|
||||
COUNT(*) AS total_bindings,
|
||||
COALESCE(SUM(CASE WHEN b.status = 'active' AND b.deleted_at IS NULL THEN 1 ELSE 0 END), 0) AS active_bindings,
|
||||
MIN(b.start_date) AS first_rented_at,
|
||||
MAX(COALESCE(b.end_date, b.start_date)) AS latest_rental_activity,
|
||||
COALESCE(SUM(
|
||||
CASE
|
||||
WHEN b.status = 'active'
|
||||
AND b.deleted_at IS NULL
|
||||
AND s.status IN ('active', 'paused')
|
||||
THEN COALESCE(i.line_total, 0)
|
||||
ELSE 0
|
||||
END
|
||||
), 0) AS active_mrr,
|
||||
COALESCE(SUM(
|
||||
CASE
|
||||
WHEN b.status = 'active'
|
||||
AND b.deleted_at IS NULL
|
||||
AND s.status IN ('draft', 'active', 'paused')
|
||||
THEN COALESCE(i.line_total, 0)
|
||||
ELSE 0
|
||||
END
|
||||
), 0) AS pipeline_mrr
|
||||
FROM subscription_asset_bindings b
|
||||
LEFT JOIN sag_subscriptions s ON s.id = b.subscription_id
|
||||
LEFT JOIN sag_subscription_items i
|
||||
ON i.subscription_id = s.id
|
||||
AND i.asset_id = b.asset_id
|
||||
WHERE b.asset_id = %s
|
||||
"""
|
||||
rental_overview = execute_query(rental_overview_query, (hardware_id,))
|
||||
rental_overview = (rental_overview or [{}])[0]
|
||||
|
||||
rental_revenue_query = """
|
||||
SELECT
|
||||
COALESCE(SUM(
|
||||
CASE
|
||||
WHEN o.sync_status IN ('exported', 'posted', 'paid')
|
||||
THEN ((line->>'quantity')::numeric * (line->>'unit_price')::numeric)
|
||||
ELSE 0
|
||||
END
|
||||
), 0) AS exported_or_posted_revenue,
|
||||
COALESCE(SUM(
|
||||
CASE
|
||||
WHEN o.sync_status = 'pending'
|
||||
THEN ((line->>'quantity')::numeric * (line->>'unit_price')::numeric)
|
||||
ELSE 0
|
||||
END
|
||||
), 0) AS pending_revenue,
|
||||
COALESCE(SUM((line->>'quantity')::numeric * (line->>'unit_price')::numeric), 0) AS total_revenue,
|
||||
COUNT(DISTINCT o.id) AS order_count,
|
||||
COUNT(DISTINCT CASE WHEN o.sync_status IN ('exported', 'posted', 'paid') THEN o.id END) AS exported_or_posted_order_count,
|
||||
COUNT(DISTINCT CASE WHEN o.sync_status = 'pending' THEN o.id END) AS pending_order_count
|
||||
FROM ordre_drafts o
|
||||
CROSS JOIN LATERAL jsonb_array_elements(COALESCE(o.lines_json, '[]'::jsonb)) line
|
||||
WHERE line ? 'source_id'
|
||||
AND (line->>'source_id') ~ '^[0-9]+$'
|
||||
AND (line->>'source_id')::integer = %s
|
||||
"""
|
||||
rental_revenue = execute_query(rental_revenue_query, (hardware_id,))
|
||||
rental_revenue = (rental_revenue or [{}])[0]
|
||||
|
||||
recent_rentals_query = """
|
||||
SELECT
|
||||
o.id,
|
||||
o.title,
|
||||
o.sync_status,
|
||||
o.created_at,
|
||||
COALESCE(SUM((line->>'quantity')::numeric * (line->>'unit_price')::numeric), 0) AS amount
|
||||
FROM ordre_drafts o
|
||||
CROSS JOIN LATERAL jsonb_array_elements(COALESCE(o.lines_json, '[]'::jsonb)) line
|
||||
WHERE line ? 'source_id'
|
||||
AND (line->>'source_id') ~ '^[0-9]+$'
|
||||
AND (line->>'source_id')::integer = %s
|
||||
GROUP BY o.id, o.title, o.sync_status, o.created_at
|
||||
ORDER BY o.created_at DESC
|
||||
LIMIT 8
|
||||
"""
|
||||
recent_rentals = execute_query(recent_rentals_query, (hardware_id,))
|
||||
|
||||
rental_stats = {
|
||||
"total_bindings": int(rental_overview.get("total_bindings") or 0),
|
||||
"active_bindings": int(rental_overview.get("active_bindings") or 0),
|
||||
"first_rented_at": rental_overview.get("first_rented_at"),
|
||||
"latest_rental_activity": rental_overview.get("latest_rental_activity"),
|
||||
"active_mrr": float(rental_overview.get("active_mrr") or 0),
|
||||
"pipeline_mrr": float(rental_overview.get("pipeline_mrr") or 0),
|
||||
"exported_or_posted_revenue": float(rental_revenue.get("exported_or_posted_revenue") or 0),
|
||||
"pending_revenue": float(rental_revenue.get("pending_revenue") or 0),
|
||||
"total_revenue": float(rental_revenue.get("total_revenue") or 0),
|
||||
"order_count": int(rental_revenue.get("order_count") or 0),
|
||||
"exported_or_posted_order_count": int(rental_revenue.get("exported_or_posted_order_count") or 0),
|
||||
"pending_order_count": int(rental_revenue.get("pending_order_count") or 0),
|
||||
}
|
||||
|
||||
return templates.TemplateResponse("modules/hardware/templates/detail.html", {
|
||||
"request": request,
|
||||
"hardware": hardware,
|
||||
@ -581,7 +678,9 @@ async def hardware_detail(request: Request, hardware_id: int):
|
||||
"owner_customers": owner_customers or [],
|
||||
"owner_contacts": owner_contacts or [],
|
||||
"location_tree": location_tree or [],
|
||||
"eset_specs": extract_eset_specs_summary(hardware)
|
||||
"eset_specs": extract_eset_specs_summary(hardware),
|
||||
"rental_stats": rental_stats,
|
||||
"recent_rentals": recent_rentals or [],
|
||||
})
|
||||
|
||||
|
||||
|
||||
@ -105,6 +105,56 @@
|
||||
margin-right: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.price-tile {
|
||||
background: var(--bg-card);
|
||||
border: 1px solid rgba(0,0,0,0.08);
|
||||
border-radius: 12px;
|
||||
padding: 1rem;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.price-label {
|
||||
font-size: 0.85rem;
|
||||
color: var(--text-secondary);
|
||||
margin-bottom: 0.35rem;
|
||||
}
|
||||
|
||||
.price-value {
|
||||
font-size: 1.35rem;
|
||||
font-weight: 700;
|
||||
color: var(--text-primary);
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.stat-tile {
|
||||
background: var(--bg-card);
|
||||
border: 1px solid rgba(0,0,0,0.08);
|
||||
border-radius: 12px;
|
||||
padding: 1rem;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.stat-label {
|
||||
font-size: 0.82rem;
|
||||
color: var(--text-secondary);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.04em;
|
||||
margin-bottom: 0.35rem;
|
||||
}
|
||||
|
||||
.stat-value {
|
||||
font-size: 1.3rem;
|
||||
font-weight: 700;
|
||||
color: var(--text-primary);
|
||||
line-height: 1.15;
|
||||
}
|
||||
|
||||
.stat-helper {
|
||||
margin-top: 0.4rem;
|
||||
font-size: 0.82rem;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
@ -222,6 +272,16 @@
|
||||
<i class="bi bi-clock-history me-2"></i>Historik
|
||||
</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="prices-tab" data-bs-toggle="tab" data-bs-target="#prices" type="button" role="tab">
|
||||
<i class="bi bi-cash-coin me-2"></i>Priser
|
||||
</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="statistics-tab" data-bs-toggle="tab" data-bs-target="#statistics" type="button" role="tab">
|
||||
<i class="bi bi-bar-chart-line me-2"></i>Statistik
|
||||
</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="files-tab" data-bs-toggle="tab" data-bs-target="#files" type="button" role="tab">
|
||||
<i class="bi bi-paperclip me-2"></i>Filer ({{ attachments|length }})
|
||||
@ -684,6 +744,175 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tab: Prices -->
|
||||
<div class="tab-pane fade" id="prices" role="tabpanel">
|
||||
{% set start_price = hardware.rental_default_start_price if hardware.rental_default_start_price is not none else 0 %}
|
||||
{% set freight_price = hardware.rental_default_freight_price if hardware.rental_default_freight_price is not none else 0 %}
|
||||
{% set preparation_price = hardware.rental_default_preparation_price if hardware.rental_default_preparation_price is not none else 0 %}
|
||||
{% set operations_price = hardware.rental_default_operations_monthly_price if hardware.rental_default_operations_monthly_price is not none else 0 %}
|
||||
{% set startup_total = start_price + freight_price + preparation_price %}
|
||||
|
||||
<div class="card shadow-sm border-0 mb-4">
|
||||
<div class="card-header bg-white border-bottom-0 pt-3 ps-3 d-flex justify-content-between align-items-center">
|
||||
<h6 class="text-primary mb-0"><i class="bi bi-cash-coin me-2"></i>Standardpriser for udlejning</h6>
|
||||
<a href="/hardware/{{ hardware.id }}/edit" class="btn btn-sm btn-outline-primary">Rediger priser</a>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3 mb-2">
|
||||
<div class="col-md-6 col-lg-3">
|
||||
<div class="price-tile">
|
||||
<div class="price-label">Startpris</div>
|
||||
<div class="price-value">{{ "{:,.2f}".format(start_price).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-lg-3">
|
||||
<div class="price-tile">
|
||||
<div class="price-label">Fragt</div>
|
||||
<div class="price-value">{{ "{:,.2f}".format(freight_price).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-lg-3">
|
||||
<div class="price-tile">
|
||||
<div class="price-label">Klargoring</div>
|
||||
<div class="price-value">{{ "{:,.2f}".format(preparation_price).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-lg-3">
|
||||
<div class="price-tile">
|
||||
<div class="price-label">Drift pr. maned</div>
|
||||
<div class="price-value">{{ "{:,.2f}".format(operations_price).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="alert alert-light border mb-0 mt-2">
|
||||
<div class="d-flex flex-wrap align-items-center justify-content-between gap-2">
|
||||
<span class="text-muted">Standard opstartspris (start + fragt + klargoring)</span>
|
||||
<span class="fw-bold fs-5">{{ "{:,.2f}".format(startup_total).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tab: Statistics -->
|
||||
<div class="tab-pane fade" id="statistics" role="tabpanel">
|
||||
<div class="card shadow-sm border-0 mb-4">
|
||||
<div class="card-header bg-white border-bottom-0 pt-3 ps-3">
|
||||
<h6 class="text-primary mb-0"><i class="bi bi-bar-chart-line me-2"></i>Udlejningsstatistik for asset</h6>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Total omsaetning</div>
|
||||
<div class="stat-value">{{ "{:,.2f}".format(rental_stats.total_revenue).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</div>
|
||||
<div class="stat-helper">Fra alle ordrelinjer pa dette asset</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Eksporteret / bogfort</div>
|
||||
<div class="stat-value text-success">{{ "{:,.2f}".format(rental_stats.exported_or_posted_revenue).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</div>
|
||||
<div class="stat-helper">Ordrestatus: exported, posted eller paid</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Afventer fakturering</div>
|
||||
<div class="stat-value text-warning">{{ "{:,.2f}".format(rental_stats.pending_revenue).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</div>
|
||||
<div class="stat-helper">Ordrestatus: pending</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Aktiv MRR</div>
|
||||
<div class="stat-value">{{ "{:,.2f}".format(rental_stats.active_mrr).replace(",", "X").replace(".", ",").replace("X", ".") }} kr./md.</div>
|
||||
<div class="stat-helper">Aktive/pausede abonnementslinjer</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Udlejninger i alt</div>
|
||||
<div class="stat-value">{{ rental_stats.total_bindings }}</div>
|
||||
<div class="stat-helper">Antal bindings pa asset</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Aktive udlejninger</div>
|
||||
<div class="stat-value">{{ rental_stats.active_bindings }}</div>
|
||||
<div class="stat-helper">Status active</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Ordrekladder i alt</div>
|
||||
<div class="stat-value">{{ rental_stats.order_count }}</div>
|
||||
<div class="stat-helper">Med linjer for dette asset</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xl-3">
|
||||
<div class="stat-tile">
|
||||
<div class="stat-label">Pipeline MRR</div>
|
||||
<div class="stat-value">{{ "{:,.2f}".format(rental_stats.pipeline_mrr).replace(",", "X").replace(".", ",").replace("X", ".") }} kr./md.</div>
|
||||
<div class="stat-helper">Inkl. draft + active + paused</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card border-0" style="background: rgba(0,0,0,0.02);">
|
||||
<div class="card-body">
|
||||
<div class="d-flex flex-wrap gap-4 small text-muted mb-2">
|
||||
<span><strong>Forste udlejning:</strong> {{ rental_stats.first_rented_at or '-' }}</span>
|
||||
<span><strong>Seneste aktivitet:</strong> {{ rental_stats.latest_rental_activity or '-' }}</span>
|
||||
<span><strong>Eksporterede/bogforte ordrer:</strong> {{ rental_stats.exported_or_posted_order_count }}</span>
|
||||
<span><strong>Afventende ordrer:</strong> {{ rental_stats.pending_order_count }}</span>
|
||||
</div>
|
||||
|
||||
<div class="table-responsive mt-3">
|
||||
<table class="table table-sm align-middle mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Dato</th>
|
||||
<th>Titel</th>
|
||||
<th>Status</th>
|
||||
<th class="text-end">Beloeb</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% if recent_rentals %}
|
||||
{% for item in recent_rentals %}
|
||||
<tr>
|
||||
<td class="text-muted">{{ item.created_at.strftime('%Y-%m-%d') if item.created_at else '-' }}</td>
|
||||
<td>
|
||||
<a href="/ordre/{{ item.id }}" class="text-decoration-none">{{ item.title or ('Ordre #' ~ item.id) }}</a>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge {% if item.sync_status in ['posted', 'paid', 'exported'] %}bg-success{% elif item.sync_status == 'pending' %}bg-warning text-dark{% else %}bg-secondary{% endif %}">
|
||||
{{ item.sync_status or '-' }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="text-end fw-semibold">{{ "{:,.2f}".format(item.amount or 0).replace(",", "X").replace(".", ",").replace("X", ".") }} kr.</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="4" class="text-center text-muted py-3">Ingen udlejningsordrer fundet for dette asset endnu.</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tab: Files -->
|
||||
<div class="tab-pane fade" id="files" role="tabpanel">
|
||||
<div class="card shadow-sm border-0">
|
||||
|
||||
@ -867,7 +867,52 @@
|
||||
border: 1px solid rgba(15, 76, 117, 0.16);
|
||||
background: linear-gradient(180deg, rgba(15, 76, 117, 0.06), rgba(15, 76, 117, 0.02));
|
||||
border-radius: 12px;
|
||||
padding: 1rem;
|
||||
padding: 1.1rem 1.1rem 1rem;
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.45);
|
||||
}
|
||||
|
||||
#beskrivelse-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.case-left-section-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
font-size: 0.82rem;
|
||||
font-weight: 800;
|
||||
letter-spacing: 0.06em;
|
||||
text-transform: uppercase;
|
||||
color: var(--text-secondary);
|
||||
margin-bottom: 0.55rem;
|
||||
}
|
||||
|
||||
.case-left-panel {
|
||||
border: 1px solid rgba(0, 0, 0, 0.09);
|
||||
border-radius: 12px;
|
||||
background: var(--bg-card);
|
||||
padding: 0.9rem;
|
||||
}
|
||||
|
||||
#beskrivelse-history-wrap {
|
||||
border: 1px solid rgba(0, 0, 0, 0.09);
|
||||
border-radius: 12px;
|
||||
background: rgba(0, 0, 0, 0.02);
|
||||
padding: 0.75rem 0.85rem;
|
||||
}
|
||||
|
||||
#beskrivelse-history-wrap .btn-link {
|
||||
font-weight: 600;
|
||||
font-size: 0.86rem;
|
||||
}
|
||||
|
||||
#beskrivelse-comments-wrap {
|
||||
border: 1px solid rgba(0, 0, 0, 0.1);
|
||||
border-radius: 12px;
|
||||
background: var(--bg-card);
|
||||
padding: 0.95rem;
|
||||
}
|
||||
|
||||
.narrative-lead {
|
||||
@ -1726,18 +1771,19 @@
|
||||
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||
gap: 0.7rem;
|
||||
align-items: start;
|
||||
background: var(--bg-card);
|
||||
background: transparent;
|
||||
border: 1px solid rgba(0,0,0,0.08);
|
||||
border-radius: 12px;
|
||||
padding: 0.75rem;
|
||||
border-radius: 0;
|
||||
padding: 0.55rem 0.45rem;
|
||||
margin-bottom: 0.75rem;
|
||||
}
|
||||
|
||||
.case-tabs-topbar.topbar-primary {
|
||||
grid-template-columns: 105px minmax(260px, 1.45fr) minmax(150px, 0.95fr) minmax(170px, 1fr) minmax(170px, 1fr) minmax(240px, 1.35fr);
|
||||
background: linear-gradient(140deg, rgba(15,76,117,0.11), rgba(15,76,117,0.03));
|
||||
background: linear-gradient(140deg, rgba(15,76,117,0.08), rgba(15,76,117,0.01));
|
||||
border: 1px solid rgba(15,76,117,0.22);
|
||||
box-shadow: 0 3px 12px rgba(15,76,117,0.1);
|
||||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
@ -1817,9 +1863,10 @@
|
||||
}
|
||||
|
||||
.topbar-primary .case-inline-select {
|
||||
background: rgba(255,255,255,0.78);
|
||||
background: rgba(255,255,255,0.88);
|
||||
border-color: rgba(15,76,117,0.3);
|
||||
box-shadow: 0 1px 3px rgba(15,76,117,0.08);
|
||||
box-shadow: none;
|
||||
border-radius: 4px;
|
||||
font-weight: 700;
|
||||
color: var(--accent);
|
||||
}
|
||||
@ -1843,19 +1890,18 @@
|
||||
letter-spacing: 0.01em;
|
||||
color: var(--text-primary);
|
||||
text-decoration: none;
|
||||
padding: 0.5rem 0.95rem;
|
||||
padding: 0.38rem 0.1rem;
|
||||
min-height: 38px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid rgba(0,0,0,0.12);
|
||||
background: rgba(255,255,255,0.72);
|
||||
border-radius: 0;
|
||||
border: none;
|
||||
background: transparent;
|
||||
box-shadow: none;
|
||||
transition: transform 0.14s ease, box-shadow 0.14s ease, filter 0.14s ease;
|
||||
}
|
||||
|
||||
.back-link:hover {
|
||||
color: var(--accent);
|
||||
border-color: var(--accent);
|
||||
background: rgba(255,255,255,0.95);
|
||||
background: transparent;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
@ -1866,14 +1912,13 @@
|
||||
|
||||
[data-bs-theme="dark"] .back-link {
|
||||
color: #dce8f4;
|
||||
background: rgba(20, 27, 38, 0.72);
|
||||
border-color: rgba(170, 190, 216, 0.35);
|
||||
background: transparent;
|
||||
border: none;
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .back-link:hover {
|
||||
color: #9fc4e8;
|
||||
border-color: #9fc4e8;
|
||||
background: rgba(20, 27, 38, 0.86);
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .case-tabs-topbar.topbar-primary {
|
||||
@ -1934,17 +1979,22 @@
|
||||
}
|
||||
|
||||
.case-tabs-topbar-item {
|
||||
background: color-mix(in srgb, var(--accent) 3%, var(--bg-card));
|
||||
border: 1px solid rgba(0,0,0,0.06);
|
||||
border-radius: 10px;
|
||||
background: transparent;
|
||||
border: none;
|
||||
border-left: 1px solid rgba(15,76,117,0.16);
|
||||
border-radius: 0;
|
||||
padding: 0.58rem 0.68rem;
|
||||
min-width: 0;
|
||||
transition: border-color 0.15s ease, box-shadow 0.15s ease, background-color 0.15s ease;
|
||||
}
|
||||
|
||||
.case-tabs-topbar-item:first-child {
|
||||
border-left: none;
|
||||
}
|
||||
|
||||
.case-tabs-topbar-item:hover {
|
||||
border-color: rgba(15, 76, 117, 0.28);
|
||||
box-shadow: 0 2px 8px rgba(15, 76, 117, 0.08);
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.case-tabs-topbar-label {
|
||||
@ -1985,6 +2035,8 @@
|
||||
font-size: 0.86rem;
|
||||
padding: 0.45rem 0.7rem;
|
||||
min-height: 38px;
|
||||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.case-top-aux {
|
||||
@ -2008,7 +2060,7 @@
|
||||
border: 1px solid rgba(0,0,0,0.12);
|
||||
background: rgba(255,255,255,0.72);
|
||||
color: var(--text-primary);
|
||||
border-radius: 7px;
|
||||
border-radius: 0;
|
||||
font-size: 0.8rem;
|
||||
font-weight: 600;
|
||||
padding: 0.45rem 0.7rem;
|
||||
@ -2822,6 +2874,8 @@
|
||||
</div>
|
||||
|
||||
<div class="mt-4 pt-3 border-top border-light" id="beskrivelse-section">
|
||||
<div class="case-left-panel">
|
||||
<div class="case-left-section-title"><i class="bi bi-card-text"></i>Opgavebeskrivelse</div>
|
||||
<!-- View mode -->
|
||||
<div id="beskrivelse-view" class="narrative-description" style="min-height: 120px; cursor: pointer;" ondblclick="startBeskrivelsEdit()">
|
||||
<div class="narrative-lead">{{ case.titel }}</div>
|
||||
@ -2833,6 +2887,7 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Edit mode (hidden by default) -->
|
||||
<div id="beskrivelse-editor" class="d-none mt-1">
|
||||
@ -2870,7 +2925,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mt-4 pt-3 border-top border-light" id="beskrivelse-comments-wrap">
|
||||
<div id="beskrivelse-comments-wrap">
|
||||
<div class="d-flex justify-content-between align-items-center mb-3">
|
||||
<h6 class="text-muted text-uppercase small mb-0 fw-bold" style="letter-spacing: 0.05em;">
|
||||
<i class="bi bi-chat-left-text me-1"></i>Kommentarer
|
||||
|
||||
@ -47,6 +47,14 @@ def _extract_create_table_block(sql: str, start_pos: int) -> str:
|
||||
|
||||
depth = 0
|
||||
for idx in range(open_paren, len(sql)):
|
||||
ch = sql[idx]
|
||||
if ch == "(":
|
||||
depth += 1
|
||||
elif ch == ")":
|
||||
depth -= 1
|
||||
if depth == 0:
|
||||
return sql[open_paren + 1:idx]
|
||||
return ""
|
||||
|
||||
|
||||
def _migration_numeric_prefix(file_name: str) -> int | None:
|
||||
@ -81,14 +89,6 @@ def _find_duplicate_migration_numbers(file_names: list[str]) -> list[dict]:
|
||||
if len(files) > 1:
|
||||
duplicates.append({"number": number, "files": files})
|
||||
return duplicates
|
||||
ch = sql[idx]
|
||||
if ch == "(":
|
||||
depth += 1
|
||||
elif ch == ")":
|
||||
depth -= 1
|
||||
if depth == 0:
|
||||
return sql[open_paren + 1:idx]
|
||||
return ""
|
||||
|
||||
|
||||
def _parse_columns_from_create_block(block: str) -> set[str]:
|
||||
|
||||
@ -165,6 +165,10 @@
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.global-bottom-bar .dropdown-menu {
|
||||
z-index: calc(var(--bottom-bar-zindex) + 40);
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-action-btn:hover {
|
||||
border-color: rgba(var(--text-primary-rgb), 0.25);
|
||||
background: var(--accent-light);
|
||||
@ -228,6 +232,24 @@
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip .bb-chip-label {
|
||||
opacity: 0.95;
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip .bb-chip-bubble {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-width: 1.35rem;
|
||||
height: 1.35rem;
|
||||
border-radius: 999px;
|
||||
padding: 0 0.35rem;
|
||||
font-size: 0.72rem;
|
||||
font-weight: 700;
|
||||
background: rgba(var(--text-primary-rgb), 0.15);
|
||||
color: currentColor;
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip:hover {
|
||||
transform: translateY(-1px);
|
||||
box-shadow: 0 3px 8px rgba(0,0,0,0.08);
|
||||
@ -246,18 +268,30 @@
|
||||
color: #146c43;
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip.sev-ok .bb-chip-bubble {
|
||||
background: rgba(25, 135, 84, 0.2);
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip.sev-warn {
|
||||
background: rgba(255, 193, 7, 0.22);
|
||||
border-color: rgba(255, 193, 7, 0.5);
|
||||
color: #8a6d00;
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip.sev-warn .bb-chip-bubble {
|
||||
background: rgba(255, 193, 7, 0.3);
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip.sev-critical {
|
||||
background: rgba(220, 53, 69, 0.14);
|
||||
border-color: rgba(220, 53, 69, 0.4);
|
||||
color: #b02a37;
|
||||
}
|
||||
|
||||
.global-bottom-bar .bb-chip.sev-critical .bb-chip-bubble {
|
||||
background: rgba(220, 53, 69, 0.22);
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .global-bottom-bar .bb-chip.sev-ok {
|
||||
color: #75d39a;
|
||||
}
|
||||
@ -269,6 +303,10 @@
|
||||
[data-bs-theme="dark"] .global-bottom-bar .bb-chip.sev-critical {
|
||||
color: #ff9aa2;
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .global-bottom-bar .bb-chip .bb-chip-bubble {
|
||||
background: rgba(255, 255, 255, 0.12);
|
||||
}
|
||||
[data-bs-theme="dark"] .global-bottom-bar .bb-chip.is-active {
|
||||
color: #fff;
|
||||
}
|
||||
@ -966,9 +1004,9 @@
|
||||
<div id="globalBottomBar" class="global-bottom-bar" hidden>
|
||||
<div class="bb-header">
|
||||
<div class="bb-zone bb-zone-left" role="status" aria-live="polite">
|
||||
<button class="bb-chip" type="button" data-bb-key="mail"><i class="bi bi-envelope"></i> <span class="bb-chip-text">Ulæste mails: 0</span></button>
|
||||
<button class="bb-chip" type="button" data-bb-key="urgent"><i class="bi bi-exclamation-octagon"></i> <span class="bb-chip-text">Hastesager: 0</span></button>
|
||||
<button class="bb-chip" type="button" data-bb-key="unassigned"><i class="bi bi-person-x"></i> <span class="bb-chip-text">Uden ansvarlig: 0</span></button>
|
||||
<button class="bb-chip" type="button" data-bb-key="mail"><i class="bi bi-envelope"></i> <span class="bb-chip-label">Ulæste mails</span> <span class="bb-chip-bubble" aria-hidden="true">0</span> <span class="bb-chip-text visually-hidden">Ulæste mails: 0</span></button>
|
||||
<button class="bb-chip" type="button" data-bb-key="urgent"><i class="bi bi-exclamation-octagon"></i> <span class="bb-chip-label">Hastesager</span> <span class="bb-chip-bubble" aria-hidden="true">0</span> <span class="bb-chip-text visually-hidden">Hastesager: 0</span></button>
|
||||
<button class="bb-chip" type="button" data-bb-key="unassigned"><i class="bi bi-person-x"></i> <span class="bb-chip-label">Uden ansvarlig</span> <span class="bb-chip-bubble" aria-hidden="true">0</span> <span class="bb-chip-text visually-hidden">Uden ansvarlig: 0</span></button>
|
||||
</div>
|
||||
<div class="bb-zone bb-zone-center">
|
||||
<div class="dropdown">
|
||||
|
||||
@ -317,6 +317,8 @@
|
||||
for (let i = 0; i < keys.length; i++) {
|
||||
const key = keys[i];
|
||||
const chipText = document.querySelector('.bb-chip[data-bb-key="' + key + '"] .bb-chip-text');
|
||||
const chipLabel = document.querySelector('.bb-chip[data-bb-key="' + key + '"] .bb-chip-label');
|
||||
const chipBubble = document.querySelector('.bb-chip[data-bb-key="' + key + '"] .bb-chip-bubble');
|
||||
const chip = document.querySelector('.bb-chip[data-bb-key="' + key + '"]');
|
||||
if (chipText && chip) {
|
||||
const val = counts[key];
|
||||
@ -331,6 +333,12 @@
|
||||
eset: 'ESET'
|
||||
};
|
||||
|
||||
if (chipLabel) {
|
||||
chipLabel.textContent = labels[key];
|
||||
}
|
||||
if (chipBubble) {
|
||||
chipBubble.textContent = String(val);
|
||||
}
|
||||
chipText.textContent = labels[key] + ': ' + val;
|
||||
chip.classList.toggle('has-items', val > 0);
|
||||
chip.classList.remove('sev-ok', 'sev-warn', 'sev-critical');
|
||||
|
||||
Loading…
Reference in New Issue
Block a user