diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css index 13e1f274..cc2ae1c8 100644 --- a/anatomy/static/css/anatomy.css +++ b/anatomy/static/css/anatomy.css @@ -116,7 +116,6 @@ button a { } .marking-list { - float: right; } .save { @@ -147,12 +146,13 @@ button a { #dicom-image { width: 60%; - float: left; + position: fixed; + right: 0px; height: 600px; + bottom: 0px; } .marking { - float: right; } #question-mark-list { diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html index 6baf2311..13ee9562 100644 --- a/anatomy/templates/anatomy/mark.html +++ b/anatomy/templates/anatomy/mark.html @@ -3,7 +3,7 @@ {% block content %}

Marking question {{question_details.current}} of {{question_details.total}}

Edit Admin Edit -

{{ question.question_type }}

+

{{ question.question_type }}

diff --git a/physics/templates/physics/exam_list.html b/physics/templates/physics/exam_list.html index cf3a86c4..97c4d779 100644 --- a/physics/templates/physics/exam_list.html +++ b/physics/templates/physics/exam_list.html @@ -25,6 +25,10 @@ {% endfor %} +

Active exams will be available to take at the below url: + Available exams +

+ {% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/exam_take.html b/physics/templates/physics/exam_take.html index 8521549d..f8ab241b 100644 --- a/physics/templates/physics/exam_take.html +++ b/physics/templates/physics/exam_take.html @@ -5,13 +5,25 @@

Exam: {{ exam.name }}

+ +
Candidate number:
-

- Please make sure you submit answers before closing or navigating from this page (as otherwise they will not be - saved) -

+ +

Questions

{% autoescape off %}
    @@ -22,31 +34,36 @@
    1. {{ question.a }}:
    2. {{ question.b }}:
    3. {{ question.c }}:
    4. {{ question.d }}:
    5. {{ question.e }}:
    6. @@ -71,7 +88,7 @@ $(evt.target).parent().find("input").click(); }); - $("#submit").click(() =>{ + $("#submit").click(() => { let cid = $("#cid").val() if (cid == "") { alert("You need to enter a valid candidate number."); @@ -106,31 +123,31 @@ } } -function postAnswers(ans) { - console.log(ans); - $.post("{% url 'physics:exam_answers_submit' %}", JSON.stringify(ans)).done((data) => { - console.log(data); - if (data.success) { - let ret = confirm( - `Answers sucessfully submitted. Click OK to finish the exam.` - ); + function postAnswers(ans) { + console.log(ans); + $.post("{% url 'physics:exam_answers_submit' %}", JSON.stringify(ans)).done((data) => { + console.log(data); + if (data.success) { + let ret = confirm( + `Answers sucessfully submitted. Click OK to finish the exam.` + ); - if (ret) { - //window.saveSession(); - $("#exams-button-link").remove(); - $("#submit").after(''); - $("#exams-button-link").click(() => { - window.location.href = "{% url 'physics:active_exams' %}"; - }) - window.answers_submitted = true; - } else { - } - } else { - alert(`Error submitting answers: ${data.error}`); + if (ret) { + //window.saveSession(); + $("#exams-button-link").remove(); + $("#submit").after(''); + $("#exams-button-link").click(() => { + window.location.href = "{% url 'physics:active_exams' %}"; + }) + window.answers_submitted = true; + } else { + } + } else { + alert(`Error submitting answers: ${data.error}`); + } + }); + // $.post( "http://localhost:8000/submit_answers", JSON.stringify(ans)); } - }); - // $.post( "http://localhost:8000/submit_answers", JSON.stringify(ans)); -} diff --git a/templates/cid_selector.html b/templates/cid_selector.html index 7066f3fe..861e478c 100644 --- a/templates/cid_selector.html +++ b/templates/cid_selector.html @@ -2,13 +2,22 @@ {% block content %}
      -

      Please enter your CID

      +

      Score / Results checker

      +

      Please enter your CID

      CID: