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
+11 -11
View File
@@ -130,7 +130,7 @@ class AnatomyQuestion(models.Model):
def __str__(self):
# Get first answer
return "{} [{}, {}]".format(
self.GetPrimaryAnswer(), self.modality, self.structure
self.get_primary_answer(), self.modality, self.structure
)
# Get associated exams
e = self.exams.all().values_list("name", flat=True)
@@ -146,19 +146,19 @@ class AnatomyQuestion(models.Model):
def get_absolute_url(self):
return reverse("anatomy:question_detail", kwargs={"pk": self.pk})
def GetPrimaryAnswer(self):
def get_primary_answer(self):
if len(self.answers.filter(proposed=False)) > 0:
return self.answers.filter(proposed=False).first().answer
else:
return "None yet..."
def GetExams(self):
def get_exams(self):
e = self.exams.all().values_list("name", flat=True)
exams = ", ".join(e)
return exams
def GetUnmarkedAnswersString(self):
unmarked_answers = self.GetUnmarkedAnswers()
def get_unmarked_answer_string(self):
unmarked_answers = self.get_unmarked_answers()
if not unmarked_answers:
return "No answers to mark"
@@ -168,18 +168,18 @@ class AnatomyQuestion(models.Model):
)
)
def GetUnmarkedAnswers(self):
def get_unmarked_answers(self):
user_answers = set(
[i.answer_compare for i in self.cid_user_answers.all()]
)
unmarked_answers = user_answers - self.GetMarkedAnswers()
unmarked_answers = user_answers - self.get_marked_answers()
return unmarked_answers
def GetUnmarkedAnswerCount(self):
return len(self.GetUnmarkedAnswers())
def get_unmarked_answer_count(self):
return len(self.get_unmarked_answers())
def GetMarkedAnswers(self):
def get_marked_answers(self):
return set(
[
i.answer_compare
@@ -350,7 +350,7 @@ class CidUserAnswer(models.Model):
except (Exam.DoesNotExist, KeyError) as e:
exam = "None"
return "{}/{}/{}: {}".format(
exam, self.cid, self.question.GetPrimaryAnswer(), self.answer
exam, self.cid, self.question.get_primary_answer(), self.answer
)
def save(self, *args, **kwargs):