fix race in filters

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

diff --git a/src/club/admin.py b/src/club/admin.py
index 4d65c3c..2ba842a 100644 (file)
--- a/src/club/admin.py
+++ b/src/club/admin.py
@@ -5,6 +5,7 @@ import json
 from django.contrib import admin
 from django.db.models.functions import Now
 from django.db.models import Q
+from django import forms
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -14,7 +15,20 @@ from wolnelektury.utils import YesNoFilter
 from . import models
 
 
-admin.site.register(models.Club)
+class SingleAmountInline(admin.TabularInline):
+    model = models.SingleAmount
+
+
+class MonthlyAmountInline(admin.TabularInline):
+    model = models.MonthlyAmount
+
+
+@admin.register(models.Club)
+class ClubAdmin(admin.ModelAdmin):
+    inlines = [
+        SingleAmountInline,
+        MonthlyAmountInline
+    ]
 
 
 class PayUOrderInline(admin.TabularInline):
@@ -54,13 +68,54 @@ class ExpiredFilter(YesNoFilter):
     q = Q(expires_at__isnull=False, expires_at__lt=Now())
 
 
+class ScheduleForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['email'].required = False
+        self.fields['method'].required = False
+        self.fields['consent'].required = False
+
+    class Meta:
+        model = models.Schedule
+        fields = '__all__'
+
+
+class SourceFilter(admin.SimpleListFilter):
+    title = _('Source') # display title
+    parameter_name = 'source'
+    template = "admin/long_filter.html"
+
+    def lookups(self, request, model_admin):
+        lookups = [
+            (m, m) for m in
+            model_admin.model.objects.exclude(source='').values_list('source', flat=True).distinct()[:10]
+        ]
+        print(lookups)
+        return lookups
+
+    def queryset(self, request, queryset):
+        return queryset
+    
+    #field_name = 'source' # name of the foreign key field
+
+
+
+
 class ScheduleAdmin(admin.ModelAdmin):
+    form = ScheduleForm
+
     list_display = [
         'email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled',
         'method'
     ]
-    search_fields = ['email']
-    list_filter = ['is_cancelled', 'monthly', 'yearly', 'method', PayedFilter, ExpiredFilter, 'source']
+    list_display_links = ['email', 'started_at']
+    search_fields = ['email', 'source']
+    list_filter = [
+        'is_cancelled', 'monthly', 'yearly', 'method',
+        PayedFilter, ExpiredFilter,
+        SourceFilter,
+    ]
+    filter_horizontal = ['consent']
     date_hierarchy = 'started_at'
     raw_id_fields = ['membership']
     inlines = [PayUOrderInline, PayUCardTokenInline]
@@ -141,21 +196,14 @@ admin.site.register(models.PayUOrder, PayUOrderAdmin)
 admin.site.register(models.Ambassador)
 
 
-
-@admin.register(models.DirectDebit)
-class DirectDebitAdmin(admin.ModelAdmin):
-    list_display = ['date', 'amount', 'first_name', 'last_name']
-    fields = [
-        ('first_name', 'sex', 'date_of_birth'),
-        'last_name',
-        ('street', 'building'),
-        ('town', 'flat'),
-        ('postal_code', 'phone'),
-        'email',
-        'iban',
-        'payment_id',
-        'agree_newsletter',
-        'date',
-        'amount'
-    ]
     
+
+@admin.register(models.Consent)
+class ConsentAdmin(admin.ModelAdmin):
+    list_display = ['text', 'order', 'active', 'required']
+
+    def get_readonly_fields(self, request, obj=None):
+        if obj:
+            return ['text']
+        else:
+            return []