From be450f9d85f24205249cf1e1775f3eccb36333d6 Mon Sep 17 00:00:00 2001 From: solocla Date: Wed, 15 Jul 2026 16:59:27 +0200 Subject: [PATCH 01/22] parts with save button --- public/userarea/modal_partsTable.php | 3 + public/userarea/partsTable.js | 645 ++++++++------------------- 2 files changed, 179 insertions(+), 469 deletions(-) diff --git a/public/userarea/modal_partsTable.php b/public/userarea/modal_partsTable.php index 143623a..75d945c 100644 --- a/public/userarea/modal_partsTable.php +++ b/public/userarea/modal_partsTable.php @@ -29,6 +29,9 @@
Elenco Parti
+ + + `; + fBtn.parentNode.insertBefore(bar, fBtn.nextSibling); + + fBtn.addEventListener("click", toggleFilters); + document + .getElementById("filterDeleteBtn") + .addEventListener("click", batchDelete); + document + .getElementById("filterRestrictBtn") + .addEventListener("click", toggleRestrict); + } + + // ── Event delegation ── + function attachEvents() { + // checkbox click + document.addEventListener("change", function (e) { + if (e.target.classList.contains("filter-row-checkbox")) { + const rowEl = e.target.closest(".grid-row"); + toggleRow(rowEl.dataset.id, e.target.checked); + } + }); + + // Seleziona / deseleziona tutti i FILTRATI visibili + document.addEventListener("change", function (e) { + if (e.target.id !== "filterSelectAll") return; + const on = e.target.checked; + document + .querySelectorAll("#gridRowContainer .grid-row") + .forEach((rowEl) => { + if (rowEl.style.display === "none") return; + const id = parseInt(rowEl.dataset.id, 10); + if (!id) return; + if (on) selected.add(id); + else selected.delete(id); + rowEl.classList.toggle("row-selected", on); + const cb = rowEl.querySelector(".filter-row-checkbox"); + if (cb) cb.checked = on; + }); + updateToolbar(); + }); + + // click su QUALSIASI punto della riga (tranne campi interattivi) = seleziona + document.addEventListener("click", function (e) { + if (!filtersActive) return; + const rowEl = e.target.closest("#gridRowContainer .grid-row"); + if (!rowEl) return; + + // ignora click su elementi interattivi + if ( + e.target.closest( + "input, select, textarea, button, a, .select2-container, .action-btn, .propagate-btn, .add-part-btn", + ) + ) { + // ma se ho cliccato proprio la checkbox, lascia fare al change + return; + } + + const cb = rowEl.querySelector(".filter-row-checkbox"); + if (!cb) return; + cb.checked = !cb.checked; + toggleRow(rowEl.dataset.id, cb.checked); + }); + + // filtri colonna live (debounce) + let t = null; + document.addEventListener("input", function (e) { + if (!e.target.classList.contains("filter-col-input")) return; + const key = e.target.dataset.colKey; + colFilters[key] = e.target.value; + clearTimeout(t); + t = setTimeout(applyVisibility, 200); + }); + } + + // ── Re-inietta dopo ogni re-render della griglia ── + function hookRerender() { + const orig = R().renderVisibleRows; + R().renderVisibleRows = function () { + orig.apply(this, arguments); + if (filtersActive) { + injectCheckboxes(); + applyVisibility(); + } + }; + } + + function init() { + if (!window.gridRenderer) { + console.error("[gridFilter] gridRenderer non trovato"); + return; + } + buildUI(); + attachEvents(); + hookRerender(); + } + + // parte dopo che gridRenderer ha finito init + if (document.readyState === "loading") { + document.addEventListener("DOMContentLoaded", () => + setTimeout(init, 300), + ); + } else { + setTimeout(init, 300); + } +})(); diff --git a/public/userarea/gridRenderer.js b/public/userarea/gridRenderer.js index 4048a94..24463da 100644 --- a/public/userarea/gridRenderer.js +++ b/public/userarea/gridRenderer.js @@ -1388,6 +1388,11 @@ if (column === "idclient") { data.forEach((row) => { + if ( + window.isTargetGridId && + !window.isTargetGridId(row.iddatadb) + ) + return; const oldClientId = row.idclient || ""; row.idclient = value; @@ -1421,6 +1426,11 @@ if (column === "cliente_fornitore_id") { data.forEach((row) => { + if ( + window.isTargetGridId && + !window.isTargetGridId(row.iddatadb) + ) + return; row.cliente_fornitore_id = value; row._dirty = true; }); @@ -1434,6 +1444,11 @@ const fixedKey = column.replace("fixed_", ""); data.forEach((row) => { + if ( + window.isTargetGridId && + !window.isTargetGridId(row.iddatadb) + ) + return; if (!row.fixedFields) row.fixedFields = {}; row.fixedFields[fixedKey] = value; row._dirty = true; @@ -1446,6 +1461,11 @@ if (col && (col.type === "detail" || col.type === "main_field")) { data.forEach((row) => { + if ( + window.isTargetGridId && + !window.isTargetGridId(row.iddatadb) + ) + return; if (!row.details) row.details = {}; row.details[col.key] = value; @@ -1760,3 +1780,127 @@ }, }; })(); +// =================== +// NAVIGAZIONE GRIGLIA CON FRECCE TASTIERA +// =================== +(function () { + // Naviga solo tra input di testo/numero/time e date-picker. + // I Select2 (client, fornitore, SceltaMultipla) sono esclusi: + // lì le frecce servono al dropdown. + function isNavigable(el) { + if (!el || !el.classList) return false; + if (!el.classList.contains("cell-input")) return false; + // Escludi i select (nativi o Select2) + if (el.tagName === "SELECT") return false; + if (el.classList.contains("select2-hidden-accessible")) return false; + return true; + } + + // Tutte le celle navigabili della riga, ordinate per data-index + function navCellsInRow($row) { + return $row.find(".grid-cell[data-index]").filter(function () { + const input = this.querySelector(".cell-input"); + return isNavigable(input); + }); + } + + function focusCellInput($cell) { + if (!$cell || !$cell.length) return; + const input = $cell.get(0).querySelector(".cell-input"); + if (!input) return; + input.focus(); + if (input.type !== "date" && typeof input.select === "function") { + try { + input.select(); + } catch (e) {} + } + } + + function atStart(el) { + if (el.type === "date" || el.type === "number" || el.type === "time") + return true; + return el.selectionStart === 0 && el.selectionEnd === 0; + } + + function atEnd(el) { + if (el.type === "date" || el.type === "number" || el.type === "time") + return true; + const len = (el.value || "").length; + return el.selectionStart === len && el.selectionEnd === len; + } + + $(document).on("keydown", "#gridRowContainer .cell-input", function (e) { + const el = this; + if (!isNavigable(el)) return; + + // Ignora se un dropdown Select2 è aperto + if ($(".select2-container--open").length) return; + + const key = e.key; + if ( + key !== "ArrowUp" && + key !== "ArrowDown" && + key !== "ArrowLeft" && + key !== "ArrowRight" + ) { + return; + } + + const $cell = $(el).closest(".grid-cell"); + const $row = $cell.closest(".grid-row"); + if (!$cell.length || !$row.length) return; + + const colIndex = $cell.attr("data-index"); + + // --- SU / GIÙ: stessa colonna (data-index), riga adiacente --- + if (key === "ArrowUp" || key === "ArrowDown") { + const $targetRow = + key === "ArrowUp" + ? $row.prev(".grid-row") + : $row.next(".grid-row"); + if (!$targetRow.length) return; + + e.preventDefault(); + + // Cella stessa colonna nella riga di destinazione + let $target = $targetRow.find( + `.grid-cell[data-index="${colIndex}"]`, + ); + + // Se quella colonna non è navigabile (es. è un select), + // cerca la più vicina navigabile nella riga + if ( + !$target.length || + !isNavigable($target.get(0).querySelector(".cell-input")) + ) { + const $cells = navCellsInRow($targetRow); + if (!$cells.length) return; + $target = $cells.first(); + } + + focusCellInput($target); + return; + } + + // --- SINISTRA / DESTRA: cella navigabile precedente/successiva nella riga --- + const $cells = navCellsInRow($row); + const curPos = $cells.index($cell); + if (curPos === -1) return; + + if (key === "ArrowLeft") { + if (!atStart(el)) return; + if (curPos <= 0) return; + e.preventDefault(); + focusCellInput($cells.eq(curPos - 1)); + return; + } + + if (key === "ArrowRight") { + if (!atEnd(el)) return; + if (curPos >= $cells.length - 1) return; + e.preventDefault(); + focusCellInput($cells.eq(curPos + 1)); + return; + } + }); +})(); diff --git a/public/userarea/imported.php b/public/userarea/imported.php index c728f3b..39ae9f8 100644 --- a/public/userarea/imported.php +++ b/public/userarea/imported.php @@ -1328,6 +1328,117 @@ $gridMeta = [ outline: 2px solid #dc3545 !important; outline-offset: -2px; } + + /* ── Filtri / selezione righe ── */ + #filtersToggleBtn.active { + background-color: #0dcaf0 !important; + color: #fff !important; + border-color: #0dcaf0 !important; + } + + /* checkbox dentro la cella Actions */ + .filter-cb-wrap { + display: none; + align-items: center; + justify-content: center; + margin-right: 6px; + flex-shrink: 0; + } + + .grid-container.filters-on .filter-cb-wrap { + display: inline-flex; + } + + .filter-cb-wrap input { + width: 18px !important; + height: 18px !important; + cursor: pointer; + } + + .grid-container.filters-on .button-cell { + display: flex; + align-items: center; + } + + .grid-row.row-selected { + background-color: #cfe9ff !important; + } + + .grid-row.row-selected .button-cell, + .grid-row.row-selected .grid-cell:nth-child(2), + .grid-row.row-selected .grid-cell:nth-child(3) { + background-color: #cfe9ff !important; + } + + .grid-filter-row { + background: #eef6f9 !important; + border-bottom: 2px solid #0dcaf0; + } + + .grid-filter-row .grid-cell { + padding: 4px 8px; + } + + .grid-filter-row .filter-actions-cell { + background: #eef6f9 !important; + } + + .grid-container.filters-on .grid-row { + cursor: pointer; + } + + .grid-container.filters-on .grid-row input, + .grid-container.filters-on .grid-row select, + .grid-container.filters-on .grid-row textarea, + .grid-container.filters-on .grid-row button, + .grid-container.filters-on .grid-row a { + cursor: auto; + } + + /* Sticky su riga propagazione e filtri (fix scroll orizzontale) */ + .grid-top .grid-cell.save-all-cell { + position: sticky !important; + left: 0; + z-index: 9; + background: #fff; + } + + .grid-top .grid-cell:nth-child(2) { + position: sticky !important; + left: 210px; + z-index: 8; + background: #fff; + } + + = 2): ?>.grid-top .grid-cell:nth-child(3) { + position: sticky !important; + left: 360px; + z-index: 7; + background: #fff; + } + + .grid-filter-row .filter-actions-cell { + position: sticky !important; + left: 0; + z-index: 9; + background: #eef6f9 !important; + } + + .grid-filter-row .grid-cell:nth-child(2) { + position: sticky !important; + left: 210px; + z-index: 8; + background: #eef6f9 !important; + } + + = 2): ?>.grid-filter-row .grid-cell:nth-child(3) { + position: sticky !important; + left: 360px; + z-index: 7; + background: #eef6f9 !important; + } + + Edit Imported Data - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?> @@ -1456,6 +1567,7 @@ $gridMeta = [ + diff --git a/public/userarea/stats_export_lims.php b/public/userarea/stats_export_lims.php index 797d13f..a48c10c 100644 --- a/public/userarea/stats_export_lims.php +++ b/public/userarea/stats_export_lims.php @@ -103,30 +103,31 @@
-
+
-
Export mese
-
0
- Dati dal 16/07/2026 +
Campioni mese
+
0
+ Commesse: 0 · dal 16/07/2026
-
Export anno
-
0
- Dati dal 16/07/2026 +
Campioni anno
+
0
+ Commesse: 0 · dal 16/07/2026
-
Export giorno (status L)
-
0
+
Campioni esportati (giorno)
+
0
+ Commesse: 0
@@ -146,14 +147,6 @@
-
-
-
-
Clienti distinti
-
0
-
-
-
@@ -222,7 +215,8 @@ ID Cliente Cliente - Export + Campioni + Commesse @@ -243,7 +237,8 @@ ID Utente Utente - Export + Campioni + Commesse @@ -295,6 +290,10 @@ data: 'clientname', defaultContent: '—' }, + { + data: 'parts', + className: 'text-end' + }, { data: 'tot', className: 'text-end' @@ -318,6 +317,10 @@ data: 'username', defaultContent: '—' }, + { + data: 'parts', + className: 'text-end' + }, { data: 'tot', className: 'text-end' @@ -428,11 +431,13 @@ return; } - // KPI - $('#kpiExport').text(res.totals.export); - $('#kpiExportMonth').text(res.totalsMonth ? res.totalsMonth.export : 0); - $('#kpiExportYear').text(res.totalsYear ? res.totalsYear.export : 0); - $('#kpiClienti').text(res.byClient.length); + // KPI — dato principale = parti/campioni, sotto le commesse + $('#kpiParts').text(res.totals.parts ?? 0); + $('#kpiExport').text(res.totals.export ?? 0); + $('#kpiPartsMonth').text(res.totalsMonth ? (res.totalsMonth.parts ?? 0) : 0); + $('#kpiExportMonth').text(res.totalsMonth ? (res.totalsMonth.export ?? 0) : 0); + $('#kpiPartsYear').text(res.totalsYear ? (res.totalsYear.parts ?? 0) : 0); + $('#kpiExportYear').text(res.totalsYear ? (res.totalsYear.export ?? 0) : 0); $('#kpiLimsSamples').text(res.limsSamples ?? 0); $('#limsSamplesInput').val(res.limsSamples ?? ''); @@ -452,25 +457,26 @@ } const limsTot = parseInt(res.limsSamples ?? 0, 10); + const partsTot = parseInt(res.totals.parts ?? 0, 10); if (limsTot > 0) { - const perc = (res.totals.export / limsTot) * 100; + const perc = (partsTot / limsTot) * 100; $('#kpiPerc').text(perc.toFixed(1) + '%'); } else { $('#kpiPerc').text('—'); } - // Torta esportati vs totale - renderPie(res.totals.export, limsTot); + // Torta parti esportate vs totale inserito nel LIMS + renderPie(partsTot, limsTot); - // Grafici + // Grafici — valori = campioni/parti const clientTop = topN(res.byClient); const userTop = topN(res.byUser); chartClienti = renderBarChart(chartClienti, 'chartClienti', clientTop.map(r => r.clientname ? (r.clientname + ' (' + r.idclient + ')') : ('ID ' + r.idclient)), - clientTop.map(r => r.tot), 'Export'); + clientTop.map(r => r.parts), 'Campioni'); chartUtenti = renderBarChart(chartUtenti, 'chartUtenti', userTop.map(r => r.username ? (r.username + ' (' + r.user_id + ')') : ('ID ' + r.user_id)), - userTop.map(r => r.tot), 'Export'); + userTop.map(r => r.parts), 'Campioni'); // Tabelle dtClienti.clear().rows.add(res.byClient).draw(); diff --git a/public/userarea/stats_export_lims_data.php b/public/userarea/stats_export_lims_data.php index a918633..9191332 100644 --- a/public/userarea/stats_export_lims_data.php +++ b/public/userarea/stats_export_lims_data.php @@ -15,14 +15,17 @@ try { } // --- Export per cliente (status = 'l', giornata su export_date) --- + // tot = numero commesse, parts = numero parti/campioni $stmtC = $pdo->prepare(" SELECT d.idclient AS idclient, - COUNT(*) AS tot + COUNT(DISTINCT d.iddatadb) AS tot, + COUNT(ip.id) AS parts FROM datadb d + LEFT JOIN identification_parts ip ON ip.iddatadb = d.iddatadb WHERE d.status = 'l' AND DATE(d.export_date) = :d GROUP BY d.idclient - ORDER BY tot DESC + ORDER BY parts DESC "); $stmtC->execute(['d' => $date]); $byClient = $stmtC->fetchAll(PDO::FETCH_ASSOC); @@ -38,16 +41,19 @@ try { } // --- Export per utente (status = 'l', giornata su export_date) --- + // tot = numero commesse, parts = numero parti/campioni $stmtU = $pdo->prepare(" SELECT d.user_id AS user_id, TRIM(CONCAT(COALESCE(u.first_name,''),' ',COALESCE(u.last_name,''))) AS username, - COUNT(*) AS tot + COUNT(DISTINCT d.iddatadb) AS tot, + COUNT(ip.id) AS parts FROM datadb d LEFT JOIN auth_users u ON u.id = d.user_id + LEFT JOIN identification_parts ip ON ip.iddatadb = d.iddatadb WHERE d.status = 'l' AND DATE(d.export_date) = :d GROUP BY d.user_id, username - ORDER BY tot DESC + ORDER BY parts DESC "); $stmtU->execute(['d' => $date]); $byUser = $stmtU->fetchAll(PDO::FETCH_ASSOC); @@ -56,6 +62,7 @@ try { foreach ($byClient as &$r) { $r['idclient'] = $r['idclient'] !== null ? (int)$r['idclient'] : null; $r['tot'] = (int)$r['tot']; + $r['parts'] = (int)$r['parts']; $nm = $clientNames[$r['idclient']] ?? ''; $r['clientname'] = $nm !== '' ? $nm : null; } @@ -63,6 +70,7 @@ try { foreach ($byUser as &$r) { $r['user_id'] = $r['user_id'] !== null ? (int)$r['user_id'] : null; $r['tot'] = (int)$r['tot']; + $r['parts'] = (int)$r['parts']; if (isset($r['username'])) $r['username'] = $r['username'] !== null && $r['username'] !== '' ? $r['username'] : null; } unset($r); @@ -70,7 +78,19 @@ try { // --- Totale export della giornata --- $totExport = array_sum(array_column($byClient, 'tot')); - // --- Totale export del MESE della data selezionata (status = 'l') --- + // --- Totale PARTI/CAMPIONI della giornata (righe identification_parts legate + // ai datadb esportati status='l' in questa giornata) --- + $stmtP = $pdo->prepare(" + SELECT COUNT(*) + FROM identification_parts ip + INNER JOIN datadb d ON d.iddatadb = ip.iddatadb + WHERE d.status = 'l' + AND DATE(d.export_date) = :d + "); + $stmtP->execute(['d' => $date]); + $totParts = (int)$stmtP->fetchColumn(); + + // --- Totale COMMESSE del MESE (status = 'l') --- $stmtM = $pdo->prepare(" SELECT COUNT(*) FROM datadb d @@ -80,7 +100,18 @@ try { $stmtM->execute(['m' => $d->format('Y-m')]); $totExportMonth = (int)$stmtM->fetchColumn(); - // --- Totale export dell'ANNO della data selezionata (status = 'l') --- + // --- Totale PARTI del MESE (status = 'l') --- + $stmtMP = $pdo->prepare(" + SELECT COUNT(*) + FROM identification_parts ip + INNER JOIN datadb d ON d.iddatadb = ip.iddatadb + WHERE d.status = 'l' + AND DATE_FORMAT(d.export_date, '%Y-%m') = :m + "); + $stmtMP->execute(['m' => $d->format('Y-m')]); + $totPartsMonth = (int)$stmtMP->fetchColumn(); + + // --- Totale COMMESSE dell'ANNO (status = 'l') --- $stmtY = $pdo->prepare(" SELECT COUNT(*) FROM datadb d @@ -90,6 +121,17 @@ try { $stmtY->execute(['y' => $d->format('Y')]); $totExportYear = (int)$stmtY->fetchColumn(); + // --- Totale PARTI dell'ANNO (status = 'l') --- + $stmtYP = $pdo->prepare(" + SELECT COUNT(*) + FROM identification_parts ip + INNER JOIN datadb d ON d.iddatadb = ip.iddatadb + WHERE d.status = 'l' + AND YEAR(d.export_date) = :y + "); + $stmtYP->execute(['y' => $d->format('Y')]); + $totPartsYear = (int)$stmtYP->fetchColumn(); + // --- Campioni totali inseriti nel LIMS per la giornata (tabella lims_daily_samples) --- $stmtL = $pdo->prepare("SELECT total_samples FROM lims_daily_samples WHERE sample_date = :d LIMIT 1"); $stmtL->execute(['d' => $date]); @@ -101,9 +143,9 @@ try { 'date' => $date, 'month' => $d->format('Y-m'), 'year' => (int)$d->format('Y'), - 'totals' => ['export' => (int)$totExport], - 'totalsMonth' => ['export' => $totExportMonth], - 'totalsYear' => ['export' => $totExportYear], + 'totals' => ['export' => (int)$totExport, 'parts' => $totParts], + 'totalsMonth' => ['export' => $totExportMonth, 'parts' => $totPartsMonth], + 'totalsYear' => ['export' => $totExportYear, 'parts' => $totPartsYear], 'byClient' => $byClient, 'byUser' => $byUser, 'limsSamples' => $limsSamples, From ff676376ab52b448236ef22d7c616636ec5562fb Mon Sep 17 00:00:00 2001 From: solocla Date: Fri, 17 Jul 2026 09:19:23 +0200 Subject: [PATCH 04/22] fixed filter --- public/userarea/gridFilter.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/public/userarea/gridFilter.js b/public/userarea/gridFilter.js index b6774a9..389a194 100644 --- a/public/userarea/gridFilter.js +++ b/public/userarea/gridFilter.js @@ -390,15 +390,24 @@ }); } + // ── Ripristina stato filtri dopo un re-render (checkbox + restrizione) ── + function restoreFilterState() { + if (!filtersActive) return; + injectCheckboxes(); + applyVisibility(); // ri-applica sia filtri colonna sia restringi selezione + } + // ── Re-inietta dopo ogni re-render della griglia ── function hookRerender() { const orig = R().renderVisibleRows; R().renderVisibleRows = function () { - orig.apply(this, arguments); - if (filtersActive) { - injectCheckboxes(); - applyVisibility(); - } + const ret = orig.apply(this, arguments); + // sincrono + restoreFilterState(); + // e di nuovo dopo il tick, per coprire re-render dentro .then() async + setTimeout(restoreFilterState, 0); + setTimeout(restoreFilterState, 50); + return ret; }; } From 86b1c8420d29167270064a9caa9eec89af0b3525 Mon Sep 17 00:00:00 2001 From: solocla Date: Fri, 17 Jul 2026 09:30:55 +0200 Subject: [PATCH 05/22] fixed rebuild grid --- public/userarea/gridFilter.js | 40 +++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/public/userarea/gridFilter.js b/public/userarea/gridFilter.js index 389a194..201c61d 100644 --- a/public/userarea/gridFilter.js +++ b/public/userarea/gridFilter.js @@ -391,24 +391,36 @@ } // ── Ripristina stato filtri dopo un re-render (checkbox + restrizione) ── + let _restoring = false; function restoreFilterState() { - if (!filtersActive) return; - injectCheckboxes(); - applyVisibility(); // ri-applica sia filtri colonna sia restringi selezione + if (!filtersActive || _restoring) return; + _restoring = true; // evita loop con l'observer mentre iniettiamo/nascondiamo + try { + injectCheckboxes(); + applyVisibility(); // ri-applica filtri colonna E restringi selezione + } finally { + // rilascia dopo il tick così le nostre mutazioni non ci ri-triggerano subito + setTimeout(() => { + _restoring = false; + }, 0); + } } - // ── Re-inietta dopo ogni re-render della griglia ── + // ── Observer: qualunque cosa ricrei le righe (propagazione, save, ecc.) + // ripristina automaticamente checkbox + restrizione. Robusto perché + // non dipende da chi chiama renderVisibleRows. ── function hookRerender() { - const orig = R().renderVisibleRows; - R().renderVisibleRows = function () { - const ret = orig.apply(this, arguments); - // sincrono - restoreFilterState(); - // e di nuovo dopo il tick, per coprire re-render dentro .then() async - setTimeout(restoreFilterState, 0); - setTimeout(restoreFilterState, 50); - return ret; - }; + const rowC = document.getElementById("gridRowContainer"); + if (!rowC) return; + + const obs = new MutationObserver(() => { + if (!filtersActive || _restoring) return; + // debounce leggero: aspetta che il render finisca + clearTimeout(hookRerender._t); + hookRerender._t = setTimeout(restoreFilterState, 30); + }); + + obs.observe(rowC, { childList: true }); } function init() { From c2fd2dc470bcfa89b02acb327a4a070c6f4e4eb3 Mon Sep 17 00:00:00 2001 From: solocla Date: Fri, 17 Jul 2026 10:46:33 +0200 Subject: [PATCH 06/22] fixed export and save to selection --- public/userarea/clone_parts_to_visible.php | 23 ++ public/userarea/exportLims_gridData.js | 417 +++++++++++++++------ public/userarea/modal_partsTable.php | 6 + public/userarea/partsTable.js | 18 +- public/userarea/saveAll.js | 118 ++++-- 5 files changed, 423 insertions(+), 159 deletions(-) diff --git a/public/userarea/clone_parts_to_visible.php b/public/userarea/clone_parts_to_visible.php index 23a4f3a..a2a9222 100644 --- a/public/userarea/clone_parts_to_visible.php +++ b/public/userarea/clone_parts_to_visible.php @@ -14,6 +14,7 @@ $targetList = $data['target_iddatadb_list'] ?? []; // (comportamento di default richiesto, coerente con la checkbox pre-spuntata) $cloneNotes = array_key_exists('clone_notes', $data) ? !empty($data['clone_notes']) : true; $cloneAnalyses = !empty($data['clone_analyses']); +$overwrite = !empty($data['overwrite']); $targetIds = array_values(array_unique(array_filter(array_map('intval', (array)$targetList), function ($v) use ($sourceIddatadb) { return $v > 0 && $v !== $sourceIddatadb; @@ -93,6 +94,28 @@ try { $details = []; $totalClonedParts = 0; $totalClonedAnalyses = 0; + $totalDeletedParts = 0; + + // 2b. Se overwrite: elimina le parti esistenti dei target (e i loro figli) + if ($overwrite) { + $stmtSelectExisting = $pdo->prepare("SELECT id FROM identification_parts WHERE iddatadb = ?"); + $stmtDeleteCFByPart = $pdo->prepare("DELETE FROM identification_parts_customfields WHERE part_id = ?"); + $stmtDeleteAnByPart = $pdo->prepare("DELETE FROM identification_parts_analyses WHERE part_id = ?"); + $stmtDeletePart = $pdo->prepare("DELETE FROM identification_parts WHERE id = ?"); + + foreach ($targetIds as $targetIddatadb) { + $stmtSelectExisting->execute([$targetIddatadb]); + $existingIds = $stmtSelectExisting->fetchAll(PDO::FETCH_COLUMN); + + foreach ($existingIds as $existingPartId) { + $existingPartId = (int)$existingPartId; + $stmtDeleteCFByPart->execute([$existingPartId]); + $stmtDeleteAnByPart->execute([$existingPartId]); + $stmtDeletePart->execute([$existingPartId]); + $totalDeletedParts++; + } + } + } // 3. Clone source parts to each target record foreach ($targetIds as $targetIddatadb) { diff --git a/public/userarea/exportLims_gridData.js b/public/userarea/exportLims_gridData.js index 3c1730a..44bb57a 100644 --- a/public/userarea/exportLims_gridData.js +++ b/public/userarea/exportLims_gridData.js @@ -5,7 +5,7 @@ * Single export + batch export (Export All) with validation. */ (function () { - 'use strict'; + "use strict"; let pendingConfirmHandler = null; let batchRunning = false; @@ -17,7 +17,7 @@ // ── Helpers ────────────────────────────────────────────────────────── function cleanupBackdrop() { - document.querySelectorAll(".modal-backdrop").forEach(b => b.remove()); + document.querySelectorAll(".modal-backdrop").forEach((b) => b.remove()); document.body.classList.remove("modal-open"); document.body.style.paddingRight = ""; const overlay = document.querySelector(".overlay.toggle-icon"); @@ -29,7 +29,9 @@ } function getRowIndexByIddatadb(iddatadb) { - return (window.gridData || []).findIndex(r => String(r.iddatadb) === String(iddatadb)); + return (window.gridData || []).findIndex( + (r) => String(r.iddatadb) === String(iddatadb), + ); } // ── Validation ────────────────────────────────────────────────────── @@ -40,21 +42,31 @@ headers: { "Content-Type": "application/json" }, body: JSON.stringify({ rows: rowsToValidate }), }); - if (!response.ok) throw new Error(`Validation HTTP error: ${response.status}`); + if (!response.ok) + throw new Error(`Validation HTTP error: ${response.status}`); return response.json(); } function clearValidationErrors() { // Clear from gridData - (window.gridData || []).forEach(row => { delete row._validationErrors; delete row._exportError; }); - - document.querySelectorAll(".grid-cell.validation-error").forEach(cell => { - cell.classList.remove("validation-error"); - cell.querySelectorAll(".input-validation-error").forEach(el => el.classList.remove("input-validation-error")); - const tooltip = cell.querySelector(".validation-tooltip"); - if (tooltip) tooltip.remove(); + (window.gridData || []).forEach((row) => { + delete row._validationErrors; + delete row._exportError; }); - document.querySelectorAll(".grid-row.validation-row-error").forEach(row => row.classList.remove("validation-row-error")); + + document + .querySelectorAll(".grid-cell.validation-error") + .forEach((cell) => { + cell.classList.remove("validation-error"); + cell.querySelectorAll(".input-validation-error").forEach((el) => + el.classList.remove("input-validation-error"), + ); + const tooltip = cell.querySelector(".validation-tooltip"); + if (tooltip) tooltip.remove(); + }); + document + .querySelectorAll(".grid-row.validation-row-error") + .forEach((row) => row.classList.remove("validation-row-error")); clearAllRowErrors(); } @@ -67,7 +79,7 @@ gridRow.classList.add("validation-row-error"); const messages = []; - errors.forEach(err => { + errors.forEach((err) => { messages.push(err.message); if (!err.field) return; @@ -76,19 +88,26 @@ const label = err.field.substring("field_label:".length); const headers = document.querySelectorAll(".grid-header"); let targetIndex = null; - headers.forEach(h => { - if (h.textContent.trim() === label) targetIndex = h.getAttribute("data-index"); + headers.forEach((h) => { + if (h.textContent.trim() === label) + targetIndex = h.getAttribute("data-index"); }); if (targetIndex) { - cell = gridRow.querySelector(`.grid-cell[data-index="${targetIndex}"]`); + cell = gridRow.querySelector( + `.grid-cell[data-index="${targetIndex}"]`, + ); } } else { - cell = gridRow.querySelector(`.grid-cell[data-col="${err.field}"]`); + cell = gridRow.querySelector( + `.grid-cell[data-col="${err.field}"]`, + ); } if (cell) { cell.classList.add("validation-error"); - cell.querySelectorAll("input, select").forEach(el => el.classList.add("input-validation-error")); + cell.querySelectorAll("input, select").forEach((el) => + el.classList.add("input-validation-error"), + ); let tooltip = cell.querySelector(".validation-tooltip"); if (!tooltip) { tooltip = document.createElement("div"); @@ -109,34 +128,43 @@ formData.append("iddatadb", iddatadb); if (batchUuid) formData.append("batch_uuid", batchUuid); - const response = await fetch("export_to_lims.php", { method: "POST", body: formData }); - if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`); + const response = await fetch("export_to_lims.php", { + method: "POST", + body: formData, + }); + if (!response.ok) + throw new Error(`HTTP error! status: ${response.status}`); const data = await response.json(); if (data.success) { // Update gridData const idx = getRowIndexByIddatadb(iddatadb); if (idx >= 0) { - window.gridData[idx].status = 'l'; + window.gridData[idx].status = "l"; window.gridData[idx].commessaweb = data.commessaweb; } // Update visible DOM row const gridRow = getGridRow(iddatadb); if (gridRow) { - const statusBadge = gridRow.querySelector('.grid-cell[data-col="status"] .status-badge'); + const statusBadge = gridRow.querySelector( + '.grid-cell[data-col="status"] .status-badge', + ); if (statusBadge) { statusBadge.classList.remove("status-i", "status-P"); statusBadge.classList.add("status-l"); statusBadge.textContent = "To LIMS"; } - const statusCell = gridRow.querySelector('.grid-cell[data-col="status"]'); + const statusCell = gridRow.querySelector( + '.grid-cell[data-col="status"]', + ); if (statusCell && data.commessaweb) { let cwSpan = statusCell.querySelector(".commessaweb-code"); if (!cwSpan) { cwSpan = document.createElement("span"); cwSpan.className = "commessaweb-code"; - cwSpan.style.cssText = "display:block; font-size:0.75em; color:#555; margin-top:2px;"; + cwSpan.style.cssText = + "display:block; font-size:0.75em; color:#555; margin-top:2px;"; statusCell.appendChild(cwSpan); } cwSpan.textContent = data.commessaweb; @@ -164,7 +192,8 @@ const label = document.getElementById("exportResponseModalLabel"); if (data.success) { - msg.innerHTML = `${data.message.replace(/\n/g, "
")}` + + msg.innerHTML = + `${data.message.replace(/\n/g, "
")}` + `
ID CommessaWeb: ${data.idcommessaweb}` + `
Codice CommessaWeb: ${data.commessaweb}` + (data.totalPhotos > 0 ? `
Foto: ${data.totalPhotos}` : ""); @@ -186,10 +215,14 @@ row.classList.remove("batch-disabled"); row.classList.add("batch-exporting"); if (btnCell) { - btnCell.querySelectorAll(".action-btn").forEach(b => { b.dataset.prevDisplay = b.style.display; b.style.display = "none"; }); + btnCell.querySelectorAll(".action-btn").forEach((b) => { + b.dataset.prevDisplay = b.style.display; + b.style.display = "none"; + }); const spinner = document.createElement("span"); spinner.className = "batch-row-spinner"; - spinner.innerHTML = ' Exporting...'; + spinner.innerHTML = + ' Exporting...'; btnCell.appendChild(spinner); } } else { @@ -197,7 +230,10 @@ if (btnCell) { const spinner = btnCell.querySelector(".batch-row-spinner"); if (spinner) spinner.remove(); - btnCell.querySelectorAll(".action-btn").forEach(b => { b.style.display = b.dataset.prevDisplay || ""; delete b.dataset.prevDisplay; }); + btnCell.querySelectorAll(".action-btn").forEach((b) => { + b.style.display = b.dataset.prevDisplay || ""; + delete b.dataset.prevDisplay; + }); } } } @@ -213,32 +249,56 @@ errorEl.className = "batch-error-msg"; errorEl.textContent = "Warning — click for details"; errorEl.addEventListener("click", () => { - document.getElementById("exportResponseMessage").innerHTML = message.replace(/\n/g, "
"); - document.getElementById("exportResponseModalLabel").textContent = "Error (id: " + iddatadb + ")"; - new bootstrap.Modal(document.getElementById("exportResponseModal"), { keyboard: false }).show(); + document.getElementById("exportResponseMessage").innerHTML = + message.replace(/\n/g, "
"); + document.getElementById( + "exportResponseModalLabel", + ).textContent = "Error (id: " + iddatadb + ")"; + new bootstrap.Modal( + document.getElementById("exportResponseModal"), + { keyboard: false }, + ).show(); }); btnCell.appendChild(errorEl); } } function clearAllRowErrors() { - document.querySelectorAll(".grid-row.batch-row-error").forEach(row => { - row.classList.remove("batch-row-error"); - const msg = row.querySelector(".batch-error-msg"); - if (msg) msg.remove(); - }); + document + .querySelectorAll(".grid-row.batch-row-error") + .forEach((row) => { + row.classList.remove("batch-row-error"); + const msg = row.querySelector(".batch-error-msg"); + if (msg) msg.remove(); + }); } function disableAllRowButtons() { - document.querySelectorAll(".grid-row[data-id]").forEach(row => row.classList.add("batch-disabled")); - const toggle = document.querySelector(".actions-dropdown .dropdown-toggle"); - if (toggle) { toggle.disabled = true; toggle.style.opacity = "0.5"; toggle.style.pointerEvents = "none"; } + document + .querySelectorAll(".grid-row[data-id]") + .forEach((row) => row.classList.add("batch-disabled")); + const toggle = document.querySelector( + ".actions-dropdown .dropdown-toggle", + ); + if (toggle) { + toggle.disabled = true; + toggle.style.opacity = "0.5"; + toggle.style.pointerEvents = "none"; + } } function enableAllRowButtons() { - document.querySelectorAll(".grid-row[data-id]").forEach(row => row.classList.remove("batch-disabled")); - const toggle = document.querySelector(".actions-dropdown .dropdown-toggle"); - if (toggle) { toggle.disabled = false; toggle.style.opacity = ""; toggle.style.pointerEvents = ""; } + document + .querySelectorAll(".grid-row[data-id]") + .forEach((row) => row.classList.remove("batch-disabled")); + const toggle = document.querySelector( + ".actions-dropdown .dropdown-toggle", + ); + if (toggle) { + toggle.disabled = false; + toggle.style.opacity = ""; + toggle.style.pointerEvents = ""; + } } // ── Single row export: validate → confirm → send ──────────────────── @@ -250,40 +310,61 @@ if (gridRow) { setRowExporting(gridRow, true); const spinner = gridRow.querySelector(".batch-row-spinner"); - if (spinner) spinner.innerHTML = ' Validating...'; + if (spinner) + spinner.innerHTML = + ' Validating...'; } validateRows([{ iddatadb: parseInt(iddatadb), index: rowIndex }]) - .then(validationData => { - if (gridRow) { setRowExporting(gridRow, false); gridRow.classList.remove("batch-disabled"); } + .then((validationData) => { + if (gridRow) { + setRowExporting(gridRow, false); + gridRow.classList.remove("batch-disabled"); + } if (!validationData.success) { - showExportResult({ success: false, message: validationData.message || "Validation error" }); + showExportResult({ + success: false, + message: validationData.message || "Validation error", + }); return; } const result = validationData.results[rowIndex]; if (result && !result.valid) { - if (gridRow) showValidationErrors(gridRow, iddatadb, result.errors); + if (gridRow) + showValidationErrors(gridRow, iddatadb, result.errors); return; } showConfirmAndExport(iddatadb, rowIndex); }) - .catch(error => { - if (gridRow) { setRowExporting(gridRow, false); gridRow.classList.remove("batch-disabled"); } - showExportResult({ success: false, message: "Validation error: " + error.message }); + .catch((error) => { + if (gridRow) { + setRowExporting(gridRow, false); + gridRow.classList.remove("batch-disabled"); + } + showExportResult({ + success: false, + message: "Validation error: " + error.message, + }); }); } function showConfirmAndExport(iddatadb, rowIndex) { - const confirmModalElement = document.getElementById("exportConfirmModal"); + const confirmModalElement = + document.getElementById("exportConfirmModal"); if (!confirmModalElement) return; - const confirmModal = new bootstrap.Modal(confirmModalElement, { keyboard: false }); + const confirmModal = new bootstrap.Modal(confirmModalElement, { + keyboard: false, + }); document.getElementById("exportIddatadb").textContent = iddatadb; confirmModal.show(); const confirmBtn = document.getElementById("exportConfirmBtn"); - if (!confirmBtn) { confirmModal.hide(); return; } + if (!confirmBtn) { + confirmModal.hide(); + return; + } const confirmHandler = async () => { pendingConfirmHandler = null; @@ -294,24 +375,36 @@ try { const data = await sendExport(iddatadb); - if (gridRow) { setRowExporting(gridRow, false); gridRow.classList.remove("batch-disabled"); } - if (!data.success) showRowError(gridRow, iddatadb, data.message || "Unknown error"); + if (gridRow) { + setRowExporting(gridRow, false); + gridRow.classList.remove("batch-disabled"); + } + if (!data.success) + showRowError( + gridRow, + iddatadb, + data.message || "Unknown error", + ); showExportResult(data); } catch (error) { - if (gridRow) { setRowExporting(gridRow, false); gridRow.classList.remove("batch-disabled"); } + if (gridRow) { + setRowExporting(gridRow, false); + gridRow.classList.remove("batch-disabled"); + } showRowError(gridRow, iddatadb, error.message); showExportResult({ success: false, message: error.message }); } }; - if (pendingConfirmHandler) confirmBtn.removeEventListener("click", pendingConfirmHandler); + if (pendingConfirmHandler) + confirmBtn.removeEventListener("click", pendingConfirmHandler); pendingConfirmHandler = confirmHandler; confirmBtn.addEventListener("click", confirmHandler, { once: true }); } // ── Single row click (event delegation) ───────────────────────────── - $(document).on('click', '.export-lims-btn', function (e) { + $(document).on("click", ".export-lims-btn", function (e) { e.preventDefault(); if (batchRunning) return; @@ -322,24 +415,34 @@ // Check unsaved changes for this row const dataRow = window.gridData?.[rowIndex]; if (dataRow && dataRow._dirty) { - const unsavedModal = new bootstrap.Modal(document.getElementById("exportUnsavedModal"), { keyboard: false }); + const unsavedModal = new bootstrap.Modal( + document.getElementById("exportUnsavedModal"), + { keyboard: false }, + ); unsavedModal.show(); - document.getElementById("saveAndExportBtn")?.addEventListener("click", () => { - unsavedModal.hide(); - // Save first, then export - const formData = window.buildSavePayload(rowIndex); - fetch('save_edited_row.php', { method: 'POST', body: formData }) - .then(r => r.json()) - .then(result => { - if (result.success) { - dataRow._dirty = false; - startExportConfirmFlow(iddatadb, rowIndex); - } else { - alert('Save failed: ' + result.message); - } - }); - }, { once: true }); + document.getElementById("saveAndExportBtn")?.addEventListener( + "click", + () => { + unsavedModal.hide(); + // Save first, then export + const formData = window.buildSavePayload(rowIndex); + fetch("save_edited_row.php", { + method: "POST", + body: formData, + }) + .then((r) => r.json()) + .then((result) => { + if (result.success) { + dataRow._dirty = false; + startExportConfirmFlow(iddatadb, rowIndex); + } else { + alert("Save failed: " + result.message); + } + }); + }, + { once: true }, + ); return; } @@ -349,18 +452,33 @@ // ── Batch export (Export All) ─────────────────────────────────────── function collectEligibleRows() { - // Read from gridData, not DOM + // Read from gridData, not DOM. Se i filtri sono attivi, limita al target set. + const target = + typeof window.getTargetGridIds === "function" + ? window.getTargetGridIds() + : null; const eligible = []; (window.gridData || []).forEach((row, index) => { - if (row.status !== 'l') { - eligible.push({ iddatadb: row.iddatadb, index, row: getGridRow(row.iddatadb) }); - } + if (row.status === "l") return; + if (target && !target.has(parseInt(row.iddatadb, 10))) return; + eligible.push({ + iddatadb: row.iddatadb, + index, + row: getGridRow(row.iddatadb), + }); }); return eligible; } function hasUnsavedChanges() { - return (window.gridData || []).some(r => r._dirty); + const target = + typeof window.getTargetGridIds === "function" + ? window.getTargetGridIds() + : null; + return (window.gridData || []).some( + (r) => + r._dirty && (!target || target.has(parseInt(r.iddatadb, 10))), + ); } async function validateAndFilter(eligibleRows) { @@ -369,7 +487,8 @@ index, })); const validationData = await validateRows(rowsToValidate); - if (!validationData.success) throw new Error(validationData.message || "Validation error"); + if (!validationData.success) + throw new Error(validationData.message || "Validation error"); const validRows = []; let invalidCount = 0; @@ -377,7 +496,12 @@ for (const item of eligibleRows) { const result = validationData.results[item.index]; if (result && !result.valid) { - if (item.row) showValidationErrors(item.row, item.iddatadb, result.errors); + if (item.row) + showValidationErrors( + item.row, + item.iddatadb, + result.errors, + ); invalidCount++; } else { validRows.push(item); @@ -410,54 +534,92 @@ if (validRows.length === 0) { document.getElementById("exportResponseMessage").innerHTML = `No valid rows for export.
${invalidCount} rows with validation errors.`; - document.getElementById("exportResponseModalLabel").textContent = "Validation Failed"; - new bootstrap.Modal(document.getElementById("exportResponseModal"), { keyboard: false }).show(); + document.getElementById( + "exportResponseModalLabel", + ).textContent = "Validation Failed"; + new bootstrap.Modal( + document.getElementById("exportResponseModal"), + { keyboard: false }, + ).show(); return; } - const confirmModal = new bootstrap.Modal(document.getElementById("exportBatchConfirmModal"), { keyboard: false }); + const confirmModal = new bootstrap.Modal( + document.getElementById("exportBatchConfirmModal"), + { keyboard: false }, + ); let countText = String(validRows.length); - if (invalidCount > 0) countText += ` (${invalidCount} excluded due to errors)`; - document.getElementById("exportBatchCount").textContent = countText; + if (invalidCount > 0) + countText += ` (${invalidCount} excluded due to errors)`; + document.getElementById("exportBatchCount").textContent = + countText; confirmModal.show(); - const confirmBtn = document.getElementById("exportBatchConfirmBtn"); - if (pendingBatchConfirmHandler) confirmBtn.removeEventListener("click", pendingBatchConfirmHandler); + const confirmBtn = document.getElementById( + "exportBatchConfirmBtn", + ); + if (pendingBatchConfirmHandler) + confirmBtn.removeEventListener( + "click", + pendingBatchConfirmHandler, + ); pendingBatchConfirmHandler = () => { pendingBatchConfirmHandler = null; confirmModal.hide(); startBatchExport(validRows); }; - confirmBtn.addEventListener("click", pendingBatchConfirmHandler, { once: true }); + confirmBtn.addEventListener( + "click", + pendingBatchConfirmHandler, + { once: true }, + ); }) - .catch(error => { + .catch((error) => { showValidationSpinner(false); - document.getElementById("exportResponseMessage").textContent = "Validation error: " + error.message; - document.getElementById("exportResponseModalLabel").textContent = "Validation Error"; - new bootstrap.Modal(document.getElementById("exportResponseModal"), { keyboard: false }).show(); + document.getElementById("exportResponseMessage").textContent = + "Validation error: " + error.message; + document.getElementById( + "exportResponseModalLabel", + ).textContent = "Validation Error"; + new bootstrap.Modal( + document.getElementById("exportResponseModal"), + { keyboard: false }, + ).show(); }); } - $(document).on('click', '.export-all-lims-btn', function (e) { + $(document).on("click", ".export-all-lims-btn", function (e) { e.preventDefault(); if (batchRunning) return; if (hasUnsavedChanges()) { - const unsavedModal = new bootstrap.Modal(document.getElementById("exportBatchUnsavedModal"), { keyboard: false }); + const unsavedModal = new bootstrap.Modal( + document.getElementById("exportBatchUnsavedModal"), + { keyboard: false }, + ); unsavedModal.show(); - document.getElementById("batchSaveAndExportBtn")?.addEventListener("click", () => { - unsavedModal.hide(); - // Trigger save all first — listen for completion - alert("Please Save All first, then Export All."); - }, { once: true }); + document.getElementById("batchSaveAndExportBtn")?.addEventListener( + "click", + () => { + unsavedModal.hide(); + // Trigger save all first — listen for completion + alert("Please Save All first, then Export All."); + }, + { once: true }, + ); return; } const eligibleRows = collectEligibleRows(); if (eligibleRows.length === 0) { - document.getElementById("exportResponseMessage").textContent = "All rows already exported to LIMS."; - document.getElementById("exportResponseModalLabel").textContent = "Export All"; - new bootstrap.Modal(document.getElementById("exportResponseModal"), { keyboard: false }).show(); + document.getElementById("exportResponseMessage").textContent = + "All rows already exported to LIMS."; + document.getElementById("exportResponseModalLabel").textContent = + "Export All"; + new bootstrap.Modal( + document.getElementById("exportResponseModal"), + { keyboard: false }, + ).show(); return; } showBatchConfirm(eligibleRows); @@ -468,7 +630,9 @@ batchRunning = true; const batchUuid = crypto.randomUUID(); const total = eligibleRows.length; - let processed = 0, succeeded = 0, failed = 0; + let processed = 0, + succeeded = 0, + failed = 0; disableAllRowButtons(); @@ -479,18 +643,25 @@ if (cancelBtn) cancelBtn.disabled = false; if (statusEl) statusEl.textContent = `Exporting 0 / ${total}...`; - cancelBtn?.addEventListener("click", () => { - batchCancelled = true; - if (statusEl) statusEl.textContent = "Cancelling... (waiting for current row)"; - if (cancelBtn) cancelBtn.disabled = true; - }, { once: true }); + cancelBtn?.addEventListener( + "click", + () => { + batchCancelled = true; + if (statusEl) + statusEl.textContent = + "Cancelling... (waiting for current row)"; + if (cancelBtn) cancelBtn.disabled = true; + }, + { once: true }, + ); (async () => { for (let i = 0; i < eligibleRows.length; i++) { if (batchCancelled) break; const { iddatadb, row } = eligibleRows[i]; - if (statusEl) statusEl.textContent = `Exporting ${processed + 1} / ${total} (id: ${iddatadb})...`; + if (statusEl) + statusEl.textContent = `Exporting ${processed + 1} / ${total} (id: ${iddatadb})...`; const gridRow = row || getGridRow(iddatadb); if (gridRow) setRowExporting(gridRow, true); @@ -503,18 +674,29 @@ } else { failed++; const errIdx = getRowIndexByIddatadb(iddatadb); - if (errIdx >= 0) window.gridData[errIdx]._exportError = data.message || "Unknown error"; - if (gridRow) showRowError(gridRow, iddatadb, data.message || "Unknown error"); + if (errIdx >= 0) + window.gridData[errIdx]._exportError = + data.message || "Unknown error"; + if (gridRow) + showRowError( + gridRow, + iddatadb, + data.message || "Unknown error", + ); } } catch (error) { processed++; failed++; const errIdx = getRowIndexByIddatadb(iddatadb); - if (errIdx >= 0) window.gridData[errIdx]._exportError = error.message; + if (errIdx >= 0) + window.gridData[errIdx]._exportError = error.message; if (gridRow) showRowError(gridRow, iddatadb, error.message); } - if (gridRow) { setRowExporting(gridRow, false); gridRow.classList.remove("batch-disabled"); } + if (gridRow) { + setRowExporting(gridRow, false); + gridRow.classList.remove("batch-disabled"); + } } batchRunning = false; @@ -529,7 +711,8 @@ (window.gridData || []).forEach((row, idx) => { if (row._exportError) { const gridRow = getGridRow(row.iddatadb); - if (gridRow) showRowError(gridRow, row.iddatadb, row._exportError); + if (gridRow) + showRowError(gridRow, row.iddatadb, row._exportError); } }); @@ -549,7 +732,9 @@ const modalEl = document.getElementById("exportResponseModal"); new bootstrap.Modal(modalEl, { keyboard: false }).show(); - modalEl.addEventListener("hidden.bs.modal", cleanupBackdrop, { once: true }); + modalEl.addEventListener("hidden.bs.modal", cleanupBackdrop, { + once: true, + }); })(); } })(); diff --git a/public/userarea/modal_partsTable.php b/public/userarea/modal_partsTable.php index 75d945c..0157a2c 100644 --- a/public/userarea/modal_partsTable.php +++ b/public/userarea/modal_partsTable.php @@ -214,6 +214,12 @@ Duplica anche le analisi collegate +
+ + +
diff --git a/public/userarea/partsTable.js b/public/userarea/partsTable.js index c91a67e..5b1ef61 100644 --- a/public/userarea/partsTable.js +++ b/public/userarea/partsTable.js @@ -555,6 +555,14 @@ $(document).ready(function () { // =================== function getVisiblePartsRecordList() { + // Se i filtri sono attivi, usa la regola selezione/visibili di gridFilter. + if (typeof window.getTargetGridIds === "function") { + const target = window.getTargetGridIds(); + if (target && target.size > 0) { + return [...target].map((v) => parseInt(v, 10)).filter(Boolean); + } + } + const listFromModal = $("#partsModal").data("visible-iddatadb-list"); if (Array.isArray(listFromModal) && listFromModal.length > 0) { @@ -2265,8 +2273,11 @@ $(document).ready(function () { const sourceIddatadb = parseInt($("#partsModal").data("iddatadb"), 10) || null; - const visibleListRaw = - $("#partsModal").data("visible-iddatadb-list") || []; + // Target = selezione/visibili secondo gridFilter, con fallback alla lista del modal + let visibleListRaw = + typeof getVisiblePartsRecordList === "function" + ? getVisiblePartsRecordList() + : $("#partsModal").data("visible-iddatadb-list") || []; if (!sourceIddatadb) { const errorMsg = $( @@ -2308,6 +2319,7 @@ $(document).ready(function () { ); $("#cloneNotesCheckbox").prop("checked", true); $("#cloneAnalysesCheckbox").prop("checked", false); + $("#cloneOverwriteCheckbox").prop("checked", true); const modalInstance = new bootstrap.Modal( document.getElementById("cloneConfirmModal"), @@ -2323,6 +2335,7 @@ $(document).ready(function () { const targetIds = $("#cloneConfirmModal").data("target-ids") || []; const cloneNotes = $("#cloneNotesCheckbox").is(":checked"); const cloneAnalyses = $("#cloneAnalysesCheckbox").is(":checked"); + const cloneOverwrite = $("#cloneOverwriteCheckbox").is(":checked"); if (!sourceIddatadb || !targetIds.length) { return; @@ -2351,6 +2364,7 @@ $(document).ready(function () { target_iddatadb_list: targetIds, clone_notes: cloneNotes, clone_analyses: cloneAnalyses, + overwrite: cloneOverwrite, }), success: function (response) { $btn.prop("disabled", false).html(originalHtml); diff --git a/public/userarea/saveAll.js b/public/userarea/saveAll.js index 28fb515..290fd1b 100644 --- a/public/userarea/saveAll.js +++ b/public/userarea/saveAll.js @@ -1,8 +1,8 @@ /** * saveAll.js — Save All functionality using gridData */ -(function() { - 'use strict'; +(function () { + "use strict"; let saveAllRunning = false; @@ -11,7 +11,7 @@ } // ── Save single row ────────────────────────────────────────────────── - $(document).on('click', '.save-btn', async function() { + $(document).on("click", ".save-btn", async function () { const btn = this; const rowIndex = parseInt(btn.dataset.row); const row = window.gridData?.[rowIndex]; @@ -23,29 +23,44 @@ try { const formData = window.buildSavePayload(rowIndex); - const resp = await fetch('save_edited_row.php', { method: 'POST', body: formData }); + const resp = await fetch("save_edited_row.php", { + method: "POST", + body: formData, + }); const result = await resp.json(); if (result.success) { row._dirty = false; - if (window.gridRenderer?.clearDirty) window.gridRenderer.clearDirty(rowIndex); + if (window.gridRenderer?.clearDirty) + window.gridRenderer.clearDirty(rowIndex); // Flash success on row without re-rendering (preserves Select2 state) - const gridRow = document.querySelector(`.grid-row[data-id="${row.iddatadb}"]`); + const gridRow = document.querySelector( + `.grid-row[data-id="${row.iddatadb}"]`, + ); if (gridRow) { - gridRow.classList.remove('row-dirty'); - gridRow.querySelectorAll('.grid-cell').forEach(cell => { - cell.classList.remove('cell-changed'); - cell.classList.add('flash-success'); + gridRow.classList.remove("row-dirty"); + gridRow.querySelectorAll(".grid-cell").forEach((cell) => { + cell.classList.remove("cell-changed"); + cell.classList.add("flash-success"); }); - setTimeout(() => gridRow.querySelectorAll('.flash-success').forEach(c => c.classList.remove('flash-success')), 500); + setTimeout( + () => + gridRow + .querySelectorAll(".flash-success") + .forEach((c) => + c.classList.remove("flash-success"), + ), + 500, + ); } - const toastEl = document.getElementById('saveSuccessToast'); - if (toastEl) bootstrap.Toast.getOrCreateInstance(toastEl).show(); + const toastEl = document.getElementById("saveSuccessToast"); + if (toastEl) + bootstrap.Toast.getOrCreateInstance(toastEl).show(); } else { - alert('Errore: ' + result.message); + alert("Errore: " + result.message); } } catch (e) { - alert('Errore: ' + e.message); + alert("Errore: " + e.message); } finally { btn.innerHTML = origHtml; btn.disabled = false; @@ -53,49 +68,68 @@ }); // ── Save All ───────────────────────────────────────────────────────── - $(document).on('click', '.save-all-btn', function(e) { + $(document).on("click", ".save-all-btn", function (e) { e.preventDefault(); if (isBusy()) return; - const modalEl = document.getElementById('saveAllConfirmModal'); + const modalEl = document.getElementById("saveAllConfirmModal"); if (!modalEl) return; new bootstrap.Modal(modalEl, { keyboard: false }).show(); }); - $(document).on('click', '#saveAllConfirmBtn', async function() { - const confirmModal = bootstrap.Modal.getInstance(document.getElementById('saveAllConfirmModal')); + $(document).on("click", "#saveAllConfirmBtn", async function () { + const confirmModal = bootstrap.Modal.getInstance( + document.getElementById("saveAllConfirmModal"), + ); if (confirmModal) confirmModal.hide(); saveAllRunning = true; - const bar = document.getElementById('batchExportBar'); - const statusEl = document.getElementById('batchExportStatus'); - const cancelBtn = document.getElementById('exportBatchCancelBtn'); - if (bar) bar.style.display = ''; - if (cancelBtn) cancelBtn.style.display = 'none'; - if (statusEl) statusEl.textContent = 'Saving...'; + const bar = document.getElementById("batchExportBar"); + const statusEl = document.getElementById("batchExportStatus"); + const cancelBtn = document.getElementById("exportBatchCancelBtn"); + if (bar) bar.style.display = ""; + if (cancelBtn) cancelBtn.style.display = "none"; + if (statusEl) statusEl.textContent = "Saving..."; const data = window.gridData || []; - const dirtyRows = data.map((r, i) => r._dirty ? i : -1).filter(i => i >= 0); + const target = + typeof window.getTargetGridIds === "function" + ? window.getTargetGridIds() + : null; + const dirtyRows = data + .map((r, i) => (r._dirty ? i : -1)) + .filter((i) => i >= 0) + .filter( + (i) => !target || target.has(parseInt(data[i].iddatadb, 10)), + ); if (dirtyRows.length === 0) { saveAllRunning = false; - if (bar) bar.style.display = 'none'; - const msgEl = document.getElementById('saveAllResultMessage'); - if (msgEl) msgEl.textContent = 'No changes to save.'; - new bootstrap.Modal(document.getElementById('saveAllResultModal')).show(); + if (bar) bar.style.display = "none"; + const msgEl = document.getElementById("saveAllResultMessage"); + if (msgEl) msgEl.textContent = "No changes to save."; + new bootstrap.Modal( + document.getElementById("saveAllResultModal"), + ).show(); return; } - let success = 0, fail = 0; + let success = 0, + fail = 0; for (const idx of dirtyRows) { - if (statusEl) statusEl.textContent = `Saving ${success + fail + 1} / ${dirtyRows.length}...`; + if (statusEl) + statusEl.textContent = `Saving ${success + fail + 1} / ${dirtyRows.length}...`; try { const formData = window.buildSavePayload(idx); - const resp = await fetch('save_edited_row.php', { method: 'POST', body: formData }); + const resp = await fetch("save_edited_row.php", { + method: "POST", + body: formData, + }); const result = await resp.json(); if (result.success) { data[idx]._dirty = false; - if (window.gridRenderer?.clearDirty) window.gridRenderer.clearDirty(idx); + if (window.gridRenderer?.clearDirty) + window.gridRenderer.clearDirty(idx); success++; } else { fail++; @@ -106,22 +140,24 @@ } saveAllRunning = false; - if (bar) bar.style.display = 'none'; + if (bar) bar.style.display = "none"; const gr = window.gridRenderer; if (gr) gr.renderVisibleRows(); - const msg = `Saved: ${success}` + (fail > 0 ? `, Errors: ${fail}` : ''); - const msgEl = document.getElementById('saveAllResultMessage'); + const msg = `Saved: ${success}` + (fail > 0 ? `, Errors: ${fail}` : ""); + const msgEl = document.getElementById("saveAllResultMessage"); if (msgEl) msgEl.textContent = msg; - new bootstrap.Modal(document.getElementById('saveAllResultModal')).show(); + new bootstrap.Modal( + document.getElementById("saveAllResultModal"), + ).show(); }); // ── beforeunload ───────────────────────────────────────────────────── - window.addEventListener('beforeunload', function(e) { - if (window.gridData && window.gridData.some(r => r._dirty)) { + window.addEventListener("beforeunload", function (e) { + if (window.gridData && window.gridData.some((r) => r._dirty)) { e.preventDefault(); - e.returnValue = ''; + e.returnValue = ""; } }); From 1107e003f8e156a9990bcd727bc36414119e8898 Mon Sep 17 00:00:00 2001 From: solocla Date: Fri, 17 Jul 2026 10:53:31 +0200 Subject: [PATCH 07/22] update stats monthly --- public/userarea/stats_export_lims_monthly.php | 48 +++++++++++------- .../stats_export_lims_monthly_data.php | 50 +++++++++++++++---- 2 files changed, 71 insertions(+), 27 deletions(-) diff --git a/public/userarea/stats_export_lims_monthly.php b/public/userarea/stats_export_lims_monthly.php index 3d81b79..e66b49c 100644 --- a/public/userarea/stats_export_lims_monthly.php +++ b/public/userarea/stats_export_lims_monthly.php @@ -109,17 +109,18 @@
-
Export mese (status L)
-
0
+
Campioni mese
+
0
+ Commesse: 0
-
Export anno — (status L)
-
0
- Dati a partire dal 16/07/2026 +
Campioni anno —
+
0
+ Commesse: 0 · dal 16/07/2026
@@ -154,7 +155,7 @@
-
Export per cliente (idclient) — top 15
+
Campioni per cliente (idclient) — top 15
@@ -164,7 +165,7 @@
-
Export per utente (user_id) — top 15
+
Campioni per utente (user_id) — top 15
@@ -187,7 +188,8 @@ ID Cliente Cliente - Export + Campioni + Commesse @@ -208,7 +210,8 @@ ID Utente Utente - Export + Campioni + Commesse @@ -273,6 +276,10 @@ data: 'clientname', defaultContent: '—' }, + { + data: 'parts', + className: 'text-end' + }, { data: 'tot', className: 'text-end' @@ -296,6 +303,10 @@ data: 'username', defaultContent: '—' }, + { + data: 'parts', + className: 'text-end' + }, { data: 'tot', className: 'text-end' @@ -359,32 +370,35 @@ return; } - // KPI mese - $('#kpiExport').text(res.totals.export); + // KPI mese — dato principale = campioni/parti, sotto le commesse + $('#kpiParts').text(res.totals.parts ?? 0); + $('#kpiExport').text(res.totals.export ?? 0); $('#kpiClienti').text(res.byClient.length); $('#kpiLimsSamples').text(res.limsSamples ?? 0); const limsTot = parseInt(res.limsSamples ?? 0, 10); + const partsTot = parseInt(res.totals.parts ?? 0, 10); if (limsTot > 0) { - const perc = (res.totals.export / limsTot) * 100; + const perc = (partsTot / limsTot) * 100; $('#kpiPerc').text(perc.toFixed(1) + '%'); } else { $('#kpiPerc').text('—'); } - // Box annuale - $('#kpiExportYear').text(res.totalsYear.export); + // Box annuale — campioni + commesse + $('#kpiPartsYear').text(res.totalsYear ? (res.totalsYear.parts ?? 0) : 0); + $('#kpiExportYear').text(res.totalsYear ? (res.totalsYear.export ?? 0) : 0); $('#yearLabel').text(res.year); - // Grafici + // Grafici — valori = campioni/parti const clientTop = topN(res.byClient); const userTop = topN(res.byUser); chartClienti = renderBarChart(chartClienti, 'chartClienti', clientTop.map(r => r.clientname ? (r.clientname + ' (' + r.idclient + ')') : ('ID ' + r.idclient)), - clientTop.map(r => r.tot), 'Export'); + clientTop.map(r => r.parts), 'Campioni'); chartUtenti = renderBarChart(chartUtenti, 'chartUtenti', userTop.map(r => r.username ? (r.username + ' (' + r.user_id + ')') : ('ID ' + r.user_id)), - userTop.map(r => r.tot), 'Export'); + userTop.map(r => r.parts), 'Campioni'); // Tabelle dtClienti.clear().rows.add(res.byClient).draw(); diff --git a/public/userarea/stats_export_lims_monthly_data.php b/public/userarea/stats_export_lims_monthly_data.php index f5ff68c..4535459 100644 --- a/public/userarea/stats_export_lims_monthly_data.php +++ b/public/userarea/stats_export_lims_monthly_data.php @@ -16,15 +16,18 @@ try { $year = $dm->format('Y'); - // --- Export per cliente (status = 'l', giornata su export_date, filtro mese) --- + // --- Export per cliente (status = 'l', filtro mese) --- + // tot = numero commesse, parts = numero parti/campioni $stmtC = $pdo->prepare(" SELECT d.idclient AS idclient, - COUNT(*) AS tot + COUNT(DISTINCT d.iddatadb) AS tot, + COUNT(ip.id) AS parts FROM datadb d + LEFT JOIN identification_parts ip ON ip.iddatadb = d.iddatadb WHERE d.status = 'l' AND DATE_FORMAT(d.export_date, '%Y-%m') = :m GROUP BY d.idclient - ORDER BY tot DESC + ORDER BY parts DESC "); $stmtC->execute(['m' => $month]); $byClient = $stmtC->fetchAll(PDO::FETCH_ASSOC); @@ -40,16 +43,19 @@ try { } // --- Export per utente (status = 'l', filtro mese) --- + // tot = numero commesse, parts = numero parti/campioni $stmtU = $pdo->prepare(" SELECT d.user_id AS user_id, TRIM(CONCAT(COALESCE(u.first_name,''),' ',COALESCE(u.last_name,''))) AS username, - COUNT(*) AS tot + COUNT(DISTINCT d.iddatadb) AS tot, + COUNT(ip.id) AS parts FROM datadb d LEFT JOIN auth_users u ON u.id = d.user_id + LEFT JOIN identification_parts ip ON ip.iddatadb = d.iddatadb WHERE d.status = 'l' AND DATE_FORMAT(d.export_date, '%Y-%m') = :m GROUP BY d.user_id, username - ORDER BY tot DESC + ORDER BY parts DESC "); $stmtU->execute(['m' => $month]); $byUser = $stmtU->fetchAll(PDO::FETCH_ASSOC); @@ -58,6 +64,7 @@ try { foreach ($byClient as &$r) { $r['idclient'] = $r['idclient'] !== null ? (int)$r['idclient'] : null; $r['tot'] = (int)$r['tot']; + $r['parts'] = (int)$r['parts']; $nm = $clientNames[$r['idclient']] ?? ''; $r['clientname'] = $nm !== '' ? $nm : null; } @@ -65,16 +72,28 @@ try { foreach ($byUser as &$r) { $r['user_id'] = $r['user_id'] !== null ? (int)$r['user_id'] : null; $r['tot'] = (int)$r['tot']; + $r['parts'] = (int)$r['parts']; if (isset($r['username'])) $r['username'] = $r['username'] !== null && $r['username'] !== '' ? $r['username'] : null; } unset($r); - // --- Totale export del mese --- + // --- Totale COMMESSE del mese --- $totExport = array_sum(array_column($byClient, 'tot')); - // --- Totale export dell'ANNO del mese selezionato --- + // --- Totale PARTI/CAMPIONI del mese (status = 'l') --- + $stmtP = $pdo->prepare(" + SELECT COUNT(*) + FROM identification_parts ip + INNER JOIN datadb d ON d.iddatadb = ip.iddatadb + WHERE d.status = 'l' + AND DATE_FORMAT(d.export_date, '%Y-%m') = :m + "); + $stmtP->execute(['m' => $month]); + $totParts = (int)$stmtP->fetchColumn(); + + // --- Totale COMMESSE dell'ANNO del mese selezionato --- $stmtY = $pdo->prepare(" - SELECT COUNT(*) + SELECT COUNT(*) FROM datadb d WHERE d.status = 'l' AND YEAR(d.export_date) = :y @@ -82,6 +101,17 @@ try { $stmtY->execute(['y' => $year]); $totExportYear = (int)$stmtY->fetchColumn(); + // --- Totale PARTI dell'ANNO del mese selezionato --- + $stmtYP = $pdo->prepare(" + SELECT COUNT(*) + FROM identification_parts ip + INNER JOIN datadb d ON d.iddatadb = ip.iddatadb + WHERE d.status = 'l' + AND YEAR(d.export_date) = :y + "); + $stmtYP->execute(['y' => $year]); + $totPartsYear = (int)$stmtYP->fetchColumn(); + // --- Campioni LIMS: somma dei total_samples di tutti i giorni del mese --- $stmtL = $pdo->prepare(" SELECT COALESCE(SUM(total_samples), 0) @@ -95,8 +125,8 @@ try { 'success' => true, 'month' => $month, 'year' => (int)$year, - 'totals' => ['export' => (int)$totExport], - 'totalsYear' => ['export' => $totExportYear], + 'totals' => ['export' => (int)$totExport, 'parts' => $totParts], + 'totalsYear' => ['export' => $totExportYear, 'parts' => $totPartsYear], 'byClient' => $byClient, 'byUser' => $byUser, 'limsSamples' => $limsSamples, From 232f8244bf6dbbd00baaa9e3e7ca81bb6658da0a Mon Sep 17 00:00:00 2001 From: solocla Date: Fri, 17 Jul 2026 11:01:51 +0200 Subject: [PATCH 08/22] fixed dirty rows --- public/userarea/gridRenderer.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/userarea/gridRenderer.js b/public/userarea/gridRenderer.js index 24463da..582082f 100644 --- a/public/userarea/gridRenderer.js +++ b/public/userarea/gridRenderer.js @@ -968,6 +968,11 @@ if (!row) return; + // Salta le righe nascoste (filtrate / non nella selezione ristretta): + // non devono essere sincronizzate né marcate dirty. + const rowEl = cell.closest(".grid-row"); + if (rowEl && rowEl.style.display === "none") return; + const colType = cell.dataset.colType; const colKey = cell.dataset.col; const input = cell.querySelector(".cell-input"); From 05356fc98bf7b5bd8a2375d3c0ff9b0634b4ce64 Mon Sep 17 00:00:00 2001 From: solocla Date: Fri, 17 Jul 2026 13:58:50 +0200 Subject: [PATCH 09/22] readded clona parti --- public/userarea/modal_partsTable.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/userarea/modal_partsTable.php b/public/userarea/modal_partsTable.php index 0157a2c..422c913 100644 --- a/public/userarea/modal_partsTable.php +++ b/public/userarea/modal_partsTable.php @@ -48,6 +48,9 @@ + From c3f3e824dc15974b6c48b3fedfe4be57ea969161 Mon Sep 17 00:00:00 2001 From: "r.mubarakzyanov" Date: Sun, 19 Jul 2026 13:05:00 +0300 Subject: [PATCH 10/22] server side filtering and ui-fixes --- public/userarea/filter_records.php | 340 ++++++++++++++++++ public/userarea/gridFilter.js | 309 +++++++++++++++- public/userarea/imported.php | 3 +- public/userarea/include/grid_data_builder.php | 213 +++++++++++ 4 files changed, 860 insertions(+), 5 deletions(-) create mode 100644 public/userarea/filter_records.php create mode 100644 public/userarea/include/grid_data_builder.php diff --git a/public/userarea/filter_records.php b/public/userarea/filter_records.php new file mode 100644 index 0000000..2ed5565 --- /dev/null +++ b/public/userarea/filter_records.php @@ -0,0 +1,340 @@ +getConnection(); + +const FILTER_ALLOWED_PER_PAGE = [20, 40, 60, 100]; +const FILTER_ALLIDS_CAP = 5000; + +$body = json_decode(file_get_contents('php://input'), true) ?: []; + +$templateId = (int)($body['template_id'] ?? 0); +if ($templateId <= 0) { + echo json_encode(['success' => false, 'message' => 'template_id mancante']); + exit; +} + +$status = in_array($body['status'] ?? 'i', ['i', 'P', 'l'], true) ? $body['status'] : 'i'; +$showAll = !empty($body['all_users']); +$importref = trim((string)($body['importref'] ?? '')); // scope su un singolo import +$filters = is_array($body['filters'] ?? null) ? $body['filters'] : []; +$userId = (int)($iduserlogin ?? 0); +$perPage = in_array((int)($body['per_page'] ?? 20), FILTER_ALLOWED_PER_PAGE, true) ? (int)$body['per_page'] : 20; +$page = max(1, (int)($body['page'] ?? 1)); +$wantAllIds = !empty($body['want_all_ids']); + +$cacheDir = __DIR__ . '/cache'; + +$fixedAliasMap = [ + 'ClienteResponsabile' => 'cliente_responsabile_id', + 'ClienteFornitore' => 'cliente_fornitore_id', + 'ClienteAnalisi' => 'clienteAnalisi', + 'ClienteFatturazione' => 'ClienteFatturazione', + 'MoltiplicatorePrezzo' => 'moltiplicatore_prezzo_id', + 'AnagraficaCertestObject' => 'anagrafica_certest_object_id', + 'AnagraficaCertestService' => 'anagrafica_certest_service_id', + 'ConsegnaRichiesta' => 'consegna_richiesta', +]; +$staticCols = ['importreferencecode', 'filename_import', 'importdate', 'commessaweb']; + +// ── Risolutori "etichetta → lista di ID" via cache ──────────────────────── +function cacheItems(string $file): array +{ + if (!is_file($file)) return []; + $data = json_decode(file_get_contents($file), true); + if (!is_array($data)) return []; + return $data['value'] ?? $data ?? []; +} + +/** Clienti: label "Nome - X - id" (come search_clienti.php). */ +function resolveClientIdsByTerm(string $cacheDir, string $term): array +{ + $term = mb_strtolower(trim($term)); + if ($term === '') return []; + $ids = []; + foreach (cacheItems($cacheDir . '/clienti.json') as $c) { + $name = trim($c['Nominativo'] ?? ''); + $id = trim((string)($c['IdCliente'] ?? '')); + $code = trim((string)($c['CodiceCliente'] ?? '')); + $parts = explode('_', $code); + $suffix = trim($parts[1] ?? ''); + if ($suffix === '' && $code !== '') $suffix = substr($code, 0, 1); + if ($suffix === '') $suffix = '--'; + $label = mb_strtolower($name . ' - ' . $suffix . ' - ' . $id); + if (mb_strpos($label, $term) !== false) $ids[] = (int)$c['IdCliente']; + } + return array_values(array_unique($ids)); +} + +/** Dropdown generico: matcha il termine su qualsiasi label field, ritorna gli id. */ +function resolveIdsFromCache(string $file, string $idField, array $labelFields, string $term): array +{ + $term = mb_strtolower(trim($term)); + if ($term === '') return []; + $ids = []; + foreach (cacheItems($file) as $it) { + $hay = ''; + foreach ($labelFields as $lf) $hay .= ' ' . ($it[$lf] ?? ''); + if (mb_strpos(mb_strtolower($hay), $term) !== false && isset($it[$idField])) { + $ids[] = (int)$it[$idField]; + } + } + return array_values(array_unique($ids)); +} + +/** + * Per un fixed field che memorizza un ID, risolve il termine in lista di id. + * Ritorna: array di id (IN), [] se il termine non matcha nulla, null se la colonna + * non è risolvibile (→ il chiamante la salta invece di fare LIKE sbagliato). + */ +function resolveFixedIds(string $cacheDir, string $key, string $term): ?array +{ + switch ($key) { + case 'ClienteAnalisi': + case 'ClienteFatturazione': + return resolveClientIdsByTerm($cacheDir, $term); + case 'MoltiplicatorePrezzo': + return resolveIdsFromCache($cacheDir . '/moltiplicatori_prezzo.json', 'IdMoltiplicatorePrezzo', ['Codice', 'Descrizione'], $term); + case 'AnagraficaCertestObject': + return resolveIdsFromCache($cacheDir . '/anagrafica_certest_object.json', 'IdAnagrafica', ['Codice', 'NomeAnagrafica'], $term); + case 'AnagraficaCertestService': + return resolveIdsFromCache($cacheDir . '/anagrafica_certest_service.json', 'IdAnagrafica', ['Codice', 'NomeAnagrafica'], $term); + default: + // ClienteResponsabile (per-cliente) e altri: non risolvibili globalmente + return null; + } +} + +/** + * @return array lista di [idclient, idResponsabile] + */ +function resolveResponsabilePairs(string $cacheDir, string $term): array +{ + $term = mb_strtolower(trim($term)); + if ($term === '') return []; + $pairs = []; + foreach (glob($cacheDir . '/cliente_responsabili_*.json') ?: [] as $file) { + if (!preg_match('/cliente_responsabili_(\d+)\.json$/', $file, $m)) continue; + $cid = (int)$m[1]; + $data = json_decode(file_get_contents($file), true); + foreach (($data['Responsabili'] ?? []) as $r) { + $name = mb_strtolower((string)($r['Nominativo'] ?? '')); + if ($name !== '' && mb_strpos($name, $term) !== false && isset($r['IdClienteResponsabile'])) { + $pairs[] = [$cid, (int)$r['IdClienteResponsabile']]; + } + } + } + return $pairs; +} + +/** Meta di un mapping (data_type, field_id), con cache statica. */ +function mappingMeta(PDO $pdo, int $mappingId): array +{ + static $cache = []; + if (!array_key_exists($mappingId, $cache)) { + $st = $pdo->prepare("SELECT data_type, field_id FROM template_mapping WHERE id = ?"); + $st->execute([$mappingId]); + $cache[$mappingId] = $st->fetch(PDO::FETCH_ASSOC) ?: ['data_type' => 'Testo', 'field_id' => null]; + } + return $cache[$mappingId]; +} + +function resolveCustomFieldValueIds(string $cacheDir, $fieldId, string $term): array +{ + $fieldId = (int)$fieldId; + $term = mb_strtolower(trim($term)); + if ($fieldId <= 0 || $term === '') return []; + $ids = []; + foreach (cacheItems($cacheDir . "/customfield_{$fieldId}.json") as $it) { + $label = mb_strtolower((string)($it['Valore'] ?? '')); + if (mb_strpos($label, $term) !== false && isset($it['IdCustomFieldsValue'])) { + $ids[] = (int)$it['IdCustomFieldsValue']; + } + } + return array_values(array_unique($ids)); +} + +// ── Costruzione WHERE ────────────────────────────────────────────────────── +$conds = ['d.templateid = ?', 'd.status = ?']; +$params = [$templateId, $status]; +$needUserJoin = false; + +if (!$showAll) { + $conds[] = 'd.user_id = ?'; + $params[] = $userId; +} + +// Scope su un singolo import (come imported.php ?importref=) +if ($importref !== '') { + $conds[] = 'd.importreferencecode = ?'; + $params[] = $importref; +} + +/** Aggiunge una condizione "colonna id IN (lista risolta)". */ +function addIdInCondition(array &$conds, array &$params, string $col, array $ids): void +{ + if (empty($ids)) { + $conds[] = '1 = 0'; // termine dato ma nessun match → zero risultati + return; + } + $ph = implode(',', array_fill(0, count($ids), '?')); + $conds[] = "d.`{$col}` IN ($ph)"; + foreach ($ids as $id) $params[] = (int)$id; +} + +foreach ($filters as $f) { + $term = trim((string)($f['term'] ?? '')); + if ($term === '') continue; + $type = (string)($f['type'] ?? ''); + $key = (string)($f['key'] ?? ''); + $like = '%' . $term . '%'; + + switch ($type) { + case 'detail': + case 'main_field': + $mappingId = (int)$key; + if ($mappingId <= 0) break; + $mm = mappingMeta($pdo, $mappingId); + if (($mm['data_type'] ?? '') === 'SceltaMultipla') { + // Dropdown: field_value = ID valore → risolvi label→id, match IN (= non LIKE) + $vids = resolveCustomFieldValueIds($cacheDir, $mm['field_id'], $term); + if (empty($vids)) { + $conds[] = '1 = 0'; + break; + } + $inph = implode(',', array_fill(0, count($vids), '?')); + $conds[] = "EXISTS (SELECT 1 FROM import_data_details x + WHERE x.id = d.iddatadb AND x.mapping_id = ? AND x.field_value IN ($inph))"; + $params[] = $mappingId; + foreach ($vids as $vid) $params[] = $vid; + } else { + // Testo / Data: match testuale + $conds[] = "EXISTS (SELECT 1 FROM import_data_details x + WHERE x.id = d.iddatadb AND x.mapping_id = ? AND x.field_value LIKE ?)"; + $params[] = $mappingId; + $params[] = $like; + } + break; + + case 'idclient': + addIdInCondition($conds, $params, 'idclient', resolveClientIdsByTerm($cacheDir, $term)); + break; + + case 'cliente_fornitore_id': + addIdInCondition($conds, $params, 'cliente_fornitore_id', resolveClientIdsByTerm($cacheDir, $term)); + break; + + case 'tested_component': + $conds[] = 'd.tested_component LIKE ?'; + $params[] = $like; + break; + + case 'status': + // Il dropdown invia direttamente il codice ('i'/'P'/'l'). + if (in_array($term, ['i', 'P', 'l'], true)) { + $conds[] = 'd.status = ?'; + $params[] = $term; + } else { + $conds[] = '1 = 0'; + } + break; + + case 'fixed': + $col = $fixedAliasMap[$key] ?? null; + if ($col === null) break; + if ($key === 'ConsegnaRichiesta') { + // Data: match testuale sul valore data (es. "2026-03"). + $conds[] = "CAST(d.`{$col}` AS CHAR) LIKE ?"; + $params[] = $like; + } elseif ($key === 'ClienteResponsabile') { + // Match sulla coppia (idclient, id responsabile). + $pairs = resolveResponsabilePairs($cacheDir, $term); + if (empty($pairs)) { + $conds[] = '1 = 0'; + break; + } + $rowvals = implode(',', array_fill(0, count($pairs), '(?,?)')); + $conds[] = "(d.idclient, d.`{$col}`) IN ($rowvals)"; + foreach ($pairs as $pr) { + $params[] = $pr[0]; + $params[] = $pr[1]; + } + } else { + $ids = resolveFixedIds($cacheDir, $key, $term); + if ($ids === null) break; // non risolvibile → non filtrare (niente LIKE su id) + addIdInCondition($conds, $params, $col, $ids); + } + break; + + case 'static': + if ($key === 'user_name') { + $needUserJoin = true; + $conds[] = "CONCAT(COALESCE(u.first_name,''),' ',COALESCE(u.last_name,'')) LIKE ?"; + $params[] = $like; + } elseif (in_array($key, $staticCols, true)) { + $conds[] = "d.`{$key}` LIKE ?"; + $params[] = $like; + } + break; + + default: + break; // tracking/awb ecc. → non filtrabili + } +} + +$whereSql = implode(' AND ', $conds); +$joinSql = $needUserJoin ? 'LEFT JOIN auth_users u ON d.user_id = u.id' : ''; + +try { + // Totale + pagine + $countStmt = $pdo->prepare("SELECT COUNT(*) FROM datadb d {$joinSql} WHERE {$whereSql}"); + $countStmt->execute($params); + $total = (int)$countStmt->fetchColumn(); + $totalPages = max(1, (int)ceil($total / $perPage)); + if ($page > $totalPages) $page = $totalPages; + $offset = ($page - 1) * $perPage; + + // Pagina corrente + $pageStmt = $pdo->prepare(" + SELECT d.iddatadb + FROM datadb d {$joinSql} + WHERE {$whereSql} + ORDER BY d.excelrow ASC, d.iddatadb ASC + LIMIT {$perPage} OFFSET {$offset} + "); + $pageStmt->execute($params); + $pageIds = array_map('intval', $pageStmt->fetchAll(PDO::FETCH_COLUMN)); + + $config = buildGridConfig($pdo, $templateId); + $rows = buildGridRows($pdo, $pageIds, $config); + + $out = [ + 'success' => true, + 'total' => $total, + 'page' => $page, + 'per_page' => $perPage, + 'total_pages' => $totalPages, + 'rows' => $rows, + ]; + + // Tutti gli id del match (per "seleziona tutti"), solo su richiesta + if ($wantAllIds) { + $allStmt = $pdo->prepare(" + SELECT d.iddatadb FROM datadb d {$joinSql} + WHERE {$whereSql} + ORDER BY d.excelrow ASC, d.iddatadb ASC + LIMIT " . FILTER_ALLIDS_CAP . " + "); + $allStmt->execute($params); + $out['all_ids'] = array_map('intval', $allStmt->fetchAll(PDO::FETCH_COLUMN)); + $out['all_ids_capped'] = $total > FILTER_ALLIDS_CAP; + } + + echo json_encode($out); +} catch (Exception $e) { + error_log('filter_records error: ' . $e->getMessage()); + echo json_encode(['success' => false, 'message' => $e->getMessage()]); +} diff --git a/public/userarea/gridFilter.js b/public/userarea/gridFilter.js index 201c61d..1f9f056 100644 --- a/public/userarea/gridFilter.js +++ b/public/userarea/gridFilter.js @@ -21,8 +21,255 @@ return R().getMeta(); } - // ── Filtro: decide se una riga passa i filtri colonna ── + // ── Filtro SERVER-SIDE (paginato, come la lista normale ma filtrata) ────── + // Il filtro gira su TUTTO il template; il server restituisce UNA PAGINA di righe + // filtrate + il totale, e navighiamo le pagine del set filtrato via AJAX. + const TEMPLATE_ID = + new URLSearchParams(location.search).get("id") || (meta().templateId ?? ""); + const SHOW_ALL = + new URLSearchParams(location.search).get("all_users") === "1"; + const IMPORTREF = + new URLSearchParams(location.search).get("importref") || ""; + const FILTER_PER_PAGE = + parseInt(new URLSearchParams(location.search).get("limit"), 10) || 20; + + let serverFiltered = false; + let filterPage = 1; + let filterTotalPages = 1; + let filterTotal = 0; + let originalData = null; // snapshot della pagina originale (per ripristino) + let filterReqSeq = 0; + + function collectActiveFilters() { + const cols = meta().columns || []; + const out = []; + for (const [key, term] of Object.entries(colFilters)) { + if (!term || !String(term).trim()) continue; + const col = cols.find((c) => String(c.key) === String(key)); + if (!col) continue; + out.push({ key: String(key), type: col.type, term: String(term).trim() }); + } + return out; + } + + // Sostituisce il dataset del renderer in-place e ridisegna. + function swapData(rows) { + const arr = data(); + arr.length = 0; + (rows || []).forEach((r) => arr.push(r)); + R().renderVisibleRows(); + } + + function hidePagination(hide) { + // Durante il filtro la paginazione server (per pagina, via URL) è fuorviante. + document.querySelectorAll(".pager-bar").forEach((el) => { + el.style.display = hide ? "none" : ""; + }); + } + + // Pager del set filtrato (Prec / pag X di Y / Succ) nella toolbar. + function updateFilterPager() { + const el = document.getElementById("filterPager"); + if (!el) return; + if (!serverFiltered) { + el.style.display = "none"; + el.innerHTML = ""; + return; + } + el.style.display = "inline-flex"; + el.innerHTML = + `` + + `${filterTotal} trovati · pag ${filterPage}/${filterTotalPages}` + + ``; + const prev = document.getElementById("filterPrevBtn"); + const next = document.getElementById("filterNextBtn"); + if (prev) prev.addEventListener("click", () => applyServerFilter(filterPage - 1)); + if (next) next.addEventListener("click", () => applyServerFilter(filterPage + 1)); + } + + function restoreOriginal() { + serverFiltered = false; + filterPage = 1; + filterTotalPages = 1; + filterTotal = 0; + if (originalData) swapData(originalData); + updateFilterPager(); + hidePagination(false); + updateToolbar(); + } + + async function applyServerFilter(page = 1) { + const active = collectActiveFilters(); + if (active.length === 0) { + if (serverFiltered) restoreOriginal(); + return; + } + if (!originalData) originalData = [...data()]; // snapshot pagina 1 originale + + const seq = ++filterReqSeq; + try { + const resp = await fetch("filter_records.php", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + template_id: parseInt(TEMPLATE_ID, 10), + all_users: SHOW_ALL, + importref: IMPORTREF, + status: "i", + filters: active, + page: Math.max(1, page), + per_page: FILTER_PER_PAGE, + }), + }); + const json = await resp.json(); + if (seq !== filterReqSeq) return; // risposta obsoleta: ignora + if (!json.success) { + console.error("[gridFilter] filtro:", json.message); + return; + } + serverFiltered = true; + filterPage = json.page; + filterTotalPages = json.total_pages; + filterTotal = json.total; + swapData(json.rows || []); + updateFilterPager(); + hidePagination(true); + updateToolbar(); + } catch (e) { + console.error("[gridFilter] fetch filtro fallita", e); + } + } + + // "Seleziona tutti i filtrati": chiede al server TUTTI gli id del match e li seleziona. + async function selectAllMatching(on) { + if (!serverFiltered) return; + const active = collectActiveFilters(); + try { + const resp = await fetch("filter_records.php", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + template_id: parseInt(TEMPLATE_ID, 10), + all_users: SHOW_ALL, + importref: IMPORTREF, + status: "i", + filters: active, + page: filterPage, + per_page: FILTER_PER_PAGE, + want_all_ids: true, + }), + }); + const json = await resp.json(); + if (!json.success) return; + (json.all_ids || []).forEach((id) => (on ? selected.add(id) : selected.delete(id))); + document + .querySelectorAll("#gridRowContainer .grid-row") + .forEach((rowEl) => { + rowEl.classList.toggle("row-selected", on); + const cb = rowEl.querySelector(".filter-row-checkbox"); + if (cb) cb.checked = on; + }); + updateToolbar(); + if (json.all_ids_capped) { + alert("Selezione limitata a " + (json.all_ids || []).length + " record."); + } + } catch (e) { + console.error("[gridFilter] select-all fallita", e); + } + } + + function syncFilterRow() { + const fr = document.getElementById("gridFilterRow"); + const header = document.getElementById("gridHeaderContainer"); + if (!fr || !header) return; + + const actHeader = header.querySelector(".button-header"); + const actCell = fr.querySelector(".filter-actions-cell"); + if (actHeader && actCell) { + const aw = actHeader.offsetWidth; + actCell.style.flex = `0 0 ${aw}px`; + actCell.style.minWidth = `${aw}px`; + } + + const headerCells = header.querySelectorAll( + ".grid-header:not(.button-header)", + ); + const filterCells = fr.querySelectorAll( + ".grid-cell:not(.filter-actions-cell)", + ); + headerCells.forEach((hc, i) => { + const fc = filterCells[i]; + if (fc) fc.style.flex = `0 0 ${hc.offsetWidth}px`; + }); + } + + function syncStickyLeft() { + const btnHeader = document.querySelector( + "#gridHeaderContainer .button-header", + ); + if (!btnHeader) return; + const w1 = btnHeader.offsetWidth; // larghezza reale colonna Actions + + const fixRow = (rowEl) => { + if (!rowEl) return; + const cells = rowEl.querySelectorAll( + ":scope > .grid-cell, :scope > .grid-header", + ); + const c2 = cells[1]; + const c3 = cells[2]; + if (c2 && getComputedStyle(c2).position === "sticky") { + c2.style.left = `${w1}px`; + } + if (c3 && getComputedStyle(c3).position === "sticky") { + c3.style.left = `${w1 + (c2 ? c2.offsetWidth : 0)}px`; + } + }; + + fixRow(document.getElementById("gridHeaderContainer")); + document.querySelectorAll(".grid-top").forEach(fixRow); + document + .querySelectorAll("#gridRowContainer .grid-row") + .forEach(fixRow); + fixRow(document.getElementById("gridFilterRow")); + } + + let _headerObs = null; + let _rowObs = null; + let _syncRaf = null; + + function reconnectObservers() { + const header = document.getElementById("gridHeaderContainer"); + const rows = document.getElementById("gridRowContainer"); + if (_headerObs && header) + _headerObs.observe(header, { + attributes: true, + attributeFilter: ["style"], + subtree: true, + }); + if (_rowObs && rows) _rowObs.observe(rows, { childList: true }); + } + + function scheduleSync() { + if (_syncRaf) return; + _syncRaf = requestAnimationFrame(() => { + _syncRaf = null; + if (_headerObs) _headerObs.disconnect(); + if (_rowObs) _rowObs.disconnect(); + syncStickyLeft(); + syncFilterRow(); + reconnectObservers(); + }); + } + + function hookGridSync() { + _headerObs = new MutationObserver(scheduleSync); + _rowObs = new MutationObserver(scheduleSync); + reconnectObservers(); + scheduleSync(); // primo allineamento + } + function rowMatchesFilters(row) { + if (serverFiltered) return true; for (const [key, term] of Object.entries(colFilters)) { if (!term) continue; const t = term.toLowerCase(); @@ -74,6 +321,11 @@ // ── Lista iddatadb attualmente visibili (per propagazione/export ecc.) ── window.getVisibleGridIds = function () { + if (serverFiltered) { + return data() + .map((r) => parseInt(r.iddatadb, 10)) + .filter(Boolean); + } const ids = []; document .querySelectorAll("#gridRowContainer .grid-row") @@ -178,6 +430,18 @@ cell.style.flex = `0 0 ${w}px`; if (col.type === "tracking" || col.type === "awb") { // niente filtro + } else if (col.type === "status") { + // Status: dropdown (3 valori) invece del testo libero. + const cur = colFilters[col.key] || ""; + const opt = (v, lbl) => + ``; + cell.innerHTML = + ``; } else { cell.innerHTML = ``; } @@ -185,6 +449,7 @@ }); top.parentNode.insertBefore(fr, top); + scheduleSync(); // allinea larghezze filtri + offset sticky } function removeFilterRow() { @@ -223,6 +488,9 @@ btn.classList.remove("active"); removeCheckboxes(); removeFilterRow(); + // reset filtri colonna + ripristina la pagina originale + Object.keys(colFilters).forEach((k) => delete colFilters[k]); + if (serverFiltered) restoreOriginal(); } updateToolbar(); } @@ -313,6 +581,8 @@ bar.style.cssText = "display:none;align-items:center;gap:8px;flex-shrink:0;"; bar.innerHTML = ` + + Selezionate: 0 @@ -320,6 +590,9 @@ fBtn.parentNode.insertBefore(bar, fBtn.nextSibling); fBtn.addEventListener("click", toggleFilters); + document + .getElementById("filterClearBtn") + .addEventListener("click", clearFilters); document .getElementById("filterDeleteBtn") .addEventListener("click", batchDelete); @@ -328,6 +601,17 @@ .addEventListener("click", toggleRestrict); } + // Svuota tutti i filtri di colonna (input + select) e torna alla pagina originale. + function clearFilters() { + Object.keys(colFilters).forEach((k) => delete colFilters[k]); + document + .querySelectorAll("#gridFilterRow .filter-col-input") + .forEach((el) => { + el.value = ""; + }); + if (serverFiltered) restoreOriginal(); + } + // ── Event delegation ── function attachEvents() { // checkbox click @@ -338,10 +622,17 @@ } }); - // Seleziona / deseleziona tutti i FILTRATI visibili + // Seleziona / deseleziona tutti i FILTRATI document.addEventListener("change", function (e) { if (e.target.id !== "filterSelectAll") return; const on = e.target.checked; + + // Con filtro server-side: seleziona TUTTI i match (anche altre pagine). + if (serverFiltered) { + selectAllMatching(on); + return; + } + document .querySelectorAll("#gridRowContainer .grid-row") .forEach((rowEl) => { @@ -379,14 +670,23 @@ toggleRow(rowEl.dataset.id, cb.checked); }); - // filtri colonna live (debounce) + // filtri colonna testo (debounce) → filtro server-side su tutto il template let t = null; document.addEventListener("input", function (e) { if (!e.target.classList.contains("filter-col-input")) return; + if (e.target.tagName === "SELECT") return; // i select li gestisce 'change' const key = e.target.dataset.colKey; colFilters[key] = e.target.value; clearTimeout(t); - t = setTimeout(applyVisibility, 200); + t = setTimeout(applyServerFilter, 250); + }); + + // dropdown (es. Status): applica subito, senza debounce + document.addEventListener("change", function (e) { + if (!e.target.classList.contains("filter-col-input")) return; + if (e.target.tagName !== "SELECT") return; + colFilters[e.target.dataset.colKey] = e.target.value; + applyServerFilter(); }); } @@ -431,6 +731,7 @@ buildUI(); attachEvents(); hookRerender(); + hookGridSync(); } // parte dopo che gridRenderer ha finito init diff --git a/public/userarea/imported.php b/public/userarea/imported.php index 39ae9f8..7f242fe 100644 --- a/public/userarea/imported.php +++ b/public/userarea/imported.php @@ -787,6 +787,7 @@ $gridMeta = [ padding: 10px 0; min-height: 0; flex-wrap: nowrap; + min-width: fit-content; } .grid-top .grid-cell { @@ -1806,4 +1807,4 @@ $gridMeta = [ - \ No newline at end of file + diff --git a/public/userarea/include/grid_data_builder.php b/public/userarea/include/grid_data_builder.php new file mode 100644 index 0000000..5463f0c --- /dev/null +++ b/public/userarea/include/grid_data_builder.php @@ -0,0 +1,213 @@ + 'cliente_responsabile_id', + 'ClienteFornitore' => 'cliente_fornitore_id', + 'ClienteAnalisi' => 'clienteAnalisi', + 'ClienteFatturazione' => 'ClienteFatturazione', + 'MoltiplicatorePrezzo' => 'moltiplicatore_prezzo_id', + 'AnagraficaCertestObject' => 'anagrafica_certest_object_id', + 'AnagraficaCertestService' => 'anagrafica_certest_service_id', + 'ConsegnaRichiesta' => 'consegna_richiesta', + ]; + + // Fixed fields visibili, ordinati come imported.php + $fixedStmt = $pdo->prepare(" + SELECT id, fixed_field_key, is_manual, data_type, is_required, default_value, is_visible_import + FROM template_fixed_mapping + WHERE template_id = ? AND is_visible_import = 1 + ORDER BY id + "); + $fixedStmt->execute([$templateId]); + $fixedFieldsRaw = $fixedStmt->fetchAll(PDO::FETCH_ASSOC); + + $desiredOrder = [ + 'ClienteResponsabile', 'ClienteFornitore', 'ClienteAnalisi', 'ClienteFatturazione', + 'AnagraficaCertestObject', 'AnagraficaCertestService', 'MoltiplicatorePrezzo', 'ConsegnaRichiesta', + ]; + $excludeFromFixed = ['ClienteFornitore']; // reso come colonna a sé + + $fixedFields = []; + $tempMap = []; + foreach ($fixedFieldsRaw as $f) { + if (in_array($f['fixed_field_key'], $excludeFromFixed, true)) continue; + $tempMap[$f['fixed_field_key']] = $f; + } + foreach ($desiredOrder as $key) { + if (isset($tempMap[$key])) { + $fixedFields[] = $tempMap[$key]; + unset($tempMap[$key]); + } + } + foreach ($tempMap as $f) { + $fixedFields[] = $f; + } + + // Main field mappings (max 2), come imported.php + $mapStmt = $pdo->prepare(" + SELECT id, field_label, data_type, is_required, field_id, field_order, + main_field, is_visible_import, manual_default + FROM template_mapping + WHERE template_id = ? + ORDER BY field_order ASC, id ASC + "); + $mapStmt->execute([$templateId]); + $allMappings = $mapStmt->fetchAll(PDO::FETCH_ASSOC); + + $mainFieldMappings = []; + foreach ($allMappings as $mapping) { + if ((string)$mapping['main_field'] === '1' && (int)$mapping['is_visible_import'] === 1) { + $mainFieldMappings[] = $mapping; + } + if (count($mainFieldMappings) >= 2) break; + } + + // Default idclient dal template + $tplStmt = $pdo->prepare("SELECT idclient FROM excel_templates WHERE id = ?"); + $tplStmt->execute([$templateId]); + $default_idclient = $tplStmt->fetchColumn(); + $default_idclient = $default_idclient !== false ? $default_idclient : null; + + return [ + 'fixedFields' => $fixedFields, + 'fixedAliasMap' => $fixedAliasMap, + 'mainFieldMappings' => $mainFieldMappings, + 'default_idclient' => $default_idclient, + ]; + } +} + +if (!function_exists('buildGridRows')) { + /** + * Costruisce le righe gridData per la lista di iddatadb data, nell'ordine passato. + * + * @param int[] $iddatadbList + * @param array $config output di buildGridConfig() + * @return array righe nella stessa forma di imported.php $gridDataArray + */ + function buildGridRows(PDO $pdo, array $iddatadbList, array $config): array + { + $iddatadbList = array_values(array_filter(array_map('intval', $iddatadbList), fn($v) => $v > 0)); + if (empty($iddatadbList)) { + return []; + } + + $fixedFields = $config['fixedFields']; + $fixedAliasMap = $config['fixedAliasMap']; + $mainFieldMappings = $config['mainFieldMappings']; + $default_idclient = $config['default_idclient']; + + $ph = implode(',', array_fill(0, count($iddatadbList), '?')); + + // Righe datadb + user_name + $stmt = $pdo->prepare(" + SELECT d.*, CONCAT(u.first_name, ' ', u.last_name) AS user_name + FROM datadb d + LEFT JOIN auth_users u ON d.user_id = u.id + WHERE d.iddatadb IN ($ph) + "); + $stmt->execute($iddatadbList); + $byId = []; + foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $r) { + $byId[(int)$r['iddatadb']] = $r; + } + + // Dettagli (import_data_details) + $detStmt = $pdo->prepare(" + SELECT d.id AS datadb_id, d.mapping_id, d.field_value, + m.field_id, m.field_label, m.data_type, m.is_required, m.manual_default + FROM import_data_details d + JOIN template_mapping m ON d.mapping_id = m.id + WHERE d.id IN ($ph) + "); + $detStmt->execute($iddatadbList); + $detailsByRow = []; + foreach ($detStmt->fetchAll(PDO::FETCH_ASSOC) as $d) { + $detailsByRow[(int)$d['datadb_id']][] = $d; + } + + // Costruzione righe nell'ordine della lista passata + $rows = []; + foreach ($iddatadbList as $id) { + $row = $byId[$id] ?? null; + if ($row === null) continue; + + $rowObj = [ + 'iddatadb' => (int)$row['iddatadb'], + 'status' => $row['status'] ?? 'i', + 'idclient' => $row['idclient'] ?? $default_idclient, + 'cliente_fornitore_id' => $row['cliente_fornitore_id'] ?? null, + 'tested_component' => $row['tested_component'] ?? '', + 'commessaweb' => $row['commessaweb'] ?? null, + 'user_name' => $row['user_name'] ?? '', + 'importreferencecode' => $row['importreferencecode'] ?? '', + 'filename_import' => $row['filename_import'] ?? '', + 'importdate' => $row['importdate'] ?? '', + ]; + + // Fixed fields + $rowObj['fixedFields'] = []; + foreach ($fixedFields as $f) { + $key = $f['fixed_field_key']; + $dbCol = $fixedAliasMap[$key] ?? $key; + $val = $row[$dbCol] ?? ''; + if ($val === '' || $val === null) { + $val = gdbFixedDefaultValue($f); + } + $rowObj['fixedFields'][$key] = (string)$val; + } + + // Details + $rowObj['details'] = []; + $rowDetails = $detailsByRow[$id] ?? []; + foreach ($rowDetails as $d) { + $rowObj['details'][(string)$d['mapping_id']] = $d['field_value'] ?? ''; + } + + // Main field values + foreach ($mainFieldMappings as $mainMapping) { + $found = null; + foreach ($rowDetails as $d) { + if ($d['mapping_id'] == $mainMapping['id']) { + $found = $d; + break; + } + } + $rowObj['details'][(string)$mainMapping['id']] = + ($found['field_value'] ?? null) ?? ($mainMapping['manual_default'] ?? ''); + } + + if (!empty($mainFieldMappings)) { + $firstMain = $mainFieldMappings[0]; + $rowObj['mainFieldValue'] = $rowObj['details'][(string)$firstMain['id']] ?? ''; + } + + $rowObj['_dirty'] = false; + $rows[] = $rowObj; + } + + return $rows; + } +} From 69bb029d9d548542e93a79a3ff2efb9ca3c057bf Mon Sep 17 00:00:00 2001 From: "r.mubarakzyanov" Date: Sun, 19 Jul 2026 14:23:23 +0300 Subject: [PATCH 11/22] union ids --- public/userarea/filter_records.php | 54 +++++++++++++ public/userarea/gridFilter.js | 119 ++++++++++++++++++++++++++--- 2 files changed, 163 insertions(+), 10 deletions(-) diff --git a/public/userarea/filter_records.php b/public/userarea/filter_records.php index 2ed5565..6c47bda 100644 --- a/public/userarea/filter_records.php +++ b/public/userarea/filter_records.php @@ -28,6 +28,60 @@ $wantAllIds = !empty($body['want_all_ids']); $cacheDir = __DIR__ . '/cache'; +$explicitIds = []; +if (isset($body['ids']) && is_array($body['ids'])) { + $explicitIds = array_values(array_unique(array_filter( + array_map('intval', $body['ids']), + fn($v) => $v > 0 + ))); +} +if (!empty($explicitIds)) { + // Scoping di sicurezza: solo record del template/utente/import corretti. + $conds = ['d.templateid = ?', 'd.status = ?']; + $params = [$templateId, $status]; + if (!$showAll) { $conds[] = 'd.user_id = ?'; $params[] = $userId; } + if ($importref !== '') { $conds[] = 'd.importreferencecode = ?'; $params[] = $importref; } + $ph = implode(',', array_fill(0, count($explicitIds), '?')); + $conds[] = "d.iddatadb IN ($ph)"; + foreach ($explicitIds as $id) $params[] = $id; + $whereSql = implode(' AND ', $conds); + + try { + $countStmt = $pdo->prepare("SELECT COUNT(*) FROM datadb d WHERE {$whereSql}"); + $countStmt->execute($params); + $total = (int)$countStmt->fetchColumn(); + $totalPages = max(1, (int)ceil($total / $perPage)); + if ($page > $totalPages) $page = $totalPages; + $offset = ($page - 1) * $perPage; + + $idStmt = $pdo->prepare(" + SELECT d.iddatadb FROM datadb d + WHERE {$whereSql} + ORDER BY d.excelrow ASC, d.iddatadb ASC + LIMIT {$perPage} OFFSET {$offset} + "); + $idStmt->execute($params); + $pageIds = array_map('intval', $idStmt->fetchAll(PDO::FETCH_COLUMN)); + + $config = buildGridConfig($pdo, $templateId); + $rows = buildGridRows($pdo, $pageIds, $config); + + echo json_encode([ + 'success' => true, + 'total' => $total, + 'page' => $page, + 'per_page' => $perPage, + 'total_pages' => $totalPages, + 'rows' => $rows, + 'mode' => 'selection', + ]); + } catch (Exception $e) { + error_log('filter_records (ids mode) error: ' . $e->getMessage()); + echo json_encode(['success' => false, 'message' => $e->getMessage()]); + } + exit; +} + $fixedAliasMap = [ 'ClienteResponsabile' => 'cliente_responsabile_id', 'ClienteFornitore' => 'cliente_fornitore_id', diff --git a/public/userarea/gridFilter.js b/public/userarea/gridFilter.js index 1f9f056..7b8b721 100644 --- a/public/userarea/gridFilter.js +++ b/public/userarea/gridFilter.js @@ -39,6 +39,8 @@ let filterTotal = 0; let originalData = null; // snapshot della pagina originale (per ripristino) let filterReqSeq = 0; + let showingSelection = false; // true quando mostriamo l'UNIONE dei selezionati + let pagerFn = null; // paginazione corrente (applyServerFilter | showSelectedRecords) function collectActiveFilters() { const cols = meta().columns || []; @@ -77,14 +79,16 @@ return; } el.style.display = "inline-flex"; + const label = showingSelection ? "selezionati" : "trovati"; el.innerHTML = `` + - `${filterTotal} trovati · pag ${filterPage}/${filterTotalPages}` + + `${filterTotal} ${label} · pag ${filterPage}/${filterTotalPages}` + ``; + const go = pagerFn || applyServerFilter; const prev = document.getElementById("filterPrevBtn"); const next = document.getElementById("filterNextBtn"); - if (prev) prev.addEventListener("click", () => applyServerFilter(filterPage - 1)); - if (next) next.addEventListener("click", () => applyServerFilter(filterPage + 1)); + if (prev) prev.addEventListener("click", () => go(filterPage - 1)); + if (next) next.addEventListener("click", () => go(filterPage + 1)); } function restoreOriginal() { @@ -128,6 +132,8 @@ return; } serverFiltered = true; + showingSelection = false; + pagerFn = applyServerFilter; filterPage = json.page; filterTotalPages = json.total_pages; filterTotal = json.total; @@ -140,6 +146,91 @@ } } + // ── Mostra i SELEZIONATI (unione tra filtri diversi) ────────────────── + // La selezione si accumula tra filtri; questo carica dal server TUTTI i record + // selezionati (per id) e li mostra, paginati, a prescindere dai filtri correnti. + async function showSelectedRecords(page = 1) { + const ids = [...selected]; + if (!ids.length) { + showingSelection = false; + updateToolbar(); + return; + } + pagerFn = showSelectedRecords; + try { + const resp = await fetch("filter_records.php", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + template_id: parseInt(TEMPLATE_ID, 10), + all_users: SHOW_ALL, + importref: IMPORTREF, + status: "i", + ids: ids, + page: Math.max(1, page), + per_page: FILTER_PER_PAGE, + }), + }); + const json = await resp.json(); + if (!json.success) { + console.error("[gridFilter] mostra selezionati:", json.message); + return; + } + if (!originalData) originalData = [...data()]; + showingSelection = true; + serverFiltered = true; + filterPage = json.page; + filterTotalPages = json.total_pages; + filterTotal = json.total; + swapData(json.rows || []); + updateFilterPager(); + hidePagination(true); + updateToolbar(); + } catch (e) { + console.error("[gridFilter] mostra selezionati fallita", e); + } + } + + // Tumbler "Mostra selezionati" / "Torna al filtro". + function toggleShowSelected() { + if (!showingSelection) { + if (!selected.size) return; + showSelectedRecords(1); + } else { + exitSelectionView(); + } + } + + // Torna dal "mostra selezionati" al filtro corrente (o alla pagina originale). + function exitSelectionView() { + showingSelection = false; + pagerFn = applyServerFilter; + if (collectActiveFilters().length) { + applyServerFilter(1); + } else { + restoreOriginal(); + } + updateToolbar(); + } + + // Deseleziona tutto. + function clearSelection() { + selected.clear(); + document + .querySelectorAll("#gridRowContainer .grid-row.row-selected") + .forEach((el) => el.classList.remove("row-selected")); + document + .querySelectorAll(".filter-row-checkbox") + .forEach((cb) => (cb.checked = false)); + const sa = document.getElementById("filterSelectAll"); + if (sa) sa.checked = false; + if (showingSelection) { + exitSelectionView(); + } else { + updateToolbar(); + } + } + // "Seleziona tutti i filtrati": chiede al server TUTTI gli id del match e li seleziona. async function selectAllMatching(on) { if (!serverFiltered) return; @@ -466,11 +557,15 @@ const cntEl = document.getElementById("filterSelCount"); if (cntEl) cntEl.textContent = count; document.getElementById("filterDeleteBtn").disabled = count === 0; - document.getElementById("filterRestrictBtn").disabled = - count === 0 && !restricted; - document.getElementById("filterRestrictBtn").innerHTML = restricted - ? ' Mostra tutti' - : ' Restringi selezione'; + + const showBtn = document.getElementById("filterRestrictBtn"); + showBtn.disabled = count === 0 && !showingSelection; + showBtn.innerHTML = showingSelection + ? ' Torna al filtro' + : ' Mostra selezionati'; + + const clearSelBtn = document.getElementById("filterClearSelBtn"); + if (clearSelBtn) clearSelBtn.disabled = count === 0; } // ── Main toggle ── @@ -584,7 +679,8 @@ Selezionate: 0 - + + `; fBtn.parentNode.insertBefore(bar, fBtn.nextSibling); @@ -598,7 +694,10 @@ .addEventListener("click", batchDelete); document .getElementById("filterRestrictBtn") - .addEventListener("click", toggleRestrict); + .addEventListener("click", toggleShowSelected); + document + .getElementById("filterClearSelBtn") + .addEventListener("click", clearSelection); } // Svuota tutti i filtri di colonna (input + select) e torna alla pagina originale. From 699bffaa780252f6d089ad501ef0998e3992b4f0 Mon Sep 17 00:00:00 2001 From: solocla Date: Mon, 20 Jul 2026 11:32:22 +0200 Subject: [PATCH 12/22] ranking custom field --- public/userarea/gridRenderer.js | 1 - public/userarea/search_customfield_values.php | 74 ++++++++++++++++--- 2 files changed, 65 insertions(+), 10 deletions(-) diff --git a/public/userarea/gridRenderer.js b/public/userarea/gridRenderer.js index 582082f..bffa0fa 100644 --- a/public/userarea/gridRenderer.js +++ b/public/userarea/gridRenderer.js @@ -392,7 +392,6 @@ allowClear: true, width: "100%", minimumInputLength: 0, - sorter: sortSelect2ResultsByStart, ajax: { url: "search_customfield_values.php", dataType: "json", diff --git a/public/userarea/search_customfield_values.php b/public/userarea/search_customfield_values.php index 6e4205a..35f95d4 100644 --- a/public/userarea/search_customfield_values.php +++ b/public/userarea/search_customfield_values.php @@ -51,18 +51,74 @@ try { exit; } - // Search by query - $results = []; - foreach ($values as $v) { - $text = $v['Valore'] ?? ''; - if ($q === '' || mb_strpos(mb_strtolower($text), $q) !== false) { - $results[] = ['id' => $v['IdCustomFieldsValue'], 'text' => $text]; - if ($limit > 0 && count($results) >= $limit) break; + // Search — multi-term AND, position-independent, ranked + $terms = array_values(array_filter( + preg_split('/\s+/u', $q, -1, PREG_SPLIT_NO_EMPTY) + )); + + // Nessun termine digitato: alfabetico, taglio al limite + if (empty($terms)) { + $all = []; + foreach ($values as $v) { + $all[] = ['id' => $v['IdCustomFieldsValue'], 'text' => $v['Valore'] ?? '']; } + usort($all, fn($a, $b) => strcasecmp($a['text'], $b['text'])); + if ($limit > 0) $all = array_slice($all, 0, $limit); + echo json_encode(['results' => $all]); + exit; } - // Sort alphabetically - usort($results, fn($a, $b) => strcasecmp($a['text'], $b['text'])); + $firstTerm = $terms[0]; + $scored = []; + + foreach ($values as $v) { + $text = $v['Valore'] ?? ''; + $textLower = mb_strtolower($text); + + // AND: tutti i termini devono essere presenti, in qualsiasi posizione + $matchAll = true; + foreach ($terms as $t) { + if (mb_strpos($textLower, $t) === false) { + $matchAll = false; + break; + } + } + if (!$matchAll) continue; + + // Punteggio di pertinenza (più basso = più rilevante) + if ($textLower === $q) { + $score = 0; // match esatto + } elseif (mb_strpos($textLower, $firstTerm) === 0) { + $score = 1; // inizia col primo termine + } elseif (preg_match('/(^|\s)' . preg_quote($firstTerm, '/') . '/u', $textLower)) { + $score = 2; // primo termine a inizio di una parola + } else { + $score = 3; // presente ma non a inizio parola + } + + $scored[] = [ + 'id' => $v['IdCustomFieldsValue'], + 'text' => $text, + '_s' => $score, + '_n' => $textLower + ]; + } + + // Ordina per punteggio, poi alfabetico + usort($scored, function ($a, $b) { + if ($a['_s'] !== $b['_s']) return $a['_s'] - $b['_s']; + return strcmp($a['_n'], $b['_n']); + }); + + // Taglia DOPO l'ordinamento e rimuovi i campi interni + if ($limit > 0) { + $scored = array_slice($scored, 0, $limit); + } + + $results = array_map( + fn($r) => ['id' => $r['id'], 'text' => $r['text']], + $scored + ); echo json_encode(['results' => $results]); } catch (Exception $e) { From 7db96a1f9c8538c4def2efc96df0fab6a840681a Mon Sep 17 00:00:00 2001 From: solocla Date: Mon, 20 Jul 2026 15:18:29 +0200 Subject: [PATCH 13/22] fixed matrix in analysis --- public/userarea/analysisModal.js | 2 +- public/userarea/search_matrici.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/userarea/analysisModal.js b/public/userarea/analysisModal.js index 3c073e2..dc813e5 100644 --- a/public/userarea/analysisModal.js +++ b/public/userarea/analysisModal.js @@ -7,7 +7,7 @@ function loadAnalysisMatrixNames() { return $.ajax({ - url: "get_matrici_db.php", + url: "search_matrici.php?full_list=1", method: "GET", dataType: "json", }) diff --git a/public/userarea/search_matrici.php b/public/userarea/search_matrici.php index 785b428..9868c22 100644 --- a/public/userarea/search_matrici.php +++ b/public/userarea/search_matrici.php @@ -62,7 +62,11 @@ if (isset($_GET['macro_list'])) { echo json_encode(['success' => true, 'value' => $macros]); exit; } - +// Return full matrix list (same shape as get_matrici_db.php) +if (isset($_GET['full_list'])) { + echo json_encode(['success' => true, 'value' => $matrici]); + exit; +} // Search (with optional MacroMatrice filter) - multi-term AND, position-independent, ranked $terms = array_values(array_filter( preg_split('/\s+/u', $q, -1, PREG_SPLIT_NO_EMPTY) From bd9bd52c10c33af3da38af0f78d28d68ecbedd55 Mon Sep 17 00:00:00 2001 From: solocla Date: Mon, 20 Jul 2026 15:48:29 +0200 Subject: [PATCH 14/22] fixed modal analysis name matrix --- public/userarea/modal_analysis.php | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/public/userarea/modal_analysis.php b/public/userarea/modal_analysis.php index 50895b6..6d3cc98 100644 --- a/public/userarea/modal_analysis.php +++ b/public/userarea/modal_analysis.php @@ -136,14 +136,9 @@ $matrixGroups = array_values($matrixGroups); +
+ L'operazione può richiedere da qualche secondo a un paio di minuti. +
+ + +
+
+ Aggiornamento in corso… + 0s +
+ +
+
0%
+
+ +
    + +
