From ec14320792da272a004d0cc89936d2b6c9c330ad Mon Sep 17 00:00:00 2001
From: Nicky Gerritsen <github@accounts.nickygerritsen.nl>
Date: Sun, 14 Dec 2025 08:44:45 +0200
Subject: [PATCH 1/2] Allow to mark multiple balloons as done

---
 .../src/Controller/Jury/BalloonController.php |  10 ++
 webapp/src/Service/BalloonService.php         |  21 +++-
 webapp/templates/jury/balloons.html.twig      |  38 ++++++
 .../jury/partials/balloon_list.html.twig      | 116 ++++++++++--------
 4 files changed, 127 insertions(+), 58 deletions(-)

diff --git a/webapp/src/Controller/Jury/BalloonController.php b/webapp/src/Controller/Jury/BalloonController.php
index 9098772310..29e0962aeb 100644
--- a/webapp/src/Controller/Jury/BalloonController.php
+++ b/webapp/src/Controller/Jury/BalloonController.php
@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\ExpressionLanguage\Expression;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
@@ -175,4 +176,13 @@ public function setDoneAction(int $balloonId, BalloonService $balloonService): R
 
         return $this->redirectToRoute("jury_balloons");
     }
+
+    #[Route(path: '/done', name: 'jury_balloons_setdone_multiple', methods: ['POST'])]
+    public function setMultipleDoneAction(Request $request, BalloonService $balloonService): RedirectResponse
+    {
+        $balloonIds = $request->request->all('balloonIds');
+        $balloonService->setDone($balloonIds);
+
+        return $this->redirectToRoute("jury_balloons");
+    }
 }
diff --git a/webapp/src/Service/BalloonService.php b/webapp/src/Service/BalloonService.php
index 2b3dad6d13..c77f7d4ca4 100644
--- a/webapp/src/Service/BalloonService.php
+++ b/webapp/src/Service/BalloonService.php
@@ -181,14 +181,25 @@ public function collectBalloonTable(Contest $contest, bool $todo = false): array
         return $balloons_table;
     }
 
-    public function setDone(int $balloonId): void
+    /**
+     * @param int|list<int> $balloonId
+     */
+    public function setDone(int|array $balloonId): void
     {
         $em = $this->em;
-        $balloon = $em->getRepository(Balloon::class)->find($balloonId);
-        if (!$balloon) {
-            throw new NotFoundHttpException('balloon not found');
+        $balloons = $em->createQueryBuilder()
+            ->from(Balloon::class, 'b')
+            ->select('b')
+            ->andWhere('b.balloonid IN (:balloonIds)')
+            ->setParameter('balloonIds', $balloonId)
+            ->getQuery()
+            ->getResult();
+        if (empty($balloons)) {
+            throw new NotFoundHttpException('balloon(s) not found');
+        }
+        foreach ($balloons as $balloon) {
+            $balloon->setDone(true);
         }
-        $balloon->setDone(true);
         $em->flush();
     }
 }
diff --git a/webapp/templates/jury/balloons.html.twig b/webapp/templates/jury/balloons.html.twig
index 38d87c88fe..058f92b8a2 100644
--- a/webapp/templates/jury/balloons.html.twig
+++ b/webapp/templates/jury/balloons.html.twig
@@ -83,6 +83,16 @@
 {% block extrafooter %}
     {% if current_contest is not null %}
         <script>
