From f9da32a00ee5bce26f7cdabc22eb9a8102d33e10 Mon Sep 17 00:00:00 2001
From: didayolo <adrien.pavao@gmail.com>
Date: Tue, 19 Nov 2024 19:33:05 +0100
Subject: [PATCH 1/3] Revert changes but put num_entries = 0

---
 src/apps/api/views/competitions.py                   | 3 ++-
 src/static/riot/competitions/detail/leaderboards.tag | 2 ++
 src/tests/functional/test_submissions.py             | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index c34eec48e..6612a3f43 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -705,6 +705,7 @@ def get_leaderboard(self, request, pk):
             # - child submissions (submissions who has a parent i.e. parent field is not null)
             # - Failed submissions
             # - Cancelled submissions
+            num_entries = 0 # TMP, remove counting
             # num_entries = Submission.objects.filter(
             #     Q(owner__username=submission['owner']) |
             #     Q(parent__owner__username=submission['owner']),
@@ -737,7 +738,7 @@ def get_leaderboard(self, request, pk):
                     'fact_sheet_answers': submission['fact_sheet_answers'],
                     'slug_url': submission['slug_url'],
                     'organization': submission['organization'],
-                    # 'num_entries': num_entries,
+                    'num_entries': num_entries,
                     'created_when': submission['created_when']
                 })
             for score in submission['scores']:
diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index 25cc1e99a..b004d5ce9 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -34,6 +34,7 @@
         <tr>
             <th class="center aligned">#</th>
             <th>Participant</th>
+            <th>Entries</th>
             <th>Date</th>
             <th>ID</th>
             <th each="{ column in filtered_columns }" colspan="1">{column.title}</th>
@@ -82,6 +83,7 @@
             </td>
             <td if="{submission.organization === null}"><a href="{submission.slug_url}">{ submission.owner }</a></td>
             <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
+            <td>{submission.num_entries}</td>
             <td>{ pretty_date(submission.created_when) }</td>
             <td>{submission.id}</td>
             <td each="{ column in filtered_columns }">
diff --git a/src/tests/functional/test_submissions.py b/src/tests/functional/test_submissions.py
index 6248ccaf2..3ee088ae0 100644
--- a/src/tests/functional/test_submissions.py
+++ b/src/tests/functional/test_submissions.py
@@ -74,7 +74,7 @@ def _run_submission_and_add_to_leaderboard(self, competition_zip_path, submissio
 
         # The leaderboard table lists our submission
         prediction_score = Submission.objects.get(pk=submission_id).scores.first().score
-        assert Decimal(self.find('leaderboards table tbody tr:nth-of-type(1) td:nth-of-type(5)').text) == round(Decimal(prediction_score), precision)
+        assert Decimal(self.find('leaderboards table tbody tr:nth-of-type(1) td:nth-of-type(6)').text) == round(Decimal(prediction_score), precision)
 
     def test_v15_iris_result_submission_end_to_end(self):
         self._run_submission_and_add_to_leaderboard('competition_15_iris.zip', 'submission_15_iris_result.zip', '======= Set 1 (Iris_test)', has_solutions=False, precision=4)

From 47e2b70df636f632066cb5b3f5a33b3f1d4c247b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Tue, 19 Nov 2024 19:36:55 +0100
Subject: [PATCH 2/3] Update competitions.py

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

diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index 6612a3f43..f6b734c16 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -705,7 +705,7 @@ def get_leaderboard(self, request, pk):
             # - child submissions (submissions who has a parent i.e. parent field is not null)
             # - Failed submissions
             # - Cancelled submissions
-            num_entries = 0 # TMP, remove counting
+            num_entries = 1 # TMP, remove counting
             # num_entries = Submission.objects.filter(
             #     Q(owner__username=submission['owner']) |
             #     Q(parent__owner__username=submission['owner']),

From 248cd71ed248833c04dbe4b7b44691cf8e147c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Tue, 19 Nov 2024 19:39:24 +0100
Subject: [PATCH 3/3] Flake8

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

diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index f6b734c16..3f032b834 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -705,7 +705,7 @@ def get_leaderboard(self, request, pk):
             # - child submissions (submissions who has a parent i.e. parent field is not null)
             # - Failed submissions
             # - Cancelled submissions
-            num_entries = 1 # TMP, remove counting
+            num_entries = 1  # TMP, remove counting
             # num_entries = Submission.objects.filter(
             #     Q(owner__username=submission['owner']) |
             #     Q(parent__owner__username=submission['owner']),