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

fix a load of test

Browse Source
This commit is contained in:
Ross
2023-11-27 12:08:45 +00:00
parent 95c136d3f3
commit 5cc57587aa
16 changed files with 209 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/accounts_bulk_create.html
+2 -2
View File
@@ -26,8 +26,8 @@
<table>
<tr><th>First name</th><th>Last name</th><th>Email</th><th>Grade</th><th>Supervisor</th><th>Supervisor email</th></tr>
<tr><td>name 1</td><td>last name 1</td><td>email1@email.com</td><td>grade 1</td><td>supervisor 1</td><td>Supervisor@email.com</td></tr>
<tr><td>name 2</td><td>last name 2</td><td>email2@email.com</td><td>grade 2</td><td>supervisor 2</td><td>Supervisor2@email.com</td></tr>
<tr><td>name 1</td><td>last name 1</td><td>email1@email.com</td><td>ST1</td><td>supervisor 1</td><td>Supervisor@email.com</td></tr>
<tr><td>name 2</td><td>last name 2</td><td>email2@email.com</td><td>ST2</td><td>supervisor 2</td><td>Supervisor2@email.com</td></tr>
</table>
templates/cid_scores.html
+28 -6
View File
@@ -3,16 +3,38 @@
{% block content %}
<div class="">
<h2>CID: {{ cid }}</h2>
<div class="alert alert-dark" role="alert">
<details>
<summary>Help</summary>
<p>This page shows the exam(s) to which you have access.</p>
<p>When an exam is available to take it will have a "Start" button next to it.</p>
<p>Once you have submitted answers you will be able to view them from the Exam results section. (Please note: although your answers will be visible as soon as they are submitted, correct answers will only be available when the exam results have been published.)</p>
<p>If you have not submitted any answer for an exam it will not appear in the Exam Results section below. In this case you can still review the pubilshed results by following the "Results Published" link in the assigend exams section.</p>
</details>
</div>
<h3>Assigned exams</h3>
<div id="exam-assigned">
The following exams will be available to take when active.
{% for exam_type, exams in available_exams %}
<h4>{{exam_type|title}}</h4>
<ul class='{{exam_type|lower}}'>
{% for exam in exams %}
<li class="exam" data-exam-id="{{exam.pk}}"><a href="{{exam.get_take_url}}?cid={{cid}}&passcode={{passcode}}" target="_blank">{{exam.name}} {% if exam.active %}[Active]{% endif %}</a></li>
{% endfor %}
</ul>
{% if exams %}
<h4>{{exam_type|title}}</h4>
<ul class='{{exam_type|lower}}'>
{% for exam in exams %}
<li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
{% if exam.active %}
<a href="{{exam.get_take_url}}?cid={{cid}}&passcode={{passcode}}" target="_blank" title="Click to take exam">
<button class="small-url-button start-button">Start</button>
</a>
{% endif %}
{% if exam.publish_results %}
<a href= "{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}" title="Click to view results">
<button class="small-url-button results-button">Results Published</button>
</a>
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
{% endfor %}
</div>
templates/profile.html
+6 -6
View File
@@ -5,14 +5,14 @@
<div class="anatomy">
<h1>Profile</h1>
<div>
Username: {{ user.username }}
Username: <span id="username">{{ user.username }}</span>
</div>
<div>
Email: {{ user.email }}
Email: <span id="email">{{ user.email }}</span>
</div>
<div>
Name: {{ user.first_name }}
{{ user.last_name }}
Name: <span id="first-name">{{ user.first_name }}<span>
<span id="last-name">{{ user.last_name }}</span>
</div>
<div>
Grade: {{ user.userprofile.grade }}
@@ -54,11 +54,11 @@
</p>
<a href="{% url 'password_change'%}">Change password</a>
<a id="password-change" href="{% url 'password_change'%}">Change password</a>
{% if request.user|has_group:"cid_user_manager" %}
<a href="{% url 'account_update' user.username %}">Update user details</a>
{% endif %}
<a href="{% url 'account_profile_update' user.username %}">Update user profile</a>
<a id="update-profile-link" href="{% url 'account_profile_update' user.username %}">Update user profile</a>
</div>
{% endblock %}
templates/user_scores.html
+10 -2
View File
@@ -21,8 +21,16 @@
<ul class='{{exam_type|lower}}'>
{% for exam in exams %}
<li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
{% if exam.active %}<a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam"><button class="small-url-button">Start</button></a>{% endif %}
{% if exam.publish_results %}<a href= "{% url exam_type|lower|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results"><button class="small-url-button">Results Published</button></a>{% endif %}
{% if exam.active %}
<a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam">
<button class="small-url-button start-button">Start</button>
</a>
{% endif %}
{% if exam.publish_results %}
<a href= "{% url exam_type|lower|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">
<button class="small-url-button results-button">Results Published</button>
</a>
{% endif %}
</li>
{% endfor %}
</ul>
templates/user_update_profile.html
+1 -1
View File
@@ -4,7 +4,7 @@
{% block content %}
<h2>Editing user: {{object.username}}</h2>
This form allows you to edit additional user details.
This form allows you to edit your profile details. If your supervisor is not available on the system please contact: ross.kruger@nhs.net.
{% if request.user|has_group:"cid_user_manager" %}
Name and emails can be edited <a href="{% url 'account_update' object.username %}">here</a>