lino 24.11.1__py3-none-any.whl → 25.1.1__py3-none-any.whl

lino/modlib/memo/mixins.py

@@ -171,24 +171,24 @@ class BasePreviewable(dd.Model):
         )
         short = truncate_comment(full, self.get_preview_length())
         if not full.startswith("<"):
-            if markdown is not None:
+            if dd.get_plugin_setting("memo", "use_markup"):
                 full = markdown.markdown(full, **MARKDOWNCFG)
         return (short, full)
 
     def get_saved_mentions(self):
         Mention = rt.models.memo.Mention
         flt = gfk2lookup(Mention.owner, self)
-        return Mention.objects.filter(**flt).order_by("source_type", "source_id")
+        return Mention.objects.filter(**flt).order_by("target_type", "target_id")
 
     def synchronize_mentions(self, mentions):
         Mention = rt.models.memo.Mention
         for obj in self.get_saved_mentions():
-            if obj.source in mentions:
-                mentions.remove(obj.source)
+            if obj.target in mentions:
+                mentions.remove(obj.target)
             else:
                 obj.delete()
-        for source in mentions:
-            obj = Mention(owner=self, source=source)
+        for target in mentions:
+            obj = Mention(owner=self, target=target)
             # source_id=source.pk,
             # source_type=ContentType.objects.get_for_model(source.__class__))
             obj.full_clean()
@@ -274,7 +274,7 @@ class PreviewableChecker(Checker):
         ):
             yield (True, _("Preview differs from source."))
             is_broken = True
-        found_mentions = set([obj.source for obj in obj.get_saved_mentions()])
+        found_mentions = set([obj.target for obj in obj.get_saved_mentions()])
         if expected_mentions != found_mentions:
             yield (True, _("Mentions differ from expected mentions."))
             is_broken = True

lino/modlib/memo/models.py

@@ -9,6 +9,7 @@ from django.utils.text import format_lazy
 
 # from rstgen.sphinxconf.sigal_image import line2html
 from lino.api import dd, rt, _
+from lino.core import constants
 from lino.core.roles import SiteStaff
 from lino.core.gfks import gfk2lookup
 from lino.modlib.gfks.mixins import Controllable
@@ -17,7 +18,7 @@ from .parser import split_name_rest
 # from .mixins import *
 
 # Translators: will also be concatenated with '(type)' '(object)'
-source_label = _("Source")
+target_label = _("Target")
 
 
 class Mention(Controllable):
@@ -27,36 +28,64 @@ class Mention(Controllable):
         verbose_name = _("Mention")
         verbose_name_plural = _("Mentions")
 
-    source_type = dd.ForeignKey(
+    target_type = dd.ForeignKey(
         ContentType,
         editable=True,
         blank=True,
         null=True,
-        related_name="%(app_label)s_%(class)s_source_set",
-        verbose_name=format_lazy("{} {}", source_label, _("(type)")),
+        related_name="%(app_label)s_%(class)s_target_set",
+        verbose_name=format_lazy("{} {}", target_label, _("(type)")),
     )
 
-    source_id = GenericForeignKeyIdField(
-        source_type,
+    target_id = GenericForeignKeyIdField(
+        target_type,
         editable=True,
         blank=True,
         null=True,
-        verbose_name=format_lazy("{} {}", source_label, _("(object)")),
+        verbose_name=format_lazy("{} {}", target_label, _("(object)")),
     )
 
-    source = GenericForeignKey("source_type", "source_id", verbose_name=source_label)
+    target = GenericForeignKey("target_type", "target_id", verbose_name=target_label)
 
+    @classmethod
+    def get_simple_parameters(cls):
+        for p in super().get_simple_parameters():
+            yield p
+        yield "target_type"
+        yield "target_id"
+
+    def as_summary_item(self, ar, text=None, **kwargs):
+        # raise Exception("20240613")
+        if ar is None:
+            obj = super()
+        elif ar.is_obvious_field('target'):
+            obj = self.owner
+        elif ar.is_obvious_field('owner'):
+            obj = self.target
+        else:
+            obj = super()
+        return obj.as_summary_item(ar, text, **kwargs)
+
+dd.update_field(Mention, 'owner', verbose_name=_("Referrer"))
 
 class Mentions(dd.Table):
     required_roles = dd.login_required(SiteStaff)
     editable = False
     model = "memo.Mention"
-    column_names = "source owner *"
+    column_names = "owner target *"
     # detail_layout = """
     # id comment owner created
     # """
 
+# Not used because when you are on the owner, you can see the mentions in the memo text
+# class MentionsByOwner(Mentions):
+#     label = _("Mentions")
+#     master_key = "owner"
+#     column_names = "target *"
+#     default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
 
-class MentionsByOwner(Mentions):
-    master_key = "owner"
-    column_names = "source *"
+class MentionsByTarget(Mentions):
+    label = _("Mentioned by")
+    master_key = "target"
+    column_names = "owner *"
+    default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}

lino/modlib/memo/parser.py

@@ -159,7 +159,7 @@ class Parser:
                 )
         self.commands[cmdname] = func
 
