data op website alfa

collect.sh

@@ -22,7 +22,7 @@ say () {
 
 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
     case "$1" in
         2[0-9][0-9][0-9]-[0-5][0-9])
@@ -161,4 +161,5 @@ done
 
 data2json $ds 1 > json/DATA-$ds-1.json
 data2json $ds 4 > json/DATA-$ds-4.json
-
+dates2json > json/index1.json
+dates2json > json/index4.json

www/app.js

@@ -32,7 +32,7 @@ function sleep(ms) {
 function getJSON(url) {
   return new Promise(function (resolve, reject) {
     var xhr = new XMLHttpRequest()
-    xhr.open('get', url, true)
+    xhr.open('get', '/alfa/wvdm/data/' + url, true)
     xhr.responseType = 'json'
     xhr.onload = function () {
       var status = xhr.status

www/index1.json

@@ -1 +0,0 @@
-[{"week":"2026-16","first":"2026-04-13","last":"2026-04-19"},{"week":"2026-15","first":"2026-04-06","last":"2026-04-12"},{"week":"2026-14","first":"2026-03-30","last":"2026-04-05"},{"week":"2026-13","first":"2026-03-23","last":"2026-03-29"},{"week":"2026-12","first":"2026-03-16","last":"2026-03-22"},{"week":"2026-11","first":"2026-03-09","last":"2026-03-15"},{"week":"2026-10","first":"2026-03-02","last":"2026-03-08"}]

www/index4.json

@@ -1 +0,0 @@
-[{"week":"2026-16","first":"2026-04-13","last":"2026-04-19"},{"week":"2026-15","first":"2026-04-06","last":"2026-04-12"},{"week":"2026-14","first":"2026-03-30","last":"2026-04-05"},{"week":"2026-13","first":"2026-03-23","last":"2026-03-29"},{"week":"2026-12","first":"2026-03-16","last":"2026-03-22"},{"week":"2026-11","first":"2026-03-09","last":"2026-03-15"},{"week":"2026-10","first":"2026-03-02","last":"2026-03-08"}]