diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index a7df6290..e884eeea 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -756,10 +756,10 @@ input {
clear: both;
}
-.check-saved {
+.check-review {
color: purple;
}
.current-mark {
- color: darkred;
+ color: gray;
}
\ No newline at end of file
diff --git a/rapids/models.py b/rapids/models.py
index 26bd7ef9..ebf8a44c 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -278,15 +278,18 @@ class Rapid(models.Model):
return len(self.get_unmarked_user_answers(exam_pk, marker=marker))
- def get_user_answers(self, exam_pk=None):
+ def get_user_answers(self, exam_pk=None, include_normal=True):
if exam_pk is None:
- user_answers = set(
- [i.answer_compare for i in self.cid_user_answers.all()]
- )
+ queryset = self.cid_user_answers.all()
else:
- user_answers = set(
- [i.answer_compare for i in self.cid_user_answers.filter(exam__id=exam_pk)]
- )
+ queryset = self.cid_user_answers.filter(exam__id=exam_pk)
+
+ if not include_normal:
+ queryset = queryset.filter(normal=False)
+
+ user_answers = set(
+ [i.answer_compare for i in queryset]
+ )
return user_answers
diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index c07d97a5..4bdea54e 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -111,7 +111,7 @@
$(".marking-list .answer").each((n, el) => {
console.log(n, el, el.dataset);
if (el.dataset.mark != el.dataset.newmark) {
- $(el).after(`Current mark [${el.dataset.mark}]`)
+ $(el).after(` saved mark [${el.dataset.mark}]`)
}
})
$("button.check-review").after("Discreptant answers are show above. Click next / save to update you your answers").hide()