Merge pull request #283 from cmu-delphi/development

Fluview indicators will not be plotted if there is no data for select…

Author: dmytrotsko

src/assets/js/selectedIndicatorsModal.js

@@ -205,6 +205,12 @@ async function checkFluviewGeoCoverage(geoValue) {
                 indicators: JSON.stringify(checkedIndicatorMembers.filter((indicator) => indicator["_endpoint"] === "fluview" || indicator["_endpoint"] === "fluview_clinical")),
             }
         }); 
+        for (const checkedIndicator of checkedIndicatorMembers.filter((indicator) => indicator["_endpoint"] === "fluview" || indicator["_endpoint"] === "fluview_clinical")) {
+            if (result["not_covered_indicators"].some((indicator) => indicator.indicator === checkedIndicator.indicator)) {
+                checkedIndicator["notCoveredGeos"] = [geoValue];
+            }
+        }
+        console.log(checkedIndicatorMembers);
         return result["not_covered_indicators"];
     } catch (error) {
         console.error("Error fetching fluview geo coverage:", error);

src/epiportal/settings.py

@@ -24,7 +24,7 @@
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.redis import RedisIntegration
 
-APP_VERSION = "1.0.22"
+APP_VERSION = "1.0.23"
 ALTERNATIVE_INTERFACE_VERSION = "1.0.9"
 
 

src/indicatorsets/utils.py

@@ -166,25 +166,26 @@ def generate_covidcast_dataset_epivis(indicator, covidcast_geos):
 def generate_fluview_dataset_epivis(indicator, fluview_geos):
     datasets = []
     for geo in fluview_geos:
-        datasets.append(
-            {
-                "color": generate_random_color(),
-                "title": FLUVIEW_INDICATORS_MAPPING.get(
-                    indicator["indicator"], indicator["indicator"]
-                ),
-                "params": {
-                    "_endpoint": (
-                        indicator["_endpoint"]
-                        if indicator["data_source"] == "fluview"
-                        else "fluview_clinical"
-                    ),
-                    "regions": geo["id"],
-                    "custom_title": generate_epivis_custom_title(
-                        indicator, geo["text"]
+        if geo["id"] not in indicator.get("notCoveredGeos", []):
+            datasets.append(
+                {
+                    "color": generate_random_color(),
+                    "title": FLUVIEW_INDICATORS_MAPPING.get(
+                        indicator["indicator"], indicator["indicator"]
                     ),
-                },
-            }
-        )
+                    "params": {
+                        "_endpoint": (
+                            indicator["_endpoint"]
+                            if indicator["data_source"] == "fluview"
+                            else "fluview_clinical"
+                        ),
+                        "regions": geo["id"],
+                        "custom_title": generate_epivis_custom_title(
+                            indicator, geo["text"]
+                        ),
+                    },
+                }
+            )
     return datasets