Add gen_cap_re_region property #38

rl-institut · Jun 11, 2019 · 5d2dac4 · 5d2dac4
1 parent 92f7cf9
commit 5d2dac4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/models.py b/models.py
@@ -203,6 +203,21 @@ def gen_cap_re(self):
                      self.mundata.gen_capacity_hydro +
                      self.mundata.gen_capacity_bio)
 
+    @property
+    def gen_cap_re_region(self):
+        gen_cap_re_region = 0
+        for value in MunData.objects.values('gen_capacity_wind'):
+            gen_cap_re_region += value['gen_capacity_wind']
+        for value in MunData.objects.values('gen_capacity_pv_roof_large'):
+            gen_cap_re_region += value['gen_capacity_pv_roof_large']
+        for value in MunData.objects.values('gen_capacity_pv_ground'):
+            gen_cap_re_region += value['gen_capacity_pv_ground']
+        for value in MunData.objects.values('gen_capacity_hydro'):
+            gen_cap_re_region += value['gen_capacity_hydro']
+        for value in MunData.objects.values('gen_capacity_bio'):
+            gen_cap_re_region += value['gen_capacity_bio']
+        return round(gen_cap_re_region)
+
 
 class RegMunGenCapReDensity(RegMunGenCapRe):
     name = 'reg_mun_gen_cap_re_density'

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

diff --git a/views/serial_views.py b/views/serial_views.py
@@ -91,7 +91,8 @@ class RegMunGenCapReData(GeoJSONLayerView):
     properties = [
         'name',
         'gen',
-        'gen_cap_re'
+        'gen_cap_re',
+        'gen_cap_re_region'
     ]