add sort_key functionality back, support multi-campaign status view

Author: zouharvi

Appraise/urls.py

@@ -188,8 +188,8 @@
         name='pairwise-assessment-document',
     ),
     re_path(
-        r'^campaign-status/(?P<campaign_name>[a-zA-Z0-9]+)/'
-        r'(?P<sort_key>[0123456])?/?$',
+        r'^campaign-status/(?P<campaign_name>[a-zA-Z0-9]+(,[a-zA-Z0-9]+))*/'
+        r'(?P<sort_key>[a-zA-Z0-9_])?/?$',
         campaign_views.campaign_status,
         name='campaign_status',
     ),

Campaign/views.py

@@ -32,7 +32,7 @@
 LOGGER = _get_logger(name=__name__)
 
 
-def campaign_status(request, campaign_name):
+def campaign_status(request, campaign_name, sort_key=None):
     """
     Campaign status view with completion details.
     """
@@ -41,6 +41,19 @@ def campaign_status(request, campaign_name):
         request.user.username or "Anonymous",
     )
 
+    if "," in campaign_name:
+        responses = [campaign_status(request, name, sort_key) for name in campaign_name.split(",")]
+        if not all([response.headers["Content-Type"] == responses[0].headers["Content-Type"] for response in responses]):
+            return HttpResponse(
+                'ERROR: You are mixing unrelated campaigns (views.py:campaign_status).',
+                content_type='text/plain',
+            )
+        else:
+            return HttpResponse(
+                "\n\n".join([response.content.decode('utf-8') for response in responses]),
+                content_type=responses[0].headers["Content-Type"],
+            )
+
     # Get Campaign instance for campaign name
     try:
         campaign = _get_campaign_instance(campaign_name)
@@ -66,7 +79,11 @@ def campaign_status(request, campaign_name):
     # special handling for ESA
     if "esa" in campaign_opts:
         return campaign_status_esa(campaign)
+    else:
+        return campaign_status_plain(request, campaign, result_type, campaign_opts, sort_key)
+
 
+def campaign_status_plain(request, campaign, result_type, campaign_opts, sort_key):
     _out = []
     for team in campaign.teams.all():
         for user in team.members.all():
@@ -202,7 +219,7 @@ def campaign_status(request, campaign_name):
 
             _out.append(_item)
 
-    _out.sort(key=lambda x: x[2])
+    _out.sort(key=lambda x: x[sort_key if sort_key else 2])
 
     _header = (
         'username',
@@ -250,7 +267,7 @@ def campaign_status_esa(campaign) -> str:
     out_str += "<tr>" + "".join(
         f"<th>{x}</th>" for x in ["Username", "Progress", "First Modified", "Last Modified", "Time (Last-First)", "Time (Real)"]
     ) + "</tr>\n"
-
+    
     for team in campaign.teams.all():
         for user in team.members.all():
             if user.is_staff: