fix(5.19): corectii UX/retentie held (findings #2-#6 /code-review high)
#2 Filtrul "doar tinute" (held=1) devine persistent: hidden #f-held in #filtre-trimiteri sincronizat prin OOB din _submissions.html + paginare pastreaza held=1; chip "Doar tinute manual / Arata tot" ca off-switch. Param `held` schimbat la str (held= gol nu mai da 422 la coercion). #3 Banner bulk "Trimite toate (N)" extras in _bulk_held_banner.html si re-randat prin OOB (#bulk-held-banner-wrap) la fiecare reincarcare a listei -> nu mai ramane stale dupa eliberari (count revine la 0). #4 tools/carantina_held seteaza purge_after (blocked_retention_days) pe randurile carantinate -> PII nu mai sta la nesfarsit (purge_expired le poate sterge). #5 Panoul de detaliu marcheaza randul tinut (eticheta amber) si ofera buton "Trimite acum la RAR" (paritate cu randul din lista). #6 expire_held seteaza purge_after=now-1s -> randul expirat e purjabil in ACELASI ciclu (purge_expired foloseste comparatie stricta), nu la ciclul urmator. Teste noi: stickiness held + banner OOB + detaliu buton (test_web_auto_send), purge_after carantina, purge acelasi-ciclu (test_worker_held). 1541 passed. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Agent
42
app/web/templates/_bulk_held_banner.html
Normal file
42
app/web/templates/_bulk_held_banner.html
Normal file
@@ -0,0 +1,42 @@
|
||||
{#
|
||||
_bulk_held_banner.html — banner bulk "Trimite toate (N)" (PRD 5.19 US-005).
|
||||
|
||||
N = randuri tinute ale contului (queued AND held=1). Randat:
|
||||
- initial in _coada.html (banner_oob nesetat -> fara OOB);
|
||||
- RE-RANDAT prin OOB (banner_oob=true) din _submissions.html la FIECARE reincarcare a
|
||||
listei, ca sa nu ramana stale dupa eliberari (fix /code-review #3).
|
||||
|
||||
Wrapper cu id STABIL #bulk-held-banner-wrap: OOB outerHTML il inlocuieste mereu (chiar si
|
||||
gol la N=0), ca id-ul sa ramana tinta pentru urmatorul OOB. Confirmare tipata prin modal
|
||||
(count + mediu RAR), NU hx-confirm.
|
||||
#}
|
||||
<div id="bulk-held-banner-wrap"{% if banner_oob %} hx-swap-oob="outerHTML"{% endif %}>
|
||||
{% if held_manual_count|default(0) %}
|
||||
<div style="display:flex; align-items:center; gap:8px; flex-wrap:wrap; margin:0 0 10px;
|
||||
padding:8px 10px; border-left:3px solid var(--warn);
|
||||
background:color-mix(in srgb, var(--warn) 10%, var(--card)); border-radius:6px;">
|
||||
<span style="font-size:var(--fs-sm);">
|
||||
<strong>{{ held_manual_count }}</strong>
|
||||
{{ 'prezentare tinuta' if held_manual_count == 1 else 'prezentari tinute' }} manual.
|
||||
</span>
|
||||
<button type="button"
|
||||
onclick="var m=document.getElementById('modal-trimite-toate'); if(m){m.hidden=false;}"
|
||||
style="margin-left:auto; padding:4px 12px; font-size:13px; border-radius:6px;
|
||||
border:1px solid var(--accent); background:var(--accent); color:#fff;
|
||||
font-weight:600; cursor:pointer;">
|
||||
Trimite toate ({{ held_manual_count }})
|
||||
</button>
|
||||
</div>
|
||||
{% set cf_id = 'modal-trimite-toate' %}
|
||||
{% set cf_titlu = 'Trimiti toate prezentarile tinute?' %}
|
||||
{% set cf_count = held_manual_count %}
|
||||
{% set cf_env = env_bulk | default('prod') %}
|
||||
{% set cf_url = '/trimite-toate' %}
|
||||
{% set cf_vals = '{}' %}
|
||||
{% set cf_target = '#submissions-wrap' %}
|
||||
{% set cf_swap = 'innerHTML' %}
|
||||
{% set cf_confirm_label = 'Trimite toate (' ~ held_manual_count ~ ')' %}
|
||||
{% set cf_deschis = false %}
|
||||
{% include '_modal_confirma_trimitere.html' %}
|
||||
{% endif %}
|
||||
</div>
|
||||
@@ -11,36 +11,9 @@
|
||||
aria-labelledby). Badge-ul de atentie + export CSV stau intr-un rand discret. #}
|
||||
<h2 id="trimiteri-heading" class="sr-only">Trimiterile tale</h2>
|
||||
|
||||
{# US-005 (PRD 5.19): bulk "Trimite toate (N)" — N = randuri tinute (queued AND held=1).
|
||||
Ascuns cand N=0. Confirmare tipata prin modal (count + mediu RAR), NU hx-confirm. #}
|
||||
{% if held_manual_count|default(0) %}
|
||||
<div style="display:flex; align-items:center; gap:8px; flex-wrap:wrap; margin:0 0 10px;
|
||||
padding:8px 10px; border-left:3px solid var(--warn);
|
||||
background:color-mix(in srgb, var(--warn) 10%, var(--card)); border-radius:6px;">
|
||||
<span style="font-size:var(--fs-sm);">
|
||||
<strong>{{ held_manual_count }}</strong>
|
||||
{{ 'prezentare tinuta' if held_manual_count == 1 else 'prezentari tinute' }} manual.
|
||||
</span>
|
||||
<button type="button"
|
||||
onclick="var m=document.getElementById('modal-trimite-toate'); if(m){m.hidden=false;}"
|
||||
style="margin-left:auto; padding:4px 12px; font-size:13px; border-radius:6px;
|
||||
border:1px solid var(--accent); background:var(--accent); color:#fff;
|
||||
font-weight:600; cursor:pointer;">
|
||||
Trimite toate ({{ held_manual_count }})
|
||||
</button>
|
||||
</div>
|
||||
{% set cf_id = 'modal-trimite-toate' %}
|
||||
{% set cf_titlu = 'Trimiti toate prezentarile tinute?' %}
|
||||
{% set cf_count = held_manual_count %}
|
||||
{% set cf_env = env_bulk | default('prod') %}
|
||||
{% set cf_url = '/trimite-toate' %}
|
||||
{% set cf_vals = '{}' %}
|
||||
{% set cf_target = '#submissions-wrap' %}
|
||||
{% set cf_swap = 'innerHTML' %}
|
||||
{% set cf_confirm_label = 'Trimite toate (' ~ held_manual_count ~ ')' %}
|
||||
{% set cf_deschis = false %}
|
||||
{% include '_modal_confirma_trimitere.html' %}
|
||||
{% endif %}
|
||||
{# US-005 (PRD 5.19): bulk "Trimite toate (N)". Randat initial aici; re-randat prin OOB
|
||||
din _submissions.html la fiecare reincarcare a listei (fix staleness /code-review #3). #}
|
||||
{% include '_bulk_held_banner.html' %}
|
||||
|
||||
{% if blocate_total %}
|
||||
<div style="display:flex; align-items:center; gap:6px; flex-wrap:wrap; margin:0 0 10px;">
|
||||
@@ -71,6 +44,9 @@
|
||||
<input type="hidden" id="f-status" name="status" value="{{ status_filtru | default('', true) }}">
|
||||
{# Pagina curenta — actualizata prin OOB swap din _submissions.html; inclusa la reincarcari. #}
|
||||
<input type="hidden" id="f-page" name="page" value="1">
|
||||
{# US-007 (5.19): filtrul "doar tinute" — persistat prin OOB din _submissions.html, ca sa
|
||||
nu se piarda la reincarcare (trimiteriChanged) sau paginare (fix /code-review #2). #}
|
||||
<input type="hidden" id="f-held" name="held" value="{{ f_held | default('') }}">
|
||||
|
||||
{# === STANGA: Quick-pills de data (preset interval) + buton Custom ===
|
||||
Azi / 7 zile / 30 zile → seteaza interval preset si submitr automat.
|
||||
|
||||
@@ -5,6 +5,13 @@
|
||||
#}
|
||||
<input type="hidden" id="f-page" name="page" value="{{ page | default(1) }}" hx-swap-oob="true">
|
||||
|
||||
{# OOB: sincronizeaza filtrul "doar tinute" (#f-held) cu starea randata acum, ca reincarcarile
|
||||
(trimiteriChanged / paginare) sa-l pastreze in loc sa revina la lista completa (/code-review #2). #}
|
||||
<input type="hidden" id="f-held" name="held" value="{{ f_held | default('') }}" hx-swap-oob="true">
|
||||
|
||||
{# OOB: banner bulk "Trimite toate (N)" re-randat la fiecare reincarcare a listei (fix staleness). #}
|
||||
{% with banner_oob = true %}{% include '_bulk_held_banner.html' %}{% endwith %}
|
||||
|
||||
{# OOB: re-randeaza pill-urile de stare (in bara de filtre, in afara #submissions-wrap) cu
|
||||
contoarele si starea activa proaspete la fiecare reincarcare a tabelului. #}
|
||||
<span hx-swap-oob="innerHTML:#pills-categorii">{% include '_pills.html' %}</span>
|
||||
@@ -22,6 +29,23 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# US-007 (5.19): chip filtru activ "doar tinute" cu buton de golire (fix /code-review #2 —
|
||||
filtrul held e sticky prin OOB, deci ii dam un off-switch explicit). #}
|
||||
{% if f_held %}
|
||||
<div style="display:flex; align-items:center; gap:8px; margin-bottom:8px; font-size:var(--fs-sm);">
|
||||
<span style="display:inline-flex; align-items:center; gap:6px; padding:2px 10px; border-radius:99px;
|
||||
border:1px solid var(--warn); color:var(--warn); font-weight:600;">
|
||||
Doar tinute manual
|
||||
</span>
|
||||
<button type="button"
|
||||
onclick="var h=document.getElementById('f-held'); if(h){h.value='';} var f=document.getElementById('filtre-trimiteri'); if(f&&window.htmx){htmx.trigger(f,'submit');}"
|
||||
style="background:none; border:none; color:var(--muted); cursor:pointer;
|
||||
text-decoration:underline; font-size:var(--fs-sm);">
|
||||
Arata tot
|
||||
</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if rows %}
|
||||
{# Form bulk cu DOUA actiuni: (1) aplica cod RAR la selectate (bulk-fix, US-010),
|
||||
(2) sterge selectate (sterge-bulk). Selectia opereaza DOAR pe randuri blocate
|
||||
@@ -196,6 +220,7 @@
|
||||
{% if f_vehicul %}{% set pq = pq + "&vehicul=" + f_vehicul %}{% endif %}
|
||||
{% if f_data_de %}{% set pq = pq + "&data_de=" + f_data_de %}{% endif %}
|
||||
{% if f_data_pana %}{% set pq = pq + "&data_pana=" + f_data_pana %}{% endif %}
|
||||
{% if f_held %}{% set pq = pq + "&held=" + f_held %}{% endif %}
|
||||
|
||||
<nav aria-label="Paginare trimiteri"
|
||||
style="display:flex; justify-content:center; gap:4px; flex-wrap:wrap; margin-top:10px;">
|
||||
|
||||
@@ -150,6 +150,29 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# === Rand tinut manual (queued AND held=1) — afordanta de eliberare (US-005/US-010, 5.19).
|
||||
Buton dedicat „Trimite acum": elibereaza randul (held 1->0); worker-ul il preia la
|
||||
urmatorul poll. Reincarca lista + inchide modalul. Confirmare 1-linie (ireversibil). === #}
|
||||
{% if tinut %}
|
||||
<div class="detaliu-actiuni-jos" style="margin-top:14px; padding-top:12px; border-top:1px solid var(--line);">
|
||||
<p class="muted" style="margin:0 0 8px; font-size:12.5px;">
|
||||
Prezentare tinuta manual — nu a plecat la RAR. Elibereaz-o pentru trimitere.
|
||||
</p>
|
||||
<form hx-post="/trimitere/{{ id }}/trimite-acum"
|
||||
hx-target="#submissions-wrap" hx-swap="innerHTML"
|
||||
hx-confirm="Trimit aceasta prezentare la RAR? Declararea este ireversibila (FINALIZATA)."
|
||||
hx-on::after-request="document.getElementById('modal-detaliu').hidden=true"
|
||||
hx-disabled-elt="find button" style="margin:0;">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token }}">
|
||||
<button type="submit"
|
||||
style="border:1px solid var(--accent); background:var(--accent); color:#fff;
|
||||
font-weight:600; padding:6px 16px; border-radius:6px; cursor:pointer;">
|
||||
Trimite acum la RAR
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# === Actiuni de jos — primar Re-pune (doar error) + Sterge pe RAND SEPARAT === #}
|
||||
{% if status == 'error' or gestionabil %}
|
||||
<div class="detaliu-actiuni-jos" style="margin-top:14px; padding-top:12px; border-top:1px solid var(--line);">
|
||||
|
||||
Reference in New Issue
Block a user