diff --git a/public/userarea/analysisModal.js b/public/userarea/analysisModal.js index bdd1e7d..791121b 100644 --- a/public/userarea/analysisModal.js +++ b/public/userarea/analysisModal.js @@ -431,7 +431,7 @@ const emptyEl = modal.querySelector("#analysisEmptyBox"); const errorEl = modal.querySelector("#analysisErrorBox"); - const webOnly = webOnlyEl ? webOnlyEl.checked : false; + const webOnly = true; const searchValue = searchEl ? searchEl.value.trim().toLowerCase() : ""; let visibleCount = 0; @@ -496,8 +496,10 @@ emptyEl.classList.add("d-none"); } - if (analysisLoadedCache[String(matrixId)]) { - renderAnalysesList(analysisLoadedCache[String(matrixId)]); + const cacheKey = String(matrixId) + "_WEB_ONLY"; + + if (analysisLoadedCache[cacheKey]) { + renderAnalysesList(analysisLoadedCache[cacheKey]); return; } @@ -509,13 +511,21 @@ dataType: "json", data: { id_matrice: matrixId, + web_only: 1, }, }) .done(function (response) { const analyses = Array.isArray(response.value) - ? response.value + ? response.value.filter(function (item) { + return ( + item.SelezionabileSuWeb === true || + item.SelezionabileSuWeb === 1 || + item.SelezionabileSuWeb === "1" + ); + }) : []; - analysisLoadedCache[String(matrixId)] = analyses; + + analysisLoadedCache[cacheKey] = analyses; renderAnalysesList(analyses); }) .fail(function (xhr) { @@ -674,12 +684,7 @@ }); } - const webOnlyEl = modal.querySelector("#analysisWebOnly"); - if (webOnlyEl) { - webOnlyEl.addEventListener("change", function () { - filterAnalysisList(); - }); - } + // WEB only is now fixed by default const searchEl = modal.querySelector("#analysisSearchInput"); if (searchEl) { diff --git a/public/userarea/get_analisi_matrice_filter.php b/public/userarea/get_analisi_matrice_filter.php index 6d1f6d7..ce5d038 100644 --- a/public/userarea/get_analisi_matrice_filter.php +++ b/public/userarea/get_analisi_matrice_filter.php @@ -18,7 +18,15 @@ try { $api = VisualLimsApiClient::getInstance(); - $filter = rawurlencode("Matrice/IdMatrice eq $idMatrice"); + $webOnly = isset($_GET['web_only']) ? (int)$_GET['web_only'] : 1; + + $filterString = "Matrice/IdMatrice eq $idMatrice"; + + if ($webOnly === 1) { + $filterString .= " and SelezionabileSuWeb eq true"; + } + + $filter = rawurlencode($filterString); $endpoint = "Analisi?\$filter={$filter}"; $base_url = 'https://93.43.5.102/limsapi/api/odata/'; diff --git a/public/userarea/modal_analysis.php b/public/userarea/modal_analysis.php index ff5b223..50895b6 100644 --- a/public/userarea/modal_analysis.php +++ b/public/userarea/modal_analysis.php @@ -259,11 +259,9 @@ $matrixGroups = array_values($matrixGroups);