Skip to content

Commit

Permalink
remove empty result chart tabs #49
Browse files Browse the repository at this point in the history 
includes:
* html template
* chart data processing
* js code loading
* tab width (css)
  • Loading branch information
@nesnoj
nesnoj committed Jun 24, 2019
1 parent 1418b56 commit 365bb78
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 50 deletions.
2 changes: 1 addition & 1 deletion static/stemp_abw/foundation/css/app.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions static/stemp_abw/js/data_functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -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) {
Expand Down
9 changes: 0 additions & 9 deletions templates/stemp_abw/map.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,15 +539,6 @@ <h3>Wollen Sie wirklich zur Startseite? Alle Änderungen gehen verloren.</h3>
{% 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);
Expand Down
74 changes: 37 additions & 37 deletions templates/stemp_abw/results.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<ul class="tabs" data-deep-link="true" data-update-history="true" data-deep-link-smudge="true" data-deep-link-smudge-delay="500" data-tabs id="deeplinked-tabs">
<li class="tabs-title tabs-title--horizontal is-active"><a href="#results-panel1" aria-selected="true">Übersicht</a></li>
<li class="tabs-title tabs-title--horizontal"><a href="#results-panel2">Stromerzeugung</a></li>
<li class="tabs-title tabs-title--horizontal"><a href="#results-panel3">Strombedarf</a></li>
<li class="tabs-title tabs-title--horizontal"><a href="#results-panel4">Wärmeerzeugung</a></li>
<li class="tabs-title tabs-title--horizontal"><a href="#results-panel5">Wärmebedarf</a></li>
<li class="tabs-title tabs-title--horizontal"><a href="#results-panel6">Flächenbedarf</a></li>
<!-- <li class="tabs-title tabs-title&#45;&#45;horizontal"><a href="#results-panel3">Strombedarf</a></li>-->
<!-- <li class="tabs-title tabs-title&#45;&#45;horizontal"><a href="#results-panel4">Wärmeerzeugung</a></li>-->
<!-- <li class="tabs-title tabs-title&#45;&#45;horizontal"><a href="#results-panel5">Wärmebedarf</a></li>-->
<!-- <li class="tabs-title tabs-title&#45;&#45;horizontal"><a href="#results-panel6">Flächenbedarf</a></li>-->
</ul>

<div class="tabs-content" data-tabs-content="deeplinked-tabs">
Expand Down Expand Up @@ -88,38 +88,38 @@
{% endfor %}
</div>
</div>
<div class="tabs-panel" id="results-panel3">
<div class="grid-x grid-margin-x">
{% for visualization in results_charts_tab3_viz %}
<div class="cell small-4">
{% include "stemp_abw/result_chart.html" %}
</div>
{% endfor %}
</div>
</div>
<div class="tabs-panel" id="results-panel4">
<div class="grid-x grid-margin-x">
{% for visualization in results_charts_tab4_viz %}
<div class="cell small-4">
{% include "stemp_abw/result_chart.html" %}
</div>
{% endfor %}
</div>
</div>
<div class="tabs-panel" id="results-panel5">
<div class="grid-x grid-margin-x">
{% for visualization in results_charts_tab5_viz %}
<div class="cell small-4">
{% include "stemp_abw/result_chart.html" %}
</div>
{% endfor %}
</div>
<div class="tabs-panel" id="results-panel6">
<div class="grid-x grid-margin-x">
<div class="cell small-4"><p>Hier folgen in Kürze Detailergebnisse...</p></div>
<div class="cell small-4"><p>Hier folgen in Kürze Detailergebnisse...</p></div>
<div class="cell small-4"><p>Hier folgen in Kürze Detailergebnisse...</p></div>
</div>
</div>
<!-- <div class="tabs-panel" id="results-panel3">-->
<!-- <div class="grid-x grid-margin-x">-->
<!-- {% for visualization in results_charts_tab3_viz %}-->
<!-- <div class="cell small-4">-->
<!-- {% include "stemp_abw/result_chart.html" %}-->
<!-- </div>-->
<!-- {% endfor %}-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="tabs-panel" id="results-panel4">-->
<!-- <div class="grid-x grid-margin-x">-->
<!-- {% for visualization in results_charts_tab4_viz %}-->
<!-- <div class="cell small-4">-->
<!-- {% include "stemp_abw/result_chart.html" %}-->
<!-- </div>-->
<!-- {% endfor %}-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="tabs-panel" id="results-panel5">-->
<!-- <div class="grid-x grid-margin-x">-->
<!-- {% for visualization in results_charts_tab5_viz %}-->
<!-- <div class="cell small-4">-->
<!-- {% include "stemp_abw/result_chart.html" %}-->
<!-- </div>-->
<!-- {% endfor %}-->
<!-- </div>-->
<!-- <div class="tabs-panel" id="results-panel6">-->
<!-- <div class="grid-x grid-margin-x">-->
<!-- <div class="cell small-4"><p>Hier folgen in Kürze Detailergebnisse...</p></div>-->
<!-- <div class="cell small-4"><p>Hier folgen in Kürze Detailergebnisse...</p></div>-->
<!-- <div class="cell small-4"><p>Hier folgen in Kürze Detailergebnisse...</p></div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>

0 comments on commit 365bb78

Please sign in to comment.