Merge pull request #48 from cmu-delphi/development

dmytrotsko · web-flow · commit c7b101977ae3 · 2024-12-05T23:59:15.000+02:00
Development
diff --git a/src/signal_sets/filters.py b/src/signal_sets/filters.py
@@ -14,31 +14,31 @@ class SignalSetFilter(django_filters.FilterSet):
 
     pathogens = django_filters.ModelMultipleChoiceFilter(
         field_name="pathogens",
-        queryset=Pathogen.objects.all(),
+        queryset=Pathogen.objects.filter(id__in=SignalSet.objects.values_list("pathogens", flat="True")),
         widget=QueryArrayWidget,
     )
 
     geographic_scope = django_filters.ModelMultipleChoiceFilter(
         field_name="geographic_scope",
-        queryset=GeographicScope.objects.all(),
+        queryset=GeographicScope.objects.filter(id__in=SignalSet.objects.values_list("geographic_scope", flat="True")),
         widget=QueryArrayWidget,
     )
 
     available_geographies = django_filters.ModelMultipleChoiceFilter(
         field_name="available_geographies",
-        queryset=Geography.objects.all().order_by("display_order_number"),
+        queryset=Geography.objects.filter(id__in=SignalSet.objects.values_list("available_geographies", flat="True")).order_by("display_order_number"),
         widget=QueryArrayWidget,
     )
 
     severity_pyramid_rungs = django_filters.ModelMultipleChoiceFilter(
         field_name="severity_pyramid_rungs",
-        queryset=SeverityPyramidRung.objects.all(),
+        queryset=SeverityPyramidRung.objects.filter(id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")),
         widget=QueryArrayWidget,
     )
 
     data_source = django_filters.ModelMultipleChoiceFilter(
         field_name="data_source",
-        queryset=DataSource.objects.all(),
+        queryset=DataSource.objects.filter(id__in=SignalSet.objects.values_list("data_source", flat="True")),
         widget=QueryArrayWidget,
     )
 
diff --git a/src/signal_sets/forms.py b/src/signal_sets/forms.py
@@ -8,25 +8,26 @@
 class SignalSetFilterForm(forms.ModelForm):
 
     pathogens = forms.ModelChoiceField(
-        queryset=Pathogen.objects.all(), widget=forms.CheckboxSelectMultiple()
+        queryset=Pathogen.objects.filter(id__in=SignalSet.objects.values_list("pathogens", flat="True")), widget=forms.CheckboxSelectMultiple()
     )
 
     geographic_scope = forms.ModelChoiceField(
-        queryset=GeographicScope.objects.all(), widget=forms.CheckboxSelectMultiple()
+        queryset=GeographicScope.objects.filter(id__in=SignalSet.objects.values_list("geographic_scope", flat="True")),
+        widget=forms.CheckboxSelectMultiple()
     )
 
     available_geographies = forms.ModelChoiceField(
-        queryset=Geography.objects.all().order_by("display_order_number"),
+        queryset=Geography.objects.filter(id__in=SignalSet.objects.values_list("available_geographies", flat="True")).order_by("display_order_number"),
         widget=forms.CheckboxSelectMultiple(),
     )
 
     severity_pyramid_rungs = forms.ModelChoiceField(
-        queryset=SeverityPyramidRung.objects.all(),
+        queryset=SeverityPyramidRung.objects.filter(id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")),
         widget=forms.CheckboxSelectMultiple(),
     )
 
     data_source = forms.ModelChoiceField(
-        queryset=DataSource.objects.all(),
+        queryset=DataSource.objects.filter(id__in=SignalSet.objects.values_list("data_source", flat="True")),
         widget=forms.CheckboxSelectMultiple(),
     )
 
diff --git a/src/signals/filters.py b/src/signals/filters.py
@@ -11,6 +11,7 @@
     Geography,
     SignalsDbView,
     SeverityPyramidRung,
+    Signal
 )
 from datasources.models import SourceSubdivision
 
@@ -42,7 +43,7 @@ class SignalFilter(django_filters.FilterSet):
     )
 
     datasource = django_filters.ModelMultipleChoiceFilter(
-        queryset=SourceSubdivision.objects.all(),
+        queryset=SourceSubdivision.objects.filter(id__in=Signal.objects.values_list("source", flat=True)),
         field_name="datasource",
         to_field_name="display_name",
     )
