Removed base_signal filter.

Author: dmytrotsko

src/signals/filters.py

@@ -50,7 +50,6 @@ 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()
@@ -73,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())
 

src/signals/views.py

@@ -57,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():

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">