- _trimitere_detaliu.html rescris pe ordinea verticala R10: header+motiv, eroare blocanta, mapare inline, formular editabil/context read-only, actiuni, <details> Detalii tehnice colapsat - zero dublare: campurile editabile apar O SINGURA DATA (nr rand propriu, VIN dedesubt, restul in grila); blocul read-only de grila contopit cu formularul - R9: operatie+cod read-only deasupra campurilor cu prez.cod_rar (fallback nemapat), fara eticheta separata Cod RAR - R2 (fix F7): buton primar conditionat de stare - error->Re-pune(/repune), needs_data/needs_mapping->Salveaza si retrimite(/corecteaza); duplicatul gol eliminat - R11: un singur Sterge outline var(--err) pe rand separat, hx-confirm specific, full-width pe mobil (.detaliu-actiuni-jos in @media 767px, base.html) - R5: hx-disabled-elt pe toate formele; inchidere pe succes prin inchideModal - R4: script modal-appropriate pastrat (curatat de US-003) - 6 teste noi in test_web_corectie.py; rutele + _detaliu_ctx NESCHIMBATE - suita 835 passed (-m 'not live'); prd.json/progress.txt US-004 passes Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
202 lines
11 KiB
HTML
202 lines
11 KiB
HTML
{% from "_eroare.html" import card_erori %}
|
|
{% import '_macros.html' as ui %}
|
|
{# PRD 5.9 US-004: detaliu editabil in-place, butoane consolidate, ordine verticala R10.
|
|
Fragmentul se swap-uieste in corpul modalului global (#detaliu-modal-body). Heading-ul
|
|
poarta id-ul folosit de aria-labelledby al dialogului.
|
|
R9: operatie + cod RAR rezolvat apar IMPREUNA, read-only, folosind `prez.cod_rar`
|
|
(fallback „nemapat"), fara eticheta separata „Cod RAR". #}
|
|
{% set cod_afis = prez.cod_rar if (prez.cod_rar and prez.cod_rar != '—') else 'nemapat' %}
|
|
<div class="card" id="detaliu-card-{{ id }}" style="border:none; padding:0; margin:0;">
|
|
|
|
{# === R10 (1): header — #id + pill + motiv uman === #}
|
|
<div style="display:flex; align-items:center; gap:8px; flex-wrap:wrap; margin:0 0 8px;">
|
|
<h2 id="detaliu-modal-titlu" style="font-size:15px; margin:0;">Detaliu trimitere #{{ id }}</h2>
|
|
<span class="pill {{ stare_css }}">{{ stare_text }}</span>
|
|
</div>
|
|
{% if motiv %}
|
|
<p class="muted" style="margin:0 0 12px; font-size:13px;">{{ motiv }}</p>
|
|
{% elif stare_subtext %}
|
|
<p class="muted" style="margin:0 0 12px; font-size:13px;">{{ stare_subtext }}</p>
|
|
{% endif %}
|
|
|
|
{# === R10 (2): bloc eroare blocanta cand exista === #}
|
|
{% if erori_3n %}
|
|
<div style="margin:0 0 14px;">
|
|
{{ card_erori(erori_3n) }}
|
|
</div>
|
|
{% endif %}
|
|
|
|
{# === R10 (3) + R9: mapare inline (PRD 5.7) — alege cod RAR pentru operatiile nemapate.
|
|
Cand nemapate_inline, linia „Operatie: X · nemapat" apare in formularul de mai jos
|
|
(cod_afis = nemapat), iar aici e picker-ul; dupa mapare, re-render arata codul rezolvat. === #}
|
|
{% if nemapate_inline %}
|
|
<div style="margin:0 0 14px; padding-bottom:12px; border-bottom:1px solid var(--line);">
|
|
<h3 style="font-size:14px; margin:0 0 4px;">Mapeaza codul operatiei</h3>
|
|
<p class="muted" style="margin:0 0 10px; font-size:13px;">
|
|
Alege codul RAR pentru fiecare operatie. La salvare, randul se re-rezolva pe loc
|
|
(si celelalte randuri cu aceeasi operatie).
|
|
</p>
|
|
{% for op in nemapate_inline %}
|
|
{% set top = op.suggestions[0] if op.suggestions else None %}
|
|
{% set preselect = top.cod_prestatie if (top and top.score >= 60) else '' %}
|
|
<form hx-post="/trimitere/{{ id }}/mapeaza" hx-target="#detaliu-modal-body" hx-swap="innerHTML"
|
|
hx-disabled-elt="find button"
|
|
style="margin:0 0 12px; padding:10px; border:1px solid var(--line); border-radius:8px;">
|
|
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
|
<input type="hidden" name="cod_op_service" value="{{ op.cod_op_service }}">
|
|
<div style="margin-bottom:6px;">
|
|
<strong>{{ op.cod_op_service }}</strong>
|
|
{% if op.denumire and op.denumire != op.cod_op_service %}
|
|
<span class="muted">— {{ op.denumire }}</span>
|
|
{% endif %}
|
|
</div>
|
|
{% if op.suggestions %}
|
|
<div class="muted" style="font-size:12px; margin-bottom:6px;">
|
|
Sugestii:
|
|
{% for s in op.suggestions[:3] %}
|
|
<span class="sugg">{{ s.cod_prestatie }} ({{ s.score|round|int }}%)</span>{% if not loop.last %}, {% endif %}
|
|
{% endfor %}
|
|
</div>
|
|
{% endif %}
|
|
<div style="display:flex; gap:10px; flex-wrap:wrap; align-items:center;">
|
|
<select name="cod_prestatie" required aria-label="Cod RAR pentru {{ op.cod_op_service }}"
|
|
style="flex:1; min-width:220px; max-width:380px;">
|
|
<option value="">— alege cod RAR —</option>
|
|
{% for n in nomenclator %}
|
|
<option value="{{ n.cod_prestatie }}" {% if n.cod_prestatie == preselect %}selected{% endif %}>
|
|
{{ n.cod_prestatie }} — {{ n.nume_prestatie }}
|
|
</option>
|
|
{% endfor %}
|
|
</select>
|
|
{{ ui.autosend_toggle(checked=True) }}
|
|
<button type="submit">Salveaza maparea</button>
|
|
</div>
|
|
</form>
|
|
{% endfor %}
|
|
</div>
|
|
{% endif %}
|
|
|
|
{# === R10 (4): formular editabil (needs_data/needs_mapping) SAU context read-only.
|
|
Zero dublare: campurile vehiculului apar O SINGURA DATA — editabile cand randul e
|
|
corectabil, altfel read-only. Operatie + cod RAR read-only deasupra campurilor. === #}
|
|
{% if editabil %}
|
|
{% set err_map = {} %}
|
|
{% for e in corectie_errors %}{% if e.field %}{% set _ = err_map.update({e.field: e.message}) %}{% endif %}{% endfor %}
|
|
|
|
{% if corectie_msg %}
|
|
<div class="flash" style="{% if corectie_error %}border-color:var(--err); background:color-mix(in srgb, var(--err) 12%, var(--card));{% endif %} margin:0 0 12px;"
|
|
{% if corectie_error %}role="alert"{% endif %}>{{ corectie_msg }}</div>
|
|
{% endif %}
|
|
|
|
{% macro camp(nume, eticheta, valoare, tip='text') %}
|
|
<div style="margin-bottom:10px;">
|
|
<label for="c-{{ nume }}" class="muted" style="font-size:12px; display:block;">{{ eticheta }}</label>
|
|
<input id="c-{{ nume }}" type="{{ tip }}" name="{{ nume }}" value="{{ valoare }}"
|
|
style="width:100%; {% if err_map.get(nume) %}border-color:var(--err);{% endif %}"
|
|
{% if err_map.get(nume) %}aria-invalid="true"{% endif %}>
|
|
{% if err_map.get(nume) %}
|
|
<div class="s-error" style="font-size:12px; margin-top:2px;">{{ err_map.get(nume) }}</div>
|
|
{% endif %}
|
|
</div>
|
|
{% endmacro %}
|
|
|
|
<form hx-post="/trimitere/{{ id }}/corecteaza"
|
|
hx-target="#detaliu-modal-body" hx-swap="innerHTML"
|
|
hx-disabled-elt="find button">
|
|
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
|
|
|
{# Operatie + cod RAR read-only deasupra campurilor (R9, fara eticheta „Cod RAR"). #}
|
|
<div style="margin:0 0 12px;">
|
|
<div class="muted" style="font-size:12px;">Operatie</div>
|
|
<div>{{ prez.operatie }} · {{ cod_afis }}</div>
|
|
</div>
|
|
|
|
{# Nr. inmatriculare pe rand propriu, VIN dedesubt — ambele latime plina. #}
|
|
{{ camp('nr_inmatriculare', 'Numar inmatriculare', form_nr) }}
|
|
{{ camp('vin', 'VIN (serie sasiu)', form_vin) }}
|
|
|
|
{# Restul campurilor in grila. #}
|
|
<div style="display:grid; grid-template-columns:repeat(auto-fit, minmax(200px, 1fr)); gap:0 16px;">
|
|
{{ camp('data_prestatie', 'Data prestatie (YYYY-MM-DD)', form_data) }}
|
|
{{ camp('odometru_final', 'Odometru final', form_odo_final) }}
|
|
{{ camp('odometru_initial', 'Odometru initial (daca e cerut)', form_odo_initial) }}
|
|
</div>
|
|
|
|
{# === R10 (5): actiune primara conditionata de stare (R2). needs_data/needs_mapping
|
|
-> „Salveaza si retrimite" pe /corecteaza. UN SINGUR buton primar per stare. === #}
|
|
<div style="margin-top:14px;">
|
|
<button type="submit">Salveaza si retrimite</button>
|
|
</div>
|
|
</form>
|
|
{% else %}
|
|
{# Context read-only pentru randuri ne-editabile (sent/sending/queued/error). #}
|
|
<div style="display:grid; grid-template-columns:repeat(auto-fit, minmax(220px, 1fr)); gap:12px 24px;">
|
|
<div style="grid-column:1 / -1;">
|
|
<div class="muted" style="font-size:12px;">Numar inmatriculare</div><div>{{ prez.vehicul_nr }}</div>
|
|
</div>
|
|
<div style="grid-column:1 / -1;">
|
|
<div class="muted" style="font-size:12px;">VIN (serie sasiu)</div>
|
|
<div style="word-break:break-all;">{{ prez.vin }}</div>
|
|
</div>
|
|
<div><div class="muted" style="font-size:12px;">Operatie</div><div>{{ prez.operatie }} · {{ cod_afis }}</div></div>
|
|
<div><div class="muted" style="font-size:12px;">Data prestatie</div><div>{{ prez.data_prestatie }}</div></div>
|
|
<div><div class="muted" style="font-size:12px;">Odometru final</div><div>{{ prez.odometru }}</div></div>
|
|
</div>
|
|
{% endif %}
|
|
|
|
{# === R10 (5): actiuni de jos — primar Re-pune (doar error) + Sterge pe RAND SEPARAT (R2/R11) === #}
|
|
{% if status == 'error' or gestionabil %}
|
|
<div class="detaliu-actiuni-jos" style="margin-top:14px; padding-top:12px; border-top:1px solid var(--line);">
|
|
{# R2: error -> buton primar „Re-pune in coada" pe /repune (error nu e editabil). #}
|
|
{% if status == 'error' %}
|
|
<form hx-post="/trimitere/{{ id }}/repune"
|
|
hx-target="#detaliu-modal-body" hx-swap="innerHTML"
|
|
hx-disabled-elt="find button" style="margin:0 0 10px;">
|
|
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
|
<button type="submit">Re-pune in coada</button>
|
|
</form>
|
|
{% endif %}
|
|
|
|
{# R11: UN SINGUR Sterge, outline distructiv (var(--err)), pe rand separat, full-width pe mobil. #}
|
|
{% if gestionabil %}
|
|
<form hx-post="/trimitere/{{ id }}/sterge"
|
|
hx-target="#detaliu-modal-body" hx-swap="innerHTML"
|
|
hx-disabled-elt="find button"
|
|
hx-confirm="Stergi definitiv trimiterea #{{ id }}? Nu se poate anula." style="margin:0;">
|
|
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
|
<button type="submit" class="btn-sterge"
|
|
style="background:var(--card); color:var(--err); border-color:var(--err);">
|
|
Sterge
|
|
</button>
|
|
</form>
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
|
|
{# === R10 (6): Detalii tehnice — colapsat implicit === #}
|
|
<details style="margin-top:14px;">
|
|
<summary class="muted" style="font-size:12px; cursor:pointer;">Detalii tehnice</summary>
|
|
<div style="display:grid; grid-template-columns:repeat(auto-fit, minmax(200px, 1fr)); gap:10px 24px; margin-top:10px;">
|
|
<div><div class="muted" style="font-size:12px;">Nr. prezentare RAR</div><div>{{ id_prezentare or '—' }}</div></div>
|
|
<div><div class="muted" style="font-size:12px;">Cod HTTP RAR</div><div>{{ rar_status_code or '—' }}</div></div>
|
|
<div><div class="muted" style="font-size:12px;">Reincercari</div><div>{{ retry_count }}</div></div>
|
|
<div><div class="muted" style="font-size:12px;">Creat</div><div>{{ created_at }}</div></div>
|
|
<div><div class="muted" style="font-size:12px;">Actualizat</div><div>{{ updated_at }}</div></div>
|
|
<div><div class="muted" style="font-size:12px;">Urmatoarea incercare</div><div>{{ next_attempt_at }}</div></div>
|
|
{% if erori_3n and erori_3n[0].cod %}
|
|
<div><div class="muted" style="font-size:12px;">Cod eroare (brut)</div><div>{{ erori_3n[0].cod }}</div></div>
|
|
{% endif %}
|
|
</div>
|
|
{% if rar_error %}
|
|
<div style="margin-top:10px;">
|
|
<div class="muted" style="font-size:12px;">Mesaj RAR (integral)</div>
|
|
<pre style="white-space:pre-wrap; word-break:break-all; font-size:12px; margin:4px 0 0; color:var(--muted);">{{ rar_error }}</pre>
|
|
</div>
|
|
{% endif %}
|
|
</details>
|
|
</div>
|
|
{# PRD 5.9 US-004 (R4): scriptul inline vechi (marcheazaDetaliuDeschis / scrollIntoView pe
|
|
randul-sibling) a fost eliminat de US-003. Focus-ul post-swap (incl. re-render corectie/
|
|
mapare) e gestionat de htmx:afterSettle pe #detaliu-modal-body din base.html. R5: inchiderea
|
|
modalului pe succes (queued/sterge) vine din HX-Trigger `inchideModal` emis de rute. #}
|