Merge pull request #121 from cmu-delphi/OKRS24-185-Signals-Change-time-label-to-use-time-type-field

OKRS24-185 Change 'time_label' to use `time_type` field

Author: BrainIsDead

src/signals/filters.py

@@ -14,7 +14,7 @@
 from signals.models import (
     FormatChoices,
     Signal,
-    TimeLabelChoices,
+    TimeTypeChoices,
 )
 
 
@@ -42,7 +42,7 @@ class SignalFilter(django_filters.FilterSet):
     )
     format_type = django_filters.MultipleChoiceFilter(choices=FormatChoices.choices)
     source = django_filters.ModelMultipleChoiceFilter(queryset=SourceSubdivision.objects.all())
-    time_label = django_filters.MultipleChoiceFilter(choices=TimeLabelChoices.choices)
+    time_type = django_filters.MultipleChoiceFilter(choices=TimeTypeChoices.choices)
 
     class Meta:
         model = Signal
@@ -56,7 +56,7 @@ class Meta:
             'category',
             'format_type',
             'source',
-            'time_label',
+            'time_type',
         ]
 
     def filter_search(self, queryset, name, value) -> Any:

src/signals/forms.py

@@ -7,7 +7,7 @@
     FormatChoices,
     Pathogen,
     Signal,
-    TimeLabelChoices,
+    TimeTypeChoices,
 )
 
 
@@ -29,7 +29,7 @@ class SignalFilterForm(forms.ModelForm):
     active = forms.TypedMultipleChoiceField(choices=ActiveChoices.choices, coerce=bool, widget=forms.CheckboxSelectMultiple())
     format_type = forms.ChoiceField(choices=FormatChoices.choices, widget=forms.CheckboxSelectMultiple())
     source = forms.ModelMultipleChoiceField(queryset=SourceSubdivision.objects.all(), widget=forms.CheckboxSelectMultiple())
-    time_label = forms.ChoiceField(choices=TimeLabelChoices.choices, widget=forms.CheckboxSelectMultiple())
+    time_type = forms.ChoiceField(choices=TimeTypeChoices.choices, widget=forms.CheckboxSelectMultiple())
 
     class Meta:
         model = Signal
@@ -44,7 +44,7 @@ class Meta:
             'format_type',
             'signal_type',
             'source',
-            'time_label',
+            'time_type',
         ]
 
         widgets = {

src/signals/views.py

@@ -53,7 +53,7 @@ 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_label": [el for el in self.request.GET.getlist("time_label")]
+            "time_type": [el for el in self.request.GET.getlist("time_type")]
         }
         url_params_str = ""
         for param_name, param_value in url_params_dict.items():

src/templates/signals/signals.html

@@ -193,22 +193,22 @@ <h2 class="accordion-header" id="available_geography-heading">
                             </div>
                             <div class="accordion-item">
                               <h2 class="accordion-header" id="available_geography-heading">
-                                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#time_label-collapse" aria-expanded="false" aria-controls="active-collapse">
-                                    <label for="id_time_label" class="form-label">
-                                        Time Label
-                                        <a href="#" data-bs-toggle="modal" data-bs-target="#time_label_modal">
+                                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#time_type-collapse" aria-expanded="false" aria-controls="active-collapse">
+                                    <label for="id_time_type" class="form-label">
+                                        Time Type
+                                        <a href="#" data-bs-toggle="modal" data-bs-target="#time_type_modal">
                                             <i class="bi bi-info-circle"></i>
                                         </a>
                                     </label>
                                 </button>
                               </h2>
-                                {% if form.time_label.value %}
-                                  <div id="time_label-collapse" class="accordion-collapse" aria-labelledby="time_label-heading">
+                                {% if form.time_type.value %}
+                                  <div id="time_type-collapse" class="accordion-collapse" aria-labelledby="time_type-heading">
                                 {% else %}
-                                  <div id="time_label-collapse" class="accordion-collapse collapse" aria-labelledby="time_label-heading">
+                                  <div id="time_type-collapse" class="accordion-collapse collapse" aria-labelledby="time_type-heading">
                                 {% endif %}
                                 <div class="accordion-body">
-                                    {{ form.time_label|as_crispy_field }}
+                                    {{ form.time_type|as_crispy_field }}
                                 </div>
                               </div>
                             </div>
@@ -438,16 +438,16 @@ <h5 class="modal-title">Source</h5>
             </div>
         </div>
     </div>
-    <div class="modal fade" id="time_label_modal" tabindex="-1" style="display: none;" aria-hidden="true">
+    <div class="modal fade" id="time_type_modal" tabindex="-1" style="display: none;" aria-hidden="true">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Time Label</h5>
+                    <h5 class="modal-title">Time Type</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
-                    {{ filters_descriptions.SignalFilter.time_label }}
+                    {{ filters_descriptions.SignalFilter.time_type }}
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary"