Adding actual point limit into group-user stats.

ReCodEx · Oct 11, 2024 · cf3e839 · cf3e839
1 parent 983f8ad
commit cf3e839
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/model/view/GroupViewFactory.php b/app/model/view/GroupViewFactory.php
@@ -159,17 +159,21 @@ private function getStudentStatsInternal(
         }
 
         $passesLimit = null;  // null = no limit
+        $limit = null;
         if ($group->getPointsLimit() !== null && $group->getPointsLimit() > 0) {
-            $passesLimit = $gainedPoints >= $group->getPointsLimit();
+            $limit = $group->getPointsLimit();
+            $passesLimit = $gainedPoints >= $limit;
         } elseif ($group->getThreshold() !== null && $group->getThreshold() > 0) {
-            $passesLimit = $gainedPoints >= $maxPoints * $group->getThreshold();
+            $limit = $maxPoints * $group->getThreshold();
+            $passesLimit = $gainedPoints >= $limit;
         }
         return [
             "userId" => $student->getId(),
             "groupId" => $group->getId(),
             "points" => [
                 "total" => $maxPoints,
-                "gained" => $gainedPoints
+                "limit" => $limit,
+                "gained" => $gainedPoints,
             ],
             "hasLimit" => $passesLimit !== null,
             "passesLimit" => $passesLimit ?? true,