Also show problem badges

nickygerritsen · nickygerritsen · commit 3bfe011e9fa6 · 2024-08-16T09:10:40.000Z
diff --git a/webapp/src/Service/StatisticsService.php b/webapp/src/Service/StatisticsService.php
@@ -520,6 +520,7 @@ public function getGroupedProblemsStats(
     /**
      * @return array{
      *     contest: Contest,
+     *     problems: ContestProblem[],
      *     filters: array<string, string>,
      *     view: string,
      *     languages: array<string, array{
@@ -529,6 +530,10 @@ public function getGroupedProblemsStats(
      *          solved: int,
      *          not_solved: int,
      *          total: int,
+     *          problems_solved: array<int, ContestProblem>,
+     *          problems_solved_count: int,
+     *          problems_attempted: array<int, ContestProblem>,
+     *          problems_attempted_count: int,
      *     }>
      * }
      */
@@ -552,6 +557,10 @@ public function getLanguagesStats(Contest $contest, string $view): array
                 'solved' => 0,
                 'not_solved' => 0,
                 'total' => 0,
+                'problems_solved' => [],
+                'problems_solved_count' => 0,
+                'problems_attempted' => [],
+                'problems_attempted_count' => 0,
             ];
         }
 
@@ -577,20 +586,28 @@ public function getLanguagesStats(Contest $contest, string $view): array
                 $languageStats[$language->getLangid()]['total']++;
                 if ($s->getResult() === 'correct') {
                     $languageStats[$language->getLangid()]['solved']++;
+                    $languageStats[$language->getLangid()]['problems_solved'][$s->getProblem()->getProbId()] = $s->getContestProblem();
                 } else {
                     $languageStats[$language->getLangid()]['not_solved']++;
                 }
+                $languageStats[$language->getLangid()]['problems_attempted'][$s->getProblem()->getProbId()] = $s->getContestProblem();
             }
         }
 
         foreach ($languageStats as &$languageStat) {
-            usort($languageStat['teams'], static fn(Team $a, Team $b) => ($a->getLabel() ?: $a->getExternalid()) <=> ($b->getLabel() ?: $b->getExternalid()));
+            usort($languageStat['teams'], static fn(
+                Team $a,
+                Team $b
+            ) => ($a->getLabel() ?: $a->getExternalid()) <=> ($b->getLabel() ?: $b->getExternalid()));
             $languageStat['team_count'] = count($languageStat['teams']);
+            $languageStat['problems_solved_count'] = count($languageStat['problems_solved']);
+            $languageStat['problems_attempted_count'] = count($languageStat['problems_attempted']);
         }
         unset($languageStat);
 
         return [
             'contest' => $contest,
+            'problems' => $this->getContestProblems($contest),
             'filters' => StatisticsService::FILTERS,
             'view' => $view,
             'languages' => $languageStats,
diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
@@ -1061,9 +1061,12 @@ public function fileTypeIcon(string $type): string
         return 'fas fa-file-' . $iconName;
     }
 
-    public function problemBadge(ContestProblem $problem): string
+    public function problemBadge(ContestProblem $problem, bool $grayedOut = false): string
     {
         $rgb        = Utils::convertToHex($problem->getColor() ?? '#ffffff');
+        if ($grayedOut) {
+            $rgb = 'whitesmoke';
+        }
         $background = Utils::parseHexColor($rgb);
 
         // Pick a border that's a bit darker.
@@ -1075,6 +1078,10 @@ public function problemBadge(ContestProblem $problem): string
 
         // Pick the foreground text color based on the background color.
         $foreground = ($background[0] + $background[1] + $background[2] > 450) ? '#000000' : '#ffffff';
+        if ($grayedOut) {
+            $foreground = 'silver';
+            $border = 'linen';
+        }
         return sprintf(
             '<span class="badge problem-badge" style="background-color: %s; border: 1px solid %s"><span style="color: %s;">%s</span></span>',
             $rgb,
diff --git a/webapp/templates/jury/analysis/languages.html.twig b/webapp/templates/jury/analysis/languages.html.twig
@@ -41,8 +41,22 @@
                             </div>
                         {% endif %}
                         <br/>
-                        <i class="fas fa-file-code fa-fw"></i> {{ language.total }} total submission{% if language.total != 1 %}s{% endif %}<br />
-                        <i class="fas fa-check fa-fw"></i> {{ language.solved }} submission{% if language.solved != 1 %}s{% endif %} solved problems<br />
+                        <i class="fas fa-file-code fa-fw"></i> {{ language.total }} total submission{% if language.total != 1 %}s{% endif %}
+                        for {{ language.problems_attempted_count }} problem{% if language.problems_attempted_count != 1 %}s{% endif %}:<br/>
+                        {% for problem in problems %}
+                            <a href="{{ path('jury_problem', {'probId': problem.probid}) }}">
+                                {{ problem | problemBadge(language.problems_attempted[problem.probid] is not defined) }}
+                            </a>
+                        {% endfor %}
+                        <br />
+                        <i class="fas fa-check fa-fw"></i> {{ language.solved }} submission{% if language.solved != 1 %}s{% endif %} solved problems
+                        for {{ language.problems_solved_count }} problem{% if language.problems_solved_count != 1 %}s{% endif %}:<br/>
+                        {% for problem in problems %}
+                            <a href="{{ path('jury_problem', {'probId': problem.probid}) }}">
+                                {{ problem | problemBadge(language.problems_solved[problem.probid] is not defined) }}
+                            </a>
+                        {% endfor %}
+                        <br />
                         <i class="fas fa-xmark fa-fw"></i> {{ language.not_solved }} submission{% if language.not_solved != 1 %}s{% endif %} did not solve a problem<br />
                     </div>
                 </div>
