Put result layer code into specific sections #38

rl-institut · Jun 5, 2019 · c6dbb4d · c6dbb4d
1 parent b282c22
commit c6dbb4d
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 69 deletions.
diff --git a/models.py b/models.py
@@ -84,18 +84,6 @@ def pop_density(self):
         return round(self.mundata.pop_2017 / self.mundata.area)
 
 
-# TODO: Remove/alter after test
-class RegMunPopDensityResult(RegMun):
-    name = 'reg_mun_pop_density_result'
-
-    class Meta:
-        proxy = True
-
-    @property
-    def pop_density_result(self):
-        return round(self.mundata.pop_2017 / self.mundata.area)
-
-
 class RegMunGenEnergyRe(RegMun):
     name = 'reg_mun_gen_energy_re'
 
@@ -425,10 +413,11 @@ class RegInfrasAviation(LayerModel):
 # Layer models (results) #
 ##########################
 # Result proxy models for serial views
+# TODO: Remove/alter after test
 import random
 random.seed(1)
 
-
+# TODO: Remove/alter after test
 class RegMunPopResult(RegMun):
     name = 'reg_mun_pop_result'
 
@@ -440,6 +429,18 @@ def pop_result(self):
         return 80000 * random.random()
 
 
+# TODO: Remove/alter after test
+class RegMunPopDensityResult(RegMun):
+    name = 'reg_mun_pop_density_result'
+
+    class Meta:
+        proxy = True
+
+    @property
+    def pop_density_result(self):
+        return round(self.mundata.pop_2017 / self.mundata.area)
+
+
 ###############
 # Data models #
 ###############

diff --git a/views/detail_views.py b/views/detail_views.py
@@ -122,49 +122,11 @@ def build_chart(self):
         return chart
 
 
-# TODO: Remove/alter after test
-class RegMunPopResultDetailView(MasterDetailView):
-    model = models.RegMunPopResult
-    template_name = 'stemp_abw/popups/pop_result.html'
-
-    def get_context_data(self, **kwargs):
-        context = super(RegMunPopResultDetailView, self).get_context_data(**kwargs)
-        self.chart_session_store(context)
-
-        return context
-
-    def build_chart(self):
-        mun_data = models.MunData.objects.get(pk=self.kwargs['pk'])
-        pop_2017 = mun_data.pop_2017
-        pop_2030 = mun_data.pop_2030
-        pop_2050 = mun_data.pop_2050
-        index = ['2017', '2030', '2050']
-        data = pd.DataFrame(index=index,
-                            data={'Personen': [pop_2017, pop_2030, pop_2050]})
-        setup_labels = {
-            'title': {'text': 'Ergebnis Bevölkerungsentwicklung'},
-            'subtitle': {'text': 'Ergebnis'},
-            'yAxis': {'title': {'text': 'Personen'}}
-        }
-        chart = highcharts.HCTimeseries(
-            data=data,
-            setup_labels=setup_labels,
-            style='display: inline-block'
-        )
-        return chart
-
-
 class RegMunPopDensityDetailView(MasterDetailView):
     model = models.RegMunPopDensity
     template_name = 'stemp_abw/popups/pop_density.html'
 
 
-# TODO: Remove/alter after test
-class RegMunPopDensityResultDetailView(MasterDetailView):
-    model = models.RegMunPopDensityResult
-    template_name = 'stemp_abw/popups/pop_density_result.html'
-
-
 class RegMunEnergyReElDemShareDetailView(MasterDetailView):
     model = models.RegMunEnergyReElDemShare
     template_name = 'stemp_abw/popups/energy_re_el_dem_share.html'
@@ -768,3 +730,43 @@ class RegInfrasHvgridDetailView(MasterDetailView):
 
 class RegInfrasAviationDetailView(MasterDetailView):
     model = models.RegInfrasAviation
+
+
+# RESULT DETAIL VIEWS
+
+# TODO: Remove/alter after test
+class RegMunPopResultDetailView(MasterDetailView):
+    model = models.RegMunPopResult
+    template_name = 'stemp_abw/popups/pop_result.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(RegMunPopResultDetailView, self).get_context_data(**kwargs)
+        self.chart_session_store(context)
+
+        return context
+
+    def build_chart(self):
+        mun_data = models.MunData.objects.get(pk=self.kwargs['pk'])
+        pop_2017 = mun_data.pop_2017
+        pop_2030 = mun_data.pop_2030
+        pop_2050 = mun_data.pop_2050
+        index = ['2017', '2030', '2050']
+        data = pd.DataFrame(index=index,
+                            data={'Personen': [pop_2017, pop_2030, pop_2050]})
+        setup_labels = {
+            'title': {'text': 'Ergebnis Bevölkerungsentwicklung'},
+            'subtitle': {'text': 'Ergebnis'},
+            'yAxis': {'title': {'text': 'Personen'}}
+        }
+        chart = highcharts.HCTimeseries(
+            data=data,
+            setup_labels=setup_labels,
+            style='display: inline-block'
+        )
+        return chart
+
+
+# TODO: Remove/alter after test
+class RegMunPopDensityResultDetailView(MasterDetailView):
+    model = models.RegMunPopDensityResult
+    template_name = 'stemp_abw/popups/pop_density_result.html'
diff --git a/views/serial_views.py b/views/serial_views.py
@@ -33,15 +33,6 @@ class RegMunPopData(GeoJSONLayerView):
                   'pop']
 
 
-# TODO: Remove/alter after test
-class RegMunPopResultData(GeoJSONLayerView):
-    model = models.RegMunPopResult
-    properties = ['popup_content',
-                  'name',
-                  'gen',
-                  'pop_result']
-
-
 class RegMunPopDensityData(GeoJSONLayerView):
     model = models.RegMunPopDensity
     properties = ['popup_content',
@@ -50,15 +41,6 @@ class RegMunPopDensityData(GeoJSONLayerView):
                   'pop_density']
 
 
-# TODO: Remove/alter after test
-class RegMunPopDensityResultData(GeoJSONLayerView):
-    model = models.RegMunPopDensityResult
-    properties = ['popup_content',
-                  'name',
-                  'gen',
-                  'pop_density_result']
-
-
 class RegMunEnergyReElDemShareData(GeoJSONLayerView):
     model = models.RegMunEnergyReElDemShare
     properties = ['popup_content',
@@ -443,3 +425,21 @@ def get(request):
             return JsonResponse(results.get_panel_results(), safe=True)
         else:
             return JsonResponse(None, safe=False)
+
+
+# TODO: Remove/alter after test
+class RegMunPopResultData(GeoJSONLayerView):
+    model = models.RegMunPopResult
+    properties = ['popup_content',
+                  'name',
+                  'gen',
+                  'pop_result']
+
+
+# TODO: Remove/alter after test
+class RegMunPopDensityResultData(GeoJSONLayerView):
+    model = models.RegMunPopDensityResult
+    properties = ['popup_content',
+                  'name',
+                  'gen',
+                  'pop_density_result']