lino 24.11.0__py3-none-any.whl → 25.1.0__py3-none-any.whl

lino/modlib/periods/models.py

@@ -8,52 +8,17 @@ from django.utils.translation import gettext_lazy as _
 
 from lino.api import dd
 from lino import mixins
-from lino.utils import last_day_of_month, ONE_DAY
+from lino.utils import ONE_DAY
 from lino.mixins.periods import DateRange
 from lino.mixins import Referrable
 
 from lino.modlib.office.roles import OfficeStaff
+from .mixins import get_range_for_date
+from .choicelists import PeriodTypes, PeriodStates
 
 NEXT_YEAR_SEP = "/"
 YEAR_PERIOD_SEP = "-"
 
-class PeriodType(dd.Choice):
-    ref_template = None
-    ref_template = None
-
-    def __init__(self, value, text, duration, ref_template):
-        super().__init__(value, text, value)
-        self.ref_template = ref_template
-        self.duration = duration
-
-class PeriodTypes(dd.ChoiceList):
-    item_class = PeriodType
-    verbose_name = _("Period type")
-    verbose_name_plural = _("Period types")
-    column_names = "value text duration ref_template"
-
-    @dd.displayfield(_("Duration"))
-    def duration(cls, p, ar):
-        return str(p.duration)
-
-    @dd.displayfield(_("Template for reference"))
-    def ref_template(cls, p, ar):
-        return p.ref_template
-
-add = PeriodTypes.add_item
-# value/names,  text, duration, ref_template
-add("month",     _("Month"),     1, "{month:0>2}")
-add("quarter",   _("Quarter"),   3, "Q{period}")
-add("trimester", _("Trimester"), 4, "T{period}")
-add("semester",  _("Semester"),  6, "S{period}")
-
-
-class PeriodStates(dd.Workflow):
-    pass
-
-add = PeriodStates.add_item
-add('10', _("Open"), 'open')
-add('20', _("Closed"), 'closed')
 
 
 class StoredYear(DateRange, Referrable):
@@ -120,7 +85,7 @@ class StoredPeriod(DateRange, Referrable):
     preferred_foreignkey_width = 10
 
     state = PeriodStates.field(default='open')
-    year = dd.ForeignKey('periods.StoredYear', blank=True, null=True)
+    year = dd.ForeignKey('periods.StoredYear', blank=True, null=True, related_name="periods")
     remark = models.CharField(_("Remark"), max_length=250, blank=True)
 
     @classmethod
@@ -197,10 +162,8 @@ class StoredPeriod(DateRange, Referrable):
         ref = date2ref(date)
         obj = cls.get_by_ref(ref, None)
         if obj is None:
-            obj = cls(
-                ref=ref,
-                start_date=date.replace(day=1),
-                end_date=last_day_of_month(date))
+            sd, ed = get_range_for_date(date)
+            obj = cls(ref=ref, start_date=sd, end_date=ed)
             obj.full_clean()
             obj.save()
         return obj
@@ -208,7 +171,7 @@ class StoredPeriod(DateRange, Referrable):
     def full_clean(self, *args, **kwargs):
         if self.start_date is None:
             self.start_date = dd.today().replace(day=1)
-        if not self.year:
+        if not self.year_id:
             self.year = StoredYear.get_or_create_from_date(self.start_date)
         super().full_clean(*args, **kwargs)
 
@@ -218,10 +181,19 @@ class StoredPeriod(DateRange, Referrable):
             # "{0} {1} (#{0})".format(self.pk, self.year)
         return self.ref
 
+    # def get_str_words(self, ar):
+    #     # if ar.is_obvious_field("year"):
+    #     if self.year.covers_date(dd.today()):
+    #         # yield self.nickname
+    #         yield f"{dd.plugins.periods.period_name} {self.nickname}"
+    #     else:
+    #         yield str(self)
+
     @property
     def nickname(self):
         if self.year.covers_date(dd.today()):
-            if len(parts := self.ref.split(YEAR_PERIOD_SEP)) == 2:
+            if self.ref and len(parts := self.ref.split(YEAR_PERIOD_SEP)) == 2:
+                # return "{} {}".format(dd.plugins.periods.period_name, parts[1])
                 return parts[1]
         return self.ref
 

