Sorted Locations by geo level, added group names

Author: dmytrotsko

src/assets/js/indicatorSetsTable.js

@@ -12,7 +12,6 @@ function calculate_table_height() {
 
 var table = new DataTable("#indicatorSetsTable", {
     fixedHeader: true,
-    responsive: true,
     searching: false,
     paging: false,
     scrollCollapse: true,

src/indicatorsets/urls.py

@@ -1,6 +1,5 @@
 from django.urls import path
 from django.urls.resolvers import URLPattern
-
 from indicatorsets.views import (IndicatorSetListView, epivis,
                                  generate_export_data_url, preview_data, create_query_code)
 

src/indicatorsets/utils.py

@@ -1,10 +1,12 @@
 import ast
 import random
+from collections import defaultdict
 from datetime import datetime as dtime
 
 import requests
 from django.conf import settings
 from epiweeks import Week
+
 from indicatorsets.models import IndicatorSet
 
 
@@ -62,3 +64,20 @@ def get_original_data_provider_choices():
         .order_by("original_data_provider")
         .distinct()
     ]
+
+
+def group_by_property(list_of_dicts, property):
+    """Groups a list of dictionaries by a specified property.
+
+    Args:
+        list_of_dicts: A list of dictionaries.
+        property: The property to group by.
+
+    Returns:
+        A dictionary where keys are the unique values of the property,
+        and values are lists of dictionaries with that property value.
+    """
+    grouped_dict = defaultdict(list)
+    for item in list_of_dicts:
+        grouped_dict[item[property]].append(item)
+    return dict(grouped_dict)

src/indicatorsets/views.py

@@ -16,6 +16,7 @@
     generate_epivis_custom_title,
     generate_random_color,
     get_epiweek,
+    group_by_property,
 )
 
 logger = logging.getLogger(__name__)
@@ -146,6 +147,29 @@ def get_url_params(self):
                     url_params_str = f"{url_params_str}&{param_name}={param_value}"
         return url_params_dict, url_params_str
 
+    def get_grouped_geographic_granularities(self):
+        geographic_granularities = [
+            {
+                "id": str(geo_unit.geo_id),
+                "geoType": geo_unit.geo_level.name,
+                "text": geo_unit.display_name,
+                "geoTypeDisplayName": geo_unit.geo_level.display_name,
+            }
+            for geo_unit in GeographyUnit.objects.all()
+            .prefetch_related("geo_level")
+            .order_by("level")
+        ]
+        geographic_granularities = group_by_property(
+            geographic_granularities, "geoTypeDisplayName"
+        )
+        grouped_geographic_granularities = []
+        for key, value in geographic_granularities.items():
+            grouped_geographic_granularities.append({
+                "text": key,
+                "children": value,
+            })
+        return grouped_geographic_granularities
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         queryset = self.get_queryset()
@@ -172,14 +196,7 @@ def get_context_data(self, **kwargs):
         context["available_geographies"] = Geography.objects.filter(
             used_in="indicators"
         )
-        context["geographic_granularities"] = [
-            {
-                "id": str(geo_unit.geo_id),
-                "geoType": geo_unit.geo_level.name,
-                "text": geo_unit.display_name,
-            }
-            for geo_unit in GeographyUnit.objects.all().prefetch_related("geo_level")
-        ]
+        context["geographic_granularities"] = self.get_grouped_geographic_granularities()
         return context
 
 

src/templates/indicatorsets/indicatorSetsFilters.html

@@ -47,7 +47,9 @@ <h2 class="card-title font-size-25">Filters</h2>
                                     data-mdb-target="#flush-collapse_{{ form.pathogens.auto_id }}"
                                     aria-expanded="false"
                                     aria-controls="flush-collapse_{{ form.pathogens.auto_id }}">
-                                Pathogens<br>/Syndromes
+                                Pathogens
+                                <br>
+                                /Syndromes
                                 <a tabindex="0"
                                    type="button"
                                    class="info-button filter-description-popover"
@@ -262,12 +264,13 @@ <h2 class="card-title font-size-25">Filters</h2>
     $(document).ready(function() {
         const geoValues = {{ geographic_granularities|safe }};
         var urlParams = JSON.parse(JSON.stringify({{ url_params_dict|safe }}));
-        const locationSearchValues = geoValues.map(item => {
-            return {
-                ...item,
-                "id": `${item.geoType}:${item.id}`
-            }
-        });
+        const locationSearchValues = geoValues.map(group => ({
+            ...group,
+            children: group.children.map(child => ({
+                ...child,
+                id: `${child.geoType}:${child.id}`
+            }))
+        }));
         initSelect2('location_search', locationSearchValues);
         if (urlParams.location_search != "") {
             var locationSearch = urlParams.location_search;