+ +
+ + Mostra dettaglio tecnico + +
+ +
+ 

+                            

+                        

+
+                        
+                        

+                            
+                            
+                        

+
+                    

+                

+
+            

+        

+
+        

+        
+        
+    

+
+    
+
+    
+
+
+
\ No newline at end of file

From df1ddce0a68b9d88252defe2db1f0521ed64da46 Mon Sep 17 00:00:00 2001
From: solocla 
Date: Wed, 22 Jul 2026 12:07:20 +0200
Subject: [PATCH 19/22] fixed buyer in template

---
 public/userarea/mapping_template_xls_scheme2.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/userarea/mapping_template_xls_scheme2.php b/public/userarea/mapping_template_xls_scheme2.php
index 11db485..07a68ce 100644
--- a/public/userarea/mapping_template_xls_scheme2.php
+++ b/public/userarea/mapping_template_xls_scheme2.php
@@ -617,7 +617,11 @@ $apiSampleJson = $template['api_sample_json'] ?? '';
                                                 
 
                                                 
-                                                    
+                                                     'Buyer'];
+                                                            $fixedKey = $fm['fixed_field_key'];
+                                                            echo htmlspecialchars($fixedFieldLabels[$fixedKey] ?? $fixedKey);
+                                                            ?>
                                                 
 
                                                 