diff --git a/src/signals/forms.py b/src/signals/forms.py
@@ -2,6 +2,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from signals.models import (
+    Signal,
     Pathogen,
     GeographicScope,
     Geography,
@@ -21,20 +22,20 @@ class SignalFilterForm(forms.ModelForm):
     )
 
     pathogens = forms.ModelChoiceField(
-        queryset=Pathogen.objects.all(), widget=forms.CheckboxSelectMultiple()
+        queryset=Pathogen.objects.filter(id__in=Signal.objects.values_list("pathogen", flat=True)), widget=forms.CheckboxSelectMultiple()
     )
 
     geographic_scope = forms.ModelChoiceField(
-        queryset=GeographicScope.objects.all(), widget=forms.CheckboxSelectMultiple()
+        queryset=GeographicScope.objects.filter(id__in=Signal.objects.values_list("geographic_scope", flat=True)), widget=forms.CheckboxSelectMultiple()
     )
 
     available_geography = forms.ModelChoiceField(
-        queryset=Geography.objects.all().order_by("display_order_number"),
+        queryset=Geography.objects.filter(id__in=Signal.objects.values_list("available_geography", flat=True)).order_by("display_order_number"),
         widget=forms.CheckboxSelectMultiple(),
     )
 
     severity_pyramid_rung = forms.ModelChoiceField(
-        queryset=SeverityPyramidRung.objects.all(),
+        queryset=SeverityPyramidRung.objects.filter(id__in=Signal.objects.values_list("severity_pyramid_rung", flat=True)),
         widget=forms.CheckboxSelectMultiple(),
     )
 
@@ -88,7 +89,7 @@ def __init__(self, *args, **kwargs) -> None:
 
         try:
             self.fields["datasource"].choices = set(
-                SourceSubdivision.objects.values_list("display_name", "display_name")
+                SourceSubdivision.objects.filter(id__in=Signal.objects.values_list("source", flat=True)).values_list("display_name", "display_name")
             )
         except SourceSubdivision.DoesNotExist:
             self.fields["datasource"].choices = []
diff --git a/src/signals/resources.py b/src/signals/resources.py
@@ -362,6 +362,9 @@ class Meta:
             "restrictions",
             "time_type",
             "signal_set",
+            "format_type",
+            "severity_pyramid_rung",
+
         ]
         import_id_fields: list[str] = ["name", "source"]
         store_instance = True
diff --git a/src/templates/signals/signals.html b/src/templates/signals/signals.html
@@ -8,7 +8,7 @@
 {% block content %}
 
 <div class="row">
-    <div class="col-3">
+    <div class="col-2">
         <form method="GET" id="filterSignalsForm">
             <div class="card">
                 <div class="card-body">
@@ -268,7 +268,7 @@ <h2 class="accordion-header" id="flush-heading_id_signal_availability">
             </div>
         
     </div>
-    <div class="col-9">
+    <div class="col-10">
         <div class="row d-flex justify-content-end">
             <div class="col-6">
                 <div class="input-group mb-3 d-flex justify-content-start">

Original file line number	Diff line number	Diff line change
`@@ -8,25 +8,26 @@`
`8`	`8`	`class SignalSetFilterForm(forms.ModelForm):`
`9`	`9`
`10`	`10`	`pathogens = forms.ModelChoiceField(`
`11`		`- queryset=Pathogen.objects.all(), widget=forms.CheckboxSelectMultiple()`
	`11`	`+ queryset=Pathogen.objects.filter(id__in=SignalSet.objects.values_list("pathogens", flat="True")), widget=forms.CheckboxSelectMultiple()`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`geographic_scope = forms.ModelChoiceField(`
`15`		`- queryset=GeographicScope.objects.all(), widget=forms.CheckboxSelectMultiple()`
	`15`	`+ queryset=GeographicScope.objects.filter(id__in=SignalSet.objects.values_list("geographic_scope", flat="True")),`
	`16`	`+ widget=forms.CheckboxSelectMultiple()`
`16`	`17`	`)`
`17`	`18`
`18`	`19`	`available_geographies = forms.ModelChoiceField(`
`19`		`- queryset=Geography.objects.all().order_by("display_order_number"),`
	`20`	`+ queryset=Geography.objects.filter(id__in=SignalSet.objects.values_list("available_geographies", flat="True")).order_by("display_order_number"),`
