From 7827c6be5ff527164ba1f79a253a6a1b39185af2 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Jan 2021 10:17:07 +0000 Subject: [PATCH 1/5] don't cache packet list --- js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/main.js b/js/main.js index 6de5cbe..15da58f 100644 --- a/js/main.js +++ b/js/main.js @@ -53,13 +53,13 @@ function retrievePacketList() { url = window.config.exam_query_url; } - $.getJSON(url, function (data) { + $.ajax({dataType: "json", cache: false, url: url, success : function (data) { if (data.hasOwnProperty("exams")) { loadExamList(data); } else { loadPacketList(data); } - }) + },}) .done(function () {}) .fail(function () { $.getJSON("packets/packets.json", function (data) { From c21bf8806a1f34372308dfda5866a5608832b37a Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Jan 2021 10:45:35 +0000 Subject: [PATCH 2/5] display answers on a failed sumbit --- js/interact.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/js/interact.js b/js/interact.js index 2fffba3..4101694 100644 --- a/js/interact.js +++ b/js/interact.js @@ -61,7 +61,22 @@ export function postAnswers(ans) { } } else { alert(`Error submitting answers: ${data.error}`); - } - }); - // $.post( "http://localhost:8000/submit_answers", JSON.stringify(ans)); + var docHeight = $(document).height(); + + $("body").append(`

A copy of your answers are displayed below. Please refresh this page to continue.

${ans}
`); + + $("#overlay") + .height(docHeight) + .css({ + 'opacity' : 0.4, + 'position': 'absolute', + 'top': 0, + 'left': 0, + 'background-color': 'black', + 'width': '100%', + 'z-index': 5000 + }); + } + }); + // $.post( "http://localhost:8000/submit_answers", JSON.stringify(ans)); } From d0d5ecb53b8cf10ed6e60805fe7e07c9a2a70f2d Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Jan 2021 10:50:14 +0000 Subject: [PATCH 3/5] and again --- js/interact.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/interact.js b/js/interact.js index 4101694..b78a80e 100644 --- a/js/interact.js +++ b/js/interact.js @@ -63,7 +63,7 @@ export function postAnswers(ans) { alert(`Error submitting answers: ${data.error}`); var docHeight = $(document).height(); - $("body").append(`

A copy of your answers are displayed below. Please refresh this page to continue.

${ans}
`); + $("body").append(`

A copy of your answers are displayed below. Please refresh this page to continue.

${JSON.stringify(ans)
}
`); $("#overlay") .height(docHeight) From 81bc8c68686dc814308e583cf90af7afb9e8020f Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Jan 2021 10:51:18 +0000 Subject: [PATCH 4/5] . --- js/interact.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/interact.js b/js/interact.js index b78a80e..4ee1bb9 100644 --- a/js/interact.js +++ b/js/interact.js @@ -63,7 +63,7 @@ export function postAnswers(ans) { alert(`Error submitting answers: ${data.error}`); var docHeight = $(document).height(); - $("body").append(`

A copy of your answers are displayed below. Please refresh this page to continue.

${JSON.stringify(ans)
}
`); + $("body").append(`

A copy of your answers are displayed below. Please refresh this page to continue.

${JSON.stringify(ans)}
`); $("#overlay") .height(docHeight) From e07984095cb6172686e167c81c8900a844238956 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Jan 2021 10:54:52 +0000 Subject: [PATCH 5/5] . --- js/interact.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/js/interact.js b/js/interact.js index 4ee1bb9..cefee76 100644 --- a/js/interact.js +++ b/js/interact.js @@ -63,17 +63,20 @@ export function postAnswers(ans) { alert(`Error submitting answers: ${data.error}`); var docHeight = $(document).height(); - $("body").append(`

A copy of your answers are displayed below. Please refresh this page to continue.

${JSON.stringify(ans)}
`); + $("body").append(`

An error has occured when submit your answers. A copy of your answers are displayed below, you may wish to save a copy. Please refresh this page to continue.

${JSON.stringify(ans)}
`); $("#overlay") .height(docHeight) .css({ - 'opacity' : 0.4, + 'opacity' : 0.9, 'position': 'absolute', 'top': 0, 'left': 0, 'background-color': 'black', 'width': '100%', + 'user-select': 'text', + '-moz-user-select': 'text', + '-webkit-user-select': 'text', 'z-index': 5000 }); }