From 36f1a3f0d436344ad34be9b54f475fb1018a102d Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 18:05:31 +0200
Subject: [PATCH] Activity admin site was missing

---
 apps/activity/admin.py  | 23 ++++++++++++++++++-----
 apps/activity/models.py |  6 ++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/apps/activity/admin.py b/apps/activity/admin.py
index 0529d306..27cabd4e 100644
--- a/apps/activity/admin.py
+++ b/apps/activity/admin.py
@@ -3,9 +3,11 @@
 
 from django.contrib import admin
 
-from .models import Activity, ActivityType, Guest
+from note_kfet.admin import admin_site
+from .models import Activity, ActivityType, Guest, Entry
 
 
+@admin.register(Activity, site=admin_site)
 class ActivityAdmin(admin.ModelAdmin):
     """
     Admin customisation for Activity
@@ -19,6 +21,7 @@ class ActivityAdmin(admin.ModelAdmin):
     ordering = ['-date_start']
 
 
+@admin.register(ActivityType, site=admin_site)
 class ActivityTypeAdmin(admin.ModelAdmin):
     """
     Admin customisation for ActivityType
@@ -26,7 +29,17 @@ class ActivityTypeAdmin(admin.ModelAdmin):
     list_display = ('name', 'can_invite', 'guest_entry_fee')
 
 
-# Register your models here.
-admin.site.register(Activity, ActivityAdmin)
-admin.site.register(ActivityType, ActivityTypeAdmin)
-admin.site.register(Guest)
+@admin.register(Guest, site=admin_site)
+class GuestAdmin(admin.ModelAdmin):
+    """
+    Admin customisation for Guest
+    """
+    list_display = ('last_name', 'first_name', 'activity', 'inviter')
+
+
+@admin.register(Entry, site=admin_site)
+class EntryAdmin(admin.ModelAdmin):
+    """
+    Admin customisation for Entry
+    """
+    list_display = ('note', 'activity', 'time', 'guest')
diff --git a/apps/activity/models.py b/apps/activity/models.py
index 7defb35c..45942cc5 100644
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -99,6 +99,9 @@ class Activity(models.Model):
         verbose_name=_('open'),
     )
 
+    def __str__(self):
+        return self.name
+
     class Meta:
         verbose_name = _("activity")
         verbose_name_plural = _("activities")
@@ -234,6 +237,9 @@ class Guest(models.Model):
 
         return super().save(force_insert, force_update, using, update_fields)
 
+    def __str__(self):
+        return self.first_name + " " + self.last_name
+
     class Meta:
         verbose_name = _("guest")
         verbose_name_plural = _("guests")