This commit is contained in:
Ross
2021-12-20 10:36:03 +00:00
parent 5f32cce58d
commit dc7584502b
3 changed files with 29 additions and 18 deletions
+13 -5
View File
@@ -9,9 +9,7 @@ from django.forms import (
) )
from django.forms import inlineformset_factory from django.forms import inlineformset_factory
from generic.models import ( from generic.models import CidUser, Examination, QuestionNote
CidUser, 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
@@ -24,16 +22,18 @@ from django.shortcuts import render, get_object_or_404, redirect
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
class ExaminationForm(ModelForm): class ExaminationForm(ModelForm):
class Meta: class Meta:
model = Examination model = Examination
fields = ["examination"] fields = ["examination"]
class QuestionNoteForm(ModelForm): class QuestionNoteForm(ModelForm):
class Meta: class Meta:
model = QuestionNote model = QuestionNote
fields = ["content_type", "object_id", "author", "note_type", "note"] fields = ["content_type", "object_id", "author", "note_type", "note"]
widgets = {'content_type': HiddenInput(), 'object_id': HiddenInput()} widgets = {"content_type": HiddenInput(), "object_id": HiddenInput()}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
question_type = kwargs.pop("question_type") question_type = kwargs.pop("question_type")
@@ -67,7 +67,15 @@ class QuestionNoteForm(ModelForm):
# self.fields["content_type"].initial = content_type # self.fields["content_type"].initial = content_type
# self.fields["object_id"].initial = pk # self.fields["object_id"].initial = pk
class CidUserForm(ModelForm): class CidUserForm(ModelForm):
class Meta: class Meta:
model = CidUser model = CidUser
fields = ["cid", "passcode", "active", "internal_candidate", "name", "email", "supervisor_email"] fields = [
"passcode",
"active",
"internal_candidate",
"name",
"email",
"supervisor_email",
]
+3
View File
@@ -247,6 +247,9 @@ class CidUser(models.Model):
def __str__(self) -> str: def __str__(self) -> str:
return str(self.cid) return str(self.cid)
def get_absolute_url(self):
return reverse('generic:manage_cids')
def check_passcode(self, passcode) -> bool: def check_passcode(self, passcode) -> bool:
return self.passcode == passcode return self.passcode == passcode
+3 -3
View File
@@ -1,4 +1,4 @@
{% extends "atlas/base.html" %} {% extends "generic/base.html" %}
<!-- {% load static from static %} --> <!-- {% load static from static %} -->
{% block css %} {% block css %}
@@ -13,8 +13,8 @@
<!-- {{ form.media }} --> <!-- {{ form.media }} -->
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h2>Edit CID User</h2> <h2>Edit CID User / {{ciduser.cid}}</h2>
Use this form to create or edit a CID user. Use this form to edit a CID user.
<form action="" method="post" enctype="multipart/form-data" id="condition-form"> <form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %} {% csrf_token %}