clean up

generic/forms.py

@@ -11,7 +11,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, UserUserGroup
+from generic.models import CidUser, CidUserGroup, Examination, QuestionNote, UserProfile, UserUserGroup
 
 from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.forms.widgets import RadioSelect, TextInput, Textarea
@@ -236,12 +236,26 @@ class CidUserGroupForm(ModelForm):
         model = CidUserGroup
         fields = ["name", "archive"]
 
+class UserUserGroupModelChoiceField(ModelMultipleChoiceField):
+    def label_from_instance(self, obj):
+        return f"{obj.username} ({obj.userprofile.grade}) [{obj.email}]"
+
 class UserUserGroupForm(ModelForm):
-    users = ModelMultipleChoiceField(
+    users = UserUserGroupModelChoiceField(
         required=False,
         queryset=User.objects.all(),
         widget=FilteredSelectMultiple(verbose_name="Users", is_stacked=False),
     )
     class Meta:
         model = UserUserGroup
-        fields = ["name", "archive", "users"]
+        fields = ["name", "archive", "users"]
+
+#class UserForm(ModelForm):
+#    class Meta:
+#        model = User
+#        fields = ["first_name", "last_name", "email"]
+#
+#class UserProfileForm(ModelForm):
+#    class Meta:
+#        model = UserProfile
+#        fields = ["supervisor_name", "supervisor_email", "registration_number", "peninsula_trainee"]