From eafe6ea051ac4469c4833d4e8f2eafd38e7076f7 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Jan 2021 14:33:46 +0000 Subject: [PATCH] . --- anatomy/static/css/anatomy.css | 8 ++++---- anatomy/static/js/anatomy.js | 3 +-- anatomy/views.py | 4 ++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css index bf02a29a..17e773ec 100644 --- a/anatomy/static/css/anatomy.css +++ b/anatomy/static/css/anatomy.css @@ -27,7 +27,7 @@ a, a:link { .answer-list .correct { /* color: green; */ - color: blue; + color: lightblue; } .answer-list .correct::after{ @@ -67,7 +67,7 @@ a, a:link { .answered { /* color: green; */ - color: blue; + color: lightblue; } .unanswered { @@ -326,7 +326,7 @@ img.uploading:hover { .user-answer-score-2 { /* color: green; */ - color: blue; + color: lightblue; } td.user-answer-score-0::after { @@ -387,7 +387,7 @@ td.user-answer-score-2::after { .answer-1 { /* color: green; */ - color: blue; + color: lightblue; } .answer-0 { diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js index 75a85c4a..765530c0 100644 --- a/anatomy/static/js/anatomy.js +++ b/anatomy/static/js/anatomy.js @@ -31,8 +31,7 @@ $(document).ready(function () { if($(".post-form").length > 0) { $(".post-form").get(0).addEventListener("submit", function (e) { - console.log(e); - if($(".not-marked").length > 0) { + if($(".not-marked").length > 0 && e.submitter.name != "skip") { e.preventDefault(); // before the code alert("Ensure all answers are marked first"); } diff --git a/anatomy/views.py b/anatomy/views.py index cb3b1b1d..6e23bcf6 100644 --- a/anatomy/views.py +++ b/anatomy/views.py @@ -420,6 +420,10 @@ def mark(request, pk, sk): # TODO: convert to JSON request # ******************************* if form.is_valid(): + # If skip button is pressed skip the question without marking + if "skip" in request.POST: + return redirect("anatomy:mark", pk=pk, sk=n + 1) + cd = form.cleaned_data # correct = cd.get("correct") # half_correct = cd.get("half_correct")