@@ -2192,6 +2196,10 @@ $apiSampleJson = $template['api_sample_json'] ?? '';
                 const tbody = document.querySelector('#fixedFieldsTable tbody');
                 if (!tbody) return;
 
+                const fixedFieldLabels = {
+                    'ClienteAnalisi': 'Buyer'
+                };
+
                 const keysWithDropdown = [
                     'ClienteResponsabile',
                     'ClienteFornitore',
@@ -2223,7 +2231,7 @@ $apiSampleJson = $template['api_sample_json'] ?? '';
              ${parseInt(r.is_required) === 1 ? 'checked' : ''}>
     
 
-    ${escapeHtml(r.fixed_field_key)}
+    ${escapeHtml(fixedFieldLabels[r.fixed_field_key] || r.fixed_field_key)}
 
 
         ${escapeHtml(r.data_type || '')}

From a3009324217f49a8431aab6400a3a3ad76741349 Mon Sep 17 00:00:00 2001
From: solocla 
Date: Wed, 22 Jul 2026 14:04:50 +0200
Subject: [PATCH 20/22] fixed field object search ranking

---
 public/userarea/gridRenderer.js | 66 ++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/public/userarea/gridRenderer.js b/public/userarea/gridRenderer.js
index 4dc6b97..d35b92e 100644
--- a/public/userarea/gridRenderer.js
+++ b/public/userarea/gridRenderer.js
@@ -143,7 +143,54 @@
             }),
         );
     }
+    // Ranking inizio/centro/fine per select con dati già in memoria.
+    // Restituisce { matcher, sorter } da passare a select2().
+    function rankedLocalSelect2() {
+        return {
+            matcher: function (params, data) {
+                const term = $.trim(params.term || "").toLowerCase();
+                if (term === "") return data;
+                if (typeof data.text === "undefined") return null;
 
+                // AND multi-termine, posizione indipendente
+                const text = data.text.toLowerCase();
+                const terms = term.split(/\s+/).filter(Boolean);
+                const all = terms.every((t) => text.indexOf(t) !== -1);
+                return all ? data : null;
+            },
+            sorter: function (results) {
+                const term = $(
+                    ".select2-container--open .select2-search__field",
+                ).val();
+                const search = (term || "").toLowerCase().trim();
+                if (!search) return results;
+
+                const first = search.split(/\s+/)[0];
+
+                function score(text) {
+                    const t = (text || "").toLowerCase();
+                    if (t === search) return 0; // match esatto
+                    if (t.indexOf(first) === 0) return 1; // inizia col termine
+                    if (new RegExp("(^|\\s)" + escapeRegExp(first)).test(t))
+                        return 2; // inizio parola
+                    return 3; // in mezzo
+                }
+
+                return results.slice().sort(function (a, b) {
+                    const sa = score(a.text);
+                    const sb = score(b.text);
+                    if (sa !== sb) return sa - sb;
+                    return (a.text || "").localeCompare(b.text || "", "it", {
+                        sensitivity: "base",
+                    });
+                });
+            },
+        };
+    }
+
+    function escapeRegExp(s) {
+        return String(s).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    }
     function sortSelect2ResultsByStart(data) {
         const term = $(".select2-container--open .select2-search__field").val();
 
@@ -683,7 +730,7 @@
 
         const reqCls = col.isRequired ? " required-input" : "";
         const req = col.isRequired ? " required" : "";
-        return ``;
+        return ``;
     }
 
     function buildDropdownOptionsHTML(fieldId, selectedValue) {
@@ -1203,6 +1250,12 @@
                 items.forEach((item) =>
                     sel.add(new Option(item.text, item.id)),
                 );
+                $(sel).select2({
+                    placeholder: "Seleziona...",
+                    allowClear: true,
+                    width: "100%",
+                    ...rankedLocalSelect2(),
+                });
             }
         });
 
@@ -1705,9 +1758,18 @@
                     const fieldId = this.dataset.fieldId;
                     if (fieldId) $(this).select2(sceltaSelect2Config(fieldId));
                 });
+            $(this)
+                .find(".searchable-fixed:not(.select2-hidden-accessible)")
+                .each(function () {
+                    $(this).select2({
+                        placeholder: "Seleziona...",
+                        allowClear: true,
+                        width: "100%",
+                        ...rankedLocalSelect2(),
+                    });
+                });
         });
     }
-
     // ── Column resize ──────────────────────────────────────────────────────
 
     function initColumnResizers() {

From b2a79aec1ba7e576538f43cdc9620240b46dcb6a Mon Sep 17 00:00:00 2001
From: solocla 
Date: Thu, 23 Jul 2026 12:13:28 +0200
Subject: [PATCH 21/22] multiple analysis on same parts

---
 ...23100916_drop_uniq_part_analysis_index.php | 25 +++++
 public/userarea/analysisModal.js              | 93 +++++++++++--------
 public/userarea/delete_part_analysis.php      | 35 +++++--
 public/userarea/save_part_analysis.php        | 12 +--
 4 files changed, 107 insertions(+), 58 deletions(-)
 create mode 100644 db/migrations/20260723100916_drop_uniq_part_analysis_index.php

diff --git a/db/migrations/20260723100916_drop_uniq_part_analysis_index.php b/db/migrations/20260723100916_drop_uniq_part_analysis_index.php
new file mode 100644
index 0000000..f78d146
--- /dev/null
+++ b/db/migrations/20260723100916_drop_uniq_part_analysis_index.php
@@ -0,0 +1,25 @@
+table('identification_parts_analyses')
+            ->removeIndexByName('uniq_part_analysis')
+            ->update();
+    }
+
+    public function down(): void
+    {
+        $this->table('identification_parts_analyses')
+            ->addIndex(['part_id', 'analysis_recordkey'], [
+                'unique' => true,
+                'name' => 'uniq_part_analysis',
+            ])
+            ->update();
+    }
+}
diff --git a/public/userarea/analysisModal.js b/public/userarea/analysisModal.js
index dc813e5..96bee35 100644
--- a/public/userarea/analysisModal.js
+++ b/public/userarea/analysisModal.js
@@ -106,8 +106,9 @@
         }
 
         container.innerHTML = items
-            .map(function (item) {
+            .map(function (item, index) {
                 const recordKey = item.analysis_recordkey || "";
+                const rowId = item.id != null ? item.id : "";
                 const title = item.analysis_name || "Unnamed analysis";
                 const method = item.analysis_method || "";
 
@@ -121,6 +122,8 @@
                     class="analysis-remove-btn"
                     data-part-id="${escapeHtml(partId)}"
                     data-recordkey="${escapeHtml(recordKey)}"
+                    data-row-id="${escapeHtml(rowId)}"
+                    data-index="${index}"
                     title="Remove analysis">×
             

         `;
@@ -166,19 +169,21 @@
         };
     }
 
-    function addAnalysisToLocalState(partId, payload, iddatadb, idmatrice) {
+    function addAnalysisToLocalState(
+        partId,
+        payload,
+        iddatadb,
+        idmatrice,
+        newId,
+    ) {
         const key = String(partId);
         if (!Array.isArray(analysisAssignedState[key])) {
             analysisAssignedState[key] = [];
         }
 
-        const exists = analysisAssignedState[key].some(function (item) {
-            return item.analysis_recordkey === payload.analysis_recordkey;
-        });
-
-        if (!exists) {
+        {
             analysisAssignedState[key].push({
-                id: null,
+                id: newId || null,
                 part_id: parseInt(partId, 10),
                 iddatadb: iddatadb || null,
                 idmatrice: idmatrice || null,
@@ -195,17 +200,24 @@
         }
     }
 
-    function removeAnalysisFromLocalState(partId, recordKey) {
+    function removeAnalysisFromLocalState(partId, recordKey, index) {
         const key = String(partId);
         if (!Array.isArray(analysisAssignedState[key])) {
             return;
         }
 
-        analysisAssignedState[key] = analysisAssignedState[key].filter(
-            function (item) {
-                return item.analysis_recordkey !== recordKey;
-            },
-        );
+        const i = parseInt(index, 10);
+        if (!isNaN(i) && i >= 0 && i < analysisAssignedState[key].length) {
+            analysisAssignedState[key].splice(i, 1);
+            return;
+        }
+
+        const found = analysisAssignedState[key].findIndex(function (item) {
+            return item.analysis_recordkey === recordKey;
+        });
+        if (found !== -1) {
+            analysisAssignedState[key].splice(found, 1);
+        }
     }
 
     function saveAnalysisAssociation(partId, payload, callback) {
@@ -237,12 +249,13 @@
                 is_accredited: payload.is_accredited,
             },
         })
-            .done(function () {
+            .done(function (resp) {
                 addAnalysisToLocalState(
                     partId,
                     payload,
                     iddatadb,
                     idmatrice !== "NO_MATRIX" ? idmatrice : null,
+                    resp && resp.id ? resp.id : null,
                 );
                 renderAssignedAnalysesForPart(partId);
                 if (typeof callback === "function") callback(true);
@@ -257,7 +270,13 @@
             });
     }
 
-    function deleteAnalysisAssociation(partId, recordKey, callback) {
+    function deleteAnalysisAssociation(
+        partId,
+        recordKey,
+        rowId,
+        index,
+        callback,
+    ) {
         $.ajax({
             url: "delete_part_analysis.php",
             method: "POST",
@@ -265,10 +284,11 @@
             data: {
                 part_id: partId,
                 analysis_recordkey: recordKey,
+                row_id: rowId || "",
             },
         })
             .done(function () {
-                removeAnalysisFromLocalState(partId, recordKey);
+                removeAnalysisFromLocalState(partId, recordKey, index);
                 renderAssignedAnalysesForPart(partId);
                 if (typeof callback === "function") callback(true);
             })
@@ -707,10 +727,18 @@
 
                 const partId = removeBtn.getAttribute("data-part-id");
                 const recordKey = removeBtn.getAttribute("data-recordkey");
+                const rowId = removeBtn.getAttribute("data-row-id");
+                const index = removeBtn.getAttribute("data-index");
 
-                deleteAnalysisAssociation(partId, recordKey, function () {
-                    const stillUsed = Object.keys(analysisAssignedState).some(
-                        function (pid) {
+                deleteAnalysisAssociation(
+                    partId,
+                    recordKey,
+                    rowId,
+                    index,
+                    function () {
+                        const stillUsed = Object.keys(
+                            analysisAssignedState,
+                        ).some(function (pid) {
                             return (
                                 Array.isArray(analysisAssignedState[pid]) &&
                                 analysisAssignedState[pid].some(
@@ -722,15 +750,15 @@
                                     },
                                 )
                             );
-                        },
-                    );
+                        });
 
-                    if (!stillUsed) {
-                        delete analysisSelectedState[recordKey];
-                    }
+                        if (!stillUsed) {
+                            delete analysisSelectedState[recordKey];
+                        }
 
-                    syncSelectedAnalysisRows();
-                });
+                        syncSelectedAnalysisRows();
+                    },
+                );
 
                 return;
             }
@@ -751,17 +779,6 @@
             }
 
             const recordKey = payload.analysis_recordkey;
-            const alreadySelected = !!analysisSelectedState[recordKey];
-
-            if (alreadySelected) {
-                selectedPartIds.forEach(function (partId) {
-                    deleteAnalysisAssociation(partId, recordKey);
-                });
-
-                delete analysisSelectedState[recordKey];
-                syncSelectedAnalysisRows();
-                return;
-            }
 
             let pending = selectedPartIds.length;
             let atLeastOneSaved = false;
diff --git a/public/userarea/delete_part_analysis.php b/public/userarea/delete_part_analysis.php
index d8bb468..91ed5b0 100644
--- a/public/userarea/delete_part_analysis.php
+++ b/public/userarea/delete_part_analysis.php
@@ -15,8 +15,9 @@ try {
 
     $partId            = isset($_POST['part_id']) ? (int)$_POST['part_id'] : 0;
     $analysisRecordkey = trim($_POST['analysis_recordkey'] ?? '');
+    $rowId             = isset($_POST['row_id']) && $_POST['row_id'] !== '' ? (int)$_POST['row_id'] : 0;
 
-    if ($partId <= 0 || $analysisRecordkey === '') {
+    if ($partId <= 0 || ($analysisRecordkey === '' && $rowId <= 0)) {
         http_response_code(400);
         echo json_encode(['success' => false, 'message' => 'Missing required data']);
         exit;
@@ -25,15 +26,29 @@ try {
     $db = DBHandlerSelect::getInstance();
     $pdo = $db->getConnection();
 
-    $stmt = $pdo->prepare("
-        DELETE FROM identification_parts_analyses
-        WHERE part_id = :part_id
-          AND analysis_recordkey = :analysis_recordkey
-    ");
-    $stmt->execute([
-        ':part_id' => $partId,
-        ':analysis_recordkey' => $analysisRecordkey,
-    ]);
+    if ($rowId > 0) {
+        $stmt = $pdo->prepare("
+            DELETE FROM identification_parts_analyses
+            WHERE id = :id
+              AND part_id = :part_id
+            LIMIT 1
+        ");
+        $stmt->execute([
+            ':id' => $rowId,
+            ':part_id' => $partId,
+        ]);
+    } else {
+        $stmt = $pdo->prepare("
+            DELETE FROM identification_parts_analyses
+            WHERE part_id = :part_id
+              AND analysis_recordkey = :analysis_recordkey
+            LIMIT 1
+        ");
+        $stmt->execute([
+            ':part_id' => $partId,
+            ':analysis_recordkey' => $analysisRecordkey,
+        ]);
+    }
 
     echo json_encode([
         'success' => true,
diff --git a/public/userarea/save_part_analysis.php b/public/userarea/save_part_analysis.php
index 8be48a1..dd166df 100644
--- a/public/userarea/save_part_analysis.php
+++ b/public/userarea/save_part_analysis.php
@@ -54,15 +54,6 @@ try {
             :is_web_selectable,
             :is_accredited
         )
-        ON DUPLICATE KEY UPDATE
-            analysis_name = VALUES(analysis_name),
-            analysis_method = VALUES(analysis_method),
-            analysis_level = VALUES(analysis_level),
-            is_web_selectable = VALUES(is_web_selectable),
-            is_accredited = VALUES(is_accredited),
-            iddatadb = VALUES(iddatadb),
-            idmatrice = VALUES(idmatrice),
-            updated_at = CURRENT_TIMESTAMP
     ");
 
     $stmt->execute([
@@ -79,7 +70,8 @@ try {
 
     echo json_encode([
         'success' => true,
-        'message' => 'Association saved'
+        'message' => 'Association saved',
+        'id' => (int)$pdo->lastInsertId()
     ]);
 } catch (Throwable $e) {
     http_response_code(500);

From 7b6d85766d5f67eed718ad5c456e44a1afe78289 Mon Sep 17 00:00:00 2001
From: solocla 
Date: Thu, 23 Jul 2026 12:18:56 +0200
Subject: [PATCH 22/22] change migration

---
 ...723100916_drop_uniq_part_analysis_index.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/db/migrations/20260723100916_drop_uniq_part_analysis_index.php b/db/migrations/20260723100916_drop_uniq_part_analysis_index.php
index f78d146..3927e7a 100644
--- a/db/migrations/20260723100916_drop_uniq_part_analysis_index.php
+++ b/db/migrations/20260723100916_drop_uniq_part_analysis_index.php
@@ -8,18 +8,22 @@ final class DropUniqPartAnalysisIndex extends AbstractMigration
 {
     public function up(): void
     {
-        $this->table('identification_parts_analyses')
-            ->removeIndexByName('uniq_part_analysis')
-            ->update();
+        $table = $this->table('identification_parts_analyses');
+
+        if ($table->hasIndexByName('uniq_part_analysis')) {
+            $table->removeIndexByName('uniq_part_analysis')->update();
+        }
     }
 
     public function down(): void
     {
-        $this->table('identification_parts_analyses')
-            ->addIndex(['part_id', 'analysis_recordkey'], [
+        $table = $this->table('identification_parts_analyses');
+
+        if (!$table->hasIndexByName('uniq_part_analysis')) {
+            $table->addIndex(['part_id', 'analysis_recordkey'], [
                 'unique' => true,
                 'name' => 'uniq_part_analysis',
-            ])
-            ->update();
+            ])->update();
+        }
     }
 }