Hide already solved problems for teams

This moves the already solved problems under a new header, the teams can still
visit those but it hides those by default to make it easier for teams to focus
on the next problem.

In case we like this we should check if the function should actually be public.

Author: vmcj

webapp/src/Controller/Team/ProblemController.php

@@ -8,6 +8,7 @@
 use App\Service\ConfigurationService;
 use App\Service\DOMJudgeService;
 use App\Service\EventLogService;
+use App\Service\ScoreboardService;
 use App\Service\StatisticsService;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
@@ -32,6 +33,7 @@ public function __construct(
         DOMJudgeService $dj,
         protected readonly ConfigurationService $config,
         protected readonly StatisticsService $stats,
+        protected readonly ScoreboardService $scoreboard,
         protected readonly EventLogService $eventLogService,
         EntityManagerInterface $em,
         KernelInterface $kernel,
@@ -46,8 +48,9 @@ public function __construct(
     public function problemsAction(): Response
     {
         $teamId = $this->dj->getUser()->getTeam()->getTeamid();
+        $cache = $this->scoreboard->getScorecache($this->dj->getCurrentContest(), $this->dj->getUser()->getTeam());
         return $this->render('team/problems.html.twig',
-            $this->dj->getTwigDataForProblemsAction($this->stats, $teamId));
+            $this->dj->getTwigDataForProblemsAction($this->stats, $teamId, cache: $cache));
     }
 
 

webapp/src/Service/DOMJudgeService.php

@@ -24,6 +24,7 @@
 use App\Entity\ProblemAttachment;
 use App\Entity\QueueTask;
 use App\Entity\Rejudging;
+use App\Entity\ScoreCache;
 use App\Entity\Submission;
 use App\Entity\Team;
 use App\Entity\TeamAffiliation;
@@ -1009,7 +1010,8 @@ public function getContestStats(Contest $contest): ContestStatus
     }
 
     /**
-     * @return array{'problems': ContestProblem[], 'samples': string[], 'showLimits': bool,
+     * @param ScoreCache[]|null $cache
+     * @return array{'allproblems': array<mixed, ContestProblem[]>, 'samples': string[], 'showLimits': bool,
      *               'defaultMemoryLimit': int, 'timeFactorDiffers': bool,
      *               'stats': array{'numBuckets': int, 'maxBucketSizeCorrect': int,
      *                              'maxBucketSizeCorrect': int, 'maxBucketSizeIncorrect': int,
@@ -1020,7 +1022,8 @@ public function getContestStats(Contest $contest): ContestStatus
     public function getTwigDataForProblemsAction(
         StatisticsService $statistics,
         ?int $teamId = null,
-        bool $forJury = false
+        bool $forJury = false,
+        ?array $cache = null
     ): array {
         $contest            = isset($teamId) ? $this->getCurrentContest($teamId) : $this->getCurrentContest(onlyPublic: !$forJury);
         $showLimits         = (bool)$this->config->get('show_limits_on_team_page');
@@ -1093,8 +1096,20 @@ public function getTwigDataForProblemsAction(
             }
         }
 
+        $allProblems = [null => [], 'solved' => []];
+        if ($cache) {
+            foreach ($cache as $ind => $cachedProblem) {
+                if ($cachedProblem->getIsCorrect(true)) {
+                    $allProblems['solved'][] = $problems[$ind];
+                } else {
+                    $allProblems[null][] = $problems[$ind];
+                }
+            }
+        } else {
+            $allProblems = [null => $problems];
+        }
         $data = [
-            'problems' => $problems,
+            'allproblems' => $allProblems,
             'samples' => $samples,
             'showLimits' => $showLimits,
             'defaultMemoryLimit' => $defaultMemoryLimit,

webapp/src/Service/ScoreboardService.php

@@ -1078,7 +1078,7 @@ protected function getCategories(bool $jury): array
      * Get the scorecache used to calculate the scoreboard.
      * @return ScoreCache[]
      */
-    protected function getScorecache(?Contest $contest, ?Team $team = null): array
+    public function getScorecache(?Contest $contest, ?Team $team = null): array
     {
         if (!$contest) {
             return [];