This commit is contained in:
Ross
2022-02-08 12:02:38 +00:00
parent e54374f12f
commit a685f58c43
4 changed files with 23 additions and 2 deletions
+6 -1
View File
@@ -9,7 +9,7 @@ from django.forms import (
) )
from django.forms import inlineformset_factory 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.contrib.admin.widgets import FilteredSelectMultiple
from django.forms.widgets import RadioSelect, TextInput, Textarea from django.forms.widgets import RadioSelect, TextInput, Textarea
@@ -156,3 +156,8 @@ class CidUserForm(ModelForm):
"login_email_sent", "login_email_sent",
"results_email_sent", "results_email_sent",
] ]
class CidUserGroupForm(ModelForm):
class Meta:
model = CidUserGroup
fields = ["name", "archive"]
@@ -12,6 +12,8 @@
">Email candidate results</button> ">Email candidate results</button>
<button class="email-button" data-emailurl="{% url 'generic:group_email_results_resend' pk=group.pk %} <button class="email-button" data-emailurl="{% url 'generic:group_email_results_resend' pk=group.pk %}
">Resend candidate results</button> ">Resend candidate results</button>
<button class="edit-button" data-emailurl="{% url 'generic:group_edit' pk=group.pk %}
">Edit</button>
</p> </p>
{% endfor %} {% endfor %}
+6
View File
@@ -53,5 +53,11 @@ urlpatterns = [
views.group_email_resend, views.group_email_resend,
name="group_email_resend", name="group_email_resend",
), ),
path(
"cids/group/<int:pk>/update", views.CidUserGroupUpdate.as_view(), name="group_update"
),
path(
"cids/group/<int:pk>/create", views.CidUserGroupCreate.as_view(), name="group_create"
),
path("cids/create", views.manage_cid_users, name="manage_cid_users"), path("cids/create", views.manage_cid_users, name="manage_cid_users"),
] ]
+9 -1
View File
@@ -40,6 +40,7 @@ from generic.tables import CidUserExamTable, CidUserTable
from .forms import ( from .forms import (
CidUserForm, CidUserForm,
ExaminationForm, ExaminationForm,
CidUserGroupForm,
) )
from .models import CidUser, CidUserGroup, Examination, QuestionNote from .models import CidUser, CidUserGroup, Examination, QuestionNote
@@ -1614,7 +1615,14 @@ class CidUserCreate(RevisionMixin, CidManagerRequiredMixin, CreateView):
model = CidUser model = CidUser
form_class = CidUserForm form_class = CidUserForm
class CidUserUpdate(RevisionMixin, CidManagerRequiredMixin, UpdateView): class CidUserUpdate(RevisionMixin, CidManagerRequiredMixin, UpdateView):
model = CidUser model = CidUser
form_class = CidUserForm form_class = CidUserForm
class CidUserGroupCreate(RevisionMixin, CidManagerRequiredMixin, CreateView):
model = CidUserGroup
form_class = CidUserGroupForm
class CidUserGroupUpdate(RevisionMixin, CidManagerRequiredMixin, UpdateView):
model = CidUserGroup
form_class = CidUserGroupForm