+            const selectedBalloons = new Set();
+            function updateMarkMultipleDone() {
+                const anyChecked = $('.balloons-table input[type="checkbox"]:checked').length > 0;
+                if (anyChecked) {
+                    $('.mark-multiple-done-button').attr('disabled', false);
+                } else {
+                    $('.mark-multiple-done-button').attr('disabled', true);
+                }
+            }
+
             $(function () {
                 $('#filter-toggle').on('change', function () {
                     if ($(this).is(':checked')) {
@@ -159,6 +169,34 @@
                             })
                             .show();
                     }
+
+                    $('.balloons-table input[type="checkbox"]').on('change', function () {
+                        updateMarkMultipleDone();
+                        const balloonId = $(this).data('balloon-id');
+                        if ($(this).is(':checked')) {
+                            selectedBalloons.add(balloonId);
+                        } else {
+                            selectedBalloons.delete(balloonId);
+                        }
+                    });
+
+                    // Restore any selected balloons and clear any selectedBalloons that don't exist anymore
+                    const existingBalloonIds = new Set();
+                    $('.balloons-table input[type="checkbox"]').each(function() {
+                        existingBalloonIds.add($(this).data('balloon-id'));
+                    });
+
+                    for (const balloonId of selectedBalloons) {
+                        if (existingBalloonIds.has(balloonId)) {
+                            // Restore the selection
+                            $('.balloons-table input[type="checkbox"][data-balloon-id="' + balloonId + '"]').prop('checked', true);
+                        } else {
+                            // Remove from selectedBalloons as it no longer exists
+                            selectedBalloons.delete(balloonId);
+                        }
+                    }
+
+                    updateMarkMultipleDone();
                 };
 
                 $('select[data-filter-field]').on('change', process_balloons_filter);
diff --git a/webapp/templates/jury/partials/balloon_list.html.twig b/webapp/templates/jury/partials/balloon_list.html.twig
index 4195b59bb6..e98ee3534d 100644
--- a/webapp/templates/jury/partials/balloon_list.html.twig
+++ b/webapp/templates/jury/partials/balloon_list.html.twig
@@ -4,60 +4,70 @@
 {% if balloons is empty %}
     <div class="alert alert-warning">No balloons</div>
 {% else %}
-    <table class="data-table table table-hover table-striped table-sm balloons-table" style="width:auto">
-        <thead class="thead-light">
-        <tr>
-            <th scope="col">&nbsp;</th>
-            <th scope="col">ID</th>
-            <th scope="col">time</th>
-            <th scope="col">solved</th>
-            <th scope="col">team</th>
-            <th scope="col">affiliation</th>
-            <th scope="col">location</th>
-            <th scope="col">category</th>
-            <th scope="col">total</th>
-            <th scope="col"></th>
-        </tr>
-        </thead>
-        <tbody>
-        {%- for balloon in balloons %}
-            <tr class="{% if balloon.data.done %}disabled{% endif %}"
-                data-affiliation-id="{{ balloon.data.affiliationid }}"
-                data-location-str="{{ balloon.data.location }}"
-                data-category-id="{{ balloon.data.categoryid }}">
-                <td>
-                {%- if balloon.data.done -%}
-                    <i class="far fa-check-circle"></i>
-                {%- else -%}
-                    <i class="far fa-hourglass"></i>
-                {%- endif -%}
-                <td>{{ balloon.data.balloonid }}</td>
-                <td data-order="{{ balloon.data.time }}">{{ balloon.data.time | printtime }}</td>
-                <td>{{ balloon.data.contestproblem | problemBadge }}</td>
-                <td>
-                    {{ balloon.data.team | entityIdBadge('t') }}
-                    {{ balloon.data.team.effectiveName | u.truncate(teamname_max_length, '…') }}
-                </td>
-                <td>{{ balloon.data.affiliation }}</td>
-                <td>{{ balloon.data.location }}</td>
-                <td>{{ balloon.data.category }}</td>
-                <td>
-                {%- for totalballoon in balloon.data.total -%}
-                    {{ totalballoon | problemBadge }}&nbsp;
-                {%- endfor -%}
-                </td>
-                <td>
-                    {%- if not balloon.data.done -%}
-                    {%- set link = path('jury_balloons_setdone', {balloonId: balloon.data.balloonid}) %}
-                    <a href="{{ link }}" title="mark balloon as done">
-                    <i class="fas fa-running"></i>
-                    </a>
-                </td>
-                {%- endif -%}
+    <form action="{{ path('jury_balloons_setdone_multiple') }}" method="post">
+        <input type="submit" class="btn btn-primary mark-multiple-done-button" value="Mark selected as done" />
+
+        <table class="data-table table table-hover table-striped table-sm balloons-table" style="width:auto">
+            <thead class="thead-light">
+            <tr>
+                <th scope="col">&nbsp;</th>
+                <th scope="col">ID</th>
+                <th scope="col">time</th>
+                <th scope="col">solved</th>
+                <th scope="col">team</th>
+                <th scope="col">affiliation</th>
+                <th scope="col">location</th>
+                <th scope="col">category</th>
+                <th scope="col">total</th>
+                <th scope="col"></th>
             </tr>
-        {%- endfor %}
+            </thead>
+            <tbody>
+            {%- for balloon in balloons %}
+                <tr class="{% if balloon.data.done %}disabled{% endif %}"
+                    data-affiliation-id="{{ balloon.data.affiliationid }}"
+                    data-location-str="{{ balloon.data.location }}"
+                    data-category-id="{{ balloon.data.categoryid }}">
+                    <td>
+                    {%- if balloon.data.done -%}
+                        <i class="far fa-check-circle"></i>
+                    {%- else -%}
+                        <i class="far fa-hourglass"></i>
+                    {%- endif -%}
+                    </td>
+                    <td>{{ balloon.data.balloonid }}</td>
+                    <td data-order="{{ balloon.data.time }}">{{ balloon.data.time | printtime }}</td>
+                    <td>{{ balloon.data.contestproblem | problemBadge }}</td>
+                    <td>
+                        {{ balloon.data.team | entityIdBadge('t') }}
+                        {{ balloon.data.team.effectiveName | u.truncate(teamname_max_length, '…') }}
+                    </td>
+                    <td>{{ balloon.data.affiliation }}</td>
+                    <td>{{ balloon.data.location }}</td>
+                    <td>{{ balloon.data.category }}</td>
+                    <td>
+                    {%- for totalballoon in balloon.data.total -%}
+                        {{ totalballoon | problemBadge }}&nbsp;
+                    {%- endfor -%}
+                    </td>
+                    <td>
+                        {%- if not balloon.data.done -%}
+                        {%- set link = path('jury_balloons_setdone', {balloonId: balloon.data.balloonid}) %}
+                        <a href="{{ link }}" title="mark balloon as done">
+                        <i class="fas fa-running"></i>
+                        </a>
+                        {%- endif -%}
+                    </td>
+                    <td>
+                        {% if not balloon.data.done %}
+                            <input type="checkbox" name="balloonIds[]" data-balloon-id="{{ balloon.data.balloonid }}" value="{{ balloon.data.balloonid }}" />
+                        {% endif %}
+                    </td>
+                </tr>
+            {%- endfor %}
 
-        </tbody>
-    </table>
+            </tbody>
+        </table>
+    </form>
 
 {% endif %}

From b8e4914eeba5fc0c076cadeb172f7b40bb006732 Mon Sep 17 00:00:00 2001
From: Nicky Gerritsen <github@accounts.nickygerritsen.nl>
Date: Sun, 14 Dec 2025 08:52:20 +0200
Subject: [PATCH 2/2] Add summary table to balloon page

---
 .../src/Controller/Jury/BalloonController.php |  4 +-
 webapp/src/Service/BalloonService.php         | 39 +++++++++++++++++++
 webapp/templates/jury/balloons.html.twig      |  2 +-
 .../jury/partials/balloon_list.html.twig      | 34 ++++++++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/webapp/src/Controller/Jury/BalloonController.php b/webapp/src/Controller/Jury/BalloonController.php
index 29e0962aeb..32aa5989a3 100644
--- a/webapp/src/Controller/Jury/BalloonController.php
+++ b/webapp/src/Controller/Jury/BalloonController.php
@@ -59,6 +59,7 @@ public function indexAction(BalloonService $balloonService): Response
         }
 
         $balloons_table = $balloonService->collectBalloonTable($contest);
