From 9de6f55e801559e8c1d8cead8e90a19bdedb41b0 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Mon, 21 Aug 2023 15:47:47 +0500
Subject: [PATCH 1/3] show/hide child submissions

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

diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index 7395d416a..a48b6d497 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -62,13 +62,18 @@ def get_context_data(self, *args, **kwargs):
         if not self.request.user.is_staff:
             raise HttpResponse(status=404)
 
+        show_child_submissions = self.request.GET.get('show_child_submissions', False)
+
         qs = Submission.objects.all()
         qs = qs.filter(created_when__gte=now() - timedelta(days=2))
+        if not show_child_submissions:
+            qs = qs.filter(parent__isnull=True)
         qs = qs.order_by('-created_when')
         qs = qs.select_related('phase__competition', 'owner')
 
         context = super().get_context_data(*args, **kwargs)
         context['submissions'] = qs[:250]
+        context['show_child_submissions'] = show_child_submissions
         return context
 
 
diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index 8e4bc172b..9b55e4b79 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -7,6 +7,9 @@
 {% block content %}
     <div class="ui container">
         <h1>Recent submissions (up to 250 or 2 days old)</h1>
+        <label>
+            <input type="checkbox" id="show_child_checkbox" {% if show_child_submissions %}checked{% endif %}> Show chilld submissions
+        </label>
         <table class="ui table">
             <thead>
             <th>Competition</th>
@@ -73,4 +76,22 @@ <h1>Monitor queues</h1>
             </div>
         </div>
     </div>
+
+    <script>
+        document.addEventListener("DOMContentLoaded", function() {
+            const checkbox = document.getElementById("show_child_checkbox");
+        
+            checkbox.addEventListener("change", function() {
+                const isChecked = checkbox.checked;
+                const url = new URL(window.location);
+                if (isChecked) {
+                    url.searchParams.set('show_child_submissions', true);
+                } else {
+                    url.searchParams.delete('show_child_submissions');
+                }
+                console.log(url)
+                window.location.href = url.toString();
+            });
+        });
+    </script>
 {% endblock %}

From d70e559b328e9dd24d072ea3f7f501c4573592aa Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Mon, 21 Aug 2023 16:02:26 +0500
Subject: [PATCH 2/3] spelling mistake fixed, show parent id when has parent,
 show explanation for child submissions

---
 src/templates/pages/server_status.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index 9b55e4b79..7774e4441 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -8,12 +8,20 @@
     <div class="ui container">
         <h1>Recent submissions (up to 250 or 2 days old)</h1>
         <label>
-            <input type="checkbox" id="show_child_checkbox" {% if show_child_submissions %}checked{% endif %}> Show chilld submissions
+            <input type="checkbox" id="show_child_checkbox" {% if show_child_submissions %}checked{% endif %}> Show child submissions
         </label>
+        <span class="ui mini circular icon button"
+            data-tooltip="Child submissions are created when a competition has multiple tasks. One child for each task"
+            data-position="top center">
+            <i class="question icon"></i>
+        </span>
         <table class="ui table">
             <thead>
             <th>Competition</th>
             <th>Submission PK</th>
+            {% if show_child_submissions %}
+                <th>Parent PK</th>
+            {% endif %}
             <th>Submitter</th>
             <th>Hostname</th>
             <th>Submitted at</th>
@@ -29,6 +37,9 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
                 <tr>
                     <td><a class="link-no-deco" target="_blank" href="./competitions/{{ submission.phase.competition.id }}">{{ submission.phase.competition.title }}</a></td>
                     <td>{{ submission.pk }}</td>
+                    {% if show_child_submissions %}
+                        <td>{{ submission.parent.pk }}</td>
+                    {% endif %}
                     <td>{{ submission.owner.username }}</td>
                     <td>{{ submission.worker_hostname }}</td>
                     <td>{{ submission.created_when|timesince }} ago</td>

From fd1afada0348c246196afdac3a190426cf5e8c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Mon, 21 Aug 2023 14:14:14 +0200
Subject: [PATCH 3/3] Update server_status.html

---
 src/templates/pages/server_status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index 2a862b510..a6dbc741f 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -11,7 +11,7 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
             <input type="checkbox" id="show_child_checkbox" {% if show_child_submissions %}checked{% endif %}> Show child submissions
         </label>
         <span class="ui mini circular icon button"
-            data-tooltip="Child submissions are created when a competition has multiple tasks. One child for each task"
+            data-tooltip="Child submissions are created when a competition has multiple tasks (one child for each task)."
             data-position="top center">
             <i class="question icon"></i>
         </span>