FIxed epiweek calculation

Pipfile

@@ -40,6 +40,7 @@ sphinxcontrib-django = "*"
 sqlalchemy = "*"
 types-requests = "*"
 tzdata = "*"
+epiweeks = "*"
 
 [dev-packages]
 flake8 = "*"

src/assets/css/style.css

@@ -1421,4 +1421,8 @@ div.dt-button-collection {
   @keyframes spin {
     0% { transform: rotate(0deg); }
     100% { transform: rotate(360deg); }
-  }
+  }
+
+div[name="choose_date"] {
+    display: none;
+}

src/assets/js/signal_sets.js

@@ -227,19 +227,37 @@ function exportData() {
     var endDate = document.getElementById('end_date').value;
 
     var manualDataExport = "To download data, please click on the link or copy/paste command into your terminal: \n\n"
+    var requests = [];
 
     checkedSignalMembers.forEach((signal) => {
         geoTypes.forEach((geoType) => {
             var geoValues = geographicValues[geoType].map((el) => (typeof el.id === 'string') ? el.id.toLowerCase() : el.id).join(",");
             if (signal["time_type"] === "week") {
-                startDate = getDateYearWeek(new Date(startDate));
-                endDate = getDateYearWeek(new Date(endDate));
-            };
-            var exportUrl = `https://api.delphi.cmu.edu/epidata/covidcast/csv?signal=${signal["data_source"]}:${signal["signal"]}&start_day=${startDate}&end_day=${endDate}&geo_type=${geoType}&geo_values=${geoValues}`;
-            manualDataExport += `wget --content-disposition <a href="${exportUrl}">${exportUrl}</a>\n`
+                var request = $.ajax({
+                    url: "get_epiweek/",
+                    type: 'POST',
+                    async: true,
+                    data: {
+                        csrfmiddlewaretoken: csrf_token,
+                        start_date: startDate,
+                        end_date: endDate,
+                    },
+                    success: function (result) {
+                        var exportUrl = `https://api.delphi.cmu.edu/epidata/covidcast/csv?signal=${signal["data_source"]}:${signal["signal"]}&start_day=${result.start_date}&end_day=${result.end_date}&geo_type=${geoType}&geo_values=${geoValues}`;
+                        manualDataExport += `wget --content-disposition <a href="${exportUrl}">${exportUrl}</a>\n`
+                    }
+                })
+                requests.push(request);
+            } else {
+                var exportUrl = `https://api.delphi.cmu.edu/epidata/covidcast/csv?signal=${signal["data_source"]}:${signal["signal"]}&start_day=${startDate}&end_day=${endDate}&geo_type=${geoType}&geo_values=${geoValues}`;
+                manualDataExport += `wget --content-disposition <a href="${exportUrl}">${exportUrl}</a>\n`
+            }
         });
     });
