polishing map fixes

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

diff --git a/src/club/admin.py b/src/club/admin.py
index 79b76cf..2ba842a 100644 (file)
--- a/src/club/admin.py
+++ b/src/club/admin.py
@@ -5,15 +5,30 @@ import json
 from django.contrib import admin
 from django.db.models.functions import Now
 from django.db.models import Q
 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 _
 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 wolnelektury.utils import YesNoFilter
 from . import models
 
 
 from modeltranslation.admin import TranslationAdmin
 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):
 
 
 class PayUOrderInline(admin.TabularInline):


@@ -53,13 +68,58 @@ class ExpiredFilter(YesNoFilter):
     q = Q(expires_at__isnull=False, expires_at__lt=Now())
 
 
     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):
 class ScheduleAdmin(admin.ModelAdmin):

-    list_display = ['email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled']
-    search_fields = ['email']
-    list_filter = ['is_cancelled', 'monthly', 'yearly', PayedFilter, ExpiredFilter]
+    form = ScheduleForm
+
+    list_display = [
+        'email', 'started_at', 'payed_at', 'expires_at', 'amount', 'monthly', 'yearly', 'is_cancelled',
+        'method'
+    ]
+    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]
     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)
 


@@ -77,9 +137,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)


@@ -132,3 +194,16 @@ admin.site.register(models.PayUOrder, PayUOrderAdmin)
 
 
 admin.site.register(models.Ambassador)
 
 
 admin.site.register(models.Ambassador)

+
+
+    
+
+@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 []