Improve user creation

generic/tables.py

@@ -11,6 +11,7 @@ from generic.models import CidUser
 
 from django.contrib.auth.models import User
 
+
 class ImageColumn(tables.Column):
     def render(self, value):
         try:
@@ -28,11 +29,11 @@ class CidUserTable(tables.Table):
         "cid_scores", args=[A("cid"), A("passcode")], orderable=True
     )
 
-    #physics_exams = tables.ManyToManyColumn(verbose_name="Physics Exams")
-    #rapid_exams = tables.ManyToManyColumn(verbose_name="Rapid Exams")
-    #sba_exams = tables.ManyToManyColumn(verbose_name="SBA Exams")
-    #longs_exams = tables.ManyToManyColumn(verbose_name="Long Exams")
-    #anatomy_exams = tables.ManyToManyColumn(verbose_name="Anatomy Exams")
+    # physics_exams = tables.ManyToManyColumn(verbose_name="Physics Exams")
+    # rapid_exams = tables.ManyToManyColumn(verbose_name="Rapid Exams")
+    # sba_exams = tables.ManyToManyColumn(verbose_name="SBA Exams")
+    # longs_exams = tables.ManyToManyColumn(verbose_name="Long Exams")
+    # anatomy_exams = tables.ManyToManyColumn(verbose_name="Anatomy Exams")
     group = tables.Column(linkify=True)
 
     selection = tables.CheckBoxColumn(accessor="pk", orderable=False)
@@ -58,9 +59,7 @@ class CidUserTable(tables.Table):
 
     def __init__(self, data=None, *args, **kwargs):
         super().__init__(
-            data.prefetch_related(
-                "group"
-            ),
+            data.prefetch_related("group"),
             *args,
             **kwargs,
         )
@@ -72,6 +71,7 @@ class CidUserTable(tables.Table):
         else:
             return format_html(record.email)
 
+
 class CidUserExamTable(tables.Table):
     # edit = tables.LinkColumn(
     #    "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False
@@ -79,7 +79,7 @@ class CidUserExamTable(tables.Table):
     cid = tables.LinkColumn(
         "cid_scores", args=[A("cid"), A("passcode")], orderable=True
     )
-    
+
     physics_exams = tables.ManyToManyColumn(verbose_name="Physics Exams")
     rapid_exams = tables.ManyToManyColumn(verbose_name="Rapid Exams")
     sba_exams = tables.ManyToManyColumn(verbose_name="SBA Exams")
@@ -110,7 +110,12 @@ class CidUserExamTable(tables.Table):
     def __init__(self, data=None, *args, **kwargs):
         super().__init__(
             data.prefetch_related(
-                "physics_exams", "rapid_exams", "sba_exams", "anatomy_exams", "longs_exams", "group"
+                "physics_exams",
+                "rapid_exams",
+                "sba_exams",
+                "anatomy_exams",
+                "longs_exams",
+                "group",
             ),
             *args,
             **kwargs,
@@ -122,42 +127,66 @@ class CidUserExamTable(tables.Table):
         else:
             return format_html(record.email)
 
+
 #    def render_cid(self, value, record):
 #        return format_html("""<a href="#" onclick="return window.create_popup_window('/longs/series/{}', 'Series')" >Popup</a>""", record.pk)
 
+
 class UserUserTable(tables.Table):
     # edit = tables.LinkColumn(
     #    "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False
     # )
 
     user = tables.Column(
-        linkify={"viewname": "account_profile", "args":[A("username")]}, orderable=True, verbose_name="User", empty_values=()
+        linkify={"viewname": "account_profile", "args": [A("username")]},
+        orderable=True,
+        verbose_name="User",
+        empty_values=(),
     )
 
     supervisor = tables.Column(
-        linkify={"viewname": "generic:supervisor_detail", "args":[A("userprofile__supervisor__pk")]}, orderable=True, verbose_name="Supervisor", accessor=A("userprofile__supervisor")
+        linkify={
+            "viewname": "generic:supervisor_detail",
+            "args": [A("userprofile__supervisor__pk")],
+        },
+        orderable=True,
+        verbose_name="Supervisor",
+        accessor=A("userprofile__supervisor"),
     )
 
     selection = tables.CheckBoxColumn(accessor="pk", orderable=False)
 
     edit = tables.Column(
-         empty_values=(), linkify={"viewname": "account_update", "args":[A("username")]}, orderable=True, verbose_name="Edit",
+        empty_values=(),
+        linkify={"viewname": "account_update", "args": [A("username")]},
+        orderable=True,
+        verbose_name="Edit",
     )
 
     user_groups = tables.ManyToManyColumn(verbose_name="Groups", linkify_item=True)
 
+    date_joined = tables.DateTimeColumn(format="Y/m/d")
+
     class Meta:
         model = User
         template_name = "django_tables2/bootstrap4.html"
         fields = (
             # "cid",
-            #"userprofile",
+            # "userprofile",
             "userprofile__grade",
-            #"user_groups",
-            #"userprofile.supervisor",
+            "date_joined",
+            # "user_groups",
+            # "userprofile.supervisor",
             # "email",
         )
-        sequence = ("user", "userprofile__grade", "supervisor", "user_groups", "edit")
+        sequence = (
+            "user",
+            "userprofile__grade",
+            "supervisor",
+            "user_groups",
+            "date_joined",
+            "edit",
+        )
 
     def __init__(self, data=None, *args, **kwargs):
         super().__init__(
@@ -176,4 +205,10 @@ class UserUserTable(tables.Table):
         return "Edit"
 
     def render_user(self, value, record):
-        return format_html("{} {}<br/>{}<br/>{}", record.first_name, record.last_name, record.username, record.email)
+        return format_html(
+            "{} {}<br/>{}<br/>{}",
+            record.first_name,
+            record.last_name,
+            record.username,
+            record.email,
+        )