More improvements to user management

generic/forms.py

@@ -14,7 +14,7 @@ from django.forms import inlineformset_factory
 from atlas.models import CaseCollection
 from django.contrib.auth.models import User
 
-from generic.models import CidUser, CidUserGroup, Examination, QuestionNote, Supervisor, UserProfile, UserUserGroup
+from generic.models import CidUser, CidUserGroup, Examination, QuestionNote, Supervisor, UserGrades, UserProfile, UserUserGroup
 
 from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.forms.widgets import RadioSelect, TextInput, Textarea
@@ -228,7 +228,7 @@ class CidUserForm(ModelForm):
             "internal_candidate",
             "name",
             "email",
-            "supervisor_email",
+            "supervisor",
             "login_email_sent",
             "results_email_sent",
             "group",
@@ -263,12 +263,20 @@ class UserUserGroupForm(ModelForm):
 #        model = UserProfile
 #        fields = ["supervisor_name", "supervisor_email", "registration_number", "peninsula_trainee"]
 
+GRADE_CHOICES = (
+    ("ST1", "ST1"),
+    ("ST2", "ST2"),
+    ("ST3", "ST3"),
+    ("ST4", "ST4"),
+    ("ST5", "ST5"),
+)
+
 class UserUserForm(Form):
     username = EmailField(required=True, help_text="Username / email should be the same. Ideally this should be an nhs email.")
     first_name = CharField(max_length=255, required=True)
     last_name = CharField(max_length=255, required=True)
-    grade = IntegerField(min_value=1, max_value=6, required=False)
-    supervisor = CharField(max_length=255, required=False) # Needs to be a user/object ref
+    grade = ModelChoiceField(UserGrades.objects.all(), required=False)
+    supervisor = ModelChoiceField(Supervisor.objects.all(), required=False) # Needs to be a user/object ref
     #
     # class Meta:
     #