various fixes to volunteer progress page

Now uses the response type of the assignment rather than the current
stage to determine question types, url etc

Author: struan

crowdsourcer/templates/crowdsourcer/volunteer_progress.html

@@ -49,7 +49,7 @@ <h1 class="mb-4">Volunteer Progress: {{ user.first_name }} {{ user.last_name }}
               {% for authority in stats.authorities %}
                 <tr>
                     <td>
-                        <a href="{% session_url authority_url_name authority.name section.section.title %}">{{ authority.name }}</a>
+                        <a href="{% session_url stats.authority_url_name authority.name section.section.title %}">{{ authority.name }}</a>
                     </td>
                     <td>
                         <div class="progress progress-thin mb-2">

crowdsourcer/views/progress.py

@@ -253,10 +253,11 @@ def get_context_data(self, **kwargs):
         user = User.objects.get(id=self.kwargs["id"])
         progress = []
 
-        types = Question.VOLUNTEER_TYPES
-
-        if self.request.current_stage.type == "Audit":
-            types = ["volunteer", "national_volunteer", "foi"]
+        types = {
+            "First Mark": Question.VOLUNTEER_TYPES,
+            "Right of Reply": Question.VOLUNTEER_TYPES,
+            "Audit": ["volunteer", "national_volunteer", "foi", "national_data"],
+        }
 
         for section in sections:
             section_details = {
@@ -278,7 +279,7 @@ def get_context_data(self, **kwargs):
                             Question.objects.filter(
                                 section=section,
                                 questiongroup=OuterRef("questiongroup"),
-                                how_marked__in=types,
+                                how_marked__in=types[rt.type],
                             )
                             .values("questiongroup")
                             .annotate(num_questions=Count("pk"))
@@ -292,11 +293,7 @@ def get_context_data(self, **kwargs):
                                 authority=OuterRef("pk"),
                                 response_type=rt,
                             )
-                            .exclude(
-                                id__in=Response.null_responses(
-                                    stage_name=self.request.current_stage.type
-                                )
-                            )
+                            .exclude(id__in=Response.null_responses(stage_name=rt.type))
                             .values("authority")
                             .annotate(
                                 response_count=Count("question_id", distinct=True)
@@ -328,9 +325,14 @@ def get_context_data(self, **kwargs):
                     if a.num_questions == a.num_responses:
                         council_totals["complete"] = council_totals["complete"] + 1
 
+                if rt.type == "First Mark":
+                    authority_url_name = "authority_question_edit"
+                elif rt.type == "Audit":
+                    authority_url_name = "authority_audit"
                 section_details["responses"][rt.type] = {
                     "authorities": authorities,
                     "totals": council_totals,
+                    "authority_url_name": authority_url_name,
                 }
                 section_details["totals"]["total"] += council_totals["total"]
                 section_details["totals"]["complete"] += council_totals["complete"]