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
+23 -15
View File
@@ -9,9 +9,7 @@ from django.forms import (
)
from django.forms import inlineformset_factory
from generic.models import (
CidUser, Examination, QuestionNote
)
from generic.models import CidUser, Examination, QuestionNote
from django.contrib.admin.widgets import FilteredSelectMultiple
from django.forms.widgets import RadioSelect, TextInput, Textarea
@@ -24,50 +22,60 @@ from django.shortcuts import render, get_object_or_404, redirect
from django.contrib.contenttypes.models import ContentType
class ExaminationForm(ModelForm):
class Meta:
model = Examination
fields = ["examination"]
class QuestionNoteForm(ModelForm):
class Meta:
model = QuestionNote
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):
question_type = kwargs.pop("question_type")
pk = kwargs.pop("pk")
user = kwargs.pop("user")
#if question_type == "rapid":
# if question_type == "rapid":
# question = Rapid
# content_type = ContentType.objects.get(model="rapid")
#elif question_type == "anatomy":
# elif question_type == "anatomy":
# question = AnatomyQuestion
# content_type = ContentType.objects.get(model="anatomyquestion")
#elif question_type == "long":
# elif question_type == "long":
# question = Long
# content_type = ContentType.objects.get(model="long")
#else:
# else:
# raise PermissionError()
#get_object_or_404(question, pk=pk)
# get_object_or_404(question, pk=pk)
# We get the 'initial' keyword argument or initialize it
# as a dict if it didn't exist.
#if kwargs.get("instance"):
# if kwargs.get("instance"):
ModelForm.__init__(self, *args, **kwargs)
super(QuestionNoteForm, self).__init__(*args, **kwargs)
#initial = kwargs.setdefault("initial", {})
# initial = kwargs.setdefault("initial", {})
## The widget for a ModelMultipleChoiceField expects
## a list of primary key for the selected data.
##initial["content_type"] = question
##initial["content_id"] = pk
#self.fields["content_type"].initial = content_type
#self.fields["object_id"].initial = pk
# self.fields["content_type"].initial = content_type
# self.fields["object_id"].initial = pk
class CidUserForm(ModelForm):
class Meta:
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:
return str(self.cid)
def get_absolute_url(self):
return reverse('generic:manage_cids')
def check_passcode(self, passcode) -> bool:
return self.passcode == passcode
+3 -3
View File
@@ -1,4 +1,4 @@
{% extends "atlas/base.html" %}
{% extends "generic/base.html" %}
<!-- {% load static from static %} -->
{% block css %}
@@ -13,8 +13,8 @@
<!-- {{ form.media }} -->
{% endblock %}
{% block content %}
<h2>Edit CID User</h2>
Use this form to create or edit a CID user.
<h2>Edit CID User / {{ciduser.cid}}</h2>
Use this form to edit a CID user.
<form action="" method="post" enctype="multipart/form-data" id="condition-form">
{% csrf_token %}