Merge pull request #128 from cmu-delphi/OKRS24-187-Signals-Add-a-filter-to-show-only-base-signals

Added filter by base_for field

Author: dmytrotsko

src/signals/filters.py

@@ -43,6 +43,7 @@ class SignalFilter(django_filters.FilterSet):
     format_type = django_filters.MultipleChoiceFilter(choices=FormatChoices.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')
 
     class Meta:
         model = Signal
@@ -57,6 +58,7 @@ class Meta:
             'format_type',
             'source',
             'time_type',
+            'base_signal',
         ]
 
     def filter_search(self, queryset, name, value) -> Any:

src/signals/forms.py

@@ -30,6 +30,7 @@ class SignalFilterForm(forms.ModelForm):
     format_type = forms.ChoiceField(choices=FormatChoices.choices, 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())
 
     class Meta:
         model = Signal
@@ -79,6 +80,7 @@ class Meta:
                 'data-bs-toggle': 'tooltip',
                 'data-bs-placement': 'bottom',
             }),
+
         }
 
     def __init__(self, *args, **kwargs) -> None:

src/signals/views.py

@@ -53,7 +53,8 @@ def get_url_params(self):
             else None,
             "format_type": [el for el in self.request.GET.getlist("format_type")],
             "source": [int(el) for el in self.request.GET.getlist("source")],
-            "time_type": [el for el in self.request.GET.getlist("time_type")]
+            "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():

src/templates/signals/signals.html

@@ -196,6 +196,25 @@ <h2 class="accordion-header" id="available_geography-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">
@@ -285,7 +304,6 @@ <h2 class="accordion-header" id="available_geography-heading">
     </div>
 </div>
 </form>
-
 <script>
 
     const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]');