Merge pull request #854 from openmultiplechoice/schu/safari-fix-inval…

…id-date IndexStatsView: fix "invalid date" error
openmultiplechoice · May 6, 2024 · 6f5d918 · 6f5d918
2 parents 410d328 + 66bc531
commit 6f5d918
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 45 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -41,8 +41,9 @@ protected function schedule(Schedule $schedule): void
             $usersByHour = [];
             foreach($range as $hour) {
                 $hourString = $hour->format('Y-m-d H:i:s');
-                $answersByHour[$hourString] = isset($answerChoicesByHour[$hourString]) ? count($answerChoicesByHour[$hourString]) : 0;
-                $usersByHour[$hourString] = isset($answerChoicesByHour[$hourString]) ?
+                $hourStringISO8601 = $hour->format('Y-m-d\TH:i:s\Z');
+                $answersByHour[$hourStringISO8601] = isset($answerChoicesByHour[$hourString]) ? count($answerChoicesByHour[$hourString]) : 0;
+                $usersByHour[$hourStringISO8601] = isset($answerChoicesByHour[$hourString]) ?
                     count(array_unique(
                         $answerChoicesByHour[$hourString]
                             ->map(function ($ac) { return $ac->session->user_id; })

diff --git a/public/build/assets/IndexSessionView-BhW6sSfw.js b/public/build/assets/IndexSessionView-BhW6sSfw.js
diff --git a/public/build/assets/IndexSessionView-COqqUes9.js b/public/build/assets/IndexSessionView-COqqUes9.js