Update librarian.

[wolnelektury.git] / src / club / admin.py

diff --git a/src/club/admin.py b/src/club/admin.py
index e0beaea..0cf7d34 100644 (file)
--- a/src/club/admin.py
+++ b/src/club/admin.py
@@ -3,9 +3,14 @@
 #
 import json
 from django.contrib import admin
 #
 import json
 from django.contrib import admin

+from django.db.models.functions import Now
+from django.db.models import Q

 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe

+from django.utils.translation import gettext_lazy as _
+from fnpdjango.actions import export_as_csv_action

 from modeltranslation.admin import TranslationAdmin
 from modeltranslation.admin import TranslationAdmin

+from wolnelektury.utils import YesNoFilter

 from . import models
 
 
 from . import models
 
 


@@ -37,13 +42,26 @@ class PayUCardTokenInline(admin.TabularInline):
         return False
 
 
         return False
 
 

+class PayedFilter(YesNoFilter):
+    title = _('payment complete')
+    parameter_name = 'payed'
+    q = ~Q(payed_at=None)
+
+
+class ExpiredFilter(YesNoFilter):
+    title = _('schedule expired')
+    parameter_name = 'expired'
+    q = Q(expires_at__isnull=False, expires_at__lt=Now())
+
+

 class ScheduleAdmin(admin.ModelAdmin):
     list_display = ['email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled']
 class ScheduleAdmin(admin.ModelAdmin):
     list_display = ['email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled']

-    list_search = ['email']
-    list_filter = ['is_cancelled']
+    search_fields = ['email']
+    list_filter = ['is_cancelled', 'monthly', 'yearly', PayedFilter, ExpiredFilter]

     date_hierarchy = 'started_at'
     raw_id_fields = ['membership']
     inlines = [PayUOrderInline, PayUCardTokenInline]
     date_hierarchy = 'started_at'
     raw_id_fields = ['membership']
     inlines = [PayUOrderInline, PayUCardTokenInline]

+    actions = [export_as_csv_action()]

 
 admin.site.register(models.Schedule, ScheduleAdmin)
 
 
 admin.site.register(models.Schedule, ScheduleAdmin)
 


@@ -61,9 +79,11 @@ class ScheduleInline(admin.TabularInline):
 
 
 class MembershipAdmin(admin.ModelAdmin):
 
 
 class MembershipAdmin(admin.ModelAdmin):

-    list_display = ['user']
+    list_display = ['user', 'manual', 'updated_at', 'notes']
+    list_filter = ['manual']
+    date_hierarchy = 'updated_at'

     raw_id_fields = ['user']
     raw_id_fields = ['user']

-    search_fields = ['user__username', 'user__email', 'schedule__email']
+    search_fields = ['user__username', 'user__email', 'schedule__email', 'notes']

     inlines = [ScheduleInline]
 
 admin.site.register(models.Membership, MembershipAdmin)
     inlines = [ScheduleInline]
 
 admin.site.register(models.Membership, MembershipAdmin)