diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html index 1ae276ba..8c7a4ae4 100644 --- a/anatomy/templates/anatomy/mark.html +++ b/anatomy/templates/anatomy/mark.html @@ -32,7 +32,11 @@ wait 0.1s end end - put (#id_answer_suggest_incorrect's value + ',' + my @data-word) into #id_answer_suggest_incorrect's value then remove closest parent " data-word='{{word}}'>(+), + if (#id_answer_suggest_incorrect's value == '') + put (#id_answer_suggest_incorrect's value + my @data-word) into #id_answer_suggest_incorrect's value + else + put (#id_answer_suggest_incorrect's value + ',' + my @data-word) into #id_answer_suggest_incorrect's value + then remove closest parent " data-word='{{word}}'>(+), {% endfor %}
diff --git a/anatomy/views.py b/anatomy/views.py index 8522a412..bac25f58 100644 --- a/anatomy/views.py +++ b/anatomy/views.py @@ -347,8 +347,6 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False): answer_suggest_incorrect: list = [] - words_present: set = set() - words_present_in_correct: set = set() if review: for ans in unmarked_user_answers: @@ -372,6 +370,9 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False): answer_suggest_incorrect.append(ans) break + words_present: set = set() + words_present_in_correct: set = set() + for ans in correct_answers: answer_words = set(ans.get_constituent_words()) words_present.update(answer_words)