From 71a0449f8d2abcbe73dcef89dd025a360f22ab41 Mon Sep 17 00:00:00 2001 From: Amar Date: Tue, 11 Feb 2025 21:29:57 +0100 Subject: [PATCH 1/2] Full reports implementation + map bug fixed --- backend/controllers/reportsController.js | 1 + frontend/src/components/Mappa/Mappa.vue | 10 +- frontend/src/components/Navbar/Navbar.vue | 2 +- .../Tabelle/TabellaSegnalazioni.vue | 2 +- frontend/src/components/Toast/Toast.vue | 2 - frontend/src/data/reports.js | 22 ++ frontend/src/router/index.js | 5 + .../src/views/dashboard/ViewDashboard.vue | 10 +- .../views/dashboard/ViewEditComunicazione.vue | 14 +- .../views/dashboard/ViewEditSegnalazione.vue | 332 ++++++++++++++---- 10 files changed, 321 insertions(+), 79 deletions(-) diff --git a/backend/controllers/reportsController.js b/backend/controllers/reportsController.js index 04f41f0..6fb1a66 100644 --- a/backend/controllers/reportsController.js +++ b/backend/controllers/reportsController.js @@ -91,6 +91,7 @@ export const updateReport = async (req, res) => { res.status(200).json(report); } catch (error) { res.status(400).json({ message: "Error in report update" }); + console.log(error.message) } }; diff --git a/frontend/src/components/Mappa/Mappa.vue b/frontend/src/components/Mappa/Mappa.vue index fb02d10..9f600b1 100644 --- a/frontend/src/components/Mappa/Mappa.vue +++ b/frontend/src/components/Mappa/Mappa.vue @@ -22,6 +22,8 @@ const props = defineProps({ }, }); +const filteredEmergencies = ref([]) + onMounted(() => { // Recupero i bordi del comune di Trento da OpenStreetMap fetch('https://nominatim.openstreetmap.org/search.php?city=Trento&polygon_geojson=1&format=json') @@ -34,6 +36,12 @@ onMounted(() => { .catch(error => { console.error('Errore caricamento mappa:', error); }); + + filteredEmergencies.value = props.emergencies?.filter(emergency => { + return emergency.coordinates.lat !== null && + emergency.coordinates.lon !== null; + }) + console.log(filteredEmergencies) }); @@ -41,7 +49,7 @@ onMounted(() => {
-
diff --git a/frontend/src/components/Navbar/Navbar.vue b/frontend/src/components/Navbar/Navbar.vue index 1a0dabd..5de3169 100644 --- a/frontend/src/components/Navbar/Navbar.vue +++ b/frontend/src/components/Navbar/Navbar.vue @@ -49,7 +49,7 @@ function chiudiMenuNavbar() {

Storico emergenze

-