From e9c8bd3606ddcefc9d441b4d401de4a38db54dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Sun, 21 Jan 2024 03:08:48 +0100
Subject: [PATCH 1/2] Replace "date of last entry" by "date"

---
 src/static/riot/competitions/detail/leaderboards.tag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index e21238b23..0617a38ea 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -35,7 +35,7 @@
             <th class="center aligned">#</th>
             <th>Participant</th>
             <th>Entries</th>
-            <th>Date of last entry</th>
+            <th>Date</th>
             <th each="{ column in filtered_columns }" colspan="1">{column.title}</th>
             
         </tr>
@@ -58,7 +58,7 @@
             <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>{submission.last_entry_date}</td>
+            <td>{submission.created_when}</td>
             <td each="{ column in filtered_columns }">
                 <a if="{column.title == 'Detailed Results'}" href="detailed_results/{get_detailed_result_submisison_id(column, submission)}" target="_blank" class="eye-icon-link">
                     <i class="icon grey eye eye-icon"></i>

From 2a941ab55ae265ce7d392d74de3d9af70bc9b537 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Mon, 22 Jan 2024 11:50:30 +0500
Subject: [PATCH 2/2] leaderboard date fixed

---
 src/apps/api/serializers/submissions.py | 4 +++-
 src/apps/api/views/competitions.py      | 8 +-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/apps/api/serializers/submissions.py b/src/apps/api/serializers/submissions.py
index ef3cdf39b..81e8de21c 100644
--- a/src/apps/api/serializers/submissions.py
+++ b/src/apps/api/serializers/submissions.py
@@ -86,6 +86,7 @@ class SubmissionLeaderBoardSerializer(serializers.ModelSerializer):
     display_name = serializers.CharField(source='owner.display_name')
     slug_url = serializers.CharField(source='owner.slug_url')
     organization = SimpleOrganizationSerializer(allow_null=True)
+    created_when = serializers.DateTimeField(format="%Y-%m-%d %H:%M")
 
     class Meta:
         model = Submission
@@ -100,7 +101,8 @@ class Meta:
             'display_name',
             'slug_url',
             'organization',
-            'detailed_result'
+            'detailed_result',
+            'created_when'
         )
         extra_kwargs = {
             "scores": {"read_only": True},
diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index 565cdee27..3dc2f0bba 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -712,12 +712,6 @@ def get_leaderboard(self, request, pk):
                 parent__isnull=False
             ).count()
 
-            # get date of last submission by the owner of this submission for this phase
-            last_entry_date = Submission.objects.filter(owner__username=submission['owner'], phase=phase)\
-                .values('created_when')\
-                .order_by('-created_when')[0]['created_when']\
-                .strftime('%Y-%m-%d')
-
             submission_key = f"{submission['owner']}{submission['parent'] or submission['id']}"
 
             # gather detailed result from submissions for each task
@@ -741,7 +735,7 @@ def get_leaderboard(self, request, pk):
                     'slug_url': submission['slug_url'],
                     'organization': submission['organization'],
                     'num_entries': num_entries,
-                    'last_entry_date': last_entry_date
+                    'created_when': submission['created_when']
                 })
             for score in submission['scores']: