Skip to content

Commit

Permalink
add dummy pictures as placeholder for scenario view
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmlancien
bmlancien committed Nov 13, 2023
1 parent 4720e27 commit 8ff98bd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 148 deletions.
Binary file added digiplan/static/images/sketches/scenarios-main.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added digiplan/static/images/sketches/scenarios-sidebar.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions digiplan/templates/components/map.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

{% include "components/onboarding.html" %}

<section class="map-wrap">

<!-- Toggle map/results views -->
{% include 'components/toggle_view.html' %}

<section class="map-wrap" style="display: flex; justify-content: start; align-items: center; padding-top: 3rem;">
<img width="862" height="487" src="{% static 'images/sketches/scenarios-main.png' %}" alt="">
</section>

146 changes: 3 additions & 143 deletions digiplan/templates/components/panel_3_results.html
View file
Original file line number Diff line number Diff line change
@@ -1,149 +1,9 @@
{% load static i18n %}

<!--<div class="panel__goal">-->
<!-- <div class="panel__charts">-->
<!-- <div class="panel__chart">-->
<!-- <div class="panel__chart-title">-->
<!-- {% translate "Anteil EE am Stromverbrauch" %} (%)-->
<!-- </div>-->
<!-- <div class="panel__chart-content">-->
<!-- <div id="renewable_share_scenario_chart" class="goal-chart"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="panel__chart">-->
<!-- <div class="panel__chart-title">-->
<!-- {% translate "THG-Reduktion ggü. 2019 (%)" %}-->
<!-- </div>-->
<!-- <div class="panel__chart-content">-->
<!-- <div id="co2_emissions_scenario_chart" class="goal-chart"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
<div class="panel__settings panel__settings--padding">
<div class="panel-item">
<h2 class="panel-item__heading panel-item__heading--nopadding">
<svg width="16" height="16" version="1.1" fill="currentColor" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg">
<path d="m12.7 0.025321v13.733h1.0583v-13.733h-1.0583zm-5.2917 4.208v9.525h1.0583v-9.525h-1.0583zm-5.2917 2.1167v7.4083h1.0583v-7.4083h-1.0583zm-2.1167 9.4821v1.1012h16.933v-1.1012h-16.933z"/>
</svg>
{% translate "Results" %}
</h2>
<div class="panel-item__form">
<select id="result_views" class="form-select" aria-label="Default select example">
<option value="" title="{% translate "Keine Auswahl" %}" selected>{% translate "Keine Auswahl" %}</option>
<optgroup label="{% translate "Renewable Energies (RE)" %}">
<option value="energy_share_2045"
title="{% translate "Annual balance sheet share of renewable energy (wind energy, photovoltaic, hydroelectric power) in the electricity demand of the sectors agriculture, GHG (trade, commerce, services), households and industry in percent. The demand is the net electricity consumption, i.e. transmission losses and power plant consumption are not taken into account. 49.7% of the electricity demand in Germany was covered by renewable energies in 2022." %}">
{% translate "Renewable Energy Share of Demand" %} (%)
</option>
<option value="energy_2045"
title="{% translate "Annual amount of energy fed into the grid from renewable plants in gigawatt hours (wind energy, photovoltaic, hydro power)." %}">
{% translate "Renewable Electricity Production (GWh)" %}</option>
<option value="energy_capita_2045"
title="{% translate "Annual amount of energy fed in from renewable plants (wind energy, photovoltaic, hydro power) in relation to the number of inhabitants in megawatt hours per inhabitant." %}">
{% translate "Renewable Electricity Production per Capita (MWh)" %}
</option>
<option value="energy_square_2045"
title="{% translate "Annual amount of energy fed in from renewable plants (wind energy, photovoltaic, hydro power) related to the area in megawatt hours per km²." %}">
{% translate "Renewable Electricity Production per km² (MWh)" %}
</option>
<option value="capacity_2045"
title="{% translate "Installed capacity from renewable energy plants (wind energy, photovoltaic, hydro power, biomass and biogas) in megawatts." %}">
{% translate "Installed Renewable Capacity (MW)" %}
</option>
<option value="capacity_square_2045"
title="{% translate "Installed capacity from renewable energy plants (wind energy, photovoltaic, hydro power, biomass and biogas) in megawatts per km²." %}">
{% translate "Installed Renewable Capacity (MW/km²)" %}
</option>
<option value="wind_turbines_2045"
title="{% translate "Number of Wind Turbines. The number for your (future) scenario is determined from the installed capacity using a 6.5 MW turbine type." %}">
{% translate "Number of Wind Turbines" %}
</option>
<option value="wind_turbines_square_2045"
title="{% translate "Number of Wind Turbines per km². The number for your (future) scenario is determined from the installed capacity using a 6.5 MW turbine type." %}">
{% translate "Number of Wind Turbines per km²" %}
</option>
</optgroup>
<optgroup label="{% translate "Energy Demand" %}">
<option value="electricity_demand_2045"
title="{% translate "Annual electricity demand in gigawatt hours of the sectors, households, tertiary sector (trade, commerce, services), agriculture and industry. This is the net electricity consumption." %}">
{% translate "Electricity Demand (GWh)" %}
</option>
<option value="electricity_demand_capita_2045"
title="{% translate "Annual electricity demand in gigawatt hours of the sectors, households, tertiary sector (trade, commerce, services), agriculture and industry per inhabitant This is the net electricity consumption." %}">
{% translate "Electricity Demand per Capita (kWh)" %}
</option>
<option value="heat_demand_2045"
title="{% translate "Annual heat consumption for space heating and domestic hot water in gigawatt hours in the household, commercial, trade and services, and agriculture (excluding industry) sectors." %}">
{% translate "Heat Demand (GWh)" %}
</option>
<option value="heat_demand_capita_2045"
title="{% translate "Annual heat consumption per inhabitant for space heating and domestic hot water in gigawatt hours in the household, commercial, trade and services, and agriculture (excluding industry) sectors." %}">
{% translate "Heat Demand per Capita (kWh)" %}
</option>
</optgroup>
</select>
<img src="{% static 'images/icons/i_info.svg' %}" alt="Info Icon" class="i-icon" data-bs-toggle="tooltip" id="info_tooltip_results" title="{% translate "Keine Auswahl" %}">
</div>
<div id="result_simnote" class="panel__simnote"></div>
<div class="panel-item">
<div class="panel-item__padding">
<div id="region_chart_2045" class="panel-item__chart"></div>
</div>
</div>
<div class="panel-item__nav" style="display: none !important;">
<p class="panel-item__nav-header">{% translate "View" %}</p>

