Add rank to first to solve and region winners in results HTML.

Fixes #2480.

Author: nickygerritsen

webapp/src/Controller/Jury/ImportExportController.php

@@ -377,16 +377,19 @@ protected function getResultsHtml(Request $request, bool $full = false): Respons
         $ranked        = [];
         $honorable     = [];
         $regionWinners = [];
+        $rankPerTeam   = [];
 
         $sortOrder = $request->query->getInt('sort_order');
 
         foreach ($this->importExportService->getResultsData($sortOrder, full: $full) as $row) {
             $team = $teamNames[$row[0]];
+            $rankPerTeam[$row[0]] = $row[1];
 
             if ($row[6] !== '') {
                 $regionWinners[] = [
                     'group' => $row[6],
                     'team' => $team,
+                    'rank' => $row[1] ?: '-',
                 ];
             }
 
@@ -434,6 +437,7 @@ protected function getResultsHtml(Request $request, bool $full = false): Respons
                 'problem_name' => $problem->getProblem()->getName(),
                 'team' => null,
                 'time' => null,
+                'rank' => null,
             ];
             foreach ($teams as $team) {
                 if (!isset($categories[$team->getCategory()->getCategoryid()]) || $team->getCategory()->getSortorder() !== $sortOrder) {
@@ -446,6 +450,7 @@ protected function getResultsHtml(Request $request, bool $full = false): Respons
                         'problem' => $problem->getShortname(),
                         'problem_name' => $problem->getProblem()->getName(),
                         'team' => $teamNames[$team->getIcpcId()],
+                        'rank' => $rankPerTeam[$team->getIcpcId()] ?: '-',
                         'time' => Utils::scoretime($matrixItem->time, $scoreIsInSeconds),
                     ];
                 }

webapp/templates/jury/export/results.html.twig

@@ -65,13 +65,15 @@
         <thead>
         <tr>
             <th scope="col">Region</th>
+            <th scope="col">Rank</th>
             <th scope="col">Team</th>
         </tr>
         </thead>
         <tbody>
         {% for row in regionWinners %}
             <tr>
                 <th scope="row">{{ row.group }}</th>
+                <td>{{ row.rank }}</td>
                 <td>{{ row.team }}</td>
             </tr>
         {% endfor %}
@@ -84,6 +86,7 @@
         <tr>
             <th scope="col">Problem</th>
             <th scope="col">Team</th>
+            <th scope="col">Rank</th>
             <th scope="col">Time</th>
         </tr>
         </thead>
@@ -98,6 +101,13 @@
                         <i>Not solved</i>
                     {% endif %}
                 </td>
+                <td>
+                    {% if row.rank is not null %}
+                        {{ row.rank }}
+                    {% else %}
+                        <i>-</i>
+                    {% endif %}
+                </td>
                 <td>
                     {% if row.time is not null %}
                         {{ row.time }}