only show active assigments on overview page

mysociety · Nov 2, 2023 · c207cd7 · c207cd7
1 parent b3dff07
commit c207cd7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/crowdsourcer/fixtures/assignments.json b/crowdsourcer/fixtures/assignments.json
@@ -7,6 +7,7 @@
     "section": 1,
     "authority": 1,
     "response_type": 1,
+    "active": true,
     "question": null
   }
 },
@@ -18,6 +19,7 @@
     "section": 2,
     "authority": 2,
     "response_type": 1,
+    "active": true,
     "question": null
   }
 },
@@ -29,6 +31,7 @@
     "section": 2,
     "authority": 3,
     "response_type": 1,
+    "active": true,
     "question": null
   }
 },
@@ -40,6 +43,7 @@
     "section": 2,
     "authority": 2,
     "response_type": 3,
+    "active": true,
     "question": null
   }
 }

diff --git a/crowdsourcer/fixtures/audit_assignments.json b/crowdsourcer/fixtures/audit_assignments.json
@@ -6,7 +6,7 @@
     "user": 2,
     "section": 1,
     "authority": 1,
-    "active": false,
+    "active": true,
     "response_type": 1,
     "question": null
   }
@@ -18,7 +18,7 @@
     "user": 2,
     "section": 2,
     "authority": 2,
-    "active": false,
+    "active": true,
     "response_type": 1,
     "question": null
   }
@@ -30,7 +30,7 @@
     "user": 2,
     "section": 2,
     "authority": 3,
-    "active": false,
+    "active": true,
     "response_type": 1,
     "question": null
   }

diff --git a/crowdsourcer/models.py b/crowdsourcer/models.py
@@ -290,7 +290,7 @@ def is_user_assigned(cls, user, **kwargs):
         if user.is_anonymous:
             return False
 
-        q = cls.objects.filter(user=user)
+        q = cls.objects.filter(user=user, active=True)
 
         if kwargs.get("section", None) is not None:
             q = q.filter(section__title=kwargs["section"])

diff --git a/crowdsourcer/views/marking.py b/crowdsourcer/views/marking.py
@@ -81,7 +81,8 @@ def get_queryset(self):
             return None
 
         qs = Assigned.objects.filter(
-            section__isnull=False, response_type=self.current_stage
+            section__isnull=False,
+            active=True,
         )
         if user.is_superuser is False:
             qs = qs.filter(user=user)