From e88807695270ac531f41a298fa12d363eee5a88b Mon Sep 17 00:00:00 2001 From: Hendrik Huyskens Date: Tue, 7 May 2024 10:32:35 +0200 Subject: [PATCH] Fix disappearing region charts --- .jshintrc | 3 ++- CHANGELOG.md | 1 + digiplan/static/js/charts.js | 3 ++- digiplan/static/js/results.js | 7 +++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.jshintrc b/.jshintrc index bc77135b..b5fbe403 100644 --- a/.jshintrc +++ b/.jshintrc @@ -37,7 +37,8 @@ "createChart": false, "clearChart": false, "hidePotentialLayers": false, - "URLSearchParams": false + "URLSearchParams": false, + "preResultCharts": false }, "strict": "implied" } diff --git a/CHANGELOG.md b/CHANGELOG.md index cbd94f74..f4101fa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe - show potential layers if detail panel is open when revisiting settings menu - popups for distilled layers - charts for popups +- disappearing region charts ## [0.1.0] - 2024-03-19 ### Added diff --git a/digiplan/static/js/charts.js b/digiplan/static/js/charts.js index a6e4651b..cb1fcc8c 100644 --- a/digiplan/static/js/charts.js +++ b/digiplan/static/js/charts.js @@ -1,3 +1,4 @@ +/* jshint ignore:start */ const preResultCharts = { wind_capacity: "wind_capacity_chart", wind_areas: "wind_areas_chart", @@ -6,6 +7,7 @@ const preResultCharts = { pv_roof_capacity: "pv_roof_capacity_chart", pv_roof_areas: "pv_roof_areas_chart", }; +/* jshint ignore:end */ // Onboarding Charts const onboarding_wind_div = document.getElementById("onboarding_wind_chart"); @@ -57,7 +59,6 @@ document.addEventListener("show.bs.tab", resizeCharts); function createChart(div_id, options) { const chartElement = document.getElementById(div_id); - chartElement.innerHTML = ""; let chart; if (echarts.getInstanceByDom(chartElement)) { chart = echarts.getInstanceByDom(chartElement); diff --git a/digiplan/static/js/results.js b/digiplan/static/js/results.js index fc6b8d25..8dc155e1 100644 --- a/digiplan/static/js/results.js +++ b/digiplan/static/js/results.js @@ -201,6 +201,13 @@ function showCharts(charts = {}) { success: function (chart_options) { for (const chart in charts) { createChart(charts[chart], chart_options[chart]); + // Remove skeleton placeholder if it exists + const skeleton = document + .getElementById(charts[chart]) + .querySelector(".skeleton"); + if (skeleton !== null) { + skeleton.remove(); + } } }, });