Executable page: use badges for current contest.

meisterT · Mar 22, 2024 · 13975e6 · 13975e6
1 parent 8fead6b
commit 13975e6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
@@ -11,6 +11,7 @@
 use App\Entity\Judging;
 use App\Entity\JudgingRun;
 use App\Entity\Language;
+use App\Entity\Problem;
 use App\Entity\Submission;
 use App\Entity\SubmissionFile;
 use App\Entity\TeamCategory;
@@ -107,6 +108,7 @@ public function getFilters(): array
             new TwigFilter('tsvField', $this->toTsvField(...)),
             new TwigFilter('fileTypeIcon', $this->fileTypeIcon(...)),
             new TwigFilter('problemBadge', $this->problemBadge(...), ['is_safe' => ['html']]),
+            new TwigFilter('problemBadgeForProblemAndContest', $this->problemBadgeForProblemAndContest(...), ['is_safe' => ['html']]),
             new TwigFilter('printMetadata', $this->printMetadata(...), ['is_safe' => ['html']]),
             new TwigFilter('printWarningContent', $this->printWarningContent(...), ['is_safe' => ['html']]),
             new TwigFilter('entityIdBadge', $this->entityIdBadge(...), ['is_safe' => ['html']]),
@@ -1079,6 +1081,16 @@ public function problemBadge(ContestProblem $problem): string
         );
     }
 
+    public function problemBadgeForProblemAndContest(Problem $problem, Contest $contest): string
+    {
+        foreach ($problem->getContestProblems() as $contestProblem) {
+            if ($contestProblem->getContest() === $contest) {
+                return $this->problemBadge($contestProblem);
+            }
+        }
+        return '';
+    }
+
     public function printMetadata(?string $metadata): string
     {
         if ($metadata === null) {

diff --git a/webapp/templates/jury/executable.html.twig b/webapp/templates/jury/executable.html.twig
@@ -48,21 +48,21 @@
                         {% if executable.type == 'compare' %}
                             {% for problem in executable.problemsCompare %}
                                 <a href="{{ path('jury_problem', {'probId': problem.probid}) }}">
-                                    p{{ problem.probid }}
+                                    p{{ problem.probid }} {{ problem | problemBadgeForProblemAndContest(current_contest) }}
                                 </a>
                                 {% set used = true %}
                             {% endfor %}
                         {% elseif executable.type == 'run' %}
                             {% for problem in executable.problemsRun %}
                                 <a href="{{ path('jury_problem', {'probId': problem.probid}) }}">
-                                    p{{ problem.probid }}
+                                    p{{ problem.probid }} {{ problem | problemBadgeForProblemAndContest(current_contest) }}
                                 </a>
                                 {% set used = true %}
                             {% endfor %}
                         {% elseif executable.type == 'compile' %}
                             {% for language in executable.languages %}
                                 <a href="{{ path('jury_language', {'langId': language.langid}) }}">
-                                    {{ language.langid }}
+                                    {{ language | entityIdBadge }}
                                 </a>
                                 {% set used = true %}
                             {% endfor %}