-    def register_django_model(self, name, model, cmd=None):
+    def register_django_model(self, name, model, cmd=None, rnd=None):
         """
         Register the given string `name` as command for referring to
         database rows of the given Django database model `model`.
@@ -172,6 +172,8 @@ class Parser:
         # if rnd is None:
         #     def rnd(obj):
         #         return "[{} {}] ({})".format(name, obj.id, title(obj))
+        if rnd is None:
+            rnd = model.memo2html
         if cmd is None:
 
             def cmd(ar, s, cmdname, mentions, context):
@@ -200,7 +202,8 @@ class Parser:
                 #     caption = obj.get_memo_title()
                 # txt = "#{0}".format(obj.id)
                 # kw.update(title=title(obj))
-                return obj.memo2html(ar, text)
+                # return obj.memo2html(ar, text)
+                return rnd(obj, ar, text)
                 # e = ar.obj2html(obj, txt, **kw)
                 # # return str(ar)
                 # return etree.tostring(e)
@@ -210,7 +213,8 @@ class Parser:
         #         pass
 
         cmd._for_model = model
-        cmd.__doc__ = """
+        if cmd.__doc__ is None:
+            cmd.__doc__ = rnd.__doc__ or """
 Insert a reference to the specified {}.
 
 The first argument is mandatory and specifies the primary key.

lino/modlib/notify/mixins.py

@@ -1,7 +1,7 @@
-# Copyright 2016-2022 Rumma & Ko Ltd
+# Copyright 2016-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from lino.utils.html import E, tostring
+from lino.utils.html import E, tostring, format_html, mark_safe
 from lino.api import dd, rt, _
 
 # PUBLIC_GROUP = "all_users_channel"
@@ -27,21 +27,21 @@ class ChangeNotifier(dd.Model):
     def get_change_body(self, ar, cw):
         ctx = dict(user=ar.user, what=ar.obj2htmls(self))
         if cw is None:
-            html = _("{user} created {what}").format(**ctx)
+            html = format_html(_("{user} created {what}"), **ctx)
             html += self.get_change_info(ar, cw)
-            html = "<p>{}</p>.".format(html)
+            html = format_html("<p>{}</p>.", html)
         else:
             items = list(cw.get_updates_html(["_user_cache"]))
             if len(items) == 0:
                 return
-            html = _("{user} modified {what}").format(**ctx)
-            html = "<p>{}:</p>".format(html)
+            txt = format_html(_("{user} modified {what}"), **ctx)
+            html = format_html("<p>{}:</p>", txt)
             html += tostring(E.ul(*items))
             html += self.get_change_info(ar, cw)
-        return "<div>{}</div>".format(html)
+        return format_html("<div>{}</div>", html)
 
     def get_change_info(self, ar, cw):
-        return ""
+        return mark_safe("")
 
     if dd.is_installed("notify"):
 

lino/modlib/periods/choicelists.py

@@ -0,0 +1,46 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2008-2024 Rumma & Ko Ltd
+# License: GNU Affero General Public License v3 (see file COPYING for details)
+
+from django.utils.translation import gettext_lazy as _
+
+from lino.api import dd
+from lino.utils import ONE_DAY
+
+
+class PeriodType(dd.Choice):
+    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')

lino/modlib/periods/mixins.py

@@ -2,14 +2,40 @@
 # Copyright 2008-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
+import datetime
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 from lino.api import dd, rt
 from lino import mixins
 from lino.mixins import Referrable
+from lino.utils import ONE_DAY
 
 from lino.modlib.office.roles import OfficeStaff
+from lino.modlib.system.choicelists import DurationUnits
+
+
+def get_range_for_date(date):
+    """
+    Return the default start and end date of the period to create for the given
+    date.
+    """
+    pt = dd.plugins.periods.period_type
+    month = date.month
+    year = date.year
+    month -= dd.plugins.periods.start_month
+    if month < 0:
+        month += 12
+        year -= 1
+    period = int(month / pt.duration)
+    month = dd.plugins.periods.start_month + period * pt.duration
+    if month > 12:
+        month -= 12
+        year += 1
+    sd = datetime.date(year, month, 1)
+    # ed = sd.replace(month=sd.month + pt.duration + 1, 1) - ONE_DAY
+    ed = DurationUnits.months.add_duration(sd, pt.duration) - ONE_DAY
+    return (sd, ed)
 
 
 class PeriodRange(dd.Model):

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/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/system/__init__.py

@@ -15,9 +15,6 @@ class Plugin(ad.Plugin):
 
     verbose_name = _("System")
     needs_plugins = ["lino.modlib.printing"]
-    use_dashboard_layouts = False
-    """Whether to use system.DashboardLayouts. This feature is broken.
-    """
 
     def setup_config_menu(self, site, user_type, m, ar=None):
         system = m.add_menu(self.app_label, self.verbose_name)

lino/modlib/system/choicelists.py

@@ -113,19 +113,6 @@ PeriodEvents.add_item_instance(PeriodEnded("30", "ended"))
 # add('30', _("Ends"), 'ended')
 
 
-class DashboardLayout(Choice):
-    main = None
-
-    def __init__(self, value, text, main, **kwargs):
-        self.main = main
-        # kwargs.update(text=value)
-        super(DashboardLayout, self).__init__(value, text, value, **kwargs)
-
-
-class DashboardLayouts(ChoiceList):
-    item_class = DashboardLayout
-
-
 class DurationUnit(Choice):
     du_freq = None  # dateutils frequency
 

lino/modlib/system/mixins.py

@@ -79,6 +79,7 @@ class Lockable(EditSafe):
 
     locked_by = dd.ForeignKey(
         rt.settings.SITE.user_model,
+        verbose_name=_("Locked by"),
         null=True,
         default=None,
         blank=True,

lino/modlib/system/models.py

@@ -29,7 +29,6 @@ from .choicelists import (
     YesNo,
     Genders,
     PeriodEvents,
-    DashboardLayouts,
     DurationUnits,
     Recurrences,
     Weekdays,
@@ -221,12 +220,6 @@ testcase_setup.connect(my_handler)
 dd.connection_created.connect(my_handler)
 models.signals.post_migrate.connect(my_handler)
 
-# def dashboard_layouts(cls, k, layout_class, **options):
-#     assert k == "detail_layout"
-#     yield cls.detail_layout
-#     for i in DashboardLayouts.get_list_items():
-#         yield i.main
-
 
 class SiteConfigs(dd.Table):
     model = "system.SiteConfig"
@@ -266,15 +259,6 @@ class Dashboard(EmptyTable):
     # notify.MyMessages
     # """
 
-    @classmethod
-    def get_extra_layouts(cls):
-        # count = 0
-        for i in DashboardLayouts.get_list_items():
-            yield i.value, i.main
-            # print("20210530", i.value, repr(i.main))
-        #     count += 1
-        # assert count > 0
-
     @classmethod
     def get_default_action(cls):
         # raise Exception("20210530")
@@ -288,8 +272,6 @@ class Dashboard(EmptyTable):
     @classmethod
     def get_detail_action(self, ar):
         u = ar.get_user()
-        if u.dashboard_layout:
-            return cls.get_action_by_name("extra_" + u.dashboard_layout.name)
         return cls.get_action_by_name("extra_default")
 
     @dd.htmlbox()

lino/modlib/uploads/mixins.py

@@ -7,10 +7,10 @@ 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 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
@@ -198,36 +198,36 @@ class UploadBase(Commentable, GalleryViewable):
             return text
         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
+    # 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