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

continue working on case collections

Browse Source
This commit is contained in:
Ross
2023-07-31 10:25:23 +01:00
parent dd300afd63
commit f268f040e2
15 changed files with 343 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atlas/templates/atlas/collection_case_view_take.html
+23 -5
View File
@@ -7,11 +7,11 @@
: {{case.title}}
{% endif %}
{% if collection.publish_results or cid_user_exam.completed %}
{% if completed %}
<span class="stamp-white">REVIEW</span>
{% endif %}
</h2>
@@ -78,16 +78,30 @@
<form method="POST" class="post-form">{% csrf_token %}
{% if collection.collection_type == "REP" %}
<div class="form-contents">
<fieldset {% if collection.publish_results or cid_user_exam.completed %}disabled="disabled"{% endif %}>
<fieldset {% if completed %}disabled="disabled"{% endif %}>
{{form}}
</fieldset>
</div>
<p>
{% if collection.publish_results %}
{% if completed %}
<h4>Answer score: {{answer.score}}</h4>
Answer feedback: {{answer.feedback|safe}}
<br/>
{% if self_review %}
<h4>Self Feedback</h4>
{% for review in self_review %}
{{review.get_display_block}}
{% endfor %}
{% endif %}
{% endif %}
</p>
{% endif %}
{% if previous %}
<button type="submit" name="previous" class="save btn btn-default">Previous</button>
@@ -103,6 +117,10 @@
<br />
<button type="submit" name="finish" class="save btn btn-default">Overview</button>
<button type="submit" id="goto-button" value="test" name="goto" class="hide">goto</button>
{% if collection.publish_results or cid_user_exam.completed %}
<a href="{% url 'atlas:add_self_review' cid_user_exam.id case.id %}">Add self review</a>
{% endif %}
</form>
<style>
label {
atlas/templates/atlas/collection_headers.html
+1 -1
View File
@@ -8,7 +8,7 @@
<div class="floating-header">
<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 %}
\ <a href="{% url 'atlas:exam_clone' collection.id %}" title="Clone the Collection">Clone</a>
{% 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>
{% endif %}
atlas/templates/atlas/collection_review_start.html
+19 -3
View File
@@ -3,10 +3,26 @@
{% block content %}
<h2>Collection: {{exam.name}}</h2>
<ul>
{% comment %} <ul>
{% for case in collection.cases.all %}
<li><a href="{% url 'atlas:collection_case_view_review' pk=collection.id case_number=forloop.counter0 %}">Case {{forloop.counter}}</a></li>
<li><a href="{% url 'atlas:collection_case_view_take_user' pk=collection.id case_number=forloop.counter0 %}">Case {{forloop.counter}}</a></li>
{% endfor %}
</ul>
</ul> {% endcomment %}
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>
{% endblock %}
atlas/templates/atlas/collection_take_overview.html
+7 -5
View File
@@ -16,7 +16,7 @@
<div class="sba-finish-list">
<ul>
{% for question, answer in question_answer_tuples %}
<li> <span {% if not answer %}class="unanswered"{% endif %}>
<li> <span {% if not collection.review_only and 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 %}
@@ -27,10 +27,12 @@
Case: {{forloop.counter}}
</a>
<br/>
{% if not answer %}
No answer
{% else %}
{{answer.answer}}
{% if not collection.review_only %}
{% if not answer %}
No answer
{% else %}
{{answer.answer}}
{% endif %}
{% endif %}
</span>
</li>
atlas/templates/atlas/collection_take_start.html
+14 -14
View File
@@ -4,23 +4,23 @@
<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/>
User: {{request.user}}<br/>
{% if cid_exam.completed %}
Ended: {{cid_exam.end_time}} <br/>
{% endif %}
{% endif %}
{% 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 %}
{% 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/selfreview_form.html
+36
View File
@@ -0,0 +1,36 @@
{% extends "base.html" %}
{% block content %}
<h2>Add Self Review</h2>
<div class="alert alert-info" role="alert">
Adding self feedback for {{user_exam.exam}}/{{case}}
</div>
<form action="" method="post">
{% csrf_token %}
{{ form.non_field_errors }}
{{ form.as_p }}
{% comment %} <div class="fieldWrapper">
{{ form.content_type.errors }}
{{ form.content_type }}
</div>
<div class="fieldWrapper">
{{ form.object_id.errors }}
{{ form.object_id }}
</div>
<div class="fieldWrapper">
{{ form.note_type.errors }}
<label for="{{ form.note_type.id_for_label }}">Note type</label>
{{ form.note_type }}
</div>
<div class="fieldWrapper">
{{ form.note.errors }}
<label for="{{ form.note.id_for_label }}">Additional information</label><br/>
{{ form.note }}
</div> {% endcomment %}
<input type="submit" value="Submit">
</form>
{% endblock %}