lino/modlib/printing/choicelists.py

@@ -46,14 +46,14 @@ class BuildMethod(Choice):
             names, self.__class__.__name__, names, **kwargs
         )
 
-    def get_target(self, action, elem):
-        "used by `get_target_name`"
+    def get_target(self, action, obj):
+        # Used by get_target_name()
         # assert self.name is not None
         return MediaFile(
             self.use_webdav,
             self.cache_name,
             self.value,
-            elem.filename_root() + self.target_ext,
+            obj.filename_root() + self.target_ext,
         )
 
     def get_target_name(self, action, elem):

lino/modlib/publisher/choicelists.py

@@ -51,12 +51,9 @@ class PublisherBuildMethod(JinjaBuildMethod):
             )
             context = elem.get_printable_context(ar)
             html = tpl.render(context)
-            self.html2file(html, filename)
+            self.html2file(html, filename, context)
             return os.path.getmtime(filename)
 
-    def html2file(self, html, filename):
-        raise NotImplementedError()
-
 
 BuildMethods.add_item_instance(PublisherBuildMethod())
 

lino/modlib/search/models.py

@@ -1,9 +1,8 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2021-2023 Rumma & Ko Ltd
+# Copyright 2021-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import re
-from html import escape
 from lxml import etree
 from django.conf import settings
 
@@ -12,7 +11,7 @@ from lino.core import constants
 from lino.core.utils import get_models
 from lino.core.site import has_elasticsearch, has_haystack
 
-from lino.utils.html import E
+from lino.utils.html import E, escape, mark_safe, format_html
 
 from .roles import SiteSearcher
 
@@ -23,15 +22,17 @@ class SiteSearchBase(dd.VirtualTable):
     required_roles = dd.login_required(SiteSearcher)
     label = _("Search")
     column_names = "description matches"
+    # column_names = "search_overview matches"
     private_apps = frozenset(["sessions", "contenttypes", "users"])
 
-    default_display_modes = {None: constants.DISPLAY_MODE_STORY}
+    default_display_modes = {None: constants.DISPLAY_MODE_LIST}
+    # default_display_modes = {None: constants.DISPLAY_MODE_STORY}
 
     card_layout = """description"""
-    list_layout = """
-    search_overview
-    matches
-    """
+    # list_layout = """
+    # search_overview
+    # matches
+    # """
 
     # _site_search_tables = []
     # @classmethod
@@ -76,6 +77,11 @@ class SiteSearchBase(dd.VirtualTable):
             return False
         return True
 
+    @classmethod
+    def row_as_paragraph(cls, ar, obj):
+        text = "{} #{}".format(obj._meta.verbose_name, obj.pk)
+        return format_html("{} : {}", ar.obj2htmls(obj, text), obj.as_paragraph(ar))
+
     @dd.displayfield(_("Description"))
     def description(self, obj, ar):
         elems = []
@@ -110,7 +116,8 @@ class SiteSearchBase(dd.VirtualTable):
                     s = matches.get(de, None)
                     if s is None:
                         s = str(de.value_from_object(obj))
-                        s = escape(s, quote=False)
+                        # s = escape(s, quote=False)
+                        s = escape(s)
                     r, count = re.subn(w, bold, s, flags=re.IGNORECASE)
                     if count:
                         matches[de] = r
@@ -132,11 +139,10 @@ class SiteSearchBase(dd.VirtualTable):
                 raise Exception("{} : {}".format(e, s))
             # return etree.fromstring(', '.join(chunks))
             # return E.raw(', '.join(chunks))
-        return s
+        return mark_safe(s)
 
 
 class SiteSearch(SiteSearchBase):
-    default_display_modes = {None: constants.DISPLAY_MODE_LIST}
 
     @classmethod
     def get_data_rows(cls, ar):

lino/modlib/system/fixtures/std.py

@@ -0,0 +1,5 @@
+from django.conf import settings
+
+def objects():
+    settings.SITE.site_config.update()
+    return []

lino/modlib/system/models.py

@@ -138,7 +138,7 @@ class SiteConfig(dd.Model):
                 # print("20180502 Created SiteConfig {}".format(
                 #     obj2str(self._site_config, True)))
                 # 20120725
