Issue #78: Show in upcomming quizzes graph inprogress quizzes that ar…

…e upcomming quizzes with override
catalyst · Mar 10, 2021 · 83fcb60 · 83fcb60
1 parent 47cbb23
commit 83fcb60
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/classes/output/upcomming_quizzes.php b/classes/output/upcomming_quizzes.php
@@ -68,9 +68,17 @@ public function get_upcomming_quizzes_chart(int $now): array {
                 $participantcount += $quiz->participants;
             }
 
+            // Check if inprogress quizzes are upcomming quizzes with overrides.
+            foreach ($quizzes['inprogress'] as $inprogress) {
+                if ($inprogress->timestampopen >= $timestamp && $inprogress->timestampopen < $timestamp + HOURSECS) {
+                    $quizcount++;
+                    $participantcount += $inprogress->participants;
+                }
+            }
+
             $quizseriesdata[] = $quizcount;
             $participantseriesdata[] = $participantcount;
-            $labels[] = userdate($timestamp, get_string('inprogressdatetime', 'local_assessfreq'));
+            $labels[] = userdate($timestamp + HOURSECS, get_string('inprogressdatetime', 'local_assessfreq'));
         }
 
         // Create chart object.