Added problem badges

DOMjudge · Sep 21, 2023 · 296af44 · 296af44
1 parent f9ccdfd
commit 296af44
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/webapp/src/Controller/Jury/ExecutableController.php b/webapp/src/Controller/Jury/ExecutableController.php
@@ -59,12 +59,25 @@ public function indexAction(Request $request): Response
             'icon' => ['title' => 'type', 'sort' => false],
             'execid' => ['title' => 'ID', 'sort' => true,],
             'type' => ['title' => 'type', 'sort' => true,],
+            'badges' => ['title' => 'problems', 'sort' => false],
             'description' => ['title' => 'description', 'sort' => true,],
         ];
 
         $propertyAccessor  = PropertyAccess::createPropertyAccessor();
         $executables_table = [];
         foreach ($executables as $e) {
+            $badges = [];
+            if ($this->dj->getCurrentContest()) {
+                foreach([$e->getProblemsCompare(), $e->getProblemsRun()] as $problemList) {
+                    foreach ($problemList as $p) {
+                        foreach ($this->dj->getCurrentContest()->getProblems() as $cp) {
+                            if ($cp->getProblem() === $p) {
+                                $badges[] = $cp;
+                            }
+                        }
+                    }
+                }
+            }
             $execdata    = [];
             $execactions = [];
             // Get whatever fields we can from the team object itself.
@@ -91,6 +104,7 @@ public function indexAction(Request $request): Response
                 default:
                     $execdata['icon']['icon'] = 'question';
             }
+            $execdata['badges']['value'] = $badges;
 
             if ($this->isGranted('ROLE_ADMIN')) {
                 $execactions[] = [

diff --git a/webapp/templates/jury/jury_macros.twig b/webapp/templates/jury/jury_macros.twig
@@ -141,6 +141,10 @@
                             {{- (item.value|default(item.default|default('')))|affiliationLogo(item.title) -}}
                             {% elseif key == "warning_content" %}
                             {{- item.value|printWarningContent -}}
+                            {% elseif key == "badges" %}
+                                {% for badge in item.value %}
+                                    {{- badge|problemBadge -}}
+                                {% endfor %}
                             {% elseif (column.render | default('')) == "entity_id_badge" %}
                             {% if item.value %}{{- item.value|entityIdBadge(item.idPrefix|default('')) -}}{% endif %}
                             {% else %}