Use a table and show solve stats per team for team language stats

Author: nickygerritsen

webapp/src/Service/StatisticsService.php

@@ -525,7 +525,11 @@ public function getGroupedProblemsStats(
      *     view: string,
      *     languages: array<string, array{
      *          name: string,
-     *          teams: array<int, Team>,
+     *          teams: array<array{
+     *              team: Team,
+     *              solved: int,
+     *              total: int,
+     *          }>,
      *          team_count: int,
      *          solved: int,
      *          not_solved: int,
@@ -582,10 +586,18 @@ public function getLanguagesStats(Contest $contest, string $view): array
 
                 $language = $s->getLanguage();
 
-                $languageStats[$language->getLangid()]['teams'][$team->getTeamid()] = $team;
+                if (!isset($languageStats[$language->getLangid()]['teams'][$team->getTeamid()])) {
+                    $languageStats[$language->getLangid()]['teams'][$team->getTeamid()] = [
+                        'team' => $team,
+                        'solved' => 0,
+                        'total' => 0,
+                    ];
+                }
+                $languageStats[$language->getLangid()]['teams'][$team->getTeamid()]['total']++;
                 $languageStats[$language->getLangid()]['total']++;
                 if ($s->getResult() === 'correct') {
                     $languageStats[$language->getLangid()]['solved']++;
+                    $languageStats[$language->getLangid()]['teams'][$team->getTeamid()]['solved']++;
                     $languageStats[$language->getLangid()]['problems_solved'][$s->getProblem()->getProbId()] = $s->getContestProblem();
                 } else {
                     $languageStats[$language->getLangid()]['not_solved']++;
@@ -595,10 +607,13 @@ public function getLanguagesStats(Contest $contest, string $view): array
         }
 
         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 function (array $a, array $b): int {
+                if ($a['solved'] === $b['solved']) {
+                    return $b['total'] <=> $a['total'];
+                }
+
+                return $b['solved'] <=> $a['solved'];
+            });
             $languageStat['team_count'] = count($languageStat['teams']);
             $languageStat['problems_solved_count'] = count($languageStat['problems_solved']);
             $languageStat['problems_attempted_count'] = count($languageStat['problems_attempted']);

webapp/templates/jury/analysis/languages.html.twig

@@ -28,15 +28,33 @@
                             </div>
                             <div class="card mt-2 mb-2 d-none" id="team-list-{{ langid }}">
                                 <div class="card-body">
-                                    <ul class="mb-0">
+                                    <table class="table table-striped table-hover">
+                                        <thead>
+                                        <tr>
+                                            <td colspan="2">Team</td>
+                                            <td>Number of solved problems in {{ language.name }}</td>
+                                            <td>Total attempts in {{ language.name }}</td>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
                                         {% for team in language.teams %}
-                                        <li>
-                                            <a href="{{ path('jury_team', {'teamId': team.teamid}) }}">
-                                                {{ team.effectiveName }} {{ team | entityIdBadge('t') }}
-                                            </a>
-                                        </li>
+                                            <tr>
+                                                <td>
+                                                    <a href="{{ path('jury_team', {'teamId': team.team.teamid}) }}">
+                                                        {{ team.team | entityIdBadge('t') }}
+                                                    </a>
+                                                </td>
+                                                <td>
+                                                    <a href="{{ path('jury_team', {'teamId': team.team.teamid}) }}">
+                                                        {{ team.team.effectiveName }}
+                                                    </a>
+                                                </td>
+                                                <td>{{ team.solved }}</td>
+                                                <td>{{ team.total }}</td>
+                                            </tr>
                                         {% endfor %}
-                                    </ul>
+                                        </tbody>
+                                    </table>
                                 </div>
                             </div>
                         {% endif %}