Fix various bugs related to marks

apps/authentication/admin.py

@@ -12,10 +12,36 @@
     Position,
     SpecialPosition,
 )
+from apps.marks.models import MarkDelay, MarkUser, Suspended, Suspension, user_sanctions
+
+
+class MarkUserInline(admin.TabularInline):
+    model = MarkUser
+    extra = 0
+    fields = ("mark",)
+    readonly_fields = ("mark",)
+
+    verbose_name = _("Prikk")
+    verbose_name_plural = _("Prikker")
+
+
+class SuspensionInline(admin.TabularInline):
+    model = Suspension
+    extra = 0
+    show_change_link = True
+    fields = ("title", "created_time", "expiration_date")
+    readonly_fields = ("title", "created_time", "expiration_date")
+
+    verbose_name = _("Suspensjon")
+    verbose_name_plural = _("Suspensjoner")
 
 
 class OnlineUserAdmin(UserAdmin, VersionAdmin):
     model = OnlineUser
+    inlines = (
+        MarkUserInline,
+        SuspensionInline,
+    )
     list_display = [
         "username",
         "first_name",
@@ -62,10 +88,32 @@
                 )
             },
         ),
+        (
+            _("Sanksjoner"),
+            {
+                "fields": ("current_total_sanctions",),
+            },
+        ),
     )
     filter_horizontal = ("groups", "user_permissions")
     search_fields = ("first_name", "last_name", "username", "ntnu_username")
-    readonly_fields = ("mark_rules_accepted", "auth0_subject")
+    readonly_fields = (
+        "mark_rules_accepted",
+        "auth0_subject",
+        "current_total_sanctions",
+    )
+
+    def current_total_sanctions(self, instance: OnlineUser):
+        match user_sanctions(instance):
+            case Suspended():
+                return "Suspendert"
+            case MarkDelay(delay):
+                return _("Forsinket påmelding med %s") % delay
+            case None:
+                return "-"
+
+    current_total_sanctions.str = True
+    current_total_sanctions.short_description = "Nåværende sanksjoner"
 
     def is_member(self, instance: OnlineUser):
         return instance.is_member
@@ -77,6 +125,13 @@
 
     mark_rules_accepted.boolean = True
 
+    def get_queryset(self, *args, **kwargs):
+        return (
+            super()
+            .get_queryset(*args, **kwargs)
+            .prefetch_related("marks", "suspension_set")
+        )
+
 
 admin.site.register(OnlineUser, OnlineUserAdmin)
 

apps/marks/admin.py

@@ -15,7 +15,21 @@ class MarkUserInline(admin.TabularInline):
 @admin.register(Mark)
 class MarkAdmin(VersionAdmin):
     inlines = (MarkUserInline,)
-    list_display = ["__str__", "category", "added_date", "weight"]
+    fields = [
+        "title",
+        "added_date",
+        "cause",
+        "weight",
+        "description",
+        "expiration_date",
+        "ruleset",
+    ]
+
+    list_display = ["__str__", "category", "cause", "added_date", "weight"]
+    readonly_fields = (
+        "expiration_date",
+        "ruleset",
+    )
     search_fields = ("title",)
 
     def save_model(self, request, obj, form, change):

apps/marks/migrations/0009_mark_weight_alter_mark_added_date_and_more.py

@@ -9,7 +9,7 @@
 
 def migrate_mark_category(apps, schema_editor):
     Mark = apps.get_model("marks", "Mark")
-    marks = Mark.objects.iterator(chunk_size=50)
+    marks = list(Mark.objects.iterator(chunk_size=50))
     for m in marks:
         for title, cause in [
             ("Manglende oppmøte", MarkClass.Cause.NO_ATTENDANCE),