From c875bafb8ab829a2a9287cf2f4db3306b36cf0b5 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Sun, 20 Aug 2023 13:18:35 +0500
Subject: [PATCH 1/3] queue name shown in server status page

---
 src/apps/pages/views.py                | 5 +++++
 src/templates/pages/server_status.html | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index 7395d416a..144c47a42 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -69,6 +69,11 @@ def get_context_data(self, *args, **kwargs):
 
         context = super().get_context_data(*args, **kwargs)
         context['submissions'] = qs[:250]
+
+        # Get queue from each submission's competition
+        for submission in context['submissions']:
+            queue_name = "Default" if submission.phase.competition.queue is None else submission.phase.competition.queue.name
+            submission.competition_queue = queue_name
         return context
 
 
diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index 8e4bc172b..1b3d08b11 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -12,6 +12,7 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
             <th>Competition</th>
             <th>Submission PK</th>
             <th>Submitter</th>
+            <th>Queue</th>
             <th>Hostname</th>
             <th>Submitted at</th>
             <th>Status</th>
@@ -27,6 +28,7 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
                     <td><a class="link-no-deco" target="_blank" href="./competitions/{{ submission.phase.competition.id }}">{{ submission.phase.competition.title }}</a></td>
                     <td>{{ submission.pk }}</td>
                     <td>{{ submission.owner.username }}</td>
+                    <td>{{ submission.competition_queue }}</td>
                     <td>{{ submission.worker_hostname }}</td>
                     <td>{{ submission.created_when|timesince }} ago</td>
                     <td>{{ submission.status }}</td>

From f12c134170cbafbd1c3a3d4d2d203f3102c92aef Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Sun, 20 Aug 2023 13:59:55 +0500
Subject: [PATCH 2/3] comment added, space added

---
 src/apps/pages/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index 144c47a42..39baed2e5 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -70,10 +70,11 @@ def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
         context['submissions'] = qs[:250]
 
-        # Get queue from each submission's competition
         for submission in context['submissions']:
+            # Get queue from each submission's competition
             queue_name = "Default" if submission.phase.competition.queue is None else submission.phase.competition.queue.name
             submission.competition_queue = queue_name
+
         return context
 
 

From 9e66e93fd0cd12a0513c6bff24432182da9cfa5e Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Sun, 20 Aug 2023 14:39:56 +0500
Subject: [PATCH 3/3] Default changed to *

---
 src/apps/pages/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index 39baed2e5..429202571 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -72,7 +72,7 @@ def get_context_data(self, *args, **kwargs):
 
         for submission in context['submissions']:
             # Get queue from each submission's competition
-            queue_name = "Default" if submission.phase.competition.queue is None else submission.phase.competition.queue.name
+            queue_name = "*" if submission.phase.competition.queue is None else submission.phase.competition.queue.name
             submission.competition_queue = queue_name
 
         return context