diff --git a/generic/templates/generic/cid_view.html b/generic/templates/generic/cid_view.html index 4c70e447..65f9bf23 100644 --- a/generic/templates/generic/cid_view.html +++ b/generic/templates/generic/cid_view.html @@ -16,8 +16,12 @@ {% render_table table %} +
+ Add new CID users +
+ {{physics_exams}} {% endblock %} diff --git a/generic/views.py b/generic/views.py index ee170427..b250673b 100644 --- a/generic/views.py +++ b/generic/views.py @@ -847,6 +847,15 @@ class CidUserView(LoginRequiredMixin, SingleTableMixin, FilterView): filterset_class = CidUserFilter + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + #user = self.request.user + + physics_exams = [(i.name, i.pk) for i in PhysicsExam.objects.filter(active=True)] + + context["physics_exams"] = physics_exams + return context + @login_required def create_cid_users(request): if request.is_ajax() and request.method == "POST": @@ -855,7 +864,7 @@ def create_cid_users(request): new_cid = max(CidUser.objects.all().order_by("-cid")[0].cid+1, 50000) for n in range(number): - passcode = random.choices(string.ascii_uppercase, k=4) + passcode = "".join(random.choices(string.ascii_uppercase, k=4)) c = CidUser(cid=new_cid, passcode=passcode) c.save() new_cid = new_cid + 1