From 3a812785d73c592f4f2a839c606a7581248d4ae8 Mon Sep 17 00:00:00 2001
From: Guillermo Gomez <guillermogomez@catalyst-au.net>
Date: Wed, 10 Mar 2021 15:28:50 +1000
Subject: [PATCH] Issue #78: Show in upcomming quizzes graph inprogress quizzes
 that are upcomming quizzes with override

---
 classes/output/upcomming_quizzes.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/classes/output/upcomming_quizzes.php b/classes/output/upcomming_quizzes.php
index a5650b5b..f07da54f 100644
--- 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.