rename rapid functions

This commit is contained in:
Ross
2021-07-07 08:38:22 +01:00
parent e5a19130ba
commit c2888ca237
17 changed files with 72 additions and 54 deletions
+8 -8
View File
@@ -145,12 +145,12 @@ class Long(models.Model):
examinations = [series.get_examination() for series in self.series.all()]
return "{} : {}".format(self.description, ", ".join(examinations))
def GetExams(self):
def get_exams(self):
e = self.exams.all().values_list("name", flat=True)
exams = ", ".join(e)
return exams
def GetImages(self, feedback=False):
def get_images(self, feedback=False):
qs = self.images.all()
if not feedback:
@@ -160,16 +160,16 @@ class Long(models.Model):
return images
def GetImageUrls(self):
def get_image_urls(self):
return ",".join(
["https://penracourses.org.uk{}".format(i.url) for i in self.GetImages()]
["https://penracourses.org.uk{}".format(i.url) for i in self.get_images()]
)
def GetUnmarkedAnswerCount(self):
def get_unmarked_answer_count(self):
answers = self.cid_user_answers.all()
return len([ans for ans in answers if not ans.is_marked()])
def GetUnmarkedAnswers(self):
def get_unmarked_answers(self):
answers = self.cid_user_answers.all()
return [ans for ans in answers if not ans.is_marked()]
@@ -266,7 +266,7 @@ class Long(models.Model):
# def GetNonFeedbackQuestionImages(self):
# return self.GetImages()
# return self.get_images()
def test_image_validator(file):
@@ -527,7 +527,7 @@ class Exam(ExamBase):
exam_questions = SortedManyToManyField(Long, related_name="exams", blank="true")
time_limit = models.IntegerField(
help_text="Exam time limit (in seconds). Default is 4500 secondse (75 minutes)",
help_text="Exam time limit (in seconds). Default is 4500 seconds (75 minutes)",
default=4500,
)