OKRS24-235 Fixed typo in Signal model field name. Fixed issue with import few fields. Added signal filters tooltips fixture.

Author: dmytrotsko

src/fixtures/signal_filters_fields.json

@@ -49,7 +49,7 @@
     "pk": 6,
     "fields": {
         "filter": 1,
-        "filter_field": "severenity_pyramid_rungs",
+        "filter_field": "severity_pyramid_rungs",
         "description": null
     }
 },

src/signals/filters.py

@@ -47,7 +47,7 @@ class SignalFilter(django_filters.FilterSet):
         )
     )
     format_type = django_filters.MultipleChoiceFilter(choices=FormatChoices.choices)
-    severenity_pyramid_rungs = django_filters.MultipleChoiceFilter(choices=SeverityPyramidRungsChoices.choices)
+    severity_pyramid_rungs = django_filters.MultipleChoiceFilter(choices=SeverityPyramidRungsChoices.choices)
     source = django_filters.ModelMultipleChoiceFilter(queryset=SourceSubdivision.objects.all(),
                                                       field_name="source_id__external_name",
                                                       to_field_name='external_name')
@@ -72,7 +72,7 @@ class Meta:
             'pathogen',
             'active',
             'available_geography',
-            'severenity_pyramid_rungs',
+            'severity_pyramid_rungs',
             'category',
             'geographic_scope',
             'source',

src/signals/forms.py

@@ -34,7 +34,7 @@ class SignalFilterForm(forms.ModelForm):
     )
     time_type = forms.ChoiceField(choices=TimeTypeChoices.choices, widget=forms.CheckboxSelectMultiple())
     geographic_scope = forms.ModelMultipleChoiceField(queryset=GeographicScope.objects.all(), widget=forms.CheckboxSelectMultiple())
-    severenity_pyramid_rungs = forms.ChoiceField(choices=SeverityPyramidRungsChoices.choices, widget=forms.CheckboxSelectMultiple())
+    severity_pyramid_rungs = forms.ChoiceField(choices=SeverityPyramidRungsChoices.choices, widget=forms.CheckboxSelectMultiple())
 
     from_date = forms.DateField(widget=forms.DateInput(attrs={'type': 'date'}), required=False)
     to_date = forms.DateField(widget=forms.DateInput(attrs={'type': 'date'}), required=False)
@@ -49,7 +49,7 @@ class Meta:
             'pathogen',
             'active',
             'available_geography',
-            'severenity_pyramid_rungs',
+            'severity_pyramid_rungs',
             'source',
             'time_type',
             'geographic_scope',

src/signals/migrations/0021_rename_severenity_pyramid_rungs_signal_severity_pyramid_rungs_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.0.6 on 2024-07-11 11:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signals', '0020_signal_signal_availability_days'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='signal',
+            old_name='severenity_pyramid_rungs',
+            new_name='severity_pyramid_rungs',
+        ),
+        migrations.AlterField(
+            model_name='signal',
+            name='age_breakdown',
+            field=models.CharField(blank=True, choices=[('0-17', '0-17'), ('18-64', '18-64'), ('65+', '65+')], help_text='Age Breakdown', max_length=128, null=True),
+        ),
+        migrations.AlterField(
+            model_name='signal',
+            name='organisations_access_list',
+            field=models.ManyToManyField(blank=True, help_text='Organisations Access List. Who may access this signal?', related_name='accessed_signals', to='signals.organisation'),
+        ),
+        migrations.AlterField(
+            model_name='signal',
+            name='organisations_sharing_list',
+            field=models.ManyToManyField(blank=True, help_text='Organisations Sharing List. Who may be told about this signal?', related_name='shared_signals', to='signals.organisation'),
+        ),
+        migrations.AlterField(
+            model_name='signal',
+            name='time_label',
+            field=models.CharField(choices=[('day', 'Day'), ('date', 'Date'), ('dseek', 'Week')], help_text='Time label', max_length=128),
+        ),
+    ]

src/signals/models.py

@@ -1,3 +1,4 @@
+from typing import Any
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.translation import gettext_lazy as _
@@ -26,7 +27,7 @@ class TimeLabelChoices(models.TextChoices):
     """
     DAY = 'day', _('Day')
     DATE = 'date', _('Date')
-    WEEK = 'week', _('Week')
+    WEEK = 'dseek', _('Week')
 
 
 class FormatChoices(models.TextChoices):
@@ -63,8 +64,8 @@ class SeverityPyramidRungsChoices(models.TextChoices):
     POPULATION = 'population', _('Population')
     INFECTED = 'infected', _('Infected')
     SYMPTOMATIC = 'symptomatic', _('Symptomatic')
-    OUTPATIENT_VISIT = 'outpatient_visit', _('Outpatient / ED')
-    ASCERTAINED = 'ascertained', _('Ascertained (case)')
+    OUTPATIENT_VISIT = 'outpatient visit', _('Outpatient / ED')
+    ASCERTAINED = 'ascertained (case)', _('Ascertained (case)')
     HOSPITALIZED = 'hospitalized', _('Hospitalized')
     ICU = 'icu', _('ICU')
     DEAD = 'dead', _('Dead')
@@ -372,7 +373,7 @@ class Signal(TimeStampedModel):
         help_text=_('Demographic Scope'),
         related_name='signals',
     )
-    severenity_pyramid_rungs: models.CharField = models.CharField(
+    severity_pyramid_rungs: models.CharField = models.CharField(
         help_text=_('Severity Pyramid Rungs'),
         max_length=128,
         choices=SeverityPyramidRungsChoices.choices,
@@ -434,6 +435,7 @@ class Signal(TimeStampedModel):
         max_length=128,
         choices=AgeBreakdownChoices.choices,
         null=True,
+        blank=True
     )
     is_smoothed: models.BooleanField = models.BooleanField(
         help_text=_('Is Smoothed'),
@@ -479,13 +481,15 @@ class Signal(TimeStampedModel):
     organisations_access_list: models.ManyToManyField = models.ManyToManyField(
         'signals.Organisation',
         help_text=_('Organisations Access List. Who may access this signal?'),
-        related_name='accessed_signals'
+        related_name='accessed_signals',
+        blank=True
     )
 
     organisations_sharing_list: models.ManyToManyField = models.ManyToManyField(
         'signals.Organisation',
         help_text=_('Organisations Sharing List. Who may be told about this signal?'),
-        related_name='shared_signals'
+        related_name='shared_signals',
+        blank=True
     )
 
     license: models.ForeignKey = models.ForeignKey(

src/signals/resources.py

@@ -87,7 +87,7 @@ class SignalResource(resources.ModelResource):
         column_name='Demographic Scope',
         widget=widgets.ManyToManyWidget(DemographicScope, field='name', separator=','),
     )
-    severenity_pyramid_rungs = Field(attribute='severenity_pyramid_rungs', column_name='Severity Pyramid Rungs')
+    severity_pyramid_rungs = Field(attribute='severity_pyramid_rungs', column_name='Severity Pyramid Rungs')
     category = Field(
         attribute='category',
         column_name='Category',
@@ -169,7 +169,7 @@ class Meta:
             'time_label',
             'reporting_cadence',
             'demographic_scope',
-            'severenity_pyramid_rungs',
+            'severity_pyramid_rungs',
             'available_geography',
             'is_smoothed',
             'is_weighted',
@@ -188,6 +188,7 @@ class Meta:
             'license',
             'restrictions',
             'typical_revision_cadence',
+            'category',
             # 'gender_breakdown',
             # 'race_breakdown',
             # 'age_breakdown',
@@ -213,6 +214,8 @@ def before_import_row(self, row, **kwargs) -> None:
         self.process_links(row)
         self.process_pathogen(row)
         self.process_license(row)
+        self.process_severity_pyramid_rungs(row)
+        self.process_time_label(row)
         self.process_signal_category(row)
         self.process_signal_type(row)
         self.process_geographic_scope(row)
@@ -238,6 +241,10 @@ def fix_boolean_fields(self, row, fields: list) -> Any:
                 row[k] = False
         return row
 
+    def process_time_label(self, row) -> Any:
+        if row['Time Label']:
+            row['Time Label'] = row['Time Label'].lower()
+
     def process_links(self, row) -> Any:
         """
         Processes links.
@@ -289,14 +296,16 @@ def process_demographic_scope(self, row) -> None:
                 for demographic_scope in demographic_scopes:
                     DemographicScope.objects.get_or_create(name=demographic_scope.strip())
 
-    def process_severenity_pyramid_rungs(self, row) -> None:
+    def process_severity_pyramid_rungs(self, row) -> None:
         """
         Processes severenity pyramid rungs.
         """
 
         if row['Severity Pyramid Rungs']:
             if row['Severity Pyramid Rungs'].startswith('None'):
                 row['Severity Pyramid Rungs'] = None
+            else:
+                row['Severity Pyramid Rungs'] = row['Severity Pyramid Rungs'].lower()
 
     def process_organisations_access_list(self, row):
         """
@@ -357,7 +366,7 @@ def process_geographic_scope(self, row):
     def after_import_row(self, row, row_result, **kwargs) -> None:
         """
         Post-processes each row after importing.
-        """
+        """        
         geographies: str = row['Available Geography'].split(',')
         delphi_aggregated_geographies: str = row['Delphi-Aggregated Geography'].split(',')
         for geography in geographies:

src/signals/views.py

@@ -50,8 +50,8 @@ def get_url_params(self):
             ]
             if self.request.GET.get("available_geography")
             else None,
-            "severenity_pyramid_rungs": [el for el in self.request.GET.getlist("severenity_pyramid_rungs")]
-            if self.request.GET.get("severenity_pyramid_rungs")
+            "severity_pyramid_rungs": [el for el in self.request.GET.getlist("severity_pyramid_rungs")]
+            if self.request.GET.get("severity_pyramid_rungs")
             else None,
             "geographic_scope": [el for el in self.request.GET.getlist("geographic_scope")]
             if self.request.GET.get("geographic_scope")
@@ -144,7 +144,7 @@ class SignalsListApiView(ListAPIView):
         "display_name",
         "pathogen__name",
         "available_geography__name",
-        "severenity_pyramid_rungs",
+        "severity_pyramid_rungs",
         "base",
         "source__name",
         "time_label",

src/templates/signals/signal_detail.html

@@ -279,7 +279,7 @@ <h5>Signals with same base</h5>
                                 </td>
                                 <td class="clickable-table-cell"
                                     onClick="location.href='{% url 'signal' pk=signal.id %}';">
-                                    {{ signal.severenity_pyramid_rungs }}
+                                    {{ signal.severity_pyramid_rungs }}
                                 </td>
                                 <td class="clickable-table-cell"
                                     onClick="location.href='{% url 'signal' pk=signal.id %}';">

src/templates/signals/signals.html

@@ -131,12 +131,12 @@ <h2 class="accordion-header" id="flush-heading_{{ form.available_geography.auto_
                             </div>
                         </div>
                         <div class="accordion-item">
-                            <h2 class="accordion-header" id="flush-heading_{{ form.severenity_pyramid_rungs.auto_id }}">
+                            <h2 class="accordion-header" id="flush-heading_{{ form.severity_pyramid_rungs.auto_id }}">
                                 <button data-mdb-collapse-init class="accordion-button collapsed" type="button"
                                     data-mdb-toggle="collapse"
-                                    data-mdb-target="#flush-collapse_{{ form.severenity_pyramid_rungs.auto_id }}"
+                                    data-mdb-target="#flush-collapse_{{ form.severity_pyramid_rungs.auto_id }}"
                                     aria-expanded="false"
-                                    aria-controls="flush-collapse_{{ form.severenity_pyramid_rungs.auto_id }}">
+                                    aria-controls="flush-collapse_{{ form.severity_pyramid_rungs.auto_id }}">
                                     Severity Pyramid
                                     <a
                                         tabindex="0"
@@ -147,22 +147,22 @@ <h2 class="accordion-header" id="flush-heading_{{ form.severenity_pyramid_rungs.
                                         data-mdb-popover-init
                                         data-mdb-trigger="hover"
                                         data-mdb-placement="right"
-                                        data-mdb-content="{{ filters_descriptions.SignalFilter.severenity_pyramid_rungs }}"
+                                        data-mdb-content="{{ filters_descriptions.SignalFilter.severity_pyramid_rungs }}"
                                         >
                                         <i class="far fa-circle-question"></i>
                                     </a>
                                 </button>
                             </h2>
-                            <div id="flush-collapse_{{ form.severenity_pyramid_rungs.auto_id }}"
-                                class="accordion-collapse {% if form.severenity_pyramid_rungs.value %} {% else %}collapse{% endif %}"
-                                aria-labelledby="flush-heading_{{ form.severenity_pyramid_rungs.auto_id }}"
+                            <div id="flush-collapse_{{ form.severity_pyramid_rungs.auto_id }}"
+                                class="accordion-collapse {% if form.severity_pyramid_rungs.value %} {% else %}collapse{% endif %}"
+                                aria-labelledby="flush-heading_{{ form.severity_pyramid_rungs.auto_id }}"
                                 data-mdb-parent="#accordionSignalFilters">
                                 <div class="accordion-body margin-top-1rem">
                                     <div class="bulk-select form-check">
                                         <input type="checkbox" class="form-check-input" id="select-all">
                                         <label class="form-check-label" for="select-all">Select all</label>
                                     </div>
-                                    {{ form.severenity_pyramid_rungs|as_crispy_field }}
+                                    {{ form.severity_pyramid_rungs|as_crispy_field }}
                                 </div>
                             </div>
                         </div>
@@ -405,7 +405,7 @@ <h2 class="accordion-header" id="flush-heading_id_signal_availability">
                                     </td>
                                     <td class="clickable-table-cell"
                                         onClick="location.href='{% url 'signal' pk=signal.id %}';">
-                                        {{ signal.severenity_pyramid_rungs }}
+                                        {{ signal.severity_pyramid_rungs }}
                                     </td>
                                     <td class="clickable-table-cell"
                                         onClick="location.href='{% url 'signal' pk=signal.id %}';">