Merge pull request #149 from cmu-delphi/pre-development

Pre development

Author: dmytrotsko

src/fixtures/available_geography.json

@@ -4,7 +4,8 @@
       "pk": 1,
       "fields": {
         "name": "county",
-        "display_name": "L2 division (e.g. U.S. counties)",
+        "display_name": "ADM2 (e.g. U.S. counties)",
+        "order_id": 3,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -15,6 +16,7 @@
       "fields": {
         "name": "hhs",
         "display_name": "HHS Regions",
+        "order_id": 4,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -24,7 +26,8 @@
       "pk": 3,
       "fields": {
         "name": "hrr",
-        "display_name": "Hospital Referral Regions (HRAs)",
+        "display_name": "Hospital Referral Regions (HRRs)",
+        "order_id": 6,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -35,6 +38,7 @@
       "fields": {
         "name": "msa",
         "display_name": "Metropolitan Statistical Areas (MSAs)",
+        "order_id": 5,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -45,6 +49,7 @@
       "fields": {
         "name": "nation",
         "display_name": "National",
+        "order_id": 1,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -54,7 +59,8 @@
       "pk": 6,
       "fields": {
         "name": "state",
-        "display_name": "L1 division (e.g. U.S. states)",
+        "display_name": "ADM1 (e.g. U.S. states)",
+        "order_id": 2,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }
@@ -65,6 +71,7 @@
       "fields": {
         "name": "dma",
         "display_name": "Designated Market Areas (DMAs)",
+        "order_id": 7,
         "created": "2023-08-09T19:23:22.597131",
         "modified": "2023-08-09T19:23:22.597131"
       }

src/signals/filters.py

@@ -1,4 +1,5 @@
 from typing import Any
+import logging
 
 import django_filters
 from django.db.models import Q
@@ -20,6 +21,9 @@
 )
 
 
+logger = logging.getLogger(__name__)
+
+
 class NumberInFilter(BaseInFilter, NumberFilter):
     pass
 
@@ -46,11 +50,13 @@ class SignalFilter(django_filters.FilterSet):
     severenity_pyramid_rungs = django_filters.MultipleChoiceFilter(choices=SeverityPyramidRungsChoices.choices)
     source = django_filters.ModelMultipleChoiceFilter(queryset=SourceSubdivision.objects.all())
     time_type = django_filters.MultipleChoiceFilter(choices=TimeTypeChoices.choices)
-    base_signal = django_filters.BooleanFilter(lookup_expr='isnull', field_name='base_for')
 
     def __init__(self, data, *args, **kwargs):
         data = data.copy()
-        data.setdefault('geographic_scope', GeographicScope.objects.get(name='USA').id)
+        try:
+            data.setdefault('geographic_scope', GeographicScope.objects.get(name='USA').id)
+        except GeographicScope.DoesNotExist:
+            logger.warning("Default Geographic Scope was not found in the database. Using an empty list.")
         super().__init__(data, *args, **kwargs)
 
     class Meta:
@@ -66,7 +72,6 @@ class Meta:
             'geographic_scope',
             'source',
             'time_type',
-            'base_signal',
         ]
 
     def filter_search(self, queryset, name, value) -> Any:

src/signals/forms.py

@@ -30,7 +30,6 @@ class SignalFilterForm(forms.ModelForm):
     active = forms.TypedMultipleChoiceField(choices=ActiveChoices.choices, coerce=bool, widget=forms.CheckboxSelectMultiple())
     source = forms.ModelMultipleChoiceField(queryset=SourceSubdivision.objects.all(), widget=forms.CheckboxSelectMultiple())
     time_type = forms.ChoiceField(choices=TimeTypeChoices.choices, widget=forms.CheckboxSelectMultiple())
-    base_signal = forms.ChoiceField(choices=[('', _('All')), (True, _('Yes')), (False, _('No'))], required=False, widget=forms.RadioSelect())
     geographic_scope = forms.ModelMultipleChoiceField(queryset=GeographicScope.objects.all(), widget=forms.CheckboxSelectMultiple())
     severenity_pyramid_rungs = forms.ChoiceField(choices=SeverityPyramidRungsChoices.choices, widget=forms.CheckboxSelectMultiple())
 
@@ -80,3 +79,5 @@ def __init__(self, *args, **kwargs) -> None:
             field.required = False
             field.help_text = ''
             field.label = ''
+            if field_name == "available_geography":
+                field.queryset = field.queryset.order_by("order_id")

src/signals/migrations/0018_geography_order_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-06-11 18:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0017_geography_display_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='geography',
+            name='order_id',
+            field=models.IntegerField(blank=True, help_text='Order ID', null=True),
+        ),
+    ]

src/signals/models.py

@@ -160,6 +160,12 @@ class Geography(TimeStampedModel):
         blank=True
     )
 
