${indicatorSetDescription}
`; @@ -71,6 +70,7 @@ function format(indicatorSetId, relatedIndicators, indicatorSetDescription) { var checkboxTitle = ""; checked = checked ? "checked" : ""; disabled = indicator.endpoint ? "" : "disabled"; + sourceType = indicator.source_type; var restricted = indicator.restricted != "No"; if (disabled === "disabled") { checkboxTitle = @@ -92,11 +92,19 @@ function format(indicatorSetId, relatedIndicators, indicatorSetDescription) { }); tableMarkup += ""; if (disabled === "disabled" || restricted) { - data += - `No available indicators yet.
"; diff --git a/src/indicators/migrations/0004_alter_indicator_base.py b/src/indicators/migrations/0004_alter_indicator_base.py new file mode 100644 index 0000000..b01df46 --- /dev/null +++ b/src/indicators/migrations/0004_alter_indicator_base.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0.7 on 2025-05-05 16:22 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('indicators', '0003_alter_indicator_geographic_scope_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='indicator', + name='base', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='base_for', to='indicators.indicator', verbose_name='Base Indicator'), + ), + ] diff --git a/src/indicators/migrations/0005_indicator_source_type.py b/src/indicators/migrations/0005_indicator_source_type.py new file mode 100644 index 0000000..0ee50e4 --- /dev/null +++ b/src/indicators/migrations/0005_indicator_source_type.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.7 on 2025-05-05 19:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('indicators', '0004_alter_indicator_base'), + ] + + operations = [ + migrations.AddField( + model_name='indicator', + name='source_type', + field=models.CharField(blank=True, choices=[('covidcast', 'Covidcast'), ('other_endpoint', 'Other Endpoint'), ('non_delphi', 'Non Delphi')], default='covidcast', help_text='Type of source for the indicator', max_length=255, null=True, verbose_name='Source Type'), + ), + ] diff --git a/src/indicators/models.py b/src/indicators/models.py index 3279652..07f7ae0 100644 --- a/src/indicators/models.py +++ b/src/indicators/models.py @@ -4,6 +4,13 @@ from django.db import models +SOURCE_TYPES = [ + ("covidcast", "Covidcast"), + ("other_endpoint", "Other Endpoint"), + ("non_delphi", "Non Delphi"), +] + + # Create your models here. class IndicatorType(models.Model): @@ -122,9 +129,7 @@ def display_name(self): class Indicator(models.Model): - name: models.CharField = models.CharField( - verbose_name="Name", max_length=255 - ) + name: models.CharField = models.CharField(verbose_name="Name", max_length=255) display_name: models.CharField = models.CharField( verbose_name="Display Name", max_length=255, blank=True ) @@ -367,7 +372,7 @@ class Indicator(models.Model): "indicators.Indicator", verbose_name="Base Indicator", related_name="base_for", - on_delete=models.PROTECT, + on_delete=models.CASCADE, null=True, blank=True, ) @@ -380,6 +385,16 @@ class Indicator(models.Model): blank=True, ) + source_type: models.CharField = models.CharField( + verbose_name="Source Type", + max_length=255, + choices=SOURCE_TYPES, + default="covidcast", + help_text="Type of source for the indicator", + blank=True, + null=True, + ) + class Meta: verbose_name = "Indicator" verbose_name_plural = "Indicators" @@ -397,7 +412,8 @@ class Meta: fields=["name", "source"], name="unique_indicator_name" ), models.UniqueConstraint( - fields=["name", "indicator_set"], name="unique_indicator_indicator_set_name" + fields=["name", "indicator_set"], + name="unique_indicator_indicator_set_name", ), ] diff --git a/src/indicators/resources.py b/src/indicators/resources.py index b09a365..cc2c1de 100644 --- a/src/indicators/resources.py +++ b/src/indicators/resources.py @@ -428,6 +428,10 @@ def before_import_row(self, row, **kwargs) -> None: def after_import_row(self, row, row_result, **kwargs): process_indicator_geography(row) + def after_save_instance(self, instance, row, **kwargs): + instance.source_type = "covidcast" + instance.save() + def skip_row(self, instance, original, row, import_validation_errors=None): if not row["Include in indicator app"]: return True @@ -601,6 +605,10 @@ def skip_row(self, instance, original, row, import_validation_errors=None): def after_import_row(self, row, row_result, **kwargs): process_indicator_geography(row) + def after_save_instance(self, instance, row, **kwargs): + instance.source_type = "other_endpoint" + instance.save() + class NonDelphiIndicatorResource(resources.ModelResource): @@ -633,3 +641,7 @@ def before_import_row(self, row, **kwargs) -> None: def skip_row(self, instance, original, row, import_validation_errors=None): if not row["Include in indicator app"]: return True + + def after_save_instance(self, instance, row, **kwargs): + instance.source_type = "non_delphi" + instance.save() diff --git a/src/indicatorsets/filters.py b/src/indicatorsets/filters.py index e98d511..dd82525 100644 --- a/src/indicatorsets/filters.py +++ b/src/indicatorsets/filters.py @@ -7,24 +7,16 @@ from indicatorsets.models import IndicatorSet -from indicatorsets.utils import get_list_of_indicators_filtered_by_geo +from indicatorsets.utils import ( + get_list_of_indicators_filtered_by_geo, + get_original_data_provider_choices, +) from indicators.models import Indicator from base.models import Pathogen, GeographicScope, Geography, SeverityPyramidRung logger = logging.getLogger(__name__) -try: - ORIGINAL_DATA_PROVIDER_CHOICES = [ - (el, el) - for el in set( - IndicatorSet.objects.values_list("original_data_provider", flat=True) - ) - ] -except Exception as e: - ORIGINAL_DATA_PROVIDER_CHOICES = [("", "No original data provider available")] - print(f"Error fetching original data provider choices: {e}") - class IndicatorSetFilter(django_filters.FilterSet): @@ -60,7 +52,7 @@ class IndicatorSetFilter(django_filters.FilterSet): original_data_provider = django_filters.MultipleChoiceFilter( field_name="original_data_provider", - choices=ORIGINAL_DATA_PROVIDER_CHOICES, + choices=get_original_data_provider_choices, widget=QueryArrayWidget, lookup_expr="exact", required=False, diff --git a/src/indicatorsets/forms.py b/src/indicatorsets/forms.py index 11e0813..abf0b8b 100644 --- a/src/indicatorsets/forms.py +++ b/src/indicatorsets/forms.py @@ -2,18 +2,7 @@ from base.models import Pathogen, GeographicScope, Geography, SeverityPyramidRung from indicatorsets.models import IndicatorSet - - -try: - ORIGINAL_DATA_PROVIDER_CHOICES = [ - (el, el) - for el in set( - IndicatorSet.objects.values_list("original_data_provider", flat=True) - ) - ] -except Exception as e: - ORIGINAL_DATA_PROVIDER_CHOICES = [("", "No original data provider available")] - print(f"Error fetching original data provider choices: {e}") +from indicatorsets.utils import get_original_data_provider_choices class IndicatorSetFilterForm(forms.ModelForm): @@ -44,7 +33,7 @@ class IndicatorSetFilterForm(forms.ModelForm): ) original_data_provider = forms.ChoiceField( - choices=ORIGINAL_DATA_PROVIDER_CHOICES, + choices=get_original_data_provider_choices, widget=forms.CheckboxSelectMultiple(), ) diff --git a/src/indicatorsets/utils.py b/src/indicatorsets/utils.py index daeb7ae..1bf84f0 100644 --- a/src/indicatorsets/utils.py +++ b/src/indicatorsets/utils.py @@ -5,6 +5,7 @@ import requests from django.conf import settings from epiweeks import Week +from indicatorsets.models import IndicatorSet def list_to_dict(lst): @@ -53,3 +54,12 @@ def get_epiweek(start_date, end_date): end_date = Week.fromdate(end_date) end_date = f"{end_date.year}{end_date.week if end_date.week >= 10 else '0' + str(end_date.week)}" return [start_date, end_date] + + +def get_original_data_provider_choices(): + return [ + (el, el) + for el in IndicatorSet.objects.values_list("original_data_provider", flat=True) + .order_by("original_data_provider") + .distinct() + ] diff --git a/src/indicatorsets/views.py b/src/indicatorsets/views.py index 473b29b..641ca33 100644 --- a/src/indicatorsets/views.py +++ b/src/indicatorsets/views.py @@ -89,6 +89,7 @@ def get_related_indicators(self, queryset, indicator_set_ids: list): "description": indicator.description if indicator.description else "", "member_description": indicator.member_description if indicator.member_description else indicator.description, "restricted": indicator.indicator_set.dua_required if indicator.indicator_set else "", + "source_type": indicator.source_type, } ) return related_indicators diff --git a/src/staticfiles/js/indicatorSetsTable.js b/src/staticfiles/js/indicatorSetsTable.js index a59472f..f20ec82 100644 --- a/src/staticfiles/js/indicatorSetsTable.js +++ b/src/staticfiles/js/indicatorSetsTable.js @@ -44,11 +44,10 @@ new DataTable.Buttons(table, { table.buttons(0, null).container().appendTo("#colvis"); function format(indicatorSetId, relatedIndicators, indicatorSetDescription) { - console.lopg; var indicators = relatedIndicators.filter( (indicator) => indicator.indicator_set === indicatorSetId ); - var disabled, restricted; + var disabled, restricted, sourceType; if (indicators.length > 0) { var data = `${indicatorSetDescription}
`; @@ -71,6 +70,7 @@ function format(indicatorSetId, relatedIndicators, indicatorSetDescription) { var checkboxTitle = ""; checked = checked ? "checked" : ""; disabled = indicator.endpoint ? "" : "disabled"; + sourceType = indicator.source_type; var restricted = indicator.restricted != "No"; if (disabled === "disabled") { checkboxTitle = @@ -92,11 +92,19 @@ function format(indicatorSetId, relatedIndicators, indicatorSetDescription) { }); tableMarkup += ""; if (disabled === "disabled" || restricted) { - data += - `No available indicators yet.
"; diff --git a/src/templates/http_errors/400.html b/src/templates/http_errors/400.html new file mode 100644 index 0000000..cac38d2 --- /dev/null +++ b/src/templates/http_errors/400.html @@ -0,0 +1,16 @@ +{% extends "http_errors/error.html" %} +{% load static %} +{% load i18n %} + +{% block content %} +