From adb7b78e99bb8076f97698f3b21a390654476726 Mon Sep 17 00:00:00 2001
From: Pawan Verma <pverma@dimagi.com>
Date: Thu, 23 Nov 2023 13:28:33 +0530
Subject: [PATCH 1/2] Add better admin displays for models

---
 commcare_connect/opportunity/admin.py | 41 +++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/commcare_connect/opportunity/admin.py b/commcare_connect/opportunity/admin.py
index b24d2300..72a61575 100644
--- a/commcare_connect/opportunity/admin.py
+++ b/commcare_connect/opportunity/admin.py
@@ -19,12 +19,6 @@
 
 admin.site.register(Opportunity)
 admin.site.register(CommCareApp)
-admin.site.register(DeliverUnit)
-admin.site.register(LearnModule)
-admin.site.register(CompletedModule)
-admin.site.register(Assessment)
-admin.site.register(UserVisit)
-admin.site.register(OpportunityClaim)
 admin.site.register(PaymentUnit)
 
 
@@ -40,3 +34,38 @@ def get_opp_name(self, obj):
     @admin.display(description="Username")
     def get_username(self, obj):
         return obj.user.username
+
+
+@admin.register(LearnModule)
+@admin.register(DeliverUnit)
+class LearnModuleAndDeliverUnitAdmin(admin.ModelAdmin):
+    list_display = ["name", "slug", "app"]
+    search_fields = ["name"]
+
+
+@admin.register(OpportunityClaim)
+class OpportunityClaimAdmin(admin.ModelAdmin):
+    list_display = ["get_username", "get_opp_name", "opportunity_access"]
+
+    @admin.display(description="Opportunity Name")
+    def get_opp_name(self, obj):
+        return obj.opportunity_access.opportunity.name
+
+    @admin.display(description="Username")
+    def get_username(self, obj):
+        return obj.opportunity_access.user.username
+
+
+@admin.register(CompletedModule)
+class CompletedModuleAdmin(admin.ModelAdmin):
+    list_display = ["module", "user", "opportunity", "date"]
+
+
+@admin.register(UserVisit)
+class UserVisitAdmin(admin.ModelAdmin):
+    list_display = ["deliver_unit", "user", "opportunity", "status"]
+
+
+@admin.register(Assessment)
+class AssessmentAdmin(admin.ModelAdmin):
+    list_display = ["app", "user", "opportunity", "date", "passed"]

From 3b24732471e89de05fb53f92e2de630989851f04 Mon Sep 17 00:00:00 2001
From: Pawan Verma <pverma@dimagi.com>
Date: Thu, 23 Nov 2023 13:30:50 +0530
Subject: [PATCH 2/2] Add admin display for connectiduserlink model

---
 commcare_connect/users/admin.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/commcare_connect/users/admin.py b/commcare_connect/users/admin.py
index 8aac1bb1..af709a54 100644
--- a/commcare_connect/users/admin.py
+++ b/commcare_connect/users/admin.py
@@ -59,4 +59,7 @@ class OrganizationAdmin(admin.ModelAdmin):
     inlines = [UserOrganizationMembershipInline]
 
 
-admin.site.register(ConnectIDUserLink)
+@admin.register(ConnectIDUserLink)
+class ConnectIDUserLinkAdmin(admin.ModelAdmin):
+    list_display = ["user", "commcare_username", "domain"]
+    ordering = ["user"]