From bf191550c6e63a960d4b3d1d5fa3de14c59487cc Mon Sep 17 00:00:00 2001 From: lucienshema Date: Fri, 25 Apr 2025 14:54:44 +0200 Subject: [PATCH] fixed map --- staticfiles/assets/js/custom.js | 137 +++++++++++++++++++++++++++----- 1 file changed, 118 insertions(+), 19 deletions(-) diff --git a/staticfiles/assets/js/custom.js b/staticfiles/assets/js/custom.js index 366088b..29936dc 100644 --- a/staticfiles/assets/js/custom.js +++ b/staticfiles/assets/js/custom.js @@ -1558,6 +1558,7 @@ async function fetchFiles(apiEndpoint) { if (!response.ok) throw new Error("Network response was not ok"); const data = await response.json(); + console.log("API Response:", data); // Inspect the response // Check if data is valid and not empty if (!data || !Array.isArray(data) || data.length === 0) { @@ -1656,29 +1657,60 @@ function initializeDataTable() { }); } -// Handle filter submission -filterForm.addEventListener("submit", (event) => { - event.preventDefault(); +// // Handle filter submission +// filterForm.addEventListener("submit", (event) => { +// event.preventDefault(); - const startDate = document.getElementById("startDate").value; - const endDate = document.getElementById("endDate").value; - let apiUrl = "/api/files/list/all/"; +// const startDate = document.getElementById("startDate").value; +// const endDate = document.getElementById("endDate").value; +// let apiUrl = "/api/files/list/all/"; - // If both dates are provided, fetch only the filtered data - if (startDate && endDate) { - apiUrl = `/uploads/api/filtered_files/list/all/?startDate=${startDate}&endDate=${endDate}`; - } +// // If both dates are provided, fetch only the filtered data +// if (startDate && endDate) { +// apiUrl = `/uploads/api/filtered_files/list/all/?startDate=${startDate}&endDate=${endDate}`; +// } - fetchFiles(apiUrl); -}); +// fetchFiles(apiUrl); +// }); -// Reset filter: clear filter fields and reload the full file list -resetFilterBtn.addEventListener("click", () => { - document.getElementById("startDate").value = ""; - document.getElementById("endDate").value = ""; - fetchFiles("/api/files/list/all/"); +// Make sure the DOM is fully loaded before trying to access elements +document.addEventListener("DOMContentLoaded", function() { + // Get the filter form element + const filterForm = document.getElementById("filterForm"); + + // Only add the event listener if the form exists + if (filterForm) { + filterForm.addEventListener("submit", (event) => { + event.preventDefault(); + + const startDate = document.getElementById("startDate").value; + const endDate = document.getElementById("endDate").value; + let apiUrl = "/api/files/list/all/"; + + // If both dates are provided, fetch only the filtered data + if (startDate && endDate) { + apiUrl = `/uploads/api/filtered_files/list/all/?startDate=${startDate}&endDate=${endDate}`; + } + + fetchFiles(apiUrl); + }); + + // Reset filter: clear filter fields and reload the full file list + resetFilterBtn.addEventListener("click", () => { + document.getElementById("startDate").value = ""; + document.getElementById("endDate").value = ""; + fetchFiles("/api/files/list/all/"); + }); + } }); +// // Reset filter: clear filter fields and reload the full file list +// resetFilterBtn.addEventListener("click", () => { +// document.getElementById("startDate").value = ""; +// document.getElementById("endDate").value = ""; +// fetchFiles("/api/files/list/all/"); +// }); + // Initial fetch for all files on page load fetchFiles("/api/files/list/all/"); @@ -1967,7 +1999,38 @@ function displayUsers(data) { initializeDataTable(); } -// Handle filter submission +// // Handle filter submission +// filterForm.addEventListener("submit", (event) => { +// event.preventDefault(); + +// const startDate = document.getElementById("startDate").value; +// const endDate = document.getElementById("endDate").value; +// let apiUrl = "/api/users/"; + +// // If both dates are provided, fetch only the filtered data +// if (startDate && endDate) { +// apiUrl = `/api/filtered_users/?startDate=${startDate}&endDate=${endDate}`; +// } + +// fetchUsers(apiUrl); +// }); + +// // Reset filter: clear filter fields and reload the full user list +// resetFilterBtn.addEventListener("click", () => { +// document.getElementById("startDate").value = ""; +// document.getElementById("endDate").value = ""; +// fetchUsers("/api/users/"); +// }); + +// Make sure the DOM is fully loaded before trying to access elements +document.addEventListener("DOMContentLoaded", function() { + // Get the filter form element + const filterForm = document.getElementById("filterForm"); + + // Only add the event listener if the form exists + if (filterForm) { + + // Handle filter submission filterForm.addEventListener("submit", (event) => { event.preventDefault(); @@ -1989,6 +2052,8 @@ resetFilterBtn.addEventListener("click", () => { document.getElementById("endDate").value = ""; fetchUsers("/api/users/"); }); + } +}); // Initial fetch for all users on page load fetchUsers("/api/users/"); @@ -2315,7 +2380,39 @@ function displayBackups(data) { initializeDataTable(); } -// Handle filter submission +// // Handle filter submission +// filterForm.addEventListener("submit", (event) => { +// event.preventDefault(); + +// const startDate = document.getElementById("startDate").value; +// const endDate = document.getElementById("endDate").value; +// let apiUrl = "/api/collection_sites/list"; + +// // If both dates are provided, fetch only the filtered data +// if (startDate && endDate) { +// apiUrl = `/api/collection_sites/filter/?startDate=${startDate}&endDate=${endDate}`; +// } + +// fetchBackups(apiUrl); +// }); + +// // Reset filter: clear filter fields and reload the full user list +// resetFilterBtn.addEventListener("click", () => { +// document.getElementById("startDate").value = ""; +// document.getElementById("endDate").value = ""; +// fetchBackups("/api/collection_sites/list"); +// }); + + +// Make sure the DOM is fully loaded before trying to access elements +document.addEventListener("DOMContentLoaded", function() { + // Get the filter form element + const filterForm = document.getElementById("filterForm"); + + // Only add the event listener if the form exists + if (filterForm) { + + // Handle filter submission filterForm.addEventListener("submit", (event) => { event.preventDefault(); @@ -2337,6 +2434,8 @@ resetFilterBtn.addEventListener("click", () => { document.getElementById("endDate").value = ""; fetchBackups("/api/collection_sites/list"); }); + } +}); // Initial fetch for all backups on page load fetchBackups("/api/collection_sites/list");