<ul class="nav nav-pills" id="results-tabs" role="tablist">
<!--
<li class="nav-item" role="presentation">
<button class="nav-link active" id="results-general-tab" data-bs-toggle="tab" data-bs-target="#results-general" type="button" role="tab" aria-controls="results-general" aria-selected="true">
<svg width="20" height="20" version="1.1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path d="M10.1,4.3c-3.9,0-7.5,2.1-9.5,5.6l0,0c-0.1,0.1-0.1,0.4,0,0.5c1.9,3.4,5.6,5.6,9.5,5.6l0,0l0,0 c3.9,0,7.5-2.1,9.5-5.6l0,0c0.1-0.1,0.1-0.4,0-0.6C17.6,6.5,13.9,4.3,10.1,4.3L10.1,4.3L10.1,4.3z M10.1,5.4c3.4,0,6.6,1.8,8.4,4.7 c-1.7,2.9-4.9,4.7-8.4,4.7c-3.4,0-6.6-1.8-8.4-4.7C3.5,7.2,6.7,5.4,10.1,5.4L10.1,5.4z M10.1,6.7c-1.8,0-3.4,1.6-3.4,3.4 s1.6,3.4,3.4,3.4s3.4-1.6,3.4-3.4S11.9,6.7,10.1,6.7z M10.1,7.8c1.2,0,2.3,1,2.3,2.3c0,1.2-1.1,2.3-2.3,2.3s-2.3-1.1-2.3-2.3 S8.9,7.8,10.1,7.8z"/>
</svg>
{% translate "Overview" %}
</button>
</li>
-->
<li class="nav-item" role="presentation">
<button class="nav-link active" id="results-electricity-tab" data-bs-toggle="tab" data-bs-target="#results-electricity" type="button" role="tab" aria-controls="results-electricity" aria-selected="false">
<svg width="16" height="16" version="1.1" fill="currentColor" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg">
<path d="m8.2021 0.025372-5.4677 8.4414h9.5898l-4.9159 8.4665h1.3229l5.4035-9.5251h-9.4609l4.8512-7.3828z"/>
</svg>
{% translate "Electricity" %}
</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="results-heat-tab" data-bs-toggle="tab" data-bs-target="#results-heat" type="button" role="tab" aria-controls="results-heat" aria-selected="false">
<svg width="20" height="20" version="1.1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path d="M14.9,3.9c-0.1-0.1-0.4-0.1-0.5-0.1h-0.1c-0.2,0-0.5,0.1-0.5,0.4c0,0.4,0,0.6,0,1s0,0.6,0,0.9C13,4.1,12,2.3,10.3,0.9 c-0.1,0-0.1-0.1-0.2-0.2c-0.5-0.1-1-0.6-1.7-0.4c-0.7,0.2-0.6,1-0.6,1.5c0,0.1,0,0.2,0,0.4c-0.1,2-1,3.6-2.3,5.6 C5.1,6.9,4.9,6.1,3.9,5.5c-0.1,0-0.2-0.1-0.4,0C3.4,5.6,3.3,5.7,3.3,5.9c0,1.6-0.6,3-1.2,4.2c-0.4,0.9-0.7,1.7-0.9,2.6 c-0.2,1.4,0.1,2.8,1.1,4.1c1,1.4,2.5,2.3,4.1,2.6c0.1,0,0.4,0,0.5-0.2c0.1-0.2,0.1-0.4,0-0.5c-1.5-2.1-0.6-3.6,0.5-5.2 c0.2-0.2,0.4-0.6,0.6-0.9c0.1,0.4,0.1,0.6,0.1,1.1v0.1c0,0.1,0.1,0.4,0.2,0.4c0.1,0.1,0.4,0,0.5-0.1c1-0.9,1.6-2.1,2.1-3.7 c0-0.1,0-0.2,0-0.4V9.8c0,0,0.1,0.1,0.1,0.2c0,0.1,0.1,0.1,0.1,0.2c1.9,2.2,2.3,4.7,1.4,7.7c0,0,0,0.1-0.1,0.1 c-0.1,0.2-0.4,0.7,0.1,1.1c0.2,0.1,0.4,0.2,0.6,0.2c0.4,0,0.6-0.2,0.7-0.4L14,19c2.7-1.7,4.4-4.3,4.6-7.3 C18.8,8.7,17.5,5.9,14.9,3.9L14.9,3.9z M17.9,11.7c-0.1,2.6-1.6,5.1-4.2,6.5c-0.1,0-0.1,0.1-0.2,0.1l0,0c0-0.1,0.1-0.1,0.1-0.2 c1-3.2,0.5-6.1-1.6-8.5l-0.1-0.1c0-0.1-0.4-0.5-0.7-0.5c-0.1,0-0.1,0-0.2,0c-0.6,0.1-0.6,0.6-0.7,1c0,0.1,0,0.1,0,0.2 c-0.2,1-0.6,1.9-1.1,2.5c-0.1-0.5-0.2-1-0.7-1.4c-0.1-0.1-0.2-0.1-0.4-0.1c-0.1,0-0.2,0.1-0.4,0.2c-0.2,0.5-0.5,1-0.9,1.5 c-1,1.5-2.1,3.1-1.1,5.2c-1-0.4-1.9-1-2.5-2c-0.7-1.1-1.1-2.3-1-3.5c0.2-0.6,0.5-1.4,0.9-2.2c0.5-1.1,1-2.2,1.2-3.6 C4.3,7.1,4.4,7.5,4.5,8c0,0.2,0.1,0.5,0.2,0.9C4.8,9,5,9.1,5.1,9.1c0.1,0,0.4,0,0.4-0.1C7,7.1,8.3,5,8.6,2.3c0-0.1,0-0.4,0-0.5 c0-0.5,0-0.5,0.1-0.6C8.8,1,9.1,1.3,9.5,1.5c0,0,0.1,0.1,0.2,0.2c1.9,1.5,2.8,3.5,3.6,5.6c0,0.1,0.1,0.2,0.4,0.2 c0.1,0,0.2,0,0.4-0.1c0.7-0.7,0.6-1.6,0.6-2.3c0-0.1,0-0.1,0-0.2C16.9,6.7,18,9.1,17.9,11.7L17.9,11.7z"/>
</svg>
{% translate "Heat" %}
</button>
</li>
<!-- <li class="nav-item" role="presentation">-->
<!-- <button class="nav-link" id="results-mobility-tab" data-bs-toggle="tab" data-bs-target="#results-mobility" type="button" role="tab" aria-controls="results-mobility" aria-selected="false">-->
<!-- <svg width="24" height="24" version="1.1" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">-->
<!-- <path d="M22,10.2l-4.6-1c-1.2-2.3-3.9-3.6-4.2-3.6c-0.5-0.1-6.4-0.4-7.7,0c-1.3,0.4-4.4,3-5,5c-0.5,1.8,0.2,4.9,0.2,5 c0,0.1,0.1,0.2,0.2,0.3c0.1,0,1.2,0.5,2.4,0.8c0.4,0.9,1.3,1.5,2.4,1.5c0.9,0,1.7-0.5,2.2-1.2C8,17,8,17,8.1,17c0.7,0,2.5,0,3.3,0 c1.1,0,3.2,0,4.4-0.1c0.5,0.7,1.3,1.1,2.2,1.1c1,0,1.9-0.6,2.4-1.5c1.4-0.3,3-0.9,3.1-0.9c0.2-0.1,0.3-0.2,0.3-0.4v-3 C23.8,11.1,22.6,10.4,22,10.2L22,10.2z M5.7,17.3c-1,0-1.9-0.8-1.9-1.9c0-1,0.8-1.9,1.9-1.9c1,0,1.9,0.8,1.9,1.9 C7.6,16.5,6.7,17.3,5.7,17.3z M18,17.3c-0.7,0-1.2-0.3-1.6-0.9c0,0,0-0.1-0.1-0.1c-0.1-0.3-0.2-0.6-0.2-0.9c0-1,0.8-1.9,1.9-1.9 c1,0,1.9,0.8,1.9,1.9C19.9,16.5,19,17.3,18,17.3L18,17.3z M22.9,15.1c-0.5,0.2-1.4,0.5-2.3,0.7c0-0.1,0-0.2,0-0.3 c0-1.5-1.2-2.7-2.7-2.7s-2.7,1.2-2.7,2.7c0,0.3,0,0.5,0.1,0.7c-1.2,0-3,0.1-4,0.1c-0.7,0-2.3,0-3.1,0c0.1-0.2,0.1-0.5,0.1-0.8 c0-1.5-1.2-2.7-2.7-2.7S3,14,3,15.5c0,0.1,0,0.2,0,0.2c-0.7-0.2-1.4-0.4-1.7-0.5c-0.1-0.7-0.6-3-0.2-4.4c0.5-1.6,3.4-4,4.5-4.4 c1.1-0.4,6.9-0.1,7.3,0c0.3,0.1,2.8,1.3,3.8,3.4C16.8,9.9,16.9,10,17,10l4.8,1c0,0,1.1,0.3,1.1,1.4L22.9,15.1z"/>-->
<!-- </svg>-->
<!-- {% translate "Transportation" %}-->
<!-- </button>-->
<!-- </li>-->
<li class="nav-item" role="presentation">
<button class="nav-link" id="results-ghg-tab" data-bs-toggle="tab" data-bs-target="#results-ghg" type="button" role="tab" aria-controls="results-general" aria-selected="true">
<svg width="20" height="20" version="1.1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path d="m23.46,22.91v-2.53c0-.17-.09-.33-.22-.44-.01,0-1.36-1.03-2.67-3.1-1.22-1.93-2.68-5.2-2.68-9.83,0-.3-.24-.54-.54-.54h-5.59c-.3,0-.54.24-.54.54,0,2.09-.3,4.07-.89,5.92-.09-.68-.13-1.38-.13-2.08,0-.3-.24-.54-.54-.54h-4.29c-.3,0-.54.24-.54.54,0,6.67-4.01,9.78-4.05,9.81-.14.1-.22.27-.22.44v1.81h0c-.3,0-.54.24-.54.54s.24.54.54.54h22.91c.3,0,.54-.24.54-.54s-.24-.54-.54-.54Zm-17.82,0H1.64v-1.55c.87-.74,4.08-3.88,4.26-9.96h3.22c.04,1.19.2,2.35.48,3.45-1.55,3.41-3.64,5.03-3.73,5.09-.14.1-.22.27-.22.44v2.53Zm1.09-2.27c.66-.56,2.49-2.32,3.86-5.38.06-.07.09-.15.11-.22.99-2.28,1.53-4.8,1.59-7.48h4.52c.19,7.99,4.47,12.15,5.56,13.08v2.27H6.72v-2.27Z"/>
<path d="m11.27,4.22c0,.71.26,1.08.47,1.39.1.15.27.23.45.23.11,0,.21-.03.31-.1.12-.08.2-.21.23-.35.03-.14,0-.29-.09-.41-.17-.24-.28-.4-.28-.77s.1-.52.28-.77c.21-.3.46-.68.46-1.39,0-.85-.34-1.31-.62-1.68-.04-.05-.07-.1-.1-.14-.08-.12-.2-.2-.35-.23-.14-.03-.29,0-.41.08-.25.17-.31.51-.15.75.04.06.09.13.16.22.21.28.38.51.38,1,0,.37-.1.52-.28.77-.21.3-.47.68-.47,1.39Z"/>
<path d="m13.63,4.22c0,.71.26,1.08.47,1.39.1.15.27.23.45.23.11,0,.21-.03.31-.1.25-.17.31-.51.14-.76-.17-.24-.28-.4-.28-.77s.1-.52.28-.77c.21-.3.46-.68.46-1.39,0-.85-.34-1.31-.61-1.67-.04-.05-.07-.1-.11-.15-.08-.12-.2-.2-.35-.23-.14-.03-.29,0-.41.08-.25.17-.31.51-.15.75.05.07.1.15.16.22.21.28.38.51.38,1,0,.37-.1.52-.28.78-.21.3-.46.68-.46,1.38Zm.49-3.92h0s0,0,0,0Z"/>
<path d="m15.99,4.22c0,.71.26,1.08.47,1.39.1.15.27.23.45.23.11,0,.21-.03.31-.1.12-.08.2-.21.23-.35.03-.14,0-.29-.09-.41-.17-.24-.27-.4-.27-.77s.1-.52.28-.77c.21-.3.47-.68.47-1.39,0-.85-.34-1.31-.61-1.67-.04-.05-.07-.1-.11-.15-.17-.25-.51-.31-.75-.15-.25.17-.31.51-.15.75.05.07.1.15.16.22.21.28.38.51.38,1,0,.37-.1.52-.28.78-.21.3-.46.68-.46,1.38Z"/>
<path d="m4.91,8.4c0,.59.22.9.38,1.14.1.15.27.23.45.23.11,0,.21-.03.31-.1.25-.17.31-.51.14-.76-.12-.18-.19-.27-.19-.52s.07-.34.19-.53c.16-.23.38-.55.38-1.13,0-.69-.28-1.07-.48-1.34-.03-.04-.06-.08-.09-.13-.08-.12-.2-.2-.35-.23-.14-.03-.29,0-.41.08-.25.17-.31.51-.15.75.03.05.07.1.12.17.16.22.27.36.27.69,0,.25-.07.34-.19.52-.15.22-.38.55-.38,1.14Z"/>
<path d="m6.72,8.4c0,.58.22.9.38,1.14.1.15.27.23.45.23.11,0,.21-.03.31-.1.25-.17.31-.51.14-.76-.12-.18-.19-.27-.19-.52s.07-.34.19-.52c.16-.23.38-.55.38-1.13,0-.69-.28-1.06-.48-1.34-.03-.04-.06-.08-.09-.13-.08-.12-.2-.2-.35-.23-.14-.03-.29,0-.41.08-.25.17-.31.51-.15.76.04.06.08.11.12.17.16.22.27.36.27.69,0,.25-.07.34-.19.52-.16.23-.38.55-.38,1.14Zm.99,1.07h0s0,0,0,0Z"/>
<path d="m8.53,8.4c0,.58.22.9.38,1.14.1.15.27.23.45.23.11,0,.21-.03.31-.1.12-.08.2-.21.23-.35.03-.14,0-.29-.09-.41-.12-.18-.19-.27-.19-.52s.07-.34.19-.52c.16-.23.38-.55.38-1.13,0-.7-.28-1.07-.49-1.35-.03-.04-.06-.08-.08-.12-.17-.25-.5-.31-.75-.15-.12.08-.2.2-.23.35-.03.14,0,.29.08.41l.12.17c.16.22.27.36.27.69,0,.25-.07.34-.19.52-.16.23-.38.55-.38,1.13Z"/>
</svg>
{% translate "THG-Emissionen" %}
</button>
</li>
</ul>
</div>

<img src="{% static 'images/sketches/scenarios-sidebar.png' %}" alt="">

</div>
</div>

0 comments on commit 8ff98bd

Please sign in to comment.