Merge branch 'master' of ssh://penracourses.org.uk:/home/ross/web/rad

generic/urls.py

@@ -235,6 +235,11 @@ def generic_exam_urls(generic_exam_view):
             generic_exam_view.exam_json_unbased,
             name="exam_json_unbased",
         ),
+        path(
+            "exam/json/<int:pk>/<int:sk>",
+            generic_exam_view.exam_question_json,
+            name="exam_question_json_unbased",
+        ),
         path(
             "exam/json/<int:pk>/<int:sk>/unbased",
             generic_exam_view.exam_question_json_unbased,

longs/forms.py

@@ -269,7 +269,9 @@ LongSeriesImageFormSet = inlineformset_factory(
 class ExamForm(ExamFormMixin, ModelForm):
     class Meta(ExamFormMixin.Meta):
         model = Exam
+        fields = ExamFormMixin.Meta.fields + ["double_mark"]
 
 class ExamAuthorForm(ExamAuthorFormMixin):
     class Meta(ExamAuthorFormMixin.Meta):
         model = Exam
+        #fields = ExamAuthorFormMixin.Meta.fields.append("double_mark")

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