From b79c4bd60f2fae3a4f7b20ed21133a98c69e11b7 Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Thu, 11 Jan 2024 17:18:00 +0100 Subject: [PATCH] repaired Modal-Window of DTC-Table in WebUI --- Software/data_src/static/js/dtc_table.js | 30 +++++++++++++++++++++++- Software/data_src/static/js/script.js | 25 +------------------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Software/data_src/static/js/dtc_table.js b/Software/data_src/static/js/dtc_table.js index 43fee75..501c5f6 100644 --- a/Software/data_src/static/js/dtc_table.js +++ b/Software/data_src/static/js/dtc_table.js @@ -81,7 +81,8 @@ function getDescriptionForDTCNumber(number, callback) { fetch(jsonFilePath) .then((response) => response.json()) .then((data) => { - const foundEntry = data.find((entry) => entry.num === number); + const dtcList = data.dtc_table_data; + const foundEntry = dtcList.find((entry) => entry.num === number); if (foundEntry) { const description = foundEntry.description; @@ -102,6 +103,32 @@ function getDescriptionForDTCNumber(number, callback) { }); } +function showDTCModal(event) { + var dtc = parseInt(event.currentTarget.getAttribute("data-dtc")); + var debugval = event.currentTarget.getAttribute("data-debugval"); + var modal = $("#dtcModal"); + + getDescriptionForDTCNumber(dtc, function (error, title, description) { + if (error) { + console.error("Fehler beim Abrufen der Beschreibung:", error); + modal.find(".modal-title").text("Fehler"); + modal + .find(".dtc-desc") + .text("DTC-Beschreibung konnte nicht geladen werden"); + } else { + modal.find(".modal-title").text(title); + modal.find(".dtc-desc").text(description); + if (debugval > 0) { + modal.find(".dtc-debugval").text("Debugvalue: " + debugval); + } else { + modal.find(".dtc-debugval").remove(); + } + } + }); + // Modal anzeigen + modal.modal("show"); +} + function fillDTCTable(dtcArray) { // Referenz auf das Tabellen-Element var table = document.getElementById("dtc_table"); @@ -176,6 +203,7 @@ function fillDTCTable(dtcArray) { row.setAttribute("data-dtc", dtcInfo[1]); row.setAttribute("data-debugval", dtcInfo[4]); + row.addEventListener("click", showDTCModal); // Aktivität var activityCell = row.insertCell(3); diff --git a/Software/data_src/static/js/script.js b/Software/data_src/static/js/script.js index eadba67..73913be 100644 --- a/Software/data_src/static/js/script.js +++ b/Software/data_src/static/js/script.js @@ -10,28 +10,5 @@ document nextSibling.innerText = fileName; }); -$("table").on("click", "tr[data-dtc]", function () { - var dtc = $(this).data("dtc"); - var debugval = $(this).data("debugval"); - var modal = $("#dtcModal"); - getDescriptionForDTCNumber(dtc, function (error, title, description) { - if (error) { - console.error("Fehler beim Abrufen der Beschreibung:", error); - modal.find(".modal-title").text("Fehler"); - modal - .find(".dtc-desc") - .text("DTC-Beschreibung konnte nicht geladen werden"); - } else { - modal.find(".modal-title").text(title); - modal.find(".dtc-desc").text(description); - if (debugval > 0) { - modal.find(".dtc-debugval").text("Debugvalue: " + debugval); - } else { - modal.find(".dtc-debugval").remove(); - } - } - }); - // Modal anzeigen - modal.modal("show"); -}); +