Add gen_energy_re_per_capita_region property #38

rl-institut · Jun 11, 2019 · 291e3d4 · 291e3d4
1 parent f25608b
commit 291e3d4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/models.py b/models.py
@@ -155,7 +155,7 @@ def energy_re_el_dem_share_region(self):
         return round(self.gen_energy_re_region / self.dem_el_energy_region * 100)
 
 
-class RegMunGenEnergyRePerCapita(RegMunGenEnergyRe):
+class RegMunGenEnergyRePerCapita(RegMunGenEnergyRe, RegMunPop):
     name = 'reg_mun_gen_energy_re_per_capita'
 
     class Meta:
@@ -165,6 +165,10 @@ class Meta:
     def gen_energy_re_per_capita(self):
         return round(self.gen_energy_re * 1e3 / self.mundata.pop_2017, 1)
 
+    @property
+    def gen_energy_re_per_capita_region(self):
+        return round(self.gen_energy_re_region * 1e3 / self.pop_region, 1)
+
 
 class RegMunGenEnergyReDensity(RegMunGenEnergyRe):
     name = 'reg_mun_gen_energy_re_density'

diff --git a/templates/stemp_abw/popups/gen_energy_re_per_capita.html b/templates/stemp_abw/popups/gen_energy_re_per_capita.html
@@ -1,6 +1,13 @@
 {% extends 'stemp_abw/popups/base_layer_popup.html' %}
 
-{% block values %}: {{ layer.gen_energy_re_per_capita }} MWh pro EinwohnerIn{% endblock %}
+{% block gen %}
+  <div class="cell">
+    <p>{{ layer.gen }}: {{ layer.gen_energy_re_per_capita }} MWh pro EinwohnerIn</p>
+  </div>
+  <div>
+    Region ABW: {{ layer.gen_energy_re_per_capita_region }} MWh pro EinwohnerIn
+  </div>
+{% endblock %}
 
 {% block vis %}
 <div class="cell" style="height: 252px;">

diff --git a/views/serial_views.py b/views/serial_views.py
@@ -71,7 +71,8 @@ class RegMunGenEnergyRePerCapitaData(GeoJSONLayerView):
     properties = [
         'name',
         'gen',
-        'gen_energy_re_per_capita'
+        'gen_energy_re_per_capita',
+        'gen_energy_re_per_capita_region'
     ]