OKRS24-235 Fixed 'ongoing' indicator. USA country is not checked by default.

Author: dmytrotsko

src/signals/filters.py

@@ -16,7 +16,6 @@
     FormatChoices,
     Signal,
     TimeTypeChoices,
-    GeographicScope,
     SeverityPyramidRungsChoices,
 )
 
@@ -56,14 +55,6 @@ class SignalFilter(django_filters.FilterSet):
     to_date = django_filters.DateFilter(field_name='to_date', lookup_expr='lte')
     signal_availability_days = django_filters.NumberFilter(field_name='signal_availability_days', lookup_expr='gte')
 
-    def __init__(self, data, *args, **kwargs):
-        data = data.copy()
-        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:
         model = Signal
         fields: list[str] = [

src/signals/views.py

@@ -10,7 +10,7 @@
 
 from signals.filters import SignalFilter
 from signals.forms import SignalFilterForm
-from signals.models import Signal, GeographicScope
+from signals.models import Signal
 from signals.serializers import SignalSerializer
 
 
@@ -82,13 +82,6 @@ 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"):
-            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/signal_detail.html

@@ -231,9 +231,9 @@ <h5>Signals with same base</h5>
                                 <td class="clickable-table-cell"
                                     onClick="location.href='{% url 'signal' pk=signal.id %}';">
                                     {% if signal.active == True%}
-                                    <i class="bi bi-circle-fill" style="color:green;"></i>
+                                    <i class="fas fa-circle" style="color: green;"></i>
                                     {% else %}
-                                    <i class="bi bi-circle-fill" style="color:red;"></i>
+                                    <i class="fas fa-circle" style="color:red;"></i>
                                     {% endif %}
                                 </td>
                                 <td class="clickable-table-cell"

src/templates/signals/signals.html

@@ -335,9 +335,9 @@ <h2 class="accordion-header" id="flush-heading_id_signal_availability">
                                     <td class="clickable-table-cell"
                                         onClick="location.href='{% url 'signal' pk=signal.id %}';">
                                         {% if signal.active == True%}
-                                        <i class="bi bi-circle-fill" style="color:green;"></i>
+                                        <i class="fas fa-circle" style="color:green;"></i>
                                         {% else %}
-                                        <i class="bi bi-circle-fill" style="color:red;"></i>
+                                        <i class="fas fa-circle" style="color:red;"></i>
                                         {% endif %}
                                     </td>
                                     <td class="clickable-table-cell"