Add support for toggles in macro tables and use it for contests and languages.

nickygerritsen · meisterT · commit 83b3b7f0d410 · 2024-03-31T21:12:00.000Z
diff --git a/webapp/src/Controller/Jury/ContestController.php b/webapp/src/Controller/Jury/ContestController.php
@@ -44,6 +44,7 @@
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[IsGranted('ROLE_JURY')]
@@ -186,12 +187,29 @@ public function indexAction(Request $request): Response
             }
 
             $contestdata['process_balloons'] = [
-                'value' => $contest->getProcessBalloons() ? 'yes' : 'no'
+                'toggle_partial' => 'contest_toggle.html.twig',
+                'partial_arguments' => [
+                    'type' => 'balloons',
+                    'contest' => $contest,
+                    'enabled' => $contest->getProcessBalloons(),
+                ],
             ];
             $contestdata['medals_enabled'] = [
-                'value' => $contest->getMedalsEnabled() ? 'yes' : 'no'
+                'toggle_partial' => 'contest_toggle.html.twig',
+                'partial_arguments' => [
+                    'type' => 'medals',
+                    'contest' => $contest,
+                    'enabled' => $contest->getMedalsEnabled(),
+                ],
+            ];
+            $contestdata['public'] = [
+                'toggle_partial' => 'contest_toggle.html.twig',
+                'partial_arguments' => [
+                    'type' => 'public',
+                    'contest' => $contest,
+                    'enabled' => $contest->getPublic(),
+                ],
             ];
-            $contestdata['public'] = ['value' => $contest->getPublic() ? 'yes' : 'no'];
             if ($contest->isOpenToAllTeams()) {
                 $contestdata['num_teams'] = ['value' => 'all'];
             } else {
@@ -343,8 +361,12 @@ public function viewAction(Request $request, int $contestId): Response
     }
 
     #[Route(path: '/{contestId}/toggle/{type<submit|balloons|tiebreaker|medals|public>}', name: 'jury_contest_toggle')]
-    public function toggleSubmitAction(Request $request, string $contestId, string $type): Response
-    {
+    public function toggleSubmitAction(
+        RouterInterface $router,
+        Request $request,
+        string $contestId,
+        string $type
+    ): Response {
         $contest = $this->em->getRepository(Contest::class)->find($contestId);
         if (!$contest) {
             throw new NotFoundHttpException(sprintf('Contest with ID %s not found', $contestId));
@@ -379,7 +401,11 @@ public function toggleSubmitAction(Request $request, string $contestId, string $
         $this->em->flush();
 
         $this->dj->auditlog('contest', $contestId, $label, $value ? 'yes' : 'no');
-        return $this->redirectToRoute('jury_contest', ['contestId' => $contestId]);
+        return $this->redirectToLocalReferrer(
+            $router,
+            $request,
+            $this->generateUrl('jury_contest', ['contestId' => $contestId])
+        );
     }
 
     #[Route(path: '/{contestId<\d+>}/remove-interval/{intervalId}', name: 'jury_contest_remove_interval', methods: ['POST'])]
diff --git a/webapp/src/Controller/Jury/LanguageController.php b/webapp/src/Controller/Jury/LanguageController.php
@@ -22,6 +22,7 @@
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 #[IsGranted('ROLE_JURY')]
@@ -98,12 +99,24 @@ public function indexAction(): Response
 
             $executable = $lang->getCompileExecutable();
 
+            $allowJudgeOptions = [
+                'toggle_partial' => 'language_toggle.html.twig',
+                'partial_arguments' => [
+                    'path' => 'jury_language_toggle_judge',
+                    'language' => $lang,
+                    'value' => $lang->getAllowJudge(),
+                ],
+            ];
+
+            if (!$lang->getAllowJudge()) {
+                $allowJudgeOptions['cssclass'] = 'text-danger font-weight-bold';
+            }
+
             // Merge in the rest of the data.
             $langdata = array_merge($langdata, [
                 'entrypoint' => ['value' => $lang->getRequireEntryPoint() ? 'yes' : 'no'],
                 'extensions' => ['value' => implode(', ', $lang->getExtensions())],
-                'allowjudge' => $lang->getAllowJudge() ?
-                    ['value' => 'yes'] : ['value' => 'no', 'cssclass'=>'text-danger font-weight-bold'],
+                'allowjudge' => $allowJudgeOptions,
                 'executable' => [
                     'value' => $executable === null ? '-' : $executable->getShortDescription(),
                     'link' => $executable === null ? null : $this->generateUrl('jury_executable', [
@@ -222,8 +235,11 @@ public function toggleSubmitAction(Request $request, string $langId): Response
     }
 
     #[Route(path: '/{langId}/toggle-judge', name: 'jury_language_toggle_judge')]
-    public function toggleJudgeAction(Request $request, string $langId): Response
-    {
+    public function toggleJudgeAction(
+        RouterInterface $router,
+        Request $request,
+        string $langId
+    ): Response {
         $language = $this->em->getRepository(Language::class)->find($langId);
         if (!$language) {
             throw new NotFoundHttpException(sprintf('Language with ID %s not found', $langId));
@@ -239,7 +255,11 @@ public function toggleJudgeAction(Request $request, string $langId): Response
 
         $this->dj->auditlog('language', $langId, 'set allow judge',
                                          $request->request->getBoolean('value') ? 'yes' : 'no');
-        return $this->redirectToRoute('jury_language', ['langId' => $langId]);
+        return $this->redirectToLocalReferrer(
+            $router,
+            $request,
+            $this->generateUrl('jury_language', ['langId' => $langId])
+        );
     }
 
     #[Route(path: '/{langId}/toggle-filter-compiler-flags', name: 'jury_language_toggle_filter_compiler_files')]
diff --git a/webapp/templates/jury/contests.html.twig b/webapp/templates/jury/contests.html.twig
@@ -6,6 +6,7 @@
 {% block extrahead %}
     {{ parent() }}
     {{ macros.table_extrahead() }}
+    {{ macros.toggle_extrahead() }}
 {% endblock %}
 
 {% block content %}
@@ -88,3 +89,8 @@
     {% endif %}
 
 {% endblock %}
+
+{% block extrafooter %}
+    {{ macros.toggle_autosubmit_extrafooter() }}
+{% endblock %}
+
diff --git a/webapp/templates/jury/jury_macros.twig b/webapp/templates/jury/jury_macros.twig
@@ -131,8 +131,10 @@
                                 {%- if item.sortvalue is defined %} data-sort="{{ item.sortvalue }}"{% endif %}
                                 {% if (column.render | default('')) == "entity_id_badge" %}style="text-align: right;" {% endif %}>
                             {%- if item.link is defined %}<a href="{{ item.link }}" {%- if item.showlink is defined %} class="showlink"{% endif %}>
-                            {%- elseif row.link is defined %}<a href="{{ row.link }}">{% endif %}
-                            {% if key == "status" %}
+                            {%- elseif row.link is defined and not item.toggle_partial is defined %}<a href="{{ row.link }}">{% endif %}
+                            {% if item.toggle_partial is defined %}
+                                {% include 'jury/partials/' ~ item.toggle_partial with item.partial_arguments %}
+                            {% elseif key == "status" %}
                             {{- (item.value|default(item.default|default('')))|statusIcon -}}
                             {% elseif key == "country" %}
                             {{- (item.value|default(item.default|default('')))|countryFlag -}}
@@ -150,7 +152,7 @@
                             {{- (item.value|default(item.default|default(''))) -}}
                             {% endif %}
                             {% if item.icon is defined %}<i class="fas fa-{{ item.icon }}"></i>{%- endif %}
-                            {%- if item.link is defined or row.link is defined -%}</a>{% endif %}
+                            {%- if item.link is defined or (row.link is defined and not item.toggle_partial is defined) -%}</a>{% endif %}
                         </td>
                     {%- endfor %}
                     {%- for action in row.actions %}
diff --git a/webapp/templates/jury/languages.html.twig b/webapp/templates/jury/languages.html.twig
@@ -6,6 +6,7 @@
 {% block extrahead %}
     {{ parent() }}
     {{ macros.table_extrahead() }}
+    {{ macros.toggle_extrahead() }}
 {% endblock %}
 
 {% block content %}
@@ -28,3 +29,7 @@
     {% endif %}
 
 {% endblock %}
+
+{% block extrafooter %}
+    {{ macros.toggle_autosubmit_extrafooter() }}
+{% endblock %}
