This commit is contained in:
Ross
2021-09-11 18:00:37 +01:00
parent 430074260d
commit 9096fc8eac
3 changed files with 57 additions and 20 deletions
+19 -19
View File
@@ -727,12 +727,12 @@ class CidUserAnswer(models.Model):
max_length=3, choices=ScoreOptions.choices, default=ScoreOptions.UNMARKED, blank=True, help_text="The final score for the candidate"
)
# primary_mark = models.ForeignKey(
# "AnswerMarks", related_name="primary_mark", on_delete=models.SET_NULL, null=True, blank=True
# )
# secondary_mark = models.ForeignKey(
# "AnswerMarks", related_name="secondary_mark", on_delete=models.SET_NULL, null=True, blank=True
# )
primary_mark = models.ForeignKey(
"AnswerMarks", related_name="primary_mark", on_delete=models.SET_NULL, null=True, blank=True
)
secondary_mark = models.ForeignKey(
"AnswerMarks", related_name="secondary_mark", on_delete=models.SET_NULL, null=True, blank=True
)
created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True)
@@ -770,16 +770,16 @@ class CidUserAnswer(models.Model):
return ""
return float(self.score)
#@reversion.register
#class AnswerMarks(models.Model):
# score = models.CharField(
# max_length=3, choices=CidUserAnswer.ScoreOptions.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="marker", on_delete=models.CASCADE
# )
@reversion.register
class AnswerMarks(models.Model):
score = models.CharField(
max_length=3, choices=CidUserAnswer.ScoreOptions.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="marker", on_delete=models.CASCADE
)