Merge branch 'main' into use_chroot_ci_tests

Author: vmcj

submit/submit_standalone.bats

@@ -18,7 +18,7 @@ setup() {
 @test "baseurl set in environment" {
     run ./submit
     assert_failure 1
-    assert_regex "$SUBMITBASEHOST.*/api(/.*)?/contests.*\[Errno -2\] Name or service not known"
+    assert_regex "$SUBMITBASEHOST"
 }
 
 @test "baseurl via parameter overrides environment" {

webapp/src/DataTransferObject/Shadowing/ContestEvent.php

@@ -9,7 +9,7 @@ public function __construct(
         public readonly string $name,
         public readonly string $duration,
         public readonly ?string $scoreboardType,
-        public readonly int $penaltyTime,
+        public readonly ?int $penaltyTime,
         public readonly ?string $formalName,
         public readonly ?string $startTime,
         public readonly ?string $countdownPauseTime,

webapp/src/Service/BalloonService.php

@@ -125,6 +125,12 @@ public function collectBalloonTable(Contest $contest, bool $todo = false): array
                 continue;
             }
 
+            $stime = $balloonsData['submittime'];
+
+            if (isset($freezetime) && $stime >= $freezetime) {
+                continue;
+            }
+
             $TOTAL_BALLOONS[$balloonsData['teamid']][$balloonsData['probshortname']] = $balloonsData[0]->getSubmission()->getContestProblem();
         }
 

webapp/src/Service/ExternalContestSourceService.php

@@ -766,7 +766,7 @@ protected function validateAndUpdateContest(Event $event, EventData $data): void
 
         // Also compare the penalty time
         $penaltyTime = $data->penaltyTime;
-        if ($this->config->get('penalty_time') != $penaltyTime) {
+        if ($penaltyTime !== null && $this->config->get('penalty_time') != $penaltyTime) {
             $this->logger->warning(
                 'Penalty time does not match between feed (%d) and local (%d)',
                 [$penaltyTime, $this->config->get('penalty_time')]
@@ -863,9 +863,11 @@ protected function validateLanguage(Event $event, EventData $data): void
         } else {
             $this->removeWarning($event->type, $data->id, ExternalSourceWarning::TYPE_DATA_MISMATCH);
 
-            $toCheck = ['extensions' => $data->extensions];
+            if ($data->extensions !== null) {
+                $toCheck = ['extensions' => $data->extensions];
 
-            $this->compareOrCreateValues($event, $data->id, $language, $toCheck);
+                $this->compareOrCreateValues($event, $data->id, $language, $toCheck);
+            }
         }
     }
 

webapp/src/Service/ScoreboardService.php

@@ -67,7 +67,7 @@ public function getScoreboard(
         if (!$freezeData->started() && !$jury && !$forceUnfrozen) {
             return null;
         }
-        $restricted = ($jury || $freezeData->showFinal(false));
+        $restricted = ($jury || $freezeData->showFinal(false) || $forceUnfrozen);
 
         $teams      = $this->getTeamsInOrder($contest, $jury && !$visibleOnly, $filter, $restricted);
         $problems   = $this->getProblems($contest);

webapp/templates/jury/submission_source.html.twig

@@ -23,7 +23,7 @@
             {% if submission.resubmissions is not empty %}
                 (resubmitted as
                 {%- for resubmission in submission.resubmissions %}
-                    <a href="{{ path('jury_submission', {submitId: resubmission.originalSubmission.submitid}) }}">s{{ resubmission.submitid }}</a>
+                    <a href="{{ path('jury_submission', {submitId: resubmission.submitid}) }}">s{{ resubmission.submitid }}</a>
                     {%- if not loop.last -%},{%- endif -%}
                 {%- endfor -%}
                 )

webapp/templates/public/team_submissions.html.twig

@@ -14,7 +14,7 @@
         data-problem-id="{{ problem.externalId }}"
         data-submissions-url="{{ path('public_submissions_data_cell', {teamId: team.externalid, problemId: problem.externalId}) }}">
         <div class="spinner-border" role="status">
-            <span class="sr-only">Loading...</span>
+            <span class="visually-hidden">Loading...</span>
         </div>
         {% include 'public/partials/submission_list_template.html.twig' %}
     </div>

webapp/templates/public/team_submissions_modal.html.twig

@@ -10,6 +10,6 @@
 
 {% block content %}
     <div class="spinner-border" role="status">
-        <span class="sr-only">Loading...</span>
+        <span class="visually-hidden">Loading...</span>
     </div>
 {% endblock %}