`20`	`21`	`widget=forms.CheckboxSelectMultiple(),`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`severity_pyramid_rungs = forms.ModelChoiceField(`
`24`		`- queryset=SeverityPyramidRung.objects.all(),`
	`25`	`+ queryset=SeverityPyramidRung.objects.filter(id__in=SignalSet.objects.values_list("severity_pyramid_rungs", flat="True")),`
`25`	`26`	`widget=forms.CheckboxSelectMultiple(),`
`26`	`27`	`)`
`27`	`28`
`28`	`29`	`data_source = forms.ModelChoiceField(`
`29`		`- queryset=DataSource.objects.all(),`
	`30`	`+ queryset=DataSource.objects.filter(id__in=SignalSet.objects.values_list("data_source", flat="True")),`
`30`	`31`	`widget=forms.CheckboxSelectMultiple(),`
`31`	`32`	`)`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`Geography,`
`12`	`12`	`SignalsDbView,`
`13`	`13`	`SeverityPyramidRung,`
	`14`	`+ Signal`
`14`	`15`	`)`
`15`	`16`	`from datasources.models import SourceSubdivision`
`16`	`17`
`@@ -42,7 +43,7 @@ class SignalFilter(django_filters.FilterSet):`
`42`	`43`	`)`
`43`	`44`
`44`	`45`	`datasource = django_filters.ModelMultipleChoiceFilter(`
`45`		`- queryset=SourceSubdivision.objects.all(),`
	`46`	`+ queryset=SourceSubdivision.objects.filter(id__in=Signal.objects.values_list("source", flat=True)),`
`46`	`47`	`field_name="datasource",`
`47`	`48`	`to_field_name="display_name",`
`48`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`from django.utils.translation import gettext_lazy as _`
`3`	`3`
`4`	`4`	`from signals.models import (`
	`5`	`+ Signal,`
`5`	`6`	`Pathogen,`
`6`	`7`	`GeographicScope,`
`7`	`8`	`Geography,`
`@@ -21,20 +22,20 @@ class SignalFilterForm(forms.ModelForm):`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`pathogens = forms.ModelChoiceField(`
`24`		`- queryset=Pathogen.objects.all(), widget=forms.CheckboxSelectMultiple()`
	`25`	`+ queryset=Pathogen.objects.filter(id__in=Signal.objects.values_list("pathogen", flat=True)), widget=forms.CheckboxSelectMultiple()`
`25`	`26`	`)`
`26`	`27`
`27`	`28`	`geographic_scope = forms.ModelChoiceField(`
`28`		`- queryset=GeographicScope.objects.all(), widget=forms.CheckboxSelectMultiple()`
	`29`	`+ queryset=GeographicScope.objects.filter(id__in=Signal.objects.values_list("geographic_scope", flat=True)), widget=forms.CheckboxSelectMultiple()`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`available_geography = forms.ModelChoiceField(`
`32`		`- queryset=Geography.objects.all().order_by("display_order_number"),`
	`33`	`+ queryset=Geography.objects.filter(id__in=Signal.objects.values_list("available_geography", flat=True)).order_by("display_order_number"),`
`33`	`34`	`widget=forms.CheckboxSelectMultiple(),`
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`severity_pyramid_rung = forms.ModelChoiceField(`
`37`		`- queryset=SeverityPyramidRung.objects.all(),`
	`38`	`+ queryset=SeverityPyramidRung.objects.filter(id__in=Signal.objects.values_list("severity_pyramid_rung", flat=True)),`
`38`	`39`	`widget=forms.CheckboxSelectMultiple(),`
`39`	`40`	`)`
`40`	`41`
`@@ -88,7 +89,7 @@ def __init__(self, args, *kwargs) -> None:`
`88`	`89`
`89`	`90`	`try:`
`90`	`91`	`self.fields["datasource"].choices = set(`
`91`		`- SourceSubdivision.objects.values_list("display_name", "display_name")`
	`92`	`+ SourceSubdivision.objects.filter(id__in=Signal.objects.values_list("source", flat=True)).values_list("display_name", "display_name")`
`92`	`93`	`)`
`93`	`94`	`except SourceSubdivision.DoesNotExist:`
`94`	`95`	`self.fields["datasource"].choices = []`