diff --git a/anatomy/models.py b/anatomy/models.py index 09daeb86..0cd9837f 100644 --- a/anatomy/models.py +++ b/anatomy/models.py @@ -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): diff --git a/anatomy/templates/anatomy/exam_overview.html b/anatomy/templates/anatomy/exam_overview.html index e67d588f..44ac9132 100644 --- a/anatomy/templates/anatomy/exam_overview.html +++ b/anatomy/templates/anatomy/exam_overview.html @@ -31,7 +31,7 @@ {{ question.description }}
- {{ question.question_type }}: {{ question.GetPrimaryAnswer }} + {{ question.question_type }}: {{ question.get_primary_answer }}
Modality: {{ question.modality }}, View, Mark diff --git a/anatomy/templates/anatomy/mark_overview.html b/anatomy/templates/anatomy/mark_overview.html index ed2619b4..95afc5bd 100644 --- a/anatomy/templates/anatomy/mark_overview.html +++ b/anatomy/templates/anatomy/mark_overview.html @@ -12,8 +12,8 @@ diff --git a/anatomy/templates/anatomy/question_detail.html b/anatomy/templates/anatomy/question_detail.html index 0f49631a..51c23cff 100644 --- a/anatomy/templates/anatomy/question_detail.html +++ b/anatomy/templates/anatomy/question_detail.html @@ -29,7 +29,7 @@
Created: {{ question.created_date }}
-

{{ question.GetPrimaryAnswer }}

+

{{ question.get_primary_answer }}

{{question.question_type}}

Answers (score): {% for answer in question.answers.all %} {{ answer }} ({{answer.status}}), diff --git a/anatomy/views.py b/anatomy/views.py index 98edc7de..8778bbc9 100644 --- a/anatomy/views.py +++ b/anatomy/views.py @@ -333,7 +333,7 @@ def mark(request, pk, sk): # i.answer.lower() for i in question.incorrect_answers.all() # ] - unmarked_user_answers = question.GetUnmarkedAnswers() + unmarked_user_answers = question.get_unmarked_answers() if request.method == "POST": @@ -576,7 +576,7 @@ def exam_scores_cid_user(request, pk, sk): answer_score = user_answer.get_answer_score() - correct_answer = q.GetPrimaryAnswer() + correct_answer = q.get_primary_answer() if not exam.publish_results: correct_answer = "*****" diff --git a/generic/models.py b/generic/models.py index 186ed75e..af9b5e48 100644 --- a/generic/models.py +++ b/generic/models.py @@ -53,7 +53,7 @@ class Sign(tagulous.models.TagModel): class ExamBase(models.Model): - name = models.CharField(max_length=200) + name = models.CharField(max_length=200, help_text="Name of the exam") #exam_questions = SortedManyToManyField(Long, related_name="exams", blank="true") active = models.BooleanField( diff --git a/longs/migrations/0037_alter_exam_time_limit.py b/longs/migrations/0037_alter_exam_time_limit.py new file mode 100644 index 00000000..ec3ad674 --- /dev/null +++ b/longs/migrations/0037_alter_exam_time_limit.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.4 on 2021-07-06 19:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0036_alter_exam_exam_mode'), + ] + + operations = [ + migrations.AlterField( + model_name='exam', + name='time_limit', + field=models.IntegerField(default=4500, help_text='Exam time limit (in seconds). Default is 4500 seconds (75 minutes)'), + ), + ] diff --git a/longs/models.py b/longs/models.py index 3cda15f8..1f030da7 100644 --- a/longs/models.py +++ b/longs/models.py @@ -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, ) diff --git a/longs/templates/longs/long_display_block.html b/longs/templates/longs/long_display_block.html index 49771d4b..68f48bbc 100755 --- a/longs/templates/longs/long_display_block.html +++ b/longs/templates/longs/long_display_block.html @@ -40,7 +40,7 @@

Mark Scheme: 

{{ question.mark_scheme }}

-

Exam(s): {{question.GetExams}}

+

Exam(s): {{question.get_exams}}

Notes: diff --git a/longs/templates/longs/mark_overview.html b/longs/templates/longs/mark_overview.html index 3c27e55a..da27deb5 100644 --- a/longs/templates/longs/mark_overview.html +++ b/longs/templates/longs/mark_overview.html @@ -12,8 +12,8 @@
diff --git a/longs/views.py b/longs/views.py index ec73369c..90b3cd07 100755 --- a/longs/views.py +++ b/longs/views.py @@ -655,7 +655,7 @@ def mark_answer(request, pk, sk, tk): raise Http404("User answer does not exist") try: - unmarked = question.GetUnmarkedAnswers() + unmarked = question.get_unmarked_answers() next_unmarked_id = unmarked[0].cid if next_unmarked_id == tk: next_unmarked_id = unmarked[1].cid diff --git a/rapids/models.py b/rapids/models.py index bbfa2bf7..05ce8014 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -216,7 +216,7 @@ class Rapid(models.Model): lat = self.laterality return "{} / {} {}".format(exams, lat, n) - def GetPrimaryAnswer(self): + def get_primary_answer(self): if self.normal: return "Normal" elif len(self.answers.filter(proposed=False)) > 0: @@ -224,13 +224,13 @@ class Rapid(models.Model): 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" @@ -240,7 +240,7 @@ class Rapid(models.Model): ) ) - def GetUnmarkedAnswers(self): + def get_unmarked_answers(self): # If normal no answers to mark if self.normal: return [] @@ -248,14 +248,14 @@ class Rapid(models.Model): user_answers = set( [i.answer_compare for i in self.cid_user_answers.all() if i.normal == False] ) - 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 @@ -276,7 +276,7 @@ class Rapid(models.Model): marked_answers = correct_answers | half_mark_answers | incorrect_answers return marked_answers - def GetCorrectUnstrippedAnswers(self): + def get_correct_unstripped_answers(self): return set( [ str(i) @@ -285,7 +285,7 @@ class Rapid(models.Model): ] ) - def GetImages(self, feedback=False): + def get_images(self, feedback=False): qs = self.images.all() if not feedback: @@ -295,10 +295,10 @@ class Rapid(models.Model): return images - def GetImageUrls(self): - return ",".join(["https://penracourses.org.uk{}".format(i.url) for i in self.GetImages()]) + def get_image_urls(self): + return ",".join(["https://penracourses.org.uk{}".format(i.url) for i in self.get_images()]) #def GetNonFeedbackQuestionImages(self): - #return self.GetImages() + #return self.get_images() class RapidImage(models.Model): @@ -427,7 +427,7 @@ class Exam(ExamBase): if not self.exam_mode: exam_questions[q.id]["normal"] = q.normal exam_questions[q.id]["feedback_images"] = feedback_images - exam_questions[q.id]["answers"] = list(q.GetCorrectUnstrippedAnswers()) + exam_questions[q.id]["answers"] = list(q.get_correct_unstripped_answers()) #if feedback_images: @@ -482,7 +482,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): diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html index c35c1233..d4f1407f 100644 --- a/rapids/templates/rapids/exam_overview.html +++ b/rapids/templates/rapids/exam_overview.html @@ -27,14 +27,14 @@
  • - {% for image in question.GetImages %} + {% for image in question.get_images %} thumbail {% endfor %} {% if not question.normal %} Abnormality: {{ question.get_abnormalities }} Region: {{ question.get_regions }}
    - {{ question.GetPrimaryAnswer }} + {{ question.get_primary_answer }} {% else %} Normal {% endif %} diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html index 0cf37d5f..b063b23a 100644 --- a/rapids/templates/rapids/mark.html +++ b/rapids/templates/rapids/mark.html @@ -13,7 +13,7 @@ Answers will be automatically marked. Answers marked as normal will be automatically marked.
    Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities }} {% endif %} -
    diff --git a/rapids/templates/rapids/mark_overview.html b/rapids/templates/rapids/mark_overview.html index 37849233..f6bc4ed1 100644 --- a/rapids/templates/rapids/mark_overview.html +++ b/rapids/templates/rapids/mark_overview.html @@ -12,8 +12,8 @@
    diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html index fc84ef9d..0b2eab14 100755 --- a/rapids/templates/rapids/question_display_block.html +++ b/rapids/templates/rapids/question_display_block.html @@ -60,7 +60,7 @@ {% endif %} -
    +