This commit is contained in:
Ross
2021-12-20 10:22:39 +00:00
parent e3ea5e9a6f
commit 5f32cce58d
20 changed files with 192 additions and 43 deletions
+32 -4
View File
@@ -25,14 +25,17 @@ import json
import urllib
from django.views import View
from django.views.generic.edit import CreateView, UpdateView
from django_filters.views import FilterView
from django_tables2.views import SingleTableMixin
from reversion.views import RevisionMixin
from generic.decorators import user_is_cid_user_manager
from generic.filters import CidUserFilter
from generic.tables import CidUserTable
from .forms import (
CidUserForm,
ExaminationForm,
)
@@ -414,10 +417,20 @@ class ExamViews(View, LoginRequiredMixin):
if not self.check_user_access(request.user):
raise PermissionDenied
marking = False
if self.app_name in ("rapids", "anatomy", "longs"):
marking = True
return render(
request,
"exam_list.html".format(self.app_name),
{"exams": exams, "app_name": self.app_name, "view_all": all},
{
"exams": exams,
"app_name": self.app_name,
"view_all": all,
"marking": marking,
},
)
@method_decorator(login_required)
@@ -526,8 +539,13 @@ class ExamViews(View, LoginRequiredMixin):
return render(
request,
"{}/exam_cids.html".format(self.app_name),
{"exam": exam, "cid_users": cid_users, "cid_user_count": cid_user_count},
"exam_cids.html",
{
"exam": exam,
"cid_users": cid_users,
"cid_user_count": cid_user_count,
"app_name": self.app_name,
},
)
# @method_decorator(login_required)
@@ -1287,7 +1305,7 @@ def group_email(request, pk, resend=False):
if resend:
users = group.ciduser_set.filter()
else:
users = group.ciduser_set.filter(login_email_sent=False)
users = gGroup.ciduser_set.filter(login_email_sent=False)
sent = []
not_sent = []
@@ -1449,3 +1467,13 @@ def manage_cid_users(request):
return JsonResponse({"status": "success"})
return JsonResponse({"status": "fail"})
class CidUserCreate(RevisionMixin, LoginRequiredMixin, CreateView):
model = CidUser
form_class = CidUserForm
class CidUserUpdate(RevisionMixin, LoginRequiredMixin, UpdateView):
model = CidUser
form_class = CidUserForm