Improve user creation

2023-02-20 11:43:56 +00:00
parent 0eacd83446
commit 81d4dc72cc
7 changed files with 191 additions and 95 deletions
@@ -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,
+        )
@@ -31,7 +31,9 @@ urlpatterns = [
        "cids/manage/<int:pk>/update", views.CidUserUpdate.as_view(), name="update_cid"
    ),
    path(
-        "cids/manage/<int:pk>/update/exams", views.CidUserExamUpdate.as_view(), name="update_cid_exams"
+        "cids/manage/<int:pk>/update/exams",
+        views.CidUserExamUpdate.as_view(),
+        name="update_cid_exams",
    ),
    path(
        "cids/manage/<int:cid>/email_results",
@@ -47,7 +49,11 @@ urlpatterns = [
    path("cids/manage/exams", views.CidUserExamView.as_view(), name="manage_cid_exams"),
    path("cids/group/", views.cid_group_view, name="cid_group_view"),
    path("cids/group/all", views.cid_group_view_all, name="cid_group_view_all"),
-    path("cids/group/<int:group_id>/", views.cid_group_view_detail, name="cid_group_detail"),
+    path(
+        "cids/group/<int:group_id>/",
+        views.cid_group_view_detail,
+        name="cid_group_detail",
+    ),
    path("cids/group/<int:pk>/email", views.group_email, name="group_email"),
    path(
        "cids/group/<int:pk>/email_results",
@@ -77,11 +83,23 @@ urlpatterns = [
    path(
        "cids/group/create", views.CidUserGroupCreate.as_view(), name="cid_group_create"
    ),
-    path("user/bulk_delete_supervisors/", views.users_bulk_delete_supervisors, name="users_bulk_delete_supervisors"),
-    path("user/bulk_edit_grade/", views.users_bulk_edit_grade, name="users_bulk_edit_grade"),
+    path(
+        "user/bulk_delete_supervisors/",
+        views.users_bulk_delete_supervisors,
+        name="users_bulk_delete_supervisors",
+    ),
+    path(
+        "user/bulk_edit_grade/",
+        views.users_bulk_edit_grade,
+        name="users_bulk_edit_grade",
+    ),
    path("user/group/", views.user_group_view, name="user_group_view"),
    path("user/group/all", views.user_group_view_all, name="user_group_view_all"),
-    path("user/group/<int:group_id>/", views.user_group_view_detail, name="user_group_detail"),
+    path(
+        "user/group/<int:group_id>/",
+        views.user_group_view_detail,
+        name="user_group_detail",
+    ),
    path(
        "user/group/<int:pk>/update",
        views.UserUserGroupUpdate.as_view(),
@@ -100,10 +118,24 @@ urlpatterns = [
    path("cids/create", views.manage_cid_users, name="manage_cid_users"),
    path("cids/create/email", views.create_cid_email, name="create_cid_email"),
    path("supervisor", views.SupervisorList.as_view(), name="supervisor"),
-    path("supervisor/<int:pk>", views.SupervisorDetail.as_view(), name="supervisor_detail"),
-    path("supervisor/<int:pk>/edit", views.SupervisorUpdate.as_view(), name="supervisor_edit"),
-    path("supervisor/create", views.SupervisorCreate.as_view(), name="supervisor_create"),
-    path("supervisor/<int:pk>/delete", views.SupervisorDelete.as_view(), name="supervisor_delete"),
+    path(
+        "supervisor/<int:pk>",
+        views.SupervisorDetail.as_view(),
+        name="supervisor_detail",
+    ),
+    path(
+        "supervisor/<int:pk>/edit",
+        views.SupervisorUpdate.as_view(),
+        name="supervisor_edit",
+    ),
+    path(
+        "supervisor/create", views.SupervisorCreate.as_view(), name="supervisor_create"
+    ),
+    path(
+        "supervisor/<int:pk>/delete",
+        views.SupervisorDelete.as_view(),
+        name="supervisor_delete",
+    ),
 ]


@@ -237,7 +269,11 @@ def generic_exam_urls(generic_exam_view: GenericExamViews):
        ),
        path("exam/json/", generic_exam_view.active_exams, name="active_exams"),
        path("exam/json/<int:pk>", generic_exam_view.exam_json, name="exam_json"),
-        path("exam/json/<int:pk>/<int:cid>/<str:passcode>", generic_exam_view.exam_json_cid, name="exam_json_cid"),
+        path(
+            "exam/json/<int:pk>/<int:cid>/<str:passcode>",
+            generic_exam_view.exam_json_cid,
+            name="exam_json_cid",
+        ),
        path(
            "exam/json/<int:pk>/unbased",
            generic_exam_view.exam_json_unbased,