Merge branch 'main' into logo-upload-fix

Author: nickygerritsen

webapp/src/Controller/Jury/SubmissionController.php

@@ -98,7 +98,10 @@ public function indexAction(
 
         $refresh = [
             'after' => 15,
-            'url' => $this->generateUrl('jury_submissions', ['view' => $viewTypes[$view]]),
+            'url' => $this->generateUrl('jury_submissions', [
+                'view' => $viewTypes[$view],
+                'page' => $request->query->getInt('page', 1),
+            ]),
             'ajax' => true,
         ];
 

webapp/src/Controller/Team/MiscController.php

@@ -181,7 +181,8 @@ public function printAction(Request $request): Response
             $ret = $this->dj->printUserFile(
                 $realfile,
                 $originalfilename,
-                $langid
+                $langid,
+                true
             );
 
             return $this->render('team/print_result.html.twig', [

webapp/src/Twig/TwigExtension.php

@@ -1147,7 +1147,7 @@ public function fileTypeIcon(string $type): string
     public function problemBadge(ContestProblem $problem, bool $grayedOut = false): string
     {
         $rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');
-        if ($grayedOut) {
+        if ($grayedOut || empty($rgb)) {
             $rgb = Utils::convertToHex('whitesmoke');
         }
         $background = Utils::parseHexColor($rgb);
@@ -1177,7 +1177,7 @@ public function problemBadge(ContestProblem $problem, bool $grayedOut = false):
     public function problemBadgeMaybe(ContestProblem $problem, ScoreboardMatrixItem $matrixItem): string
     {
         $rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');
-        if (!$matrixItem->isCorrect) {
+        if (!$matrixItem->isCorrect || empty($rgb)) {
             $rgb = Utils::convertToHex('whitesmoke');
         }
         $background = Utils::parseHexColor($rgb);