From 5cf20592be973edb226508933878c39c6043b0be Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 6 Sep 2022 09:58:44 +0100 Subject: [PATCH 1/7] . --- generic/urls.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generic/urls.py b/generic/urls.py index d27bdf83..3ed72d65 100755 --- a/generic/urls.py +++ b/generic/urls.py @@ -230,6 +230,11 @@ def generic_exam_urls(generic_exam_view): generic_exam_view.exam_json_unbased, name="exam_json_unbased", ), + path( + "exam/json//", + generic_exam_view.exam_question_json, + name="exam_question_json_unbased", + ), path( "exam/json///unbased", generic_exam_view.exam_question_json_unbased, From 5aca717ddb4c0f088b84f6501a06c972f89ec33d Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 6 Sep 2022 10:18:07 +0100 Subject: [PATCH 2/7] . --- longs/forms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/longs/forms.py b/longs/forms.py index 94b20fb3..8e6faeb0 100755 --- a/longs/forms.py +++ b/longs/forms.py @@ -272,4 +272,5 @@ class ExamForm(ExamFormMixin, ModelForm): class ExamAuthorForm(ExamAuthorFormMixin): class Meta(ExamAuthorFormMixin.Meta): - model = Exam \ No newline at end of file + model = Exam + fields = ExamAuthorFormMixin.Meta.fields.append("double_mark") \ No newline at end of file From 03d3b9de0acc722073a20364335306ae7bd64f60 Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 6 Sep 2022 10:18:28 +0100 Subject: [PATCH 3/7] . --- longs/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/longs/forms.py b/longs/forms.py index 8e6faeb0..5d22fee6 100755 --- a/longs/forms.py +++ b/longs/forms.py @@ -273,4 +273,4 @@ class ExamForm(ExamFormMixin, ModelForm): class ExamAuthorForm(ExamAuthorFormMixin): class Meta(ExamAuthorFormMixin.Meta): model = Exam - fields = ExamAuthorFormMixin.Meta.fields.append("double_mark") \ No newline at end of file + #fields = ExamAuthorFormMixin.Meta.fields.append("double_mark") \ No newline at end of file From 5d7a77ca0a33c295a9b732a7b9b69e8c04b5793c Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 6 Sep 2022 10:22:23 +0100 Subject: [PATCH 4/7] . --- longs/forms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/longs/forms.py b/longs/forms.py index 5d22fee6..233c69cb 100755 --- a/longs/forms.py +++ b/longs/forms.py @@ -269,6 +269,7 @@ LongSeriesImageFormSet = inlineformset_factory( class ExamForm(ExamFormMixin, ModelForm): class Meta(ExamFormMixin.Meta): model = Exam + fields = ExamAuthorFormMixin.Meta.fields.append("double_mark") class ExamAuthorForm(ExamAuthorFormMixin): class Meta(ExamAuthorFormMixin.Meta): From b7791e11d09b2dad3e1518f5ec7d68693312e916 Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 6 Sep 2022 10:24:35 +0100 Subject: [PATCH 5/7] . --- longs/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/longs/forms.py b/longs/forms.py index 233c69cb..d3493c4b 100755 --- a/longs/forms.py +++ b/longs/forms.py @@ -269,7 +269,7 @@ LongSeriesImageFormSet = inlineformset_factory( class ExamForm(ExamFormMixin, ModelForm): class Meta(ExamFormMixin.Meta): model = Exam - fields = ExamAuthorFormMixin.Meta.fields.append("double_mark") + fields = ExamAuthorFormMixin.Meta.fields + ["double_mark"] class ExamAuthorForm(ExamAuthorFormMixin): class Meta(ExamAuthorFormMixin.Meta): From e6a32d3b6c47494ae85bf693d79e134a99172aaf Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 6 Sep 2022 10:24:59 +0100 Subject: [PATCH 6/7] . --- longs/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/longs/forms.py b/longs/forms.py index d3493c4b..dd9c5ef3 100755 --- a/longs/forms.py +++ b/longs/forms.py @@ -269,7 +269,7 @@ LongSeriesImageFormSet = inlineformset_factory( class ExamForm(ExamFormMixin, ModelForm): class Meta(ExamFormMixin.Meta): model = Exam - fields = ExamAuthorFormMixin.Meta.fields + ["double_mark"] + fields = ExamFormMixin.Meta.fields + ["double_mark"] class ExamAuthorForm(ExamAuthorFormMixin): class Meta(ExamAuthorFormMixin.Meta): From 391e9b0b62edae712b1c15d6143cec011be82f9e Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 6 Sep 2022 10:30:56 +0100 Subject: [PATCH 7/7] . --- longs/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/longs/views.py b/longs/views.py index e9ecf03a..fa0f1a76 100755 --- a/longs/views.py +++ b/longs/views.py @@ -1035,9 +1035,10 @@ def exam_scores_cid_user(request, pk, cid, passcode): total_score = sum(answered) unmarked_number = len(answers_marks) - len(answered) total_score = "{} ({} unmarked)".format(total_score, unmarked_number) + normalised_score = "Not available" else: total_score = sum(answered) - normalised_score = normaliseScore(total_score) + normalised_score = normaliseScore(total_score) max_score = len(questions) * 8