From e2e28feed743fc8ed0f1d069eb2c42866400d1d1 Mon Sep 17 00:00:00 2001 From: nesnoj Date: Wed, 30 Aug 2023 17:45:52 +0200 Subject: [PATCH 1/2] Hide main charts in today and results --- digiplan/static/js/charts.js | 32 +++++++------- .../templates/components/panel_1_today.html | 44 +++++++++---------- .../templates/components/panel_3_results.html | 40 ++++++++--------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/digiplan/static/js/charts.js b/digiplan/static/js/charts.js index 922c20ab..9d449f31 100644 --- a/digiplan/static/js/charts.js +++ b/digiplan/static/js/charts.js @@ -1,12 +1,12 @@ // Goals & scenarios, initioalize charts -const renewable_share_goal_div = document.getElementById("renewable_share_goal_chart"); -const renewable_share_goal_chart = echarts.init(renewable_share_goal_div); -const co2_emissions_goal_div = document.getElementById("co2_emissions_goal_chart"); -const co2_emissions_goal_chart = echarts.init(co2_emissions_goal_div); -const renewable_share_scenario_div = document.getElementById("renewable_share_scenario_chart"); -const renewable_share_scenario_chart = echarts.init(renewable_share_scenario_div); -const co2_emissions_scenario_div = document.getElementById("co2_emissions_scenario_chart"); -const co2_emissions_scenario_chart = echarts.init(co2_emissions_scenario_div); +// const renewable_share_goal_div = document.getElementById("renewable_share_goal_chart"); +// const renewable_share_goal_chart = echarts.init(renewable_share_goal_div); +// const co2_emissions_goal_div = document.getElementById("co2_emissions_goal_chart"); +// const co2_emissions_goal_chart = echarts.init(co2_emissions_goal_div); +// const renewable_share_scenario_div = document.getElementById("renewable_share_scenario_chart"); +// const renewable_share_scenario_chart = echarts.init(renewable_share_scenario_div); +// const co2_emissions_scenario_div = document.getElementById("co2_emissions_scenario_chart"); +// const co2_emissions_scenario_chart = echarts.init(co2_emissions_scenario_div); // Results view, initiliaze charts // const detailed_overview_chart = echarts.init(document.getElementById("detailed_overview_chart")); @@ -287,10 +287,10 @@ const ghg_reduction_option = JSON.parse(document.getElementById("ghg_reduction") function resizeCharts() { setTimeout(function () { - renewable_share_goal_chart.resize(); - co2_emissions_goal_chart.resize(); - renewable_share_scenario_chart.resize(); - co2_emissions_scenario_chart.resize(); + // renewable_share_goal_chart.resize(); + // co2_emissions_goal_chart.resize(); + // renewable_share_scenario_chart.resize(); + // co2_emissions_scenario_chart.resize(); // detailed_overview_chart.resize(); // ghg_overview_chart.resize(); electricity_overview_chart.resize(); @@ -305,10 +305,10 @@ function resizeCharts() { } // Goals & scenarios, setOptions -renewable_share_goal_chart.setOption(renewable_share_goal); -co2_emissions_goal_chart.setOption(co2_emissions_goal); -renewable_share_scenario_chart.setOption(renewable_share_scenario); -co2_emissions_scenario_chart.setOption(co2_emissions_scenario); +// renewable_share_goal_chart.setOption(renewable_share_goal); +// co2_emissions_goal_chart.setOption(co2_emissions_goal); +// renewable_share_scenario_chart.setOption(renewable_share_scenario); +// co2_emissions_scenario_chart.setOption(co2_emissions_scenario); // Results, setOptions // detailed_overview_chart.setOption(detailed_overview_option); diff --git a/digiplan/templates/components/panel_1_today.html b/digiplan/templates/components/panel_1_today.html index aba114c4..555b6cac 100644 --- a/digiplan/templates/components/panel_1_today.html +++ b/digiplan/templates/components/panel_1_today.html @@ -1,28 +1,28 @@ {% load static i18n %} -
- - + + + + + + + + + + + + + + + + + + + + + -
-
-
- {% translate "Anteil EE am Stromverbrauch" %} (%) -
-
-
-
-
-
-
- {% translate "THG-Reduktion ggü. 2019 (%)" %} -
-
-
-
-
-
-
+

diff --git a/digiplan/templates/components/panel_3_results.html b/digiplan/templates/components/panel_3_results.html index 8e3c5e0a..e151e9de 100644 --- a/digiplan/templates/components/panel_3_results.html +++ b/digiplan/templates/components/panel_3_results.html @@ -1,25 +1,25 @@ {% load static i18n %} -
-
-
-
- {% translate "Anteil EE am Stromverbrauch" %} (%) -
-
-
-
-
-
-
- {% translate "THG-Reduktion ggü. 2019 (%)" %} -
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + + +

From bed0a1725a702b321c33fe61111480231ed710e9 Mon Sep 17 00:00:00 2001 From: nesnoj Date: Wed, 30 Aug 2023 17:46:33 +0200 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00aa33ed..b298f616 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project tries to adhere to [Semantic Versioning](https://semver.org/spe - remove language button - rework result charts - rework top navigation and linked pages +- hide main charts in today and result section ### Fixed - slider mark at wrong position