🛠️ admin.py -> Added 'time_label' to list_filter

🛠️ filters.py -> Modified filter choices and added imports
🛠️ forms.py -> Modified source field to be a ModelMultipleChoiceField
🛠️ views.py -> Modified format_type, source, and time_label handling

Author: BrainIsDead

src/signals/admin.py

@@ -57,13 +57,12 @@ class SignalAdmin(ImportExportModelAdmin):
     list_display: tuple[Literal['name']] = ('name',)
     search_fields: tuple[Literal['name'], Literal['description'], Literal['short_description']]
     search_fields = ('name', 'description', 'short_description')
-    list_filter: tuple[Literal['pathogen'], Literal['available_geography'], Literal['signal_type'], Literal['format_type'],
-                       Literal['is_smoothed'], Literal['is_weighted'], Literal['is_cumulative'], Literal['has_stderr'], Literal['has_sample_size']]
     list_filter = (
         'pathogen',
         'available_geography',
         'signal_type',
         'format_type',
+        'time_label',
         'is_smoothed',
         'is_weighted',
         'is_cumulative',

src/signals/filters.py

@@ -10,7 +10,12 @@
 )
 from django_filters.widgets import QueryArrayWidget
 
-from signals.models import Signal, TimeLabelChoices
+from datasources.models import SourceSubdivision
+from signals.models import (
+    FormatChoices,
+    Signal,
+    TimeLabelChoices,
+)
 
 
 class NumberInFilter(BaseInFilter, NumberFilter):
@@ -35,9 +40,9 @@ class SignalFilter(django_filters.FilterSet):
             ('last_updated', 'last_updated'),
         )
     )
-    time_label = django_filters.MultipleChoiceFilter(
-        choices=TimeLabelChoices.choices,
-    )
+    format_type = django_filters.MultipleChoiceFilter(choices=FormatChoices.choices)
+    source = django_filters.ModelMultipleChoiceFilter(queryset=SourceSubdivision.objects.all())
+    time_label = django_filters.MultipleChoiceFilter(choices=TimeLabelChoices.choices)
 
     class Meta:
         model = Signal

src/signals/forms.py

@@ -28,7 +28,7 @@ class SignalFilterForm(forms.ModelForm):
     pathogen = forms.ModelChoiceField(queryset=Pathogen.objects.all(), widget=forms.CheckboxSelectMultiple())
     active = forms.TypedMultipleChoiceField(choices=ActiveChoices.choices, coerce=bool, widget=forms.CheckboxSelectMultiple())
     format_type = forms.ChoiceField(choices=FormatChoices.choices, widget=forms.CheckboxSelectMultiple())
-    source = forms.ModelChoiceField(queryset=SourceSubdivision.objects.all(), widget=forms.CheckboxSelectMultiple())
+    source = forms.ModelMultipleChoiceField(queryset=SourceSubdivision.objects.all(), widget=forms.CheckboxSelectMultiple())
     time_label = forms.ChoiceField(choices=TimeLabelChoices.choices, widget=forms.CheckboxSelectMultiple())
 
     class Meta:
@@ -79,7 +79,6 @@ class Meta:
                 'data-bs-toggle': 'tooltip',
                 'data-bs-placement': 'bottom',
             }),
-            'time_label': forms.Select(attrs={'class': 'form-select'}),
         }
 
     def __init__(self, *args, **kwargs):

src/signals/views.py

@@ -9,7 +9,7 @@
 
 from signals.filters import SignalFilter
 from signals.forms import SignalFilterForm
-from signals.models import Signal, Pathogen
+from signals.models import Pathogen, Signal
 from signals.serializers import SignalSerializer
 
 
@@ -55,14 +55,11 @@ def get_url_params(self):
             "category": self.request.GET._getlist("category")
             if self.request.GET.get("category")
             else None,
-            "format_type": self.request.GET.get("format_type"),
-            "source": int(self.request.GET.get("source"))
-            if self.request.GET.get("source")
-            else "",
-            "time_label": self.request.GET.get("time_label")
-            if self.request.GET.get("time_label")
-            else "",
+            "format_type": [el for el in self.request.GET._getlist("format_type")],
+            "source": [int(el) for el in self.request.GET._getlist("source")],
+            "time_label": [el for el in self.request.GET._getlist("time_label")]
         }
+        print(url_params_dict)
         url_params_str = ""
         for param_name, param_value in url_params_dict.items():
             if isinstance(param_value, list):