Fix after upgrading django-filter.

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

diff --git a/src/catalogue/models.py b/src/catalogue/models.py
index 45250bc..d069880 100644 (file)
--- a/src/catalogue/models.py
+++ b/src/catalogue/models.py
@@ -4,6 +4,7 @@ from django.apps import apps
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _

+from admin_ordering.models import OrderableModel

 from wikidata.client import Client
 from .constants import WIKIDATA
 from .wikidata import WikidataMixin
 from wikidata.client import Client
 from .constants import WIKIDATA
 from .wikidata import WikidataMixin


@@ -19,7 +20,10 @@ class Author(WikidataMixin, models.Model):
 
     gender = models.CharField(_("gender"), max_length=255, blank=True)
     nationality = models.CharField(_("nationality"), max_length=255, blank=True)
 
     gender = models.CharField(_("gender"), max_length=255, blank=True)
     nationality = models.CharField(_("nationality"), max_length=255, blank=True)

+    year_of_birth = models.SmallIntegerField(_("year of birth"), null=True, blank=True)
+    place_of_birth = models.CharField(_('place of birth'), max_length=255, blank=True)

     year_of_death = models.SmallIntegerField(_("year of death"), null=True, blank=True)
     year_of_death = models.SmallIntegerField(_("year of death"), null=True, blank=True)

+    place_of_death = models.CharField(_('place of death'), max_length=255, blank=True)

     status = models.PositiveSmallIntegerField(
         _("status"), 
         null=True,
     status = models.PositiveSmallIntegerField(
         _("status"), 
         null=True,


@@ -36,8 +40,6 @@ class Author(WikidataMixin, models.Model):
     culturepl_link = models.CharField(_("culture.pl link"), max_length=255, blank=True)
 
     description = models.TextField(_("description"), blank=True)
     culturepl_link = models.CharField(_("culture.pl link"), max_length=255, blank=True)
 
     description = models.TextField(_("description"), blank=True)

-    description_de = models.TextField(_("description (de)"), blank=True)
-    description_lt = models.TextField(_("description (lt)"), blank=True)

 
     priority = models.PositiveSmallIntegerField(
         _("priority"), 
 
     priority = models.PositiveSmallIntegerField(
         _("priority"), 


@@ -58,11 +60,18 @@ class Author(WikidataMixin, models.Model):
         notes = "description"
 
     def __str__(self):
         notes = "description"
 
     def __str__(self):

-        return f"{self.first_name} {self.last_name}"
+        name = f"{self.first_name} {self.last_name}"
+        if self.year_of_death is not None:
+            name += f' (zm. {self.year_of_death})'
+        return name

 
     def get_absolute_url(self):
         return reverse("catalogue_author", args=[self.slug])
 
 
     def get_absolute_url(self):
         return reverse("catalogue_author", args=[self.slug])
 

+    @property
+    def name(self):
+        return f"{self.last_name}, {self.first_name}"
+    

     @property
     def pd_year(self):
         if self.year_of_death:
     @property
     def pd_year(self):
         if self.year_of_death:


@@ -73,6 +82,11 @@ class Author(WikidataMixin, models.Model):
             return None
 
 
             return None
 
 

+class NotableBook(OrderableModel):
+    author = models.ForeignKey(Author, models.CASCADE)
+    book = models.ForeignKey('Book', models.CASCADE)
+
+

 class Category(WikidataMixin, models.Model):
     name = models.CharField(_("name"), max_length=255)
     slug = models.SlugField(max_length=255, unique=True)
 class Category(WikidataMixin, models.Model):
     name = models.CharField(_("name"), max_length=255)
     slug = models.SlugField(max_length=255, unique=True)


@@ -135,6 +149,9 @@ class Book(WikidataMixin, models.Model):
     estimated_verses = models.IntegerField(_("estimated number of verses"), null=True, blank=True)
     estimate_source = models.CharField(_("source of estimates"), max_length=2048, blank=True)
 
     estimated_verses = models.IntegerField(_("estimated number of verses"), null=True, blank=True)
     estimate_source = models.CharField(_("source of estimates"), max_length=2048, blank=True)
 

+    free_license = models.BooleanField(_('free license'), default=False)
+    polona_missing = models.BooleanField(_('missing on Polona'), default=False)
+

     class Meta:
         ordering = ("title",)
         verbose_name = _('book')
     class Meta:
         ordering = ("title",)
         verbose_name = _('book')


@@ -160,14 +177,20 @@ class Book(WikidataMixin, models.Model):
 
     def get_absolute_url(self):
         return reverse("catalogue_book", args=[self.slug])
 
     def get_absolute_url(self):
         return reverse("catalogue_book", args=[self.slug])

+
+    @property
+    def wluri(self):
+        return f'https://wolnelektury.pl/katalog/lektura/{self.slug}/'

     
     def authors_str(self):
         return ", ".join(str(author) for author in self.authors.all())
     authors_str.admin_order_field = 'authors__last_name'
     
     def authors_str(self):
         return ", ".join(str(author) for author in self.authors.all())
     authors_str.admin_order_field = 'authors__last_name'

+    authors_str.short_description = _('Author')

 
     def translators_str(self):
         return ", ".join(str(author) for author in self.translators.all())
     translators_str.admin_order_field = 'translators__last_name'
 
     def translators_str(self):
         return ", ".join(str(author) for author in self.translators.all())
     translators_str.admin_order_field = 'translators__last_name'

+    translators_str.short_description = _('Translator')

 
     def get_estimated_costs(self):
         return {
 
     def get_estimated_costs(self):
         return {