Merge branch 'refs/heads/master' into missing_migrations

konova/filters/mixins/user_log.py

@@ -0,0 +1,55 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 19.08.24
+
+"""
+import django_filters
+from django import forms
+from django.db.models import QuerySet, Q
+from django.utils.translation import gettext_lazy as _
+
+
+class UserLoggedTableFilterMixin(django_filters.FilterSet):
+    ul = django_filters.CharFilter(
+        method="filter_user_log",
+        label=_(""),
+        label_suffix=_(""),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Logged user"),
+                "title": _("Search for entries where this person has been participated according to log history"),
+                "class": "form-control",
+            }
+        ),
+    )
+
+    class Meta:
+        abstract = True
+
+    def filter_user_log(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value of input
+
+        Args:
+            queryset (QuerySet): Incoming (prefiltered) queryset
+            name (str): Name of input field
+            value (str): Value of input field
+
+        Returns:
+
+        """
+        value = value.replace(",", " ")
+        value = value.strip()
+        values = value.split(" ")
+
+        q = Q()
+        for val in values:
+            q &= (
+                    Q(log__user__username__icontains=val) |
+                    Q(log__user__first_name__icontains=val) |
+                    Q(log__user__last_name__icontains=val)
+            )
+
+        queryset = queryset.filter(q)
+        return queryset

konova/filters/table_filters.py

@@ -14,6 +14,7 @@ from konova.filters.mixins.office import ConservationOfficeTableFilterMixin, Reg
 from konova.filters.mixins.record import RecordableTableFilterMixin
 from konova.filters.mixins.self_created import SelfCreatedTableFilterMixin
 from konova.filters.mixins.share import ShareableTableFilterMixin
+from konova.filters.mixins.user_log import UserLoggedTableFilterMixin
 
 
 class AbstractTableFilter(django_filters.FilterSet):
@@ -40,7 +41,8 @@ class SelectionTableFilter(RegistrationOfficeTableFilterMixin,
 
 class QueryTableFilter(KeywordTableFilterMixin,
                        FileNumberTableFilterMixin,
-                       GeoReferencedTableFilterMixin):
+                       GeoReferencedTableFilterMixin,
+                       UserLoggedTableFilterMixin):
     """ TableFilter holding different filter options for query related filtering
 
     """

konova/utils/tables.py

@@ -216,11 +216,11 @@ class TableRenderMixin:
 
         """
         html = ""
-        has_access = record.is_shared_with(self.user)
+        is_entry_shared = record.is_shared_with(self.user)
 
         html += self.render_icn(
-            tooltip=_("Full access granted") if has_access else _("Access not granted"),
-            icn_class="fas fa-edit rlp-r-inv" if has_access else "far fa-edit",
+            tooltip=_("Full access granted") if is_entry_shared else _("Access not granted"),
+            icn_class="fas fa-edit rlp-r-inv" if is_entry_shared else "far fa-edit",
         )
         return format_html(html)