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

some more update

Browse Source
This commit is contained in:
Ross
2023-11-12 17:41:46 +00:00
parent f5072126e7
commit 0fad480db4
12 changed files with 292 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anatomy/tests/test_anatomy_exams.py
+1 -1
View File
@@ -25,7 +25,7 @@ from anatomy.models import (
from generic.models import CidUser, CidUserGroup, UserUserGroup
from rad.test_helpers import AssertNotFound, create_cid_user_and_groups
from rad.tests.test_helpers import AssertNotFound, create_cid_user_and_groups
from django.contrib.auth.models import User
longs/tests/test_longs_exams.py
+1 -1
View File
@@ -31,7 +31,7 @@ from generic.models import CidUser, CidUserGroup, UserUserGroup
from django.contrib.auth.models import User
from rad.test_helpers import AssertNotFound, create_cid_user_and_groups
from rad.tests.test_helpers import AssertNotFound, create_cid_user_and_groups
physics/tests/test_physics_exams.py
+1 -1
View File
@@ -19,7 +19,7 @@ from physics.views import GenericExamViews as PhysicsExamViews
from physics.models import Category, UserAnswer, Exam, Question
from generic.models import CidUser, CidUserGroup, UserUserGroup
from rad.test_helpers import AssertNotFound, ExamTester, create_cid_user_and_groups, create_exam
from rad.tests.test_helpers import AssertNotFound, ExamTester, create_cid_user_and_groups, create_exam
from django.contrib.auth.models import User
rad/test_helpers.py → rad/tests/test_helpers.py
View File
rad/tests/test_user_access.py
View File
rad/urls.py
+1
View File
@@ -88,6 +88,7 @@ urlpatterns = [
views.UpdateUserProfileView.as_view(),
name="account_profile_update",
),
path("people", views.people, name="people"),
path("accounts/", views.UserListTableView.as_view(), name="accounts_list"),
#path("accounts/", views.UserListView.as_view(), name="accounts_list"),
path("accounts/", include("django.contrib.auth.urls")),
rad/views.py
+3
View File
@@ -79,6 +79,9 @@ from django.template import RequestContext
def feedback_checker(user):
return user.groups.filter(name="feedback_checker").exists()
@user_is_cid_user_manager
def people(request):
return render(request, "people.html", {})
@login_required
def profile(request):
rapids/tests/test_rapids_exams.py
+1 -1
View File
@@ -21,7 +21,7 @@ from generic.models import CidUser, CidUserGroup, UserUserGroup
from django.contrib.auth.models import User
from rad.test_helpers import AssertNotFound, create_cid_user_and_groups
from rad.tests.test_helpers import AssertNotFound, create_cid_user_and_groups
APP_NAME = "rapids"
rapids/tests/test_urls.py
+42 -1
View File
@@ -8,6 +8,8 @@ from rich.pretty import pprint
from bs4 import BeautifulSoup
from django.contrib.auth.models import Group
from rapids.views import GenericExamViews as RapidExamViews
from rapids.views import GenericExamViews as LongExamViews
from sbas.views import GenericExamViews as SbaExamViews
@@ -40,6 +42,17 @@ def create_superuser(db, django_user_model):
"admin", "ross@xkjq.uk", "adminpassword"
)
@pytest.fixture
def create_cid_manager(db, django_user_model):
user = django_user_model.objects.create_user(
"cid_user", "cid@user.com", "password1234"
)
g = Group.objects.create(name="cid_user_manager")
g.save()
user.groups.add(g)
return user
@pytest.fixture(params=EXAM_VIEWS)
def set_up_exams(request, django_user_model, create_superuser):
basic_user = django_user_model.objects.create_user(
@@ -212,4 +225,32 @@ def test_index(client, create_superuser, exam_views, django_user_model):
json_response = json.loads(response.content)["exams"]
assert len(json_response) == 2
assert len(json_response) == 2
def test_cid_management(client, create_cid_manager, django_user_model):
urls = [
reverse(f"people"),
#reverse(f"generic:update_cid"),
#reverse(f"generic:update_cid_exams"),
reverse(f"generic:manage_cids"),
reverse(f"generic:manage_cid_exams"),
reverse(f"generic:cid_group_view"),
reverse(f"generic:cid_group_view_all"),
reverse(f"generic:cid_group_create"),
]
for url in urls:
response = client.get(url)
assert response.status_code == 403
pass
cid_manager = create_cid_manager
client.force_login(cid_manager)
for url in urls:
response = client.get(url)
assert response.status_code == 200
pass
sbas/tests/test_sbas_exams.py
+1 -1
View File
@@ -19,7 +19,7 @@ from sbas.views import GenericExamViews as SbaExamViews
from sbas.models import Category, UserAnswer, Exam, Question
from generic.models import CidUser, CidUserGroup, UserUserGroup
from rad.test_helpers import AssertNotFound, ExamTester, create_cid_user_and_groups, create_exam
from rad.tests.test_helpers import AssertNotFound, ExamTester, create_cid_user_and_groups, create_exam
from django.contrib.auth.models import User
templates/base.html
+1 -1
View File
@@ -104,7 +104,7 @@
</span>
{% if request.user|has_group:"cid_user_manager" %}
<span id="candidate-link" class="top-bar-link">
<a href="{% url 'generic:manage_cids' %}">Candidates</a>
<a href="{% url 'people' %}">People</a>
</span>
{% endif %}
{% endif %}
templates/people.html
+240
View File
@@ -0,0 +1,240 @@
{% extends 'generic/base.html' %}
{% load crispy_forms_tags %}
{% block css %}
{% endblock %}
{% block content %}
<h2>People</h2>
<p>The system contains a number of different people / groups. This affects how they are managed and what they are able to do.</p>
<p>They can be managed using the navigation links above</p>
<h3>User(s)</h3>
<p>Users on the system have a registered account. This allows them to log in to browse the site. In most cases they will be able to creeate and manage exams / packets as well as take those that they have been given access to.</p>
<p>All South West (internal) trainees should have an account. This allows for easier management as they can be grouped by grade, can be associated with supervisors and will have their history stored.</p>
<h4>Supervisor(s)</h4>
<p>Each user can be associated with a "supervisor". This is a way of linking a user to their educational supervisor to allow for supervisor reviewing of results. By default this just includes the supervisors email (and site) but if the superivsor wishes they can associate their account which allows (TODO) for on demand access.</p>
<h3>Cid Candidate(s)</h3>
<p>These are used when a person requires access to the test system for a one off purpose, for example a course. Ideally it should be avoided if a user has an account (see above) on the system.</p>
<p>The user will be given a candidate id (CID) and passcode that can be used to log into the system. This will allow them to take exams/packets and view results.</p>
<p>
The only required information is an email address.
</p>
<p>Although it is (currently) possible to link a cid user with a supervisor, this should be avoided as they should use a full account.<p>
<h2>Groups</h2>
<p>Groups are how users are given access to exams / packets.</p>
<p>2 types of groups can be created, they are essentially the same with one managing CID candidates, the other standard accounts</p>
<p>Once a group has been created this can be associated with a packet/exam/collection and the users contained within can be given access</p>
{% endblock %}
{% block js %}
{% comment %} <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.11.3/r-2.2.9/datatables.min.css"/>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.11.3/r-2.2.9/datatables.min.js"></script> {% endcomment %}
<script>
// jQuery.fn.dataTable.render.ellipsis = function ( cutoff, wordbreak, escapeHtml ) {
//var esc = function ( t ) {
//return t
//.replace( /&/g, '&amp;' )
//.replace( /</g, '&lt;' )
//.replace( />/g, '&gt;' )
//.replace( /"/g, '&quot;' );
//};
//return function ( d, type, row ) {
//// Order, search and type get the original data
//if ( type !== 'display' ) {
//return d;
//}
//if ( typeof d !== 'number' && typeof d !== 'string' ) {
//return d;
//}
//d = d.toString(); // cast numbers
//if ( d.length <= cutoff ) {
//return d;
//}
//var shortened = d.substr(0, cutoff-1);
//// Find the last white space character in the string
//if ( wordbreak ) {
//shortened = shortened.replace(/\s([^\s]*)$/, '');
//}
//// Protect against uncontrolled HTML input
//if ( escapeHtml ) {
//shortened = esc( shortened );
//}
//return '<span class="ellipsis" title="'+esc(d)+'">'+shortened+'&#8230;</span>';
//};
//};
function postAjax(data) {
$.ajax({
url: "{% url 'generic:manage_cid_users' %}",
data: data,
type: "POST",
dataType: "json",
})
// $.ajax().done(), $.ajax().fail(), $ajax().always() are upto you. Add/change accordingly
.done(function (data) {
console.log(data);
if (data.status == "success") {
toastr.info('Added/Updated');
location.reload();
} else {
toastr.error(data.details)
}
// show some message according to the response.
// For eg. A message box showing that the status has been changed
})
.always(function () {
console.log('[Done]');
})
}
function getGenericData() {
selected_cids = []
$("#manage-span tbody input:checked").each((n, el) => {
selected_cids.push(parseInt(el.value));
})
return {
csrfmiddlewaretoken: "{{ csrf_token }}",
physics_exams: JSON.stringify($("#physics-exams").val()),
rapid_exams: JSON.stringify($("#rapid-exams").val()),
sba_exams: JSON.stringify($("#sbas-exams").val()),
longs_exams: JSON.stringify($("#longs-exams").val()),
anatomy_exams: JSON.stringify($("#anatomy-exams").val()),
casecollection_exams: JSON.stringify($("#casecollection-exams").val()),
cid_groups: JSON.stringify($("#cid-groups").val()),
delete: false,
emails: JSON.stringify(false),
number_to_create: 0,
activate: false,
deactivate: false,
add_exams: false,
clear_exams: false,
toggle_internal: false,
selected_cids: JSON.stringify(selected_cids),
}
}
$(document).ready(function () {
// {% if exams %}
//$("table").DataTable({
//columnDefs: [ {
//targets: [6,7,8,9,10],
//render: $.fn.dataTable.render.ellipsis( 17, true )
//} ],
//"paging": false,
//});
//{% else %}
//$("table").DataTable({
//"paging": false,
//});
//{% endif %}
$("#toggle-internal").click((evt) => {
data = getGenericData();
data["toggle_internal"] = true;
postAjax(data);
});
$("#add-new-emails").click((evt) => {
data = getGenericData();
data["emails"] = JSON.stringify($("#emails-input").val());
data["add_new_emails"] = true;
postAjax(data);
});
$("#add-group").click((evt) => {
data = getGenericData();
data["add_group"] = true;
postAjax(data);
});
$("#add-exams-selected-cids").click((evt) => {
data = getGenericData();
data["add_exams"] = true;
postAjax(data);
});
$("#change-exams-selected-cids").click((evt) => {
data = getGenericData();
data["change_exams"] = true;
postAjax(data);
});
$("#clear-exams-selected-cids").click((evt) => {
data = getGenericData();
data["clear_exams"] = true;
postAjax(data);
});
$("#activate-selected-cids").click((evt) => {
data = getGenericData();
data["activate"] = true;
postAjax(data);
});
$("#deactivate-selected-cids").click((evt) => {
data = getGenericData();
data["deactivate"] = true;
postAjax(data);
});
$("#delete-selected-cids").click((evt) => {
data = getGenericData();
data["delete"] = true;
postAjax(data);
});
$("#add-new-cids").click((evt) => {
n = $("#add-number").get(0).value;
if (n < 1) {
toastr.info("You need to enter how many users to add.");
return
}
data = getGenericData();
data["number_to_create"] = n;
postAjax(data);
});
});
</script>
<style>
#cid-groups {
margin: 20px;
}
.exam-selectors {
display: flex;
}
.exam-selectors select {
height: 200px;
}
</style>
{% endblock %}