add markers to exams (move away from group based to content based permissions)

This commit is contained in:
Ross
2024-08-05 10:45:38 +01:00
parent cff5a46e4c
commit e46f843284
33 changed files with 299 additions and 23 deletions
+5 -1
View File
@@ -7,7 +7,7 @@ from django.forms import (
CharField,
)
from django.forms import inlineformset_factory
from generic.forms import ExamAuthorFormMixin, ExamFormMixin
from generic.forms import ExamAuthorFormMixin, ExamFormMixin, ExamMarkerFormMixin
from rapids.models import (
Abnormality,
@@ -240,4 +240,8 @@ class ExamForm(ExamFormMixin, ModelForm):
class ExamAuthorForm(ExamAuthorFormMixin):
class Meta(ExamAuthorFormMixin.Meta):
model = Exam
class ExamMarkerForm(ExamMarkerFormMixin):
class Meta(ExamMarkerFormMixin.Meta):
model = Exam
+20
View File
@@ -0,0 +1,20 @@
# Generated by Django 5.0.2 on 2024-08-05 09:43
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('rapids', '0010_alter_exam_end_date_alter_exam_exam_results_emailed_and_more'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AddField(
model_name='exam',
name='markers',
field=models.ManyToManyField(blank=True, help_text='Authorised markers for the exam', related_name='rapid_exam_markers', to=settings.AUTH_USER_MODEL),
),
]
+7
View File
@@ -629,6 +629,13 @@ class Exam(ExamBase):
related_name="rapid_exam_author",
)
markers = models.ManyToManyField(
settings.AUTH_USER_MODEL,
blank=True,
help_text="Authorised markers for the exam",
related_name="rapid_exam_markers",
)
valid_cid_users = models.ManyToManyField(
CidUser, blank=True, related_name="rapid_exams"
)
+1
View File
@@ -50,6 +50,7 @@ urlpatterns = [
path(
"exam/<int:exam_pk>/<int:sk>/mark/review", views.mark_review, name="mark_review"
),
path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
path("exam/<int:pk>/authors", views.ExamAuthorUpdate.as_view(), name="exam_authors"),
path("exam/create", views.ExamCreate.as_view(), name="exam_create"),
path("exam/<int:exam_id>/clone", views.ExamClone.as_view(), name="exam_clone"),
+9
View File
@@ -21,6 +21,7 @@ from django.http import HttpResponseRedirect, HttpResponse
from .forms import (
ExamAuthorForm,
ExamMarkerForm,
RapidForm,
MarkRapidQuestionForm,
ImageFormSet,
@@ -761,6 +762,14 @@ class ExamAuthorUpdate(
template_name = "author_form.html"
class ExamMarkersUpdate(
RevisionMixin, CheckCanEditMixin, LoginRequiredMixin, AuthorRequiredMixin, UpdateView
):
model = Exam
form_class = ExamMarkerForm
template_name = "markers_form.html"
class UserAnswerView(LoginRequiredMixin, DetailView):
model = UserAnswer