-                # polls_tutorial menu selection `Config --> Site Parameters`
+                # polls_tutorial menu selection `Config --> Site configuration`
                 # said "SiteConfig 1 does not exist"
                 # cannot save the instance here because the db table possibly doesn't yet exit.
                 # ~ self._site_config.save()
@@ -146,7 +146,7 @@ class SiteConfig(dd.Model):
         return cls._site_config
 
     def __str__(self):
-        return force_str(_("Site Parameters"))
+        return force_str(_("Site configuration"))
 
     def update(self, **kw):
         """
@@ -238,6 +238,7 @@ class SiteConfigs(dd.Table):
     detail_layout = dd.DetailLayout(
         """
     default_build_method
+    simulate_today
     # lino.ModelsBySite
     """,
         window_size=(60, "auto"),

lino/modlib/uploads/__init__.py

@@ -9,7 +9,7 @@ from os.path import join
 from lino import ad, _
 from lino.modlib.memo.parser import split_name_rest
 
-UPLOADS_ROOT = "uploads"
+UPLOADS_ROOT = 'uploads'
 VOLUMES_ROOT = 'volumes'
 
 class Plugin(ad.Plugin):
@@ -25,6 +25,10 @@ class Plugin(ad.Plugin):
 
     """
 
+    with_thumbnails = False
+    """Whether to use PIL, the Python Imaging Library.
+    """
+
     # def on_ui_init(self, kernel):
     #     super().on_ui_init(kernel)
     #     self.site.makedirs_if_missing(self.get_uploads_root())
@@ -75,3 +79,8 @@ class Plugin(ad.Plugin):
 
         # site.makedirs_if_missing(self.get_uploads_root())
         # site.makedirs_if_missing(self.get_volumes_root())
+
+    def get_requirements(self, site):
+        if self.with_thumbnails:
+            yield "Pillow"
+            yield "PyMuPDF"

lino/modlib/uploads/choicelists.py

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2010-2020 Rumma & Ko Ltd
+# Copyright 2010-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from lino.modlib.office.roles import OfficeStaff
 from lino.api import dd, rt, _
+from lino.modlib.office.roles import OfficeStaff
 
 
 class Shortcut(dd.Choice):
@@ -17,7 +17,7 @@ class Shortcut(dd.Choice):
             self.target = target
         self.model_spec = model_spec
         value = model_spec + "." + name
-        super(Shortcut, self).__init__(value, verbose_name, name)
+        super().__init__(value, verbose_name, name)
 
     def get_uploads(self, **kw):
         """Return a queryset with the uploads of this shortcut."""

lino/modlib/uploads/mixins.py

@@ -7,19 +7,24 @@ import shutil
 import uuid
 from pathlib import Path
 
+# from rstgen.sphinxconf.sigal_image import parse_image_spec
+# from rstgen.sphinxconf.sigal_image import Standard, Thumb, Tiny, Wide, Solo, Duo, Trio
+# SMALL_FORMATS = (Thumb, Tiny, Duo, Trio)
+#
 from django.db import models
 from django.conf import settings
 from django.core.files.storage import default_storage
 from django.core.exceptions import ValidationError, FieldError
 from django.template.defaultfilters import filesizeformat
+from django.utils.html import format_html
 
-from rstgen.sphinxconf.sigal_image import parse_image_spec
 from lino.core import constants
 from lino.utils import DATE_TO_DIR_TPL
+from lino.utils import needs_update
 from lino.utils.html import E
 from lino.api import dd, rt, _
 from lino.modlib.uploads import UPLOADS_ROOT
-from lino.modlib.memo.mixins import MemoReferrable
+from lino.modlib.comments.mixins import Commentable
 
 # from lino.mixins.sequenced import Sequenced
 # from lino.modlib.gfks.mixins import Controllable
@@ -39,12 +44,6 @@ def safe_filename(name):
     return name
 
 