+    order_id: models.IntegerField = models.IntegerField(
+        help_text=_('Order ID'),
+        null=True,
+        blank=True
+    )
+
     class Meta:
         verbose_name_plural: str = "geographies"
         ordering: list[str] = ["name"]

src/signals/views.py

@@ -1,4 +1,5 @@
 from typing import Any, Dict
+import logging
 
 from django.conf import settings
 from django.views.generic import DetailView, ListView
@@ -12,6 +13,9 @@
 from signals.serializers import SignalSerializer
 
 
+logger = logging.getLogger(__name__)
+
+
 class SignalsListView(ListView):
     """
     ListView for displaying a list of Signal objects.
@@ -53,7 +57,6 @@ def get_url_params(self):
             else None,
             "source": [int(el) for el in self.request.GET.getlist("source")],
             "time_type": [el for el in self.request.GET.getlist("time_type")],
-            "base_signal": self.request.GET.get("base_signal"),
         }
         url_params_str = ""
         for param_name, param_value in url_params_dict.items():
@@ -76,7 +79,12 @@ def get_context_data(self, **kwargs) -> Dict[str, Any]:
         context: Dict[str, Any] = super().get_context_data(**kwargs)
         url_params_dict, url_params_str = self.get_url_params()
         if not url_params_dict.get("geographic_scope"):
-            url_params_dict["geographic_scope"] = [GeographicScope.objects.get(name="USA").id]
+            default_geographic_scope = []
+            try:
+                default_geographic_scope = [GeographicScope.objects.get(name="USA").id]
+            except GeographicScope.DoesNotExist:
+                logger.warning("Default Geographic Scope was not found in the database. Using an empty list.")
+            url_params_dict["geographic_scope"] = default_geographic_scope
         context["url_params_dict"] = url_params_dict
         context["form"] = SignalFilterForm(initial=url_params_dict)
         context["url_params_str"] = url_params_str

src/templates/signals/signals.html

@@ -189,25 +189,6 @@ <h2 class="accordion-header" id="time_type-heading">
                                     </div>
                                 </div>
                             </div>
-                            <div class="accordion-item">
-                              <h2 class="accordion-header">
-                                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#base_signal-collapse" aria-expanded="false" aria-controls="active-collapse">
-                                    <label for="id_base_signal" class="form-label">
-                                        Base Signal
-                                        <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Base Signal" data-bs-content="{{ filters_descriptions.SignalFilter.base_signal }}"><i class="bi bi-info-circle"></i></a>
-                                    </label>
-                                </button>
-                              </h2>
-                                {% if form.base_signal.value %}
-                                  <div id="base_signal-collapse" class="accordion-collapse" aria-labelledby="base_signal-heading">
-                                {% else %}
-                                  <div id="base_signal-collapse" class="accordion-collapse collapse" aria-labelledby="base_signal-heading">
-                                {% endif %}
-                                    <div class="accordion-body">
-                                        {{ form.base_signal|as_crispy_field }}
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <div class="card-body">
                             <div class="d-grid gap-2 mt-3">