.
This commit is contained in:
@@ -756,10 +756,10 @@ input {
|
|||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
.check-saved {
|
.check-review {
|
||||||
color: purple;
|
color: purple;
|
||||||
}
|
}
|
||||||
|
|
||||||
.current-mark {
|
.current-mark {
|
||||||
color: darkred;
|
color: gray;
|
||||||
}
|
}
|
||||||
+8
-5
@@ -278,14 +278,17 @@ class Rapid(models.Model):
|
|||||||
|
|
||||||
return len(self.get_unmarked_user_answers(exam_pk, marker=marker))
|
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:
|
if exam_pk is None:
|
||||||
user_answers = set(
|
queryset = self.cid_user_answers.all()
|
||||||
[i.answer_compare for i in self.cid_user_answers.all()]
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
|
queryset = self.cid_user_answers.filter(exam__id=exam_pk)
|
||||||
|
|
||||||
|
if not include_normal:
|
||||||
|
queryset = queryset.filter(normal=False)
|
||||||
|
|
||||||
user_answers = set(
|
user_answers = set(
|
||||||
[i.answer_compare for i in self.cid_user_answers.filter(exam__id=exam_pk)]
|
[i.answer_compare for i in queryset]
|
||||||
)
|
)
|
||||||
|
|
||||||
return user_answers
|
return user_answers
|
||||||
|
|||||||
@@ -111,7 +111,7 @@
|
|||||||
$(".marking-list .answer").each((n, el) => {
|
$(".marking-list .answer").each((n, el) => {
|
||||||
console.log(n, el, el.dataset);
|
console.log(n, el, el.dataset);
|
||||||
if (el.dataset.mark != el.dataset.newmark) {
|
if (el.dataset.mark != el.dataset.newmark) {
|
||||||
$(el).after(`<span class="current-mark">Current mark [${el.dataset.mark}]</span>`)
|
$(el).after(`<span class="current-mark"> saved mark [${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. Click next / save to update you your answers").hide()
|
||||||
|
|||||||
Reference in New Issue
Block a user