From 365bb789cc3957fe8952b38c560b1da87b25eca9 Mon Sep 17 00:00:00 2001 From: nesnoj Date: Mon, 24 Jun 2019 23:31:28 +0200 Subject: [PATCH] remove empty result chart tabs #49 includes: * html template * chart data processing * js code loading * tab width (css) --- static/stemp_abw/foundation/css/app.css | 2 +- static/stemp_abw/js/data_functions.js | 6 +- templates/stemp_abw/map.html | 9 --- templates/stemp_abw/results.html | 74 ++++++++++++------------- 4 files changed, 41 insertions(+), 50 deletions(-) diff --git a/static/stemp_abw/foundation/css/app.css b/static/stemp_abw/foundation/css/app.css index edb1cff7..9c71c8c7 100644 --- a/static/stemp_abw/foundation/css/app.css +++ b/static/stemp_abw/foundation/css/app.css @@ -1948,7 +1948,7 @@ footer.map-footer { border-top-right-radius: 100px; border-bottom-right-radius: 100px; } #results-wrap li { - width: 16.6%; + width: 50%; border-top: 0; letter-spacing: .5px; } #results-wrap li a { diff --git a/static/stemp_abw/js/data_functions.js b/static/stemp_abw/js/data_functions.js index 79275872..a345b092 100644 --- a/static/stemp_abw/js/data_functions.js +++ b/static/stemp_abw/js/data_functions.js @@ -137,9 +137,9 @@ function getSimulationResults() { idx4=parseInt($("#hc_pie_power_production_user_scn")[0].getAttribute('data-highcharts-chart')) idx5=parseInt($("#hc_pie_power_production_sq_scn")[0].getAttribute('data-highcharts-chart')) idx6=parseInt($("#hc_column_power_prod_m_user_scn")[0].getAttribute('data-highcharts-chart')) - idx7=parseInt($("#hc_res_wind_time")[0].getAttribute('data-highcharts-chart')) + //idx7=parseInt($("#hc_res_wind_time")[0].getAttribute('data-highcharts-chart')) - const hc_idx_array = [idx1, idx2, idx3, idx4, idx5, idx6, idx7] + const hc_idx_array = [idx1, idx2, idx3, idx4, idx5, idx6]//, idx7] // Check if results are not outdated if (data['sim_status'] == 'init' || data['sim_status'] == 'up_to_date') { @@ -174,7 +174,7 @@ function getSimulationResults() { Highcharts.charts[idx6].addSeries(data['hc_column_power_prod_m_user_scn'][i]); } - Highcharts.charts[idx7].series[0].setData(data['hc_res_wind_time']); + //Highcharts.charts[idx7].series[0].setData(data['hc_res_wind_time']); // Hide loading text hc_idx_array.forEach(function (item, index) { diff --git a/templates/stemp_abw/map.html b/templates/stemp_abw/map.html index 33d5b350..d3c41b5d 100644 --- a/templates/stemp_abw/map.html +++ b/templates/stemp_abw/map.html @@ -539,15 +539,6 @@

Wollen Sie wirklich zur Startseite? Alle Änderungen gehen verloren.

{% for visualization in results_charts_tab2_viz %} {{visualization.media}} {% endfor %} - {% for visualization in results_charts_tab3_viz %} - {{visualization.media}} - {% endfor %} - {% for visualization in results_charts_tab4_viz %} - {{visualization.media}} - {% endfor %} - {% for visualization in results_charts_tab5_viz %} - {{visualization.media}} - {% endfor %} setTimeout(function() { getSimulationResults(); }, 50); diff --git a/templates/stemp_abw/results.html b/templates/stemp_abw/results.html index 723ff9e6..134b75a2 100644 --- a/templates/stemp_abw/results.html +++ b/templates/stemp_abw/results.html @@ -2,10 +2,10 @@
@@ -88,38 +88,38 @@ {% endfor %}
-
-
- {% for visualization in results_charts_tab3_viz %} -
- {% include "stemp_abw/result_chart.html" %} -
- {% endfor %} -
-
-
-
- {% for visualization in results_charts_tab4_viz %} -
- {% include "stemp_abw/result_chart.html" %} -
- {% endfor %} -
-
-
-
- {% for visualization in results_charts_tab5_viz %} -
- {% include "stemp_abw/result_chart.html" %} -
- {% endfor %} -
-
-
-

Hier folgen in Kürze Detailergebnisse...

-

Hier folgen in Kürze Detailergebnisse...

-

Hier folgen in Kürze Detailergebnisse...

-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +