Minor fix

[redakcja.git] / src / catalogue / admin.py

diff --git a/src/catalogue/admin.py b/src/catalogue/admin.py
index 8d64154..2759f9a 100644 (file)
--- a/src/catalogue/admin.py
+++ b/src/catalogue/admin.py
@@ -2,17 +2,26 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.contrib import admin

+from django.db.models import Min

 from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _

-from admin_numeric_filter.admin import RangeNumericFilter, NumericFilterModelAdmin
+from admin_numeric_filter.admin import RangeNumericFilter, NumericFilterModelAdmin, RangeNumericForm
+from admin_ordering.admin import OrderableAdmin

 from fnpdjango.actions import export_as_csv_action
 from fnpdjango.actions import export_as_csv_action

+from modeltranslation.admin import TabbedTranslationAdmin

 from . import models
 import documents.models
 from .wikidata import WikidataAdminMixin
 
 
 from . import models
 import documents.models
 from .wikidata import WikidataAdminMixin
 
 

-class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin):
+class NotableBookInline(OrderableAdmin, admin.TabularInline):
+    model = models.NotableBook
+    autocomplete_fields = ['book']
+    ordering_field_hide_input = True
+
+
+class AuthorAdmin(WikidataAdminMixin, TabbedTranslationAdmin):

     list_display = [
         "first_name",
         "last_name",
     list_display = [
         "first_name",
         "last_name",


@@ -34,11 +43,64 @@ class AuthorAdmin(WikidataAdminMixin, admin.ModelAdmin):
         "status",
         "gender",
         "nationality",
         "status",
         "gender",
         "nationality",

+        "place_of_birth",
+        "place_of_death",
+        ("genitive", admin.EmptyFieldListFilter)

     ]
     list_per_page = 10000000
     search_fields = ["first_name", "last_name", "wikidata"]
     ]
     list_per_page = 10000000
     search_fields = ["first_name", "last_name", "wikidata"]

+    readonly_fields = ["wikidata_link", "description_preview"]
+
+    fieldsets = [
+        (None, {"fields": [("wikidata", "wikidata_link")]}),
+        (
+            _("Identification"),
+            {
+                "fields": [
+                    ("first_name", "last_name"),
+                    "slug",
+                    "genitive",
+                    "gender",
+                    "nationality",
+                    (
+                        "date_of_birth",
+                        "year_of_birth",
+                        "year_of_birth_inexact",
+                        "year_of_birth_range",
+                        "century_of_birth",
+                        "place_of_birth"
+                    ),
+                    (
+                        "date_of_death",
+                        "year_of_death",
+                        "year_of_death_inexact",
+                        "year_of_death_range",
+                        "century_of_death",
+                        "place_of_death"
+                    ),
+                    ("description", "description_preview"),
+                    "status",
+                    "collections",
+                    "priority",
+                    
+                    "notes",
+                    "gazeta_link",
+                    "culturepl_link",
+                    "plwiki",
+                    "photo", "photo_source", "photo_attribution",
+                ]
+            },
+        ),
+    ]
+    

     prepopulated_fields = {"slug": ("first_name", "last_name")}
     prepopulated_fields = {"slug": ("first_name", "last_name")}

-    autocomplete_fields = ["collections"]
+    autocomplete_fields = ["collections", "place_of_birth", "place_of_death"]
+    inlines = [
+        NotableBookInline,
+    ]
+
+    def description_preview(self, obj):
+        return obj.generate_description()

 
 
 admin.site.register(models.Author, AuthorAdmin)
 
 
 admin.site.register(models.Author, AuthorAdmin)


@@ -90,6 +152,60 @@ def add_title(base_class, suffix):
     return TitledCategoryFilter
 
 
     return TitledCategoryFilter
 
 