-def needs_update(src, dest):
-    if dest.exists() and dest.stat().st_mtime >= src.stat().st_mtime:
-        return False
-    return True
-
-
 def make_uploaded_file(filename, src=None, upload_date=None):
     """
     Create a dummy file that looks as if a file had really been uploaded.
@@ -130,8 +129,9 @@ class GalleryViewable(dd.Model):
         return {}
 
 
-class UploadBase(MemoReferrable, GalleryViewable):
-    class Meta(object):
+class UploadBase(Commentable, GalleryViewable):
+
+    class Meta:
         abstract = True
 
     extra_display_modes = {constants.DISPLAY_MODE_GALLERY}
@@ -180,7 +180,8 @@ class UploadBase(MemoReferrable, GalleryViewable):
         dd.logger.info("Wrote uploaded file %s", ff.path)
 
     def get_gallery_item(self, ar):
-        return dict(image_src=self.get_file_url())
+        mf = self.get_media_file()
+        return dict(image_src=mf.get_image_url())
 
     def full_clean(self, *args, **kw):
         super().full_clean(*args, **kw)
@@ -192,44 +193,41 @@ class UploadBase(MemoReferrable, GalleryViewable):
     def get_file_button(self, text=None):
         if text is None:
             text = str(self)
-        url = self.get_file_url()
-        if url is None:
+        mf = self.get_media_file()
+        if mf is None:
             return text
-        return E.a(text, href=url, target="_blank")
-
-    def memo2html(self, ar, text, **ctx):
-        # if not text:
-        #     text = self.description or str(self)
-        # ctx = dict()
-        # text = src + "|" + text
-        url = self.get_file_url()
-        if url is None:
-            return ""
-        ctx.update(src=url)
-        ctx.update(href=ar.renderer.obj2url(ar, self))
-        if url.endswith(".pdf"):
-            if not text:
-                text = str(self)
-            ctx.update(text=text)
-            tpl = '(<a href="{src}" target="_blank"/>{text}</a>'
-            tpl += '| <a href="{href}""/>detail</a>)'
-            return tpl.format(**ctx)
-
-        fmt = parse_image_spec(text, **ctx)
-        if not fmt.context["caption"]:
-            fmt.context["caption"] = self.description or str(self)
-        # if text:
-        #     ctx.update(caption=text)
-
-        rv = (
-            '<a href="{href}" target="_blank"/><img src="{src}"'
-            + ' style="{style}" title="{caption}"/></a>'
-        ).format(**fmt.context)
-        # if ar.renderer.front_end.media_name == 'react':
-        #     return ('<figure class="lino-memo-image"><img src="{src}" ' +
-        #         'style="{style}" title="{caption}"/><figcaption' +
-        #         ' style="text-align: center;">{caption}</figcaption>' +
-        #         '</figure>').format(**kwargs)
-
-        # print("20230325", rv)
-        return rv
+        return E.a(text, href=mf.get_download_url(), target="_blank")
+
+    # def memo2html(self, ar, text, **ctx):
+    #     mf = self.get_media_file()
+    #     if mf is None:
+    #         return format_html("<em>{}</em>", text or str(self))
+    #     ctx.update(src=mf.get_download_url())
+    #     ctx.update(href=ar.renderer.obj2url(ar, self))
+    #     small_url = mf.get_image_url()
+    #     if small_url is None or small_url == mf.url:  # non-previewable mimetype
+    #         if not text:
+    #             text = str(self)
+    #         ctx.update(text=text)
+    #         tpl = '(<a href="{src}" target="_blank">{text}</a>'
+    #         tpl += '| <a href="{href}">detail</a>)'
+    #         return format_html(tpl, **ctx)
+    #
+    #     fmt = parse_image_spec(text, **ctx)
+    #     if isinstance(fmt, SMALL_FORMATS):
+    #         fmt.context.update(src=small_url)
+    #
+    #     if not fmt.context["caption"]:
+    #         fmt.context["caption"] = self.description or str(self)
+    #
+    #     rv = format_html(
+    #         '<a href="{href}" target="_blank"><img src="{src}"'
+    #         + ' style="{style}" title="{caption}"/></a>', **fmt.context)
+    #     # if ar.renderer.front_end.media_name == 'react':
+    #     #     return ('<figure class="lino-memo-image"><img src="{src}" ' +
+    #     #         'style="{style}" title="{caption}"/><figcaption' +
+    #     #         ' style="text-align: center;">{caption}</figcaption>' +
+    #     #         '</figure>').format(**kwargs)
+    #
+    #     # print("20230325", rv)
+    #     return rv