Initial version to also display (public) global clarifications

To do this properly we need to think about how to get those cleanly, a lot
of data gathering is now handled by DOMJudgeService so the function should be
reachable from there. Cleaner would be a dedicated Service which would be better
in a dedicated PR as it's currently unclear if we want this.

Author: vmcj

webapp/src/Controller/PublicController.php

@@ -49,6 +49,32 @@ public function __construct(
         parent::__construct($em, $eventLog, $dj, $kernel);
     }
 
+    /**
+     * @return Clarification[]
+     */
+    protected function getGlobalClarifications(?Contest $contest): array
+    {
+        if ($contest) {
+            return $this->em->createQueryBuilder()
+                ->from(Clarification::class, 'c')
+                ->leftJoin('c.problem', 'p')
+                ->leftJoin('c.sender', 's')
+                ->leftJoin('c.recipient', 'r')
+                ->select('c', 'p')
+                ->andWhere('c.contest = :contest')
+                ->andWhere('c.sender IS NULL')
+                ->andWhere('c.recipient IS NULL')
+                ->andWhere('c.submittime <= :time')
+                ->andWhere('c.problem IS NULL')
+                ->setParameter('contest', $contest)
+                ->setparameter('time', time())
+                ->addOrderBy('c.submittime', 'DESC')
+                ->addOrderBy('c.clarid', 'DESC')
+                ->getQuery()->getResult();
+        }
+        return [];
+    }
+
     #[Route(path: '', name: 'public_index')]
     #[Route(path: '/scoreboard')]
     public function scoreboardAction(
@@ -68,7 +94,6 @@ public function scoreboardAction(
             return $this->redirectToRoute('register');
         }
 
-
         if ($static) {
             $refreshParams = [
                 'static' => 1,
@@ -88,6 +113,8 @@ public function scoreboardAction(
 
         if ($static) {
             $data['hide_menu'] = true;
+        } else {
+            $data['global_clarifications'] = $this->getGlobalClarifications($contest);
         }
 
         $data['current_contest'] = $contest;
@@ -98,6 +125,51 @@ public function scoreboardAction(
         return $this->render('public/scoreboard.html.twig', $data, $response);
     }
 
+    #[Route(path: '/clarifications', name: 'public_clarifications')]
+    public function clarificationsAction(
+        RequestStack $requestStack,
+        Request $request,
+        #[MapQueryParameter(name: 'contest')]
+        ?string $contestId = null
+    ): Response {
+        $contest = $this->getContestFromRequest($contestId) ?? $this->dj->getCurrentContest(onlyPublic: true);
+        if (!$contest) {
+            throw new NotFoundHttpException('No active contest');
+        }
+
+        /** @var Clarification[] $clarifications */
+        $clarifications = [];
+        if ($contest->getStartTimeObject()?->getTimestamp() <= time()) {
+            $clarifications = $this->em->createQueryBuilder()
+                ->from(Clarification::class, 'c')
+                ->leftJoin('c.problem', 'p')
+                ->leftJoin('c.sender', 's')
+                ->leftJoin('c.recipient', 'r')
+                ->select('c', 'p')
+                ->andWhere('c.contest = :contest')
+                ->andWhere('c.sender IS NULL')
+                ->andWhere('c.recipient IS NULL')
+                ->andWhere('c.problem IS NULL')
+                ->andWhere('c.submittime <= :time')
+                ->setParameter('contest', $contest)
+                ->setParameter('time', time())
+                ->addOrderBy('c.submittime', 'DESC')
+                ->addOrderBy('c.clarid', 'DESC')
+                ->getQuery()
+                ->getResult();
+        }
+
+        $data = [
+            'contest' => $contest,
+            'global_clarifications' => $clarifications
+        ];
+        if ($request->isXmlHttpRequest()) {
+            return $this->render('public/clarifications_general_modal.html.twig', $data);
+        } else {
+            return $this->render('public/clarifications_general.html.twig', $data);
+        }
+    }
+
     #[Route(path: '/scoreboard.zip', name: 'public_scoreboard_data_zip')]
     public function scoreboardDataZipAction(
         RequestStack $requestStack,
@@ -194,6 +266,7 @@ public function teamAction(Request $request, string $teamId): Response
             'team' => $team,
             'showFlags' => $showFlags,
             'showAffiliations' => $showAffiliations,
+            'global_clarifications' => $this->getGlobalClarifications($this->dj->getCurrentContest()),
         ];
 
         if ($request->isXmlHttpRequest()) {
@@ -474,6 +547,10 @@ public function viewAction(Request $request, string $clarId): Response
     {
         $categories = $this->config->get('clar_categories');
         $contest    = $this->dj->getCurrentContest();
+        if (!$contest) {
+            throw new NotFoundHttpException('No active contest');
+        }
+
         /** @var Clarification|null $clarification */
         $clarification = $this->em->createQueryBuilder()
             ->from(Clarification::class, 'c')

webapp/templates/public/clarifications_general.html.twig

@@ -0,0 +1,36 @@
+{% extends 'public/base.html.twig' %}
+
+{% import 'macros.html.twig' as macros %}
+
+{% block title %}View announcements for {{ contest.name }}{% endblock %}
+
+{% block extrahead %}
+    {{ parent() }}
+    {{ macros.mathjax_head() }}
+    <style>
+        .data-table td a, .data-table td a:hover {
+            display: block;
+            text-decoration: none;
+            color: inherit;
+            padding: 3px 5px;
+        }
+
+        .data-table tr {
+            border-bottom: 1px solid silver;
+        }
+
+        .data-table tr:hover {
+            background: #ffffcc !important;
+        }
+    </style>
+{% endblock %}
+
+{% block content %}
+    <h2 class="text-center mt-4">General announcements for {{ contest.name }}</h2>
+
+    {% if global_clarifications is empty %}
+        <p class="nodata">No announcements.</p>
+    {% else %}
+        {% include 'partials/clarification_list.html.twig' with {clarifications: global_clarifications} %}
+    {% endif %}
+{% endblock %}

webapp/templates/public/clarifications_general_modal.html.twig

@@ -0,0 +1,11 @@
+{% extends "partials/modal.html.twig" %}
+
+{% block title %}View announcements for {{ contest.name }}{% endblock %}
+
+{% block content %}
+    {% if general_clarifications is empty %}
+        <p class="nodata">No announcements.</p>
+    {% else %}
+        {% include 'partials/clarification_list.html.twig' with {clarifications: general_clarifications} %}
+    {% endif %}
+{% endblock %}

webapp/templates/public/menu.html.twig

@@ -25,6 +25,16 @@
                 {% endif %}
             </li>
 
+            {% if global_clarifications is defined and global_clarifications %}
+                <li class="nav-item">
+                    <a class="nav-link{% if current_route starts with 'public_clarifications' %} active{% endif %}"
+                       href="{{ path('public_clarifications') }}"
+                       id="menu_clarifications">
+                        <i class="fas fa-comments"></i> Announcements
+                    </a>
+                </li>
+            {% endif %}
+
             {% if is_granted('ROLE_TEAM') %}
                 <li class="nav-item">
                     <a class="nav-link" href="{{ path('team_index') }}">