More improvements to user management

generic/tables.py

@@ -9,6 +9,7 @@ from easy_thumbnails.exceptions import InvalidImageFormatError
 
 from generic.models import CidUser
 
+from django.contrib.auth.models import User
 
 class ImageColumn(tables.Column):
     def render(self, value):
@@ -65,7 +66,10 @@ class CidUserTable(tables.Table):
 
     def render_emails(self, value, record):
         print(self)
-        return format_html("""{}\n[{}]""", record.email, record.supervisor_email)
+        if record.supervisor is not None:
+            return format_html("""{}\n[{}]""", record.email, record.supervisor.email)
+        else:
+            return format_html(record.email)
 
 class CidUserExamTable(tables.Table):
     # edit = tables.LinkColumn(
@@ -112,7 +116,59 @@ class CidUserExamTable(tables.Table):
         )
 
     def render_emails(self, value, record):
-        return format_html("""{}\n[{}]""", record.email, record.supervisor_email)
+        if record.supervisor is not None:
+            return format_html("""{}\n[{}]""", record.email, record.supervisor.email)
+        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=()
+    )
+
+    supervisor = tables.Column(
+        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",
+    )
+
+    class Meta:
+        model = User
+        template_name = "django_tables2/bootstrap4.html"
+        fields = (
+            # "cid",
+            #"userprofile",
+            "userprofile.grade",
+            #"userprofile.supervisor",
+            # "email",
+        )
+        sequence = ("user", "userprofile.grade", "supervisor", "edit")
+
+    def __init__(self, data=None, *args, **kwargs):
+        super().__init__(
+            data.prefetch_related(
+                "supervisor",
+                "userprofile",
+                #"userprofile.grade",
+            ),
+            *args,
+            **kwargs,
+        )
+
+    # This should be avoidable?
+    def render_edit(self, value, record):
+        return "Edit"
+
+    def render_user(self, value, record):
+        return format_html("{} {}<br/>{}<br/>{}", record.first_name, record.last_name, record.username, record.email)