Fix date strings for Firefox & allow MS Excel

inSPEYERed · Aug 6, 2022 · 407e444 · 407e444
1 parent 31c5391
commit 407e444
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/website/src/dropzone.js b/website/src/dropzone.js
@@ -53,7 +53,8 @@ function handleFiles(files) {
 
 function checkMetadataForFile(file) {
     if (file.type) {
-        if (file.type != 'text/csv') {
+        // Allow CSV and Microsoft Excel CSV
+        if (file.type != 'text/csv' && file.type != 'application/vnd.ms-excel') {
             alert(`Must be a CSV file, but you uploaded this type: ${file.type}`);
             return false;
         }

diff --git a/website/src/dto.js b/website/src/dto.js
@@ -3,8 +3,13 @@ class CbData {
         this.title = data['post_title'];
         this.status = data['post_status'];
         this.type = data['type'];
-        this.startDate = new Date(data['repetition-start']);
-        this.endDate = new Date(data['repetition-end']);
+
+        // Dates
+        const beginDateStr = convertToParsableDateString(data['repetition-start']);
+        const endDateStr = convertToParsableDateString(data['repetition-end']);
+        this.startDate = new Date(beginDateStr);
+        this.endDate = new Date(endDateStr);
+
         this.station = data['location-post_title'];
         this.item = data['item-post_title'];
         this.user = new User({
@@ -47,4 +52,10 @@ function constructDTOFromCSVArray(csv) {
     }
 
     return bookings
+}
+
+function convertToParsableDateString(dateStr) {
+    // Commons Booking has this format: 25. May 2022
+    // we get back: 25 May 2022 (this is parsable by Date.parse())
+    return dateStr.replaceAll('.', '');
 }
diff --git a/website/src/evaluation.js b/website/src/evaluation.js
@@ -14,7 +14,7 @@ function evaluateBookingsPerWeek(bookings) {
         }
 
         const dates = getDatesInRange(booking.startDate, booking.endDate);
-        for (date of dates) {
+        for (const date of dates) {
             const weekNumber = getIsoWeekNumber(date);
             results[year][weekNumber - 1] += 1;
         }
@@ -33,7 +33,7 @@ function evaluateBookingsPerWeekday(bookings) {
             results[year] = [0, 0, 0, 0, 0, 0, 0] // Monday to Sunday
 
         const dates = getDatesInRange(booking.startDate, booking.endDate);
-        for (date of dates) {
+        for (const date of dates) {
             const weekDay = getIsoWeekday(date);
             results[year][weekDay - 1] += 1;
         }