+class FirstPublicationYearFilter(admin.ListFilter):
+    title = 'Rok pierwszej publikacji'
+    parameter_name = 'first_publication_year'
+    template = 'admin/filter_numeric_range.html'
+
+    def __init__(self, request, params, *args, **kwargs):
+        super().__init__(request, params, *args, **kwargs)
+
+        self.request = request
+
+        if self.parameter_name + '_from' in params:
+            value = params.pop(self.parameter_name + '_from')
+            self.used_parameters[self.parameter_name + '_from'] = value
+
+        if self.parameter_name + '_to' in params:
+            value = params.pop(self.parameter_name + '_to')
+            self.used_parameters[self.parameter_name + '_to'] = value
+
+    def has_output(self):
+        return True
+
+    def queryset(self, request, queryset):
+        filters = {}
+
+        value_from = self.used_parameters.get(self.parameter_name + '_from', None)
+        if value_from is not None and value_from != '':
+            filters.update({
+                self.parameter_name + '__gte': self.used_parameters.get(self.parameter_name + '_from', None),
+            })
+
+        value_to = self.used_parameters.get(self.parameter_name + '_to', None)
+        if value_to is not None and value_to != '':
+            filters.update({
+                self.parameter_name + '__lte': self.used_parameters.get(self.parameter_name + '_to', None),
+            })
+
+        return queryset.filter(**filters)
+
+    def choices(self, changelist):
+        return ({
+            'request': self.request,
+            'parameter_name': self.parameter_name,
+            'form': RangeNumericForm(name=self.parameter_name, data={
+                self.parameter_name + '_from': self.used_parameters.get(self.parameter_name + '_from', None),
+                self.parameter_name + '_to': self.used_parameters.get(self.parameter_name + '_to', None),
+            }),
+        }, )
+
+    def expected_parameters(self):
+        return [
+            '{}_from'.format(self.parameter_name),
+            '{}_to'.format(self.parameter_name),
+        ]
+

 
 class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
     list_display = [
 
 class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
     list_display = [


@@ -123,12 +239,20 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
         "priority",
         "authors__gender", "authors__nationality",
         "translators__gender", "translators__nationality",
         "priority",
         "authors__gender", "authors__nationality",
         "translators__gender", "translators__nationality",

+
+        ("authors__place_of_birth", add_title(admin.RelatedFieldListFilter, ' autora')),
+        ("authors__place_of_death", add_title(admin.RelatedFieldListFilter, ' autora')),
+        ("translators__place_of_birth", add_title(admin.RelatedFieldListFilter, ' tłumacza')),
+        ("translators__place_of_death", add_title(admin.RelatedFieldListFilter, ' tłumacza')),
+

         "document_book__chunk__stage",
 
         LicenseFilter,
         CoverLicenseFilter,
         'free_license',
         'polona_missing',
         "document_book__chunk__stage",
 
         LicenseFilter,
         CoverLicenseFilter,
         'free_license',
         'polona_missing',

+
+        FirstPublicationYearFilter,

     ]
     list_per_page = 1000000
 
     ]
     list_per_page = 1000000
 


@@ -137,6 +261,8 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
         "estimated_costs",
         "documents_book_link",
         "scans_source_link",
         "estimated_costs",
         "documents_book_link",
         "scans_source_link",

+        "monthly_views_page",
+        "monthly_views_reader",

     ]
     actions = [export_as_csv_action(
         fields=[
     ]
     actions = [export_as_csv_action(
         fields=[


@@ -144,8 +270,10 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
             "wikidata",
             "slug",
             "title",
             "wikidata",
             "slug",
             "title",

-            "authors_str", # authors?
-            "translators_str", # translators?
+            "authors_first_names",
+            "authors_last_names",
+            "translators_first_names",
+            "translators_last_names",

             "language",
             "based_on",
             "scans_source",
             "language",
             "based_on",
             "scans_source",


@@ -156,7 +284,24 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
             "gazeta_link",
             "estimated_chars",
             "estimated_verses",
             "gazeta_link",
             "estimated_chars",
             "estimated_verses",

-            "estimate_source"
+            "estimate_source",
+
+            "document_book__project",
+            "audience",
+            "first_publication_year",
+
+            "monthly_views_page",
+            "monthly_views_reader",
+
+            # content stats
+            "chars",
+            "chars_with_fn",
+            "words",
+            "words_with_fn",
+            "verses",
+            "chars_out_verse",
+            "verses_with_fn",
+            "chars_out_verse_with_fn",

         ]
     )]
     fieldsets = [
         ]
     )]
     fieldsets = [


@@ -171,6 +316,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
                     "translators",
                     "language",
                     "based_on",
                     "translators",
                     "language",
                     "based_on",

+                    "original_year",

                     "pd_year",
                 ]
             },
                     "pd_year",
                 ]
             },


