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 %} {{ submissionCounts.queued }} queued (from {{submissionCounts.perteam}} teams) {% endif %} + + {% if submissionCounts.inContest > 0 %} + {{ submissionCounts.inContest }} in contest + {% endif %}