Add dem_th_energy_per_capita_region property #38

rl-institut · Jun 18, 2019 · fe5430c · fe5430c
1 parent 06bf732
commit fe5430c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/models.py b/models.py
@@ -263,7 +263,7 @@ def dem_th_energy_region(self):
         return round(result / 1e3)
 
 
-class RegMunDemThEnergyPerCapita(RegMunDemThEnergy):
+class RegMunDemThEnergyPerCapita(RegMunDemThEnergy, RegMunPopDensity):
     name = 'reg_mun_dem_th_energy_per_capita'
 
     class Meta:
@@ -273,6 +273,10 @@ class Meta:
     def dem_th_energy_per_capita(self):
         return round(self.dem_th_energy * 1e6 / self.mundata.pop_2017)
 
+    @property
+    def dem_th_energy_per_capita_region(self):
+        return round(self.dem_th_energy_region * 1e6 / self.pop_region)
+
 
 class RegWaterProtArea(LayerModel):
     name = 'reg_water_prot_area'

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