+        $teamSummary = $balloonService->collectTeamBalloonSummary($balloons_table);
 
         // Add CSS class and actions.
         foreach ($balloons_table as $element) {
@@ -165,7 +166,8 @@ public function indexAction(BalloonService $balloonService): Response
             'filteredCategories' => $filteredCategories,
             'availableCategories' => $availableCategories,
             'defaultCategories' => $defaultCategories,
-            'balloons' => $balloons_table
+            'balloons' => $balloons_table,
+            'teamSummary' => $teamSummary,
         ]);
     }
 
diff --git a/webapp/src/Service/BalloonService.php b/webapp/src/Service/BalloonService.php
index c77f7d4ca4..bd8d458244 100644
--- a/webapp/src/Service/BalloonService.php
+++ b/webapp/src/Service/BalloonService.php
@@ -181,6 +181,45 @@ public function collectBalloonTable(Contest $contest, bool $todo = false): array
         return $balloons_table;
     }
 
+    /**
+     * Collect a summary of balloons per team, sorted by location (or external ID if no location).
+     *
+     * @param array<array{data: array{balloonid: int, time: string, problem: string, contestproblem: ContestProblem,
+     *                                team: Team, teamid: int, location: string|null, affiliation: string|null,
+     *                                affiliationid: int, category: string, categoryid: int, total: array<string, ContestProblem>,
+     *                                done: bool}}> $balloons
+     * @return array<int, array{team: Team, affiliation: string|null, affiliationid: int|null, location: string|null,
+     *                          category: string, categoryid: int, total: array<string, ContestProblem>}>
+     */
+    public function collectTeamBalloonSummary(array $balloons): array
+    {
+        $teamSummary = [];
+        foreach ($balloons as $balloon) {
+            $data = $balloon['data'];
+            $teamId = $data['teamid'];
+
+            if (!isset($teamSummary[$teamId])) {
+                $teamSummary[$teamId] = [
+                    'team' => $data['team'],
+                    'affiliation' => $data['affiliation'],
+                    'affiliationid' => $data['affiliationid'],
+                    'location' => $data['location'],
+                    'category' => $data['category'],
+                    'categoryid' => $data['categoryid'],
+                    'total' => $data['total'],
+                ];
+            }
+        }
+
+        uasort($teamSummary, function ($a, $b) {
+            $aKey = $a['location'] ?? $a['team']->getExternalId();
+            $bKey = $b['location'] ?? $b['team']->getExternalId();
+            return strnatcasecmp((string)$aKey, (string)$bKey);
+        });
+
+        return $teamSummary;
+    }
+
     /**
      * @param int|list<int> $balloonId
      */
diff --git a/webapp/templates/jury/balloons.html.twig b/webapp/templates/jury/balloons.html.twig
index 058f92b8a2..32034fdd51 100644
--- a/webapp/templates/jury/balloons.html.twig
+++ b/webapp/templates/jury/balloons.html.twig
@@ -129,7 +129,7 @@
                 });
 
                 window.process_balloons_filter = function () {
-                    var $trs = $('table.balloons-table > tbody tr');
+                    var $trs = $('table.balloons-table > tbody tr, table.team-summary-table > tbody tr');
 
                     var filters = [];
 
diff --git a/webapp/templates/jury/partials/balloon_list.html.twig b/webapp/templates/jury/partials/balloon_list.html.twig
index e98ee3534d..657381ac56 100644
--- a/webapp/templates/jury/partials/balloon_list.html.twig
+++ b/webapp/templates/jury/partials/balloon_list.html.twig
@@ -70,4 +70,38 @@
         </table>
     </form>
 
+    {% if teamSummary is defined and teamSummary is not empty %}
+        <h3 class="mt-4">Team Summary</h3>
+        <table class="data-table table table-hover table-striped table-sm team-summary-table" style="width:auto">
+            <thead class="thead-light">
+            <tr>
+                <th scope="col">ID</th>
+                <th scope="col">team</th>
+                <th scope="col">affiliation</th>
+                <th scope="col">location</th>
+                <th scope="col">category</th>
+                <th scope="col">total</th>
+            </tr>
+            </thead>
+            <tbody>
+            {%- for teamId, summary in teamSummary %}
+                <tr data-affiliation-id="{{ summary.affiliationid }}"
+                    data-location-str="{{ summary.location }}"
+                    data-category-id="{{ summary.categoryid }}">
+                    <td>{{ summary.team | entityIdBadge('t') }}</td>
+                    <td>{{ summary.team.effectiveName | u.truncate(teamname_max_length, '…') }}</td>
+                    <td>{{ summary.affiliation }}</td>
+                    <td>{{ summary.location }}</td>
+                    <td>{{ summary.category }}</td>
+                    <td>
+                    {%- for problem in summary.total -%}
+                        {{ problem | problemBadge }}&nbsp;
+                    {%- endfor -%}
+                    </td>
+                </tr>
+            {%- endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+
 {% endif %}