This commit is contained in:
Ross
2021-10-16 21:28:32 +01:00
parent 6e7e112e2f
commit 0a98fcf051
4 changed files with 23 additions and 25 deletions
+1 -1
View File
@@ -214,4 +214,4 @@ AnswerUpdateFormSet = inlineformset_factory(
class ExamForm(ModelForm):
class Meta:
model = Exam
fields = ["name", "time_limit", "exam_mode", "active", "archive", "double_mark", "exam_questions"]
fields = ["name", "time_limit", "exam_mode", "active", "archive", "exam_questions"]
@@ -0,0 +1,20 @@
# Generated by Django 3.2.8 on 2021-10-16 20:28
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('rapids', '0033_answermarks'),
]
operations = [
migrations.RemoveField(
model_name='exam',
name='double_mark',
),
migrations.DeleteModel(
name='AnswerMarks',
),
]
+1 -23
View File
@@ -477,9 +477,6 @@ class Exam(ExamBase):
help_text='Author of exam',
related_name="rapid_exam_author")
double_mark = models.BooleanField(default=False, help_text="If the exam requires double marking")
def get_normal_abnormal_breakdown(self):
# Inefficient but more extendible
questions = self.exam_questions.all()
@@ -665,23 +662,4 @@ class CidUserAnswer(models.Model):
mark = 0
else:
mark = "unmarked"
return mark
# Not used
@reversion.register
class AnswerMarks(models.Model):
score = models.CharField(
max_length=1, choices=Answer.MarkOptions.choices
)
#mark_reason = models.TextField(null=True, blank=True, help_text="Reason for the given mark - not visible to candidates")
#candidate_feedback = models.TextField(null=True, blank=True, help_text="Feedback for the candidate")
marker = models.ForeignKey(
settings.AUTH_USER_MODEL, related_name="rapid_marks", on_delete=models.CASCADE
)
user_answer = models.ForeignKey(
CidUserAnswer, related_name="mark", on_delete=models.SET_NULL, null=True, blank=True
)
return mark
+1 -1
View File
@@ -126,7 +126,7 @@
$(el).after(`<span class="current-mark"> saved [${el.dataset.mark}]</span>`)
}
})
$("button.check-review").after("Discreptant answers are show above. Click next / save to update you your answers").hide()
$("button.check-review").after("Discreptant answers are show above. Clickinc next / save will overwrite saved scores with your current scoring.").hide()
$(".save-buttons").show();
})