Reviewer tables are now orderable in frontend

core/static/lib/css/dataTables.bootstrap4.min.css

+table.dataTable{clear:both;margin-top:6px !important;margin-bottom:6px !important;max-width:none !important;border-collapse:separate !important}table.dataTable td,table.dataTable th{-webkit-box-sizing:content-box;box-sizing:content-box}table.dataTable td.dataTables_empty,table.dataTable th.dataTables_empty{text-align:center}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}div.dataTables_wrapper div.dataTables_length label{font-weight:normal;text-align:left;white-space:nowrap}div.dataTables_wrapper div.dataTables_length select{width:75px;display:inline-block}div.dataTables_wrapper div.dataTables_filter{text-align:right}div.dataTables_wrapper div.dataTables_filter label{font-weight:normal;white-space:nowrap;text-align:left}div.dataTables_wrapper div.dataTables_filter input{margin-left:0.5em;display:inline-block;width:auto}div.dataTables_wrapper div.dataTables_info{padding-top:0.85em;white-space:nowrap}div.dataTables_wrapper div.dataTables_paginate{margin:0;white-space:nowrap;text-align:right}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:2px 0;white-space:nowrap}div.dataTables_wrapper div.dataTables_processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}table.dataTable thead>tr>th.sorting_asc,table.dataTable thead>tr>th.sorting_desc,table.dataTable thead>tr>th.sorting,table.dataTable thead>tr>td.sorting_asc,table.dataTable thead>tr>td.sorting_desc,table.dataTable thead>tr>td.sorting{padding-right:30px}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;position:relative}table.dataTable thead .sorting:before,table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:before,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:before,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:before,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:before,table.dataTable thead .sorting_desc_disabled:after{position:absolute;bottom:0.9em;display:block;opacity:0.3}table.dataTable thead .sorting:before,table.dataTable thead .sorting_asc:before,table.dataTable thead .sorting_desc:before,table.dataTable thead .sorting_asc_disabled:before,table.dataTable thead .sorting_desc_disabled:before{right:1em;content:"\2191"}table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{right:0.5em;content:"\2193"}table.dataTable thead .sorting_asc:before,table.dataTable thead .sorting_desc:after{opacity:1}table.dataTable thead .sorting_asc_disabled:before,table.dataTable thead .sorting_desc_disabled:after{opacity:0}div.dataTables_scrollHead table.dataTable{margin-bottom:0 !important}div.dataTables_scrollBody table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dataTables_scrollBody table thead .sorting:after,div.dataTables_scrollBody table thead .sorting_asc:after,div.dataTables_scrollBody table thead .sorting_desc:after{display:none}div.dataTables_scrollBody table tbody tr:first-child th,div.dataTables_scrollBody table tbody tr:first-child td{border-top:none}div.dataTables_scrollFoot table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dataTables_wrapper div.dataTables_length,div.dataTables_wrapper div.dataTables_filter,div.dataTables_wrapper div.dataTables_info,div.dataTables_wrapper div.dataTables_paginate{text-align:center}}table.dataTable.table-condensed>thead>tr>th{padding-right:20px}table.dataTable.table-condensed .sorting:after,table.dataTable.table-condensed .sorting_asc:after,table.dataTable.table-condensed .sorting_desc:after{top:6px;right:6px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{border-left-width:0}table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable td:last-child,table.table-bordered.dataTable td:last-child{border-right-width:0}table.table-bordered.dataTable tbody th,table.table-bordered.dataTable tbody td{border-bottom-width:0}div.dataTables_scrollHead table.table-bordered{border-bottom-width:0}div.table-responsive>div.dataTables_wrapper>div.row{margin:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:first-child{padding-left:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:last-child{padding-right:0}

core/templates/base.html

@@ -16,6 +16,7 @@
   {# CSS includes #}
   <link rel="stylesheet" href="{% static 'lib/css/bootstrap.min.css' %}">
   <link rel="stylesheet" href="{% static 'lib/css/custom.css' %}">
+  <link rel="stylesheet" href="{% static 'lib/css/dataTables.bootstrap4.min.css' %}">
 
   {# Importing stuff for ACE editor #}
   <script src="{% static 'lib/ace/ace.js' %}"></script>
@@ -24,6 +25,9 @@
   <script src="{% static 'lib/js/jquery-3.1.1.min.js' %}"></script>
   <script src="{% static 'lib/js/tether.min.js' %}"></script>
   <script src="{% static 'lib/js/bootstrap.min.js' %}"></script>
+
+  {# sortable table stuff #}
+  <script src="{% static 'lib/js/jquery.dataTables.min.js' %}"></script>
 </head>
 
 {# Navbar contaning: Brand - Title - Page Title <---> (Username - Logout || Login form) #}

core/templates/core/feedback_list.html

@@ -4,10 +4,10 @@
   </a>
   <div id="collapse{{unique}}" class="collapse {{expanded}}" role="tabpanel">
     <div class="card-block">
-      <table class="table nomargin">
+      <table id="list-id-{{unique}}" class="table nomargin">
         <thead>
           <tr>
-            <th></th>
+            <th>Status</th>
             <th>Submission Type</th>
             <th>Student</th>
             <th>Score</th>

core/templates/core/reviewer_startpage.html

@@ -63,10 +63,10 @@
       <h5 class="card-header">So far {{feedback_list_manual|length}} contributions were provided</h5>
       {% endif %}
       <div class="card-block">
-        <table class="table nomargin">
+        <table id="list-id-0" class="table nomargin">
           <thead>
             <tr>
-              <th></th>
+              <th>Status</th>
               <th>Submission Type</th>
               <th>Student</th>
               <th>Score</th>
@@ -103,3 +103,19 @@
 </div>
 
 {% endblock body_block %}
+
+{% block script_block %}
+<script>
+  $(document).ready(function() {
+    $('[id^=list-id-]').DataTable({
+        "paging":     false,
+        "info":       false,
+        "searching":  false,
+        "order":      [[ 0, 'desc' ], [ 2, 'desc' ]],
+        "columnDefs": [
+          { "orderable": false, "targets": -1 },
+        ]
+    });
+  });
+</script>
+{% endblock script_block %}

core/views/user_startpages.py

@@ -64,9 +64,9 @@ def student_view(request):
 def reviewer_view(request):
     context = {
         'submission_type_list': get_annotated_feedback_count(),
-        'tutor_list': User.objects.annotate(Count('corrected_submissions')).filter(groups__name='Tutors'),
+        'tutor_list': User.objects.annotate(Count('corrected_submissions')).filter(groups__name='Tutors').order_by('-corrected_submissions'),
         'submission_list': Submission.objects.all(),
-        'feedback_list_manual': Feedback.objects.filter(origin=Feedback.MANUAL).order_by('-status', 'of_submission__student', '-modified'),
+        'feedback_list_manual': Feedback.objects.filter(origin=Feedback.MANUAL),
         'feedback_list_empty': Feedback.objects.filter(origin=Feedback.WAS_EMPTY),
         'feedback_list_did_not_compile': Feedback.objects.filter(origin=Feedback.DID_NOT_COMPILE),
         'feedback_list_could_not_link': Feedback.objects.filter(origin=Feedback.COULD_NOT_LINK),