Add option to filter submissions which are currently judging. (#2143)

* Add option to display submissions which are currently judging. * Remove dump
DOMjudge · Sep 18, 2023 · aa7022c · aa7022c
1 parent bf1bd43
commit aa7022c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/webapp/src/Controller/Jury/SubmissionController.php b/webapp/src/Controller/Jury/SubmissionController.php
@@ -72,7 +72,7 @@ public function indexAction(
         #[MapQueryParameter(name: 'view')]
         ?string $viewFromRequest = null,
     ): Response {
-        $viewTypes = [0 => 'newest', 1 => 'unverified', 2 => 'unjudged', 3 => 'all'];
+        $viewTypes = [0 => 'newest', 1 => 'unverified', 2 => 'unjudged', 3 => 'judging', 4 => 'all'];
         $view      = 0;
         if (($submissionViewCookie = $this->dj->getCookie('domjudge_submissionview')) &&
             isset($viewTypes[$submissionViewCookie])) {
@@ -101,6 +101,9 @@ public function indexAction(
         if ($viewTypes[$view] == 'unjudged') {
             $restrictions['judged'] = 0;
         }
+        if ($viewTypes[$view] == 'judging') {
+            $restrictions['judging'] = 1;
+        }
 
         $contests = $this->dj->getCurrentContests();
         if ($contest = $this->dj->getCurrentContest()) {

diff --git a/webapp/src/Service/SubmissionService.php b/webapp/src/Service/SubmissionService.php
@@ -149,6 +149,13 @@ public function getSubmissionList(
                 $queryBuilder->andWhere('j.result IS NULL OR j.endtime IS NULL');
             }
         }
+        if (isset($restrictions['judging'])) {
+            if ($restrictions['judging']) {
+                $queryBuilder->andWhere('j.starttime IS NOT NULL AND j.result IS NULL');
+            } else {
+                $queryBuilder->andWhere('j.starttime IS NULL OR j.result IS NOT NULL');
+            }
+        }
 
         if (isset($restrictions['externally_judged'])) {
             if ($restrictions['externally_judged']) {