From ef7de71a5bb3998370640c3c0c97010f0c8324e1 Mon Sep 17 00:00:00 2001 From: viveksantayana Date: Sat, 4 Dec 2021 21:25:43 +0000 Subject: [PATCH] Updated footer, added question counters. --- .../templates/admin/components/footer.html | 2 +- ref-test/quiz/static/js/quiz.js | 34 +++++++++++++----- ref-test/quiz/templates/quiz/client.html | 11 ++++-- .../templates/quiz/components/footer.html | 2 +- ref-test/quiz/templates/quiz/privacy.html | 35 ++++++++++--------- 5 files changed, 54 insertions(+), 30 deletions(-) diff --git a/ref-test/admin/templates/admin/components/footer.html b/ref-test/admin/templates/admin/components/footer.html index 6f8a931..e2cea14 100644 --- a/ref-test/admin/templates/admin/components/footer.html +++ b/ref-test/admin/templates/admin/components/footer.html @@ -1,2 +1,2 @@ -

This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at the repository under an MIT License.

+

This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at Vivek’s personal GIT repository under an MIT License.

All questions in the test are © The Scottish Korfball Association {{ now.year }}. All rights are reserved.

\ No newline at end of file diff --git a/ref-test/quiz/static/js/quiz.js b/ref-test/quiz/static/js/quiz.js index cb65e47..2df6068 100644 --- a/ref-test/quiz/static/js/quiz.js +++ b/ref-test/quiz/static/js/quiz.js @@ -375,15 +375,32 @@ function render_question() { $progress_skipped.attr('title', `Skipped: ${skipped}`); $progress_skipped.attr('aria-valuenow', skipped); $progress_skipped.css('width', `${skipped}%`); + $skipped_count.text(`Skipped: ${skipped}`); + if (skipped < 1) { + $skipped_count.fadeOut() + } else { + $skipped_count.fadeIn() + } $progress_flagged.attr('title', `Flagged: ${flagged}`); $progress_flagged.attr('aria-valuenow', flagged); $progress_flagged.css('width', `${flagged}%`); + $flagged_count.text(`Flagged: ${flagged}`); + if (flagged < 1) { + $flagged_count.fadeOut() + } else { + $flagged_count.fadeIn() + } $progress_answered.attr('title', `Answered: ${answered}`); $progress_answered.attr('aria-valuenow', answered); - $progress_answered.css('width', `10%`); - console.log(`Answered: ${answered}, Skipped: ${skipped}, Flagged: ${flagged}`); + $progress_answered.css('width', `${answered}%`); + $answered_count.text(`Answered: ${answered}`); + if (answered < 1) { + $answered_count.fadeOut() + } else { + $answered_count.fadeIn() + } $question_title.focus(); $(window).scrollTop(0); @@ -610,13 +627,14 @@ const $question_header = $("#quiz-question-header"); const $question_text = $("#quiz-question-text"); const $question_options = $("#quiz-question-options"); -const $progress_skipped = $("#skipped"); -const $progress_answered = $("#answered"); -const $progress_flagged = $("#flagged"); +const $progress_skipped = $("#skipped-bar"); +const $progress_answered = $("#answered-bar"); +const $progress_flagged = $("#flagged-bar"); +const $skipped_count = $("#skipped-count"); +const $answered_count = $("#answered-count"); +const $flagged_count = $("#flagged-count"); // Execution on Load apply_settings(display_settings); -check_started(); - -console.log($progress_answered); \ No newline at end of file +check_started(); \ No newline at end of file diff --git a/ref-test/quiz/templates/quiz/client.html b/ref-test/quiz/templates/quiz/client.html index 6dfd261..867b303 100644 --- a/ref-test/quiz/templates/quiz/client.html +++ b/ref-test/quiz/templates/quiz/client.html @@ -224,9 +224,14 @@
-
-
-
+
+
+
+
+
+ + +

Question x. diff --git a/ref-test/quiz/templates/quiz/components/footer.html b/ref-test/quiz/templates/quiz/components/footer.html index e9ef23e..c4e6961 100644 --- a/ref-test/quiz/templates/quiz/components/footer.html +++ b/ref-test/quiz/templates/quiz/components/footer.html @@ -1,3 +1,3 @@ -

This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at the repository under an MIT License.

+

This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at Vivek’s personal GIT repository under an MIT License.

All questions in the test are © The Scottish Korfball Association {{ now.year }}. All rights are reserved.

OpenDyslexic 3 is an open source typeface created by Abbie Gonzalez, licensed under a SIL-OFL. More information about OpenDyslexic is available on the project web site.

\ No newline at end of file diff --git a/ref-test/quiz/templates/quiz/privacy.html b/ref-test/quiz/templates/quiz/privacy.html index 8e117df..6e02e89 100644 --- a/ref-test/quiz/templates/quiz/privacy.html +++ b/ref-test/quiz/templates/quiz/privacy.html @@ -3,23 +3,24 @@ {% block content %}

Privacy Policy

+ This web app stores data using cookies. The web site only stores the minimum information it needs to function. +
Site Administrators
+ + +
Test Candidates
+ + +
Requests to Delete Data
+ {% endblock %} \ No newline at end of file