@@ -197,6 +343,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
                     "notes",
                     ("estimated_chars", "estimated_verses", "estimate_source"),
                     "estimated_costs",
                     "notes",
                     ("estimated_chars", "estimated_verses", "estimate_source"),
                     "estimated_costs",

+                    ("monthly_views_page", "monthly_views_reader"),

                 ]
             },
         ),
                 ]
             },
         ),


@@ -206,6 +353,7 @@ class BookAdmin(WikidataAdminMixin, NumericFilterModelAdmin):
         qs = super().get_queryset(request)
         if request.resolver_match.view_name.endswith("changelist"):
             qs = qs.prefetch_related("authors", "translators")
         qs = super().get_queryset(request)
         if request.resolver_match.view_name.endswith("changelist"):
             qs = qs.prefetch_related("authors", "translators")

+            qs = qs.annotate(first_publication_year=Min('document_book__publish_log__timestamp__year'))

         return qs
 
     def estimated_costs(self, obj):
         return qs
 
     def estimated_costs(self, obj):


@@ -268,7 +416,7 @@ class CollectionAdmin(admin.ModelAdmin):
     autocomplete_fields = []
     prepopulated_fields = {"slug": ("name",)}
     search_fields = ["name"]
     autocomplete_fields = []
     prepopulated_fields = {"slug": ("name",)}
     search_fields = ["name"]

-    fields = ['name', 'slug', 'category', 'notes', 'estimated_costs']
+    fields = ['name', 'slug', 'category', 'description', 'notes', 'estimated_costs']

     readonly_fields = ['estimated_costs']
     inlines = [AuthorInline, BookInline]
 
     readonly_fields = ['estimated_costs']
     inlines = [AuthorInline, BookInline]
 


@@ -289,9 +437,39 @@ admin.site.register(models.Collection, CollectionAdmin)
 class CategoryAdmin(admin.ModelAdmin):
     search_fields = ["name"]
 
 class CategoryAdmin(admin.ModelAdmin):
     search_fields = ["name"]
 

-admin.site.register(models.Epoch, CategoryAdmin)
-admin.site.register(models.Genre, CategoryAdmin)
-admin.site.register(models.Kind, CategoryAdmin)
+    def has_description(self, obj):
+        return bool(obj.description)
+    has_description.boolean = True
+    has_description.short_description = 'opis'
+
+
+@admin.register(models.Epoch)
+class EpochAdmin(CategoryAdmin):
+    list_display = [
+        'name',
+        'adjective_feminine_singular',
+        'adjective_nonmasculine_plural',
+        'has_description',
+    ]
+
+
+@admin.register(models.Genre)
+class GenreAdmin(CategoryAdmin):
+    list_display = [
+        'name',
+        'plural',
+        'is_epoch_specific',
+        'has_description',
+    ]
+
+
+@admin.register(models.Kind)
+class KindAdmin(CategoryAdmin):
+    list_display = [
+        'name',
+        'collective_noun',
+        'has_description',
+    ]

 
 
 
 
 
 


@@ -305,3 +483,15 @@ class WorkTypeAdmin(admin.ModelAdmin):
 
 admin.site.register(models.WorkType, WorkTypeAdmin)
 
 
 admin.site.register(models.WorkType, WorkTypeAdmin)
 

+
+
+@admin.register(models.Place)
+class PlaceAdmin(WikidataAdminMixin, TabbedTranslationAdmin):
+    search_fields = ['name']
+
+
+@admin.register(models.Thema)
+class ThemaAdmin(admin.ModelAdmin):
+    list_display = ['code', 'name', 'usable', 'hidden']
+    list_filter = ['usable', 'hidden']
+    search_fields = ['code', 'name', 'description']