Handle problemBadges for problems w/o explicit color gracefully.

meisterT · meisterT · commit 78e48afa0629 · 2025-02-28T12:33:06.000Z
diff --git a/webapp/src/Twig/TwigExtension.php b/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);

Original file line number	Diff line number	Diff line change
`@@ -1147,7 +1147,7 @@ public function fileTypeIcon(string $type): string`
`1147`	`1147`	`public function problemBadge(ContestProblem $problem, bool $grayedOut = false): string`
`1148`	`1148`	`{`
`1149`	`1149`	`$rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');`
`1150`		`- if ($grayedOut) {`
	`1150`	`+ if ($grayedOut \|\| empty($rgb)) {`
`1151`	`1151`	`$rgb = Utils::convertToHex('whitesmoke');`
`1152`	`1152`	`}`
`1153`	`1153`	`$background = Utils::parseHexColor($rgb);`
`@@ -1177,7 +1177,7 @@ public function problemBadge(ContestProblem $problem, bool $grayedOut = false):`
`1177`	`1177`	`public function problemBadgeMaybe(ContestProblem $problem, ScoreboardMatrixItem $matrixItem): string`
`1178`	`1178`	`{`
`1179`	`1179`	`$rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');`
`1180`		`- if (!$matrixItem->isCorrect) {`
	`1180`	`+ if (!$matrixItem->isCorrect \|\| empty($rgb)) {`
`1181`	`1181`	`$rgb = Utils::convertToHex('whitesmoke');`
`1182`	`1182`	`}`
`1183`	`1183`	`$background = Utils::parseHexColor($rgb);`