Merge pull request #84 from cmu-delphi/development

Development

Author: dmytrotsko

src/epiportal/settings.py

@@ -24,6 +24,8 @@
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.redis import RedisIntegration
 
+APP_VERSION = "1.0.0"
+
 
 EPIVIS_URL = os.environ.get("EPIVIS_URL", "https://delphi.cmu.edu/epivis/")
 EPIDATA_URL = os.environ.get("EPIDATA_URL", "https://api.delphi.cmu.edu/epidata/")

src/indicatorsets/views.py

@@ -184,6 +184,7 @@ def get_context_data(self, **kwargs):
         context["epidata_url"] = settings.EPIDATA_URL
         context["form"] = IndicatorSetFilterForm(initial=url_params_dict)
         context["filter"] = filter
+        context["APP_VERSION"] = settings.APP_VERSION
         context["indicator_sets"] = filter.qs.annotate(
             is_ongoing=Case(
                 When(
@@ -264,7 +265,7 @@ def epivis(request):
                                 indicator["indicator"], indicator["indicator"]
                             ),
                             "params": {
-                                "_endpoint": indicator["_endpoint"],
+                                "_endpoint": indicator["_endpoint"] if indicator["data_source"] == "fluview" else "fluview_clinical",
                                 "regions": geo["id"],
                                 "custom_title": generate_epivis_custom_title(
                                     indicator, geo["text"]

src/templates/indicatorsets/indicatorSetsFilters.html

@@ -276,6 +276,9 @@
                             <a href="https://docs.google.com/forms/d/e/1FAIpQLScqgT1fKZr5VWBfsaSp-DNaN03aV6EoZU4YljIzHJ1Wl_zmtg/viewform">Other Feedback or Suggestion</a>
                         </div>
                     </div>
+                    <div class="margin-top-1rem text-center smaller-font-size">
+                        <span>v {{ APP_VERSION }}</span>
+                    </div>
                 </div>
             </div>
         </div>