ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Ross
2021-10-16 08:36:06 +01:00
parent e3da6ac9b2
commit 26910f66c3
8 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
longs/models.py
+4 -4
View File
@@ -178,13 +178,13 @@ class Long(models.Model):
def get_image_url_array(self):
return json.dumps(["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()])
def get_unmarked_answer_count(self, exam_pk=None, marker=None):
def get_unmarked_user_answer_count(self, exam_pk=None, marker=None):
if exam_pk is None:
return self.cid_user_answers.all().count()
return len(self.get_unmarked_answers(exam_pk=exam_pk, marker=marker))
return len(self.get_unmarked_user_answers(exam_pk=exam_pk, marker=marker))
def get_unmarked_answers(self, exam_pk=None, marker=None):
def get_unmarked_user_answers(self, exam_pk=None, marker=None):
if exam_pk is None:
answers = self.cid_user_answers.all()
else:
@@ -195,7 +195,7 @@ class Long(models.Model):
if marker is None:
return unmarked_answers
# If marker is specified we check for what they have marker
# If marker is specified we check for what they have marked
marker_unmarked = []
for answer in unmarked_answers:
if answer.mark.filter(marker=marker).count() < 1: