From ed9f9cf8d498f86c71b91fb2e41e004ae8b9dc07 Mon Sep 17 00:00:00 2001
From: Kevin Jilissen <info@kevinjilissen.nl>
Date: Sat, 28 Sep 2024 09:21:37 +0200
Subject: [PATCH] Count in-contest submissions on submission list

This is to make comparing with a shadow CCS easier, as we don't
want to include jury submissions here. Filter out submissions in
invisible categories.
---
 webapp/src/Service/SubmissionService.php                 | 8 ++++++++
 webapp/templates/jury/partials/submission_list.html.twig | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/webapp/src/Service/SubmissionService.php b/webapp/src/Service/SubmissionService.php
index e8a307ba21..b46a65b2df 100644
--- a/webapp/src/Service/SubmissionService.php
+++ b/webapp/src/Service/SubmissionService.php
@@ -282,6 +282,14 @@ public function getSubmissionList(
             ->andWhere($countQueryExtras['queued'])
             ->getQuery()
             ->getSingleScalarResult();
+        $counts['inContest'] = (clone $queryBuilder)
+            ->select('COUNT(s.submitid)')
+            ->join('s.contest', 'c')
+            ->join('t.category', 'tc')
+            ->andWhere('s.submittime BETWEEN c.starttime AND c.endtime')
+            ->andWhere('tc.visible = true')
+            ->getQuery()
+            ->getSingleScalarResult();
 
         return [$submissions, $counts];
     }
diff --git a/webapp/templates/jury/partials/submission_list.html.twig b/webapp/templates/jury/partials/submission_list.html.twig
index b25e24fa1e..28df321ac6 100644
--- a/webapp/templates/jury/partials/submission_list.html.twig
+++ b/webapp/templates/jury/partials/submission_list.html.twig
@@ -41,6 +41,10 @@
         {% if submissionCounts.queued > 0 %}
             <span class="badge text-bg-danger">{{ submissionCounts.queued }} queued (from {{submissionCounts.perteam}} teams)</span>
         {% endif %}
+
+        {% if submissionCounts.inContest > 0 %}
+            <span class="badge text-bg-secondary">{{ submissionCounts.inContest }} in contest</span>
+        {% endif %}
     </div>
 
     <table class="data-table table table-hover table{% if showExternalResult and showExternalTestcases %}-3{% endif %}-striped table-sm submissions-table table-full-clickable-cell">