Allow users to sort submissions (#22)

judge/views/ranked_submission.py

@@ -23,7 +23,10 @@ def get_queryset(self):
             contest_join = ''
             points = 'sub.points'
             constraint = ''
-        queryset = super(RankedSubmissions, self).get_queryset().filter(user__is_unlisted=False)
+        queryset, args = super(RankedSubmissions, self).get_queryset(sorting_args=True)
+        queryset = queryset.filter(user__is_unlisted=False)
+        if not len(args): queryset = queryset.order_by('time')
+
         join_sql_subquery(
             queryset,
             subquery='''
@@ -47,11 +50,7 @@ def get_queryset(self):
             params=[self.problem.id, self.contest.id] * 3 if self.in_contest else [self.problem.id] * 3,
             alias='best_subs', join_fields=[('id', 'id')],
         )
-
-        if self.in_contest:
-            return queryset.order_by('-contest__points', 'time')
-        else:
-            return queryset.order_by('-points', 'time')
+        return queryset
 
     def get_title(self):
         return _('Best solutions for %s') % self.problem_name

judge/views/submission.py

@@ -204,6 +204,14 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView):
     context_object_name = 'submissions'
     first_page_href = None
 
+    sort_convert = {
+        'time' : 'Total Runtime (Ascending)', 
+        '-time' : 'Total Runtime (Descending)', 
+        'memory' : 'Memory Usage (Ascending)',
+        '-memory' : 'Memory Usage (Descending)'
+    }
+    sort_options = [(key, value) for key, value in sort_convert.items()]
+
     def get_result_data(self):
         result = self._get_result_data()
         for category in result['categories']:
@@ -224,7 +232,7 @@ def in_contest(self):
     def contest(self):
         return self.request.profile.current_contest.contest
 
-    def _get_queryset(self):
+    def _get_queryset(self, sorting_args=False):
         queryset = Submission.objects.all()
         use_straight_join(queryset)
         queryset = submission_related(queryset.order_by('-id'))
@@ -252,15 +260,15 @@ def _get_queryset(self):
             queryset = queryset.filter(language__in=Language.objects.filter(key__in=self.selected_languages))
         if self.selected_statuses:
             queryset = queryset.filter(result__in=self.selected_statuses)
+        if self.selected_sort_options:
+            queryset = queryset.order_by(*[option for option in self.selected_sort_options if option in self.sort_convert.keys()])
+        return queryset if not sorting_args else (queryset, self.selected_sort_options)
 
-        return queryset
-
-    def get_queryset(self):
-        queryset = self._get_queryset()
-        if not self.in_contest:
-            filter_submissions_by_visible_problems(queryset, self.request.user)
-
-        return queryset
+    def get_queryset(self, sorting_args=False):
+        queryset = self._get_queryset(sorting_args)
+        if sorting_args: queryset, selected_options = queryset
+        if not self.in_contest: filter_submissions_by_visible_problems(queryset, self.request.user)
+        return queryset if not sorting_args else (queryset, selected_options)
 
     def get_my_submissions_page(self):
         return None
@@ -289,6 +297,9 @@ def get_context_data(self, **kwargs):
         context['all_statuses'] = self.get_searchable_status_codes()
         context['selected_statuses'] = self.selected_statuses
 
+        context['all_sort_options'] = self.sort_options
+        context['selected_sort_options'] = self.selected_sort_options
+
         context['results_json'] = mark_safe(json.dumps(self.get_result_data()))
         context['results_colors_json'] = mark_safe(json.dumps(settings.DMOJ_STATS_SUBMISSION_RESULT_COLORS))
 
@@ -306,6 +317,7 @@ def get(self, request, *args, **kwargs):
 
         self.selected_languages = set(request.GET.getlist('language'))
         self.selected_statuses = set(request.GET.getlist('status'))
+        self.selected_sort_options = set(request.GET.getlist('sort'))
 
         if 'results' in request.GET:
             return JsonResponse(self.get_result_data())
@@ -369,10 +381,13 @@ class ProblemSubmissionsBase(SubmissionsListBase):
     dynamic_update = True
     check_contest_in_access_check = True
 
-    def get_queryset(self):
+    def get_queryset(self, sorting_args=False):
         if self.in_contest and not self.contest.contest_problems.filter(problem_id=self.problem.id).exists():
             raise Http404()
-        return super(ProblemSubmissionsBase, self)._get_queryset().filter(problem_id=self.problem.id)
+        queryset = super(ProblemSubmissionsBase, self)._get_queryset(sorting_args)
+        if sorting_args: queryset, selected_options = queryset
+        queryset = queryset.filter(problem_id=self.problem.id)
+        return queryset if not sorting_args else (queryset, selected_options)
 
     def get_title(self):
         return _('All submissions for %s') % self.problem_name

resources/submission.scss

@@ -120,12 +120,12 @@
     color: grey;
 }
 
-label[for="language"], label[for="status"] {
+label[for="language"], label[for="status"], label[for="sort"] {
     padding-bottom: 0.25em;
     display: block;
 }
 
-#language {
+#language, #sort {
     margin-top: 0.5em;
     width: 100%;
 }

templates/submission/list.html

@@ -82,6 +82,12 @@
                     placeholder: '{{ _('Filter by language...') }}',
                     matcher: idAndTextMatcher,
                 }).css({'visibility': 'visible'});
+
+                $('#sort').select2({
+                    multiple: 0,
+                    placeholder: '{{ _('Sort by...') }}',
+                    matcher: idAndTextMatcher,
+                }).css({'visibility': 'visible'});
             });
 
             // Draw the statistics graph.
@@ -135,6 +141,7 @@
                 };
                 var language_filter = $.map($('select#language option[selected]'), _collect);
                 var status_filter = $.map($('select#status option[selected]'), _collect);
+                var sort_filter = $.map($('select#sort option[selected]'), _collect);
 
                 var table = $('#submissions-table');
                 var statistics = $("#statistics-table");
@@ -148,6 +155,9 @@
                     if (status_filter.length && 'status' in message &&
                         status_filter.indexOf(message.status) == -1)
                         return;
+                    if (sort_filter.length && 'sort' in message &&
+                        sort_filter.indexOf(message.sort) == -1)
+                        return;
 
                     var id = message.id;
                     var row = table.find('div#' + id);
@@ -272,7 +282,7 @@
                 width: 78%
             }
 
-            #status, #language {
+            #status, #language, #sort {
                 visibility: hidden;
             }
         </style>
@@ -327,6 +337,18 @@ <h3>{{ _('Filter submissions') }} <i class="fa fa-search"></i></h3>
                                     {% endfor %}
                                 </select>
                             </div>
+                            <div class="filter-form-group">
+                                <label for="sort"><i>{{ _('Sort Options') }}</i></label>
+                                <select id="sort" name="sort">
+                                    {% if not selected_sort_options %}
+                                        <option value="" disabled selected></option>
+                                    {% endif %}
+                                    {% for small, name in all_sort_options %}
+                                        <option {% if small in selected_sort_options %}selected{% endif %}
+                                                value="{{ small }}">{{ name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
                             <div class="form-submit-group">
                                 <a id="go" onclick="form.submit()" class="button">{{ _('Go') }}</a>
                             </div>