Fixed filter names, added epivis custom title

Author: dmytrotsko

src/assets/js/signal_sets.js

@@ -47,6 +47,12 @@ function plotData() {
         geographicValues.forEach((geoValue) => {
             var geographicValue = (typeof geoValue.id === 'string') ? geoValue.id.toLowerCase() : geoValue.id;
             var geographicType = geoValue.geoType;
+            var epivisCustomTitle;
+            if (signal["member_short_name"]) {
+                epivisCustomTitle = `${signal["signal_set_short_name"]}:${signal["member_short_name"]} : ${geoValue.text}`
+            } else {
+                epivisCustomTitle = `${signal["signal_set_short_name"]} : ${geoValue.text}`
+            }
             dataSets[`${signal["signal"]}_${geographicValue}`] = {
                 color: '#'+(Math.random() * 0xFFFFFF << 0).toString(16).padStart(6, '0'),
                 title: "value",
@@ -56,8 +62,8 @@ function plotData() {
                     signal: signal["signal"],
                     time_type: signal["time_type"],
                     geo_type: geographicType,
-                    geo_value: geographicValue
-                    // custom_title: `${signal["data_source"]}:${signal["signal"]} - ${geoValue.text}`
+                    geo_value: geographicValue,
+                    custom_title: epivisCustomTitle
                 }
             }
         })
@@ -99,7 +105,9 @@ function addSelectedSignal(element) {
             signal: element.dataset.signal,
             time_type: element.dataset.timeType,
             signal_set: element.dataset.signalSet,
-            display_name: element.dataset.signalDisplayname
+            display_name: element.dataset.signalDisplayname,
+            signal_set_short_name: element.dataset.signalSetShortName,
+            member_short_name: element.dataset.memberShortName
         });
         updateSelectedSignals(element.dataset.datasource, element.dataset.signalDisplayname, element.dataset.signalSet, element.dataset.signal);
     } else {
@@ -215,7 +223,7 @@ function format (signalSetId, relatedSignals, signalSetDescription) {
             checked = checkedSignalMembers.filter((obj) => obj.data_source == signal.source && obj.signal == signal.name).length;
             checked = checked ? "checked" : ""
             tableMarkup += '<tr>'+
-                                `<td><input type="checkbox" name="selectedSignal" onclick="addSelectedSignal(this)" data-signal-displayname='${signal.display_name}' data-endpoint="${signal.endpoint}" data-datasource="${signal.source}" data-signal="${signal.name}" data-time-type="${signal.time_type}" data-signal-set="${signal.signal_set_name}" ${checked}></td>`+
+                                `<td><input type="checkbox" name="selectedSignal" onclick="addSelectedSignal(this)" data-signal-displayname='${signal.display_name}' data-endpoint="${signal.endpoint}" data-datasource="${signal.source}" data-signal="${signal.name}" data-time-type="${signal.time_type}" data-signal-set="${signal.signal_set_name}" data-signal-set-short-name="${signal.signal_set_short_name}" data-member-short-name="${signal.member_short_name}" ${checked}></td>`+
                                 `<td>${signal.display_name}</td>`+
                                 `<td>${signal.member_name}</td>`+
                                 `<td>${signal.member_description}</td>`+

src/fixtures/geographic_scopes.json

@@ -168,15 +168,5 @@
             "name": "Taiwan",
             "used_in": "signal_sets"
         }
-    },
-    {
-        "model": "signals.geographicscope",
-        "pk": 66,
-        "fields": {
-            "created": "2025-01-16T16:27:36.145Z",
-            "modified": "2025-01-16T16:27:36.146Z",
-            "name": "International",
-            "used_in": "signal_sets"
-        }
     }
 ]

src/fixtures/pathogens.json

@@ -208,15 +208,5 @@
           "created": "2023-08-09T19:23:22.597131",
           "modified": "2023-08-09T19:23:22.597131"
         }
-    },
-    {
-        "model": "signals.Pathogen",
-        "pk": 22,
-        "fields": {
-          "name": "N/A",
-          "used_in": "signal_sets",
-          "created": "2023-08-09T19:23:22.597131",
-          "modified": "2023-08-09T19:23:22.597131"
-        }
     }
   ]

src/signal_sets/filters.py

@@ -71,10 +71,10 @@ class SignalSetFilter(django_filters.FilterSet):
         choices=[
             ("Annually", "Annually"),
             ("Monthly", "Monthly"),
-            ("Daily", "Daily"),
             ("Weekly", "Weekly"),
+            ("Daily", "Daily"),
             ("Hourly", "Hourly"),
-            ("None", "None"),
+            ("Other", "Other"),
         ],
         lookup_expr="icontains",
     )

src/signal_sets/forms.py

@@ -50,10 +50,10 @@ class SignalSetFilterForm(forms.ModelForm):
         choices=[
             ("Annually", "Annually"),
             ("Monthly", "Monthly"),
-            ("Daily", "Daily"),
             ("Weekly", "Weekly"),
+            ("Daily", "Daily"),
             ("Hourly", "Hourly"),
-            ("None", "None")
+            ("Other", "Other")
         ],
         widget=forms.CheckboxSelectMultiple(),
     )

src/signal_sets/resources.py

@@ -67,7 +67,7 @@ def process_datasources(row) -> None:
     """
     if row["Original Data Provider"]:
         data_source = row["Original Data Provider"]
-        data_source_obj, _ = DataSource.objects.get_or_create(name=data_source)
+        data_source_obj, _ = DataSource.objects.get_or_create(name=data_source, defaults={"display_name": data_source.capitalize()})
         row["Original Data Provider"] = data_source_obj
 
 
@@ -222,6 +222,7 @@ def after_import_row(self, row, row_result, **kwargs):
         try:
             signal_set_obj = SignalSet.objects.get(id=row_result.object_id)
             for pathogen in row["Pathogen(s)/Syndrome(s)"].split(","):
+                signal_set_obj.pathogens.clear()
                 pathogen = Pathogen.objects.get(name=pathogen, used_in="signal_sets")
                 signal_set_obj.pathogens.add(pathogen)
             for severity_pyramid_rung in row["Surveillance Categories"].split(","):

src/signal_sets/views.py

@@ -96,9 +96,11 @@ def get_related_signals(self, queryset):
                     "id": signal.id,
                     "display_name": signal.get_display_name,
                     "member_name": signal.member_name,
+                    "member_short_name": signal.member_short_name,
                     "name": signal.name,
                     "signal_set": signal.signal_set.id,
                     "signal_set_name": signal.signal_set.name,
+                    "signal_set_short_name": signal.signal_set.short_name,
                     "endpoint": signal.signal_set.endpoint,
                     "source": signal.source.name,
                     "time_type": signal.time_type,