-    $('#modeSubmitResult').html(manualDataExport);
+    $.when.apply($, requests).then(function() {
+        $('#modeSubmitResult').html(manualDataExport);
+    })
+
 }
 
 function previewData() {
@@ -248,20 +266,35 @@ function previewData() {
     var geoTypes = Object.keys(geographicValues);
     var previewExample = [];
     var requests = [];
+
+    var startDate = document.getElementById("start_date").value;
+    var endDate = document.getElementById("end_date").value;
+
     checkedSignalMembers.forEach((signal) => {
-        var startDate = document.getElementById("start_date").value;
-        var endDate = document.getElementById("end_date").value;
+        var timeValues;
+
         if (signal["time_type"] === "week") {
-            startDate = getDateYearWeek(new Date(startDate));
-            endDate = getDateYearWeek(new Date(endDate));
+            $.ajax({
+                url: "get_epiweek/",
+                type: 'POST',
+                async: false,
+                data: {
+                    csrfmiddlewaretoken: csrf_token,
+                    start_date: startDate,
+                    end_date: endDate,
+                },
+                success: function (result) {
+                    timeValues = `${result.start_date}-${result.end_date}`;
+                }
+            })
         };
 
         var requestSent = false;
         if (!requestSent) {
             geoTypes.forEach((geoType) => {
                 var geoValues = geographicValues[geoType].map((el) => (typeof el.id === 'string') ? el.id.toLowerCase() : el.id).join(",");
                 $('#loader').show();
-                var timeValues = signal["time_type"] === "week" ? `${startDate}-${endDate}` : `${startDate}--${endDate}`;
+                timeValues = signal["time_type"] === "week" ? timeValues : `${startDate}--${endDate}`;
                 var request = $.ajax({
                     url: "epidata/covidcast/",
                     type: 'GET',
@@ -375,30 +408,6 @@ $('#geographic_value').on('select2:select', function (e) {
     }
 });
 
-function getDateYearWeek(date) {
-    const currentDate =
-        (typeof date === 'object') ? date : new Date();
-    const januaryFirst =
-        new Date(currentDate.getFullYear(), 0, 1);
-    const daysToNextMonday =
-        (januaryFirst.getDay() === 1) ? 0 :
-        (7 - januaryFirst.getDay()) % 7;
-    const nextMonday =
-        new Date(currentDate.getFullYear(), 0,
-        januaryFirst.getDate() + daysToNextMonday);
-
-    var weekNumber = (currentDate < nextMonday) ? 52 :
-    (currentDate > nextMonday ? Math.ceil(
-    (currentDate - nextMonday) / (24 * 3600 * 1000) / 7) : 1);
-
-    if (weekNumber < 10) {
-        weekNumber = `0${weekNumber}`;
-    }
-
-    const year = currentDate.getFullYear()
-
-    return `${year}${weekNumber}`;
-}
 
 function submitMode(event) {
     event.preventDefault();

src/signal_sets/urls.py

@@ -1,9 +1,10 @@
 from django.urls import path, re_path
 from django.urls.resolvers import URLPattern
 
-from signal_sets.views import SignalSetListView, epidata
+from signal_sets.views import SignalSetListView, epidata, get_epiweek
 
 urlpatterns: list[URLPattern] = [
     path("", SignalSetListView.as_view(), name="signal_sets"),
     re_path(r'^epidata/(?P<endpoint>.*)/$', epidata, name="epidata"),
+    path("get_epiweek/", get_epiweek, name="get_epiweek"),
 ]

src/signal_sets/views.py

@@ -1,7 +1,8 @@
 import requests
 import logging
-from typing import Any, Dict
+from typing import Any
 import json
+from datetime import datetime as dtime
 
 from django.conf import settings
 from django.db.models.query import QuerySet
@@ -14,6 +15,8 @@
 from signal_sets.filters import SignalSetFilter
 from signal_sets.forms import SignalSetFilterForm
 
+from epiweeks import Week
+
 logger = logging.getLogger(__name__)
 
 
@@ -130,9 +133,22 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         return context
 
 
-def epidata(request, endpoint=''):
+def epidata(request, endpoint=""):
     params = request.GET.dict()
     params["api_key"] = settings.EPIDATA_API_KEY
     url = f"{settings.EPIDATA_URL}{endpoint}"
     response = requests.get(url, params=params)
     return JsonResponse(response.json(), safe=False)
+
+
+def get_epiweek(request):
+    start_date = dtime.strptime(request.POST["start_date"], "%Y-%m-%d")
+    start_date = Week.fromdate(start_date)
+    end_date = dtime.strptime(request.POST["end_date"], "%Y-%m-%d")
+    end_date = Week.fromdate(end_date)
+    return JsonResponse(
+        {
+            "start_date": f"{start_date.year}{start_date.week if start_date.week >= 10 else '0' + str(start_date.week)}",
+            "end_date": f"{end_date.year}{end_date.week if end_date.week >= 10 else '0' + str(end_date.week)}",
+        }
+    )

src/templates/signal_sets/signal_sets.html

@@ -413,6 +413,7 @@ <h5 class="modal-title" id="selectedSignalsModalLabel">Selected indicators</h5>
             </div>
             <div class="modal-footer">
                 <form class="margin-top-1rem full-width" id="dataForm" onsubmit="submitMode(event)">
+                    {% csrf_token %}
                     <div class="row">
                         <div id="warning-alert"></div>
                         <div class="col-2">
@@ -485,6 +486,7 @@ <h5 class="modal-title" id="selectedSignalsModalLabel">Selected indicators</h5>
 
 <script>
     var epiVisUrl = "{{ epivis_url }}";
+    var csrf_token = "{{ csrf_token }}";
 </script>
 
 <script src="{% static 'js/signal_sets.js' %}"></script>