From a685f58c436b1a6abacd5573785ade87cc721c8c Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 8 Feb 2022 12:02:38 +0000 Subject: [PATCH] . --- generic/forms.py | 7 ++++++- generic/templates/generic/group_view.html | 2 ++ generic/urls.py | 6 ++++++ generic/views.py | 10 +++++++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/generic/forms.py b/generic/forms.py index cb7cd0f8..faf7beb9 100755 --- a/generic/forms.py +++ b/generic/forms.py @@ -9,7 +9,7 @@ from django.forms import ( ) from django.forms import inlineformset_factory -from generic.models import CidUser, Examination, QuestionNote +from generic.models import CidUser, CidUserGroup, Examination, QuestionNote from django.contrib.admin.widgets import FilteredSelectMultiple from django.forms.widgets import RadioSelect, TextInput, Textarea @@ -156,3 +156,8 @@ class CidUserForm(ModelForm): "login_email_sent", "results_email_sent", ] + +class CidUserGroupForm(ModelForm): + class Meta: + model = CidUserGroup + fields = ["name", "archive"] \ No newline at end of file diff --git a/generic/templates/generic/group_view.html b/generic/templates/generic/group_view.html index fa1f8933..41cc6bb2 100755 --- a/generic/templates/generic/group_view.html +++ b/generic/templates/generic/group_view.html @@ -12,6 +12,8 @@ ">Email candidate results +

{% endfor %} diff --git a/generic/urls.py b/generic/urls.py index 1c62b6c5..b1cbcd8b 100755 --- a/generic/urls.py +++ b/generic/urls.py @@ -53,5 +53,11 @@ urlpatterns = [ views.group_email_resend, name="group_email_resend", ), + path( + "cids/group//update", views.CidUserGroupUpdate.as_view(), name="group_update" + ), + path( + "cids/group//create", views.CidUserGroupCreate.as_view(), name="group_create" + ), path("cids/create", views.manage_cid_users, name="manage_cid_users"), ] diff --git a/generic/views.py b/generic/views.py index 798df5e6..3f98b29d 100644 --- a/generic/views.py +++ b/generic/views.py @@ -40,6 +40,7 @@ from generic.tables import CidUserExamTable, CidUserTable from .forms import ( CidUserForm, ExaminationForm, + CidUserGroupForm, ) from .models import CidUser, CidUserGroup, Examination, QuestionNote @@ -1614,7 +1615,14 @@ class CidUserCreate(RevisionMixin, CidManagerRequiredMixin, CreateView): model = CidUser form_class = CidUserForm - class CidUserUpdate(RevisionMixin, CidManagerRequiredMixin, UpdateView): model = CidUser form_class = CidUserForm + +class CidUserGroupCreate(RevisionMixin, CidManagerRequiredMixin, CreateView): + model = CidUserGroup + form_class = CidUserGroupForm + +class CidUserGroupUpdate(RevisionMixin, CidManagerRequiredMixin, UpdateView): + model = CidUserGroup + form_class = CidUserGroupForm