ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some refactoring and atlas improvements

Browse Source
This commit is contained in:
Ross
2023-07-24 11:56:12 +01:00
parent e6469e70f0
commit dd300afd63
26 changed files with 521 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atlas/templates/atlas/base.html
+3 -10
View File
@@ -4,16 +4,6 @@
Atlas
{% endblock %}
{% block css %}
{% endblock %}
{% block js %}
{% endblock %}
{% block content %}
{% endblock %}
{% block navigation %}
Atlas:
{% if request.user.is_authenticated %}
@@ -28,3 +18,6 @@
Questions by:
<span id="authors-link"><a href="{% url 'atlas:author_list' %}">author</a></span> {% endcomment %}
{% endblock %}
{% block content %}
{% endblock %}
atlas/templates/atlas/case_form.html
+1 -1
View File
@@ -53,7 +53,7 @@
Use this form to create a atlas case. Existing associated image sets can be added using this form.
{% if form.collection %}
<div class="alert alert-info" role="alert">Creating a case in the collection: <a href="{% url 'atlas:collection_detail' pk=form.collection.pk %}">{{form.collection.name}}</a></div>
<div class="alert alert-info" role="alert">Creating a case in the collection: <a href="{% url 'atlas:collection_detail' pk=form.exam.pk %}">{{form.collection.name}}</a></div>
{% endif %}
<form action="" method="post" enctype="multipart/form-data" id="atlas-form">
{% csrf_token %}
atlas/templates/atlas/collection_case_view_take.html
+1 -1
View File
@@ -9,7 +9,7 @@
{% if collection.publish_results or cid_user_exam.completed %}
review
<span class="stamp-white">REVIEW</span>
{% endif %}
atlas/templates/atlas/collection_headers.html
+2 -2
View File
@@ -6,8 +6,8 @@
<a href="{% url 'atlas:exam_cids' collection.pk %}">Candidates</a> /
<a href="{% url 'atlas:atlas_create_exam' pk=collection.pk %}">Add New Case</a>
<div class="floating-header">
<a href="{% url 'atlas:collection_update' collection.id %}" title="Edit the Collection">Edit</a>
\ <a href="{% url 'atlas:collection_delete' collection.id %}" title="Delete the Collection">Delete</a>
<a href="{% url 'atlas:exam_update' collection.id %}" title="Edit the Collection">Edit</a>
\ <a href="{% url 'atlas:exam_deleted' collection.id %}" title="Delete the Collection">Delete</a>
{% comment %} \ <a href="{% url 'atlas:collection_clone' collection.id %}" title="Clone the Collection">Clone</a> {% endcomment %}
{% if request.user.is_superuser %}
\ <a href="{% url 'admin:atlas_casecollection_change' collection.id %}" title="Edit the Collection using the admin interface">Admin Edit</a>
atlas/templates/atlas/collection_index_view.html
+1 -1
View File
@@ -1,7 +1,7 @@
{% extends 'atlas/base.html' %}
{% block content %}
<a href="{% url 'atlas:collection_create' %}">Create collection</a>
<a href="{% url 'atlas:exam_create' %}">Create collection</a>
<ul>
{% for collection in collections %}
<li><a href='{{collection.get_absolute_url}}'>{{collection.name}}</a></li>
atlas/templates/atlas/collection_take_overview.html
+9 -5
View File
@@ -8,16 +8,15 @@
<h2>Collection: {{collection.name}}
{% if collection.publish_results or cid_user_exam.completed %}
review
<span class="stamp-white">REVIEW</span>
{% endif %}
</h2>
<div><p>Questions</p></div>
{{answer_count}} out of {{collection_length}} cases answered. Click to go to case.
<div class="sba-finish-list">
<ul>
{% for question, answer in question_answer_tuples %}
<li>
<li> <span {% if not answer %}class="unanswered"{% endif %}>
<a href="
{% if cid is not None %}
{% url 'atlas:collection_case_view_take' pk=collection.id case_number=forloop.counter0 cid=cid passcode=passcode %}
@@ -25,10 +24,15 @@
{% url 'atlas:collection_case_view_take_user' pk=collection.id case_number=forloop.counter0 %}
{% endif %}
">
<span {% if not answer %}class="unanswered"{% endif %}>Case: {{forloop.counter}}</span>
Case: {{forloop.counter}}
</a>
<br/>
{{answer.answer}}
{% if not answer %}
No answer
{% else %}
{{answer.answer}}
{% endif %}
</span>
</li>
{% endfor %}
</ul>
atlas/templates/atlas/collection_take_start.html
+10 -2
View File
@@ -1,18 +1,26 @@
{% extends 'atlas/base.html' %}
{% block content %}
<h2>Start: {{collection.name}}</h2>
<h2>Start: {{collection.name}}{% if cid_exam.completed %} <span class="stamp-white">REVIEW</span>{% endif %}</h2>
{% if request.user.is_authenticated and valid_user %}
User: {{request.user}}<br/>
{% if cid_exam %}
Started: {{cid_exam.start_time}} <br/>
{% if cid_exam.completed %}
Ended: {{cid_exam.end_time}} <br/>
{% endif %}
{% endif %}
<a href="{% url 'atlas:collection_case_view_take_user' pk=collection.pk case_number=0 %}">
{% if cid_exam.completed %}
<button>Review</button>
{% else %}
<button>Start</button>
{% endif %}
</a>
{% else %}
Enter your CID and passcode in the below boxes.<br />
atlas/templates/atlas/collection_update_form.html
+17
View File
@@ -0,0 +1,17 @@
{% extends "atlas/exams.html" %}
{% block js %}
{{ form.media }}
{% endblock %}
{% block content %}
<h2>Update Exam</h2>
<form action="" method="post">
{% csrf_token %}
<table>
{{ form.as_table }}
</table>
<input type="submit" value="Submit">
</form>
{% endblock %}
atlas/templates/atlas/exams.html
+2 -2
View File
@@ -9,8 +9,8 @@
<a href="{% url 'atlas:collection_scores_cid' exam.pk %}">Scores</a> /
<a href="{% url 'atlas:exam_cids' exam.pk %}">Candidates</a>
<div class="floating-header">
<a href="{% url 'atlas:collection_update' exam.id %}" title="Edit the Collection">Edit</a>
\ <a href="{% url 'atlas:collection_delete' exam.id %}" title="Delete the Collection">Delete</a>
<a href="{% url 'atlas:exam_update' exam.id %}" title="Edit the Collection">Edit</a>
\ <a href="{% url 'atlas:exam_deleted' exam.id %}" title="Delete the Collection">Delete</a>
{% if request.user.is_superuser %}
\ <a href="{% url 'admin:atlas_casecollection_change' exam.id %}" title="Edit the Collection using the admin interface">Admin Edit</a>
{% endif %}