solocla/trf_certest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

per-row buttons locking, progress

Browse Source
This commit is contained in:
r.mubarakzyanov 2026-03-18 19:58:57 +03:00
parent 5dedc779df
commit eb21910ef3
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
public/userarea/export_to_lims.js
View File

@ -330,8 +330,16 @@ document.addEventListener("DOMContentLoaded", () => {
// Validate first // Validate first
clearValidationErrors(); clearValidationErrors();
// Show validating state on the row
setRowExporting(gridRow, true);
const spinner = gridRow.querySelector(".batch-row-spinner");
if (spinner) spinner.innerHTML = '<i class="fas fa-spinner fa-spin"></i> Validating...';
validateRows([{ iddatadb: parseInt(iddatadb), index: parseInt(rowIndex) }]) validateRows([{ iddatadb: parseInt(iddatadb), index: parseInt(rowIndex) }])
.then((validationData) => { .then((validationData) => {
setRowExporting(gridRow, false);
gridRow.classList.remove("batch-disabled");
if (!validationData.success) { if (!validationData.success) {
showExportResult({ success: false, message: validationData.message || "Errore di validazione" }); showExportResult({ success: false, message: validationData.message || "Errore di validazione" });
return; return;
@ -348,6 +356,9 @@ document.addEventListener("DOMContentLoaded", () => {
showConfirmAndExport(iddatadb, btn); showConfirmAndExport(iddatadb, btn);
}) })
.catch((error) => { .catch((error) => {
setRowExporting(gridRow, false);
gridRow.classList.remove("batch-disabled");
console.error("Validation error:", error); console.error("Validation error:", error);
showExportResult({ success: false, message: "Errore di validazione: " + error.message }); showExportResult({ success: false, message: "Errore di validazione: " + error.message });
}); });
@ -379,13 +390,29 @@ document.addEventListener("DOMContentLoaded", () => {
console.log(`Confirmed export for iddatadb: ${iddatadb}`); console.log(`Confirmed export for iddatadb: ${iddatadb}`);
confirmModal.hide(); confirmModal.hide();
const gridRow = btn.closest(".grid-row");
setRowExporting(gridRow, true);
try { try {
const gridRow = btn.closest(".grid-row");
const data = await sendExport(iddatadb, gridRow); const data = await sendExport(iddatadb, gridRow);
console.log("Export response:", data); console.log("Export response:", data);
// Stop spinner, fully restore row
setRowExporting(gridRow, false);
gridRow.classList.remove("batch-disabled");
if (!data.success) {
showRowError(gridRow, iddatadb, data.message || "Errore sconosciuto");
}
showExportResult(data); showExportResult(data);
} catch (error) { } catch (error) {
console.error("Export error:", error); console.error("Export error:", error);
// Stop spinner, fully restore row so user can retry
setRowExporting(gridRow, false);
gridRow.classList.remove("batch-disabled");
showRowError(gridRow, iddatadb, error.message);
showExportResult({ showExportResult({
success: false, success: false,
message: error.message, message: error.message,

14
public/userarea/import_edit2.php
View File

@ -1550,6 +1550,14 @@ function fixedDefaultValue(array $f): string
const rowIndex = btn.dataset.row; const rowIndex = btn.dataset.row;
const row = btn.closest('.grid-row'); const row = btn.closest('.grid-row');
const iddatadb = row.getAttribute('data-id'); const iddatadb = row.getAttribute('data-id');
// Show spinner on save button
const origHtml = btn.innerHTML;
btn.innerHTML = '<i class="fas fa-spinner fa-spin"></i>';
btn.disabled = true;
row.style.opacity = '0.6';
row.style.pointerEvents = 'none';
const formData = new FormData(); const formData = new FormData();
const inputs = row.querySelectorAll(`input[name^="rows[${rowIndex}][details]"], select[name^="rows[${rowIndex}][details]"]`); const inputs = row.querySelectorAll(`input[name^="rows[${rowIndex}][details]"], select[name^="rows[${rowIndex}][details]"]`);
@ -1638,6 +1646,12 @@ function fixedDefaultValue(array $f): string
}) })
.catch(error => { .catch(error => {
alert('Errore durante il salvataggio: ' + error.message); alert('Errore durante il salvataggio: ' + error.message);
})
.finally(() => {
btn.innerHTML = origHtml;
btn.disabled = false;
row.style.opacity = '';
row.style.pointerEvents = '';
}); });
}); });
}); });