Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/apps/api/serializers/submissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -100,7 +101,8 @@ class Meta:
'display_name',
'slug_url',
'organization',
'detailed_result'
'detailed_result',
'created_when'
)
extra_kwargs = {
"scores": {"read_only": True},
Expand Down
8 changes: 1 addition & 7 deletions src/apps/api/views/competitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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']:

Expand Down
4 changes: 2 additions & 2 deletions src/static/riot/competitions/detail/leaderboards.tag
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down