Display a simple selection menu to trigger the task

We can either pass the externalid or the id of the immutableexecutable. For now I went with the externalid as the immutable makes that it can be cached and we can use the wrong URL bij accident. The advantage of using the immutable is that we get some extra info about which versions were ran via the log. The same thing can be extracted from the judgetask table.

Author: vmcj

webapp/src/Controller/Jury/JudgehostController.php

@@ -4,6 +4,7 @@
 
 use App\Controller\BaseController;
 use App\Doctrine\DBAL\Types\JudgeTaskType;
+use App\Entity\Executable;
 use App\Entity\Judgehost;
 use App\Entity\JudgeTask;
 use App\Entity\Judging;
@@ -210,8 +211,19 @@ public function indexAction(Request $request): Response
             return strnatcasecmp($a['data']['hostname']['value'], $b['data']['hostname']['value']);
         });
 
+        /** @var Executable[] $executables */
+        $executables      = $this->em->createQueryBuilder()
+            ->select('e as executable, e.execid as execid')
+            ->from(Executable::class, 'e')
+            ->addOrderBy('e.type', 'ASC')
+            ->addOrderBy('e.execid', 'ASC')
+            ->andWhere('e.type = :type')
+            ->setParameter('type', JudgeTaskType::GENERIC_TASK)
+            ->getQuery()->getResult();
+
         $data = [
             'judgehosts' => $judgehosts_table,
+            'executables' => $executables,
             'table_fields' => $table_fields,
             'all_checked_in_recently' => $all_checked_in_recently,
             'refresh' => [
@@ -278,7 +290,18 @@ public function viewAction(Request $request, int $judgehostid): Response
                 ->getResult();
         }
 
+        /** @var Executable[] $executables */
+        $executables      = $this->em->createQueryBuilder()
+            ->select('e as executable, e.execid as execid')
+            ->from(Executable::class, 'e')
+            ->addOrderBy('e.type', 'ASC')
+            ->addOrderBy('e.execid', 'ASC')
+            ->andWhere('e.type = :type')
+            ->setParameter('type', JudgeTaskType::GENERIC_TASK)
+            ->getQuery()->getResult();
+
         $data = [
+            'executables' => $executables,
             'judgehost' => $judgehost,
             'status' => $status,
             'statusIcon' => $statusIcon,
@@ -296,10 +319,10 @@ public function viewAction(Request $request, int $judgehostid): Response
         }
     }
 
-    private function helperGenericTask(int $execid, ?JudgeHost $judgehost = null): void {
+    private function helperGenericTask(string $execid, ?JudgeHost $judgehost = null): void {
         $executable = $this->em->getRepository(Executable::class)->findOneBy(['execid' => $execid]);
         if (!$executable) {
-            throw new NotFoundHttpException(sprintf('Executable with ID %d not found', $execid));
+            throw new NotFoundHttpException(sprintf('Executable with ID %s not found', $execid));
         }
 
         $executable = $executable->getImmutableExecutable();
@@ -329,7 +352,7 @@ private function helperGenericTask(int $execid, ?JudgeHost $judgehost = null): v
 
     #[IsGranted('ROLE_ADMIN')]
     #[Route(path: '/{judgehostid}/request-generic-task/{execid}', name: 'jury_request_judgehost_generic')]
-    public function requestGenericTaskJudgehost(Request $request, int $judgehostid, int $execid): RedirectResponse
+    public function requestGenericTaskJudgehost(Request $request, int $judgehostid, string $execid): RedirectResponse
     {
         $judgehost = $this->em->getRepository(Judgehost::class)->find($judgehostid);
         if (!$judgehost) {
@@ -346,7 +369,7 @@ public function requestGenericTaskJudgehost(Request $request, int $judgehostid,
     // TODO: Does the ordering matter in the file.
     #[IsGranted('ROLE_ADMIN')]
     #[Route(path: '/request-generic-task/{execid}', name: 'jury_request_generic')]
-    public function requestGenericTask(Request $request, int $execid): RedirectResponse
+    public function requestGenericTask(Request $request, string $execid): RedirectResponse
     {
         $this->helperGenericTask($execid);
         return $this->redirectToRoute('jury_judgehost', [

webapp/templates/jury/judgehost.html.twig

@@ -67,4 +67,13 @@
         {% include 'jury/partials/judgehost_judgings.html.twig' %}
     </div>
 
+    <div>
+        <h3>Request generic actions</h3>
+        {% for executable in executables %}
+            <a href="{{ path('jury_request_judgehost_generic', {'execid': executable.executable.execid, 'judgehostid': judgehost.judgehostid}) }}">
+                {{ executable.executable.description }}
+            </a><br>
+        {% endfor %}
+    </div>
+
 {% endblock %}

webapp/templates/jury/judgehosts.html.twig

@@ -44,6 +44,37 @@
                 {{ button(path('jury_judgehost_edit'), 'Edit all judgehosts', 'secondary', 'edit') }}
             </div>
         </div>
+        <div>
+            <table border="1">
+                <thead>
+                    <tr>
+                        <th rowspan="2">Executable</th>
+                        <th colspan="{{ judgehosts | length + 1}}">Judgehost</th>
+                    </tr>
+                    <tr>
+                        <th>All</th>
+                        {% for judgehost in judgehosts %}
+                            <th>{{ judgehost.data.hostname.value }}</th>
+                        {% endfor %}
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for executable in executables %}
+                        <tr>
+                            <td>{{ executable.executable.description }}</td>
+                            <td>
+                                <a href="{{ path('jury_request_generic', {'execid': executable.execid}) }}">All</a>
+                            </td>
+                            {% for judgehost in judgehosts %}
+                                <td>
+                                    <a href="{{ path('jury_request_judgehost_generic', {'execid': executable.execid, 'judgehostid': judgehost.data.judgehostid.value}) }}">{{ judgehost.data.hostname.value }}</a>
+                                </td>
+                            {% endfor %}
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
 
     {%- endif %}