From a4966751b78631fcef3ead0c35d018bde70e8676 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Tue, 11 Jan 2022 12:56:27 +0100
Subject: [PATCH 1/9] # 61 Filter backend

* refactors table filters by introducing AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin and RecordableTableFilterMixin
* adds full filter functionality
* refactors TableFilter inheritances for all objects
---
 compensation/filters.py         |  18 +-
 intervention/filters.py         | 107 +----------
 konova/filters.py               | 311 ++++++++++++++++++++++++++++++++
 konova/models/geometry.py       |   6 +-
 locale/de/LC_MESSAGES/django.mo | Bin 29386 -> 29698 bytes
 locale/de/LC_MESSAGES/django.po |  78 +++++---
 6 files changed, 379 insertions(+), 141 deletions(-)
 create mode 100644 konova/filters.py

diff --git a/compensation/filters.py b/compensation/filters.py
index 8bf0c232..1595b985 100644
--- a/compensation/filters.py
+++ b/compensation/filters.py
@@ -10,10 +10,11 @@ from django.utils.translation import gettext_lazy as _
 from django import forms
 from django.db.models import QuerySet
 
-from intervention.filters import InterventionTableFilter
+from konova.filters import AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, \
+    RecordableTableFilterMixin
 
 
-class CompensationTableFilter(InterventionTableFilter):
+class CompensationTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, RecordableTableFilterMixin):
     """ TableFilter for compensations
 
     Based widely on InterventionTableFilter.
@@ -21,7 +22,7 @@ class CompensationTableFilter(InterventionTableFilter):
 
     """
 
-    def _filter_show_all(self, queryset, name, value) -> QuerySet:
+    def filter_show_all(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of 'show_all' setting
 
         Args:
@@ -39,7 +40,7 @@ class CompensationTableFilter(InterventionTableFilter):
         else:
             return queryset
 
-    def _filter_show_recorded(self, queryset, name, value) -> QuerySet:
+    def filter_show_recorded(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of 'show_recorded' setting
 
         Args:
@@ -58,21 +59,20 @@ class CompensationTableFilter(InterventionTableFilter):
             return queryset
 
 
-class EcoAccountTableFilter(InterventionTableFilter):
+class EcoAccountTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, RecordableTableFilterMixin):
     """ TableFilter for eco accounts
 
-    Based widely on InterventionTableFilter.
     Just some minor changes for EcoAccount model.
 
     """
     sr = django_filters.BooleanFilter(
-        method='_filter_only_show_unrecorded',
+        method='filter_only_show_unrecorded',
         label=_("Show only unrecorded"),
         label_suffix=_(""),
         widget=forms.CheckboxInput()
     )
 
-    def _filter_show_all(self, queryset, name, value) -> QuerySet:
+    def filter_show_all(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of 'show_all' setting
 
         Args:
@@ -90,7 +90,7 @@ class EcoAccountTableFilter(InterventionTableFilter):
         else:
             return queryset
 
-    def _filter_only_show_unrecorded(self, queryset, name, value) -> QuerySet:
+    def filter_only_show_unrecorded(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of 'show_recorded' setting
 
         Args:
diff --git a/intervention/filters.py b/intervention/filters.py
index 205b35c6..1dad9d36 100644
--- a/intervention/filters.py
+++ b/intervention/filters.py
@@ -5,119 +5,20 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 22.07.21
 
 """
-import django_filters
-from django import forms
-from django.contrib.auth.models import User
-from django.db.models import QuerySet, Q
-
-from django.utils.translation import gettext_lazy as _
-
-from intervention.inputs import DummyFilterInput
 from intervention.models import Intervention
+from konova.filters import AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, \
+    RecordableTableFilterMixin
 
 
-class InterventionTableFilter(django_filters.FilterSet):
+class InterventionTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, RecordableTableFilterMixin):
     """ TableFilter for Intervention model
 
     """
-    sa = django_filters.BooleanFilter(
-        method='_filter_show_all',
-        label=_("Show unshared"),
-        label_suffix=_(""),
-        widget=forms.CheckboxInput()
-    )
-    q = django_filters.Filter(
-        method='_filter_by_keyword',
-        # Since we use a custom search bar in the template, we need to 'render' this filter
-        # as 'anonymous' HiddenInput (no id, no name). This way our custom search bar's id and name won't be
-        # overwritten with these id and name (which would be equal)
-        # This way we can use the simple filter method mapping for a parameter without using a predefined widget!
-        widget=DummyFilterInput(),
-    )
-    sr = django_filters.BooleanFilter(
-        method='_filter_show_recorded',
-        label=_("Show recorded"),
-        label_suffix=_(""),
-        widget=forms.CheckboxInput()
-    )
-    # Gemarkung ##ToDo
-    g = django_filters.CharFilter(
-        field_name="name",
-        lookup_expr="icontains",
-        label=_(""),
-        label_suffix=_(""),
-        widget=forms.TextInput(
-            attrs={
-                "placeholder": _("District"),
-                "title": _("Search for district")
-            }
-        ),
-    )
-    # Kreis
-    ## ToDo
-    # Flur
-    ## ToDo
-    # Zähler
-    ## ToDo
-    # Nenner
-    ## ToDo
 
     class Meta:
         model = Intervention
         fields = []
 
-    def __init__(self, user: User, *args, **kwargs):
-        self.user = user
+    def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-    def _filter_by_keyword(self, queryset, name, value) -> QuerySet:
-        """ Filters queryset depending on value of search bar input
-
-        Args:
-            queryset ():
-            name ():
-            value ():
-
-        Returns:
-
-        """
-        value = value.strip()
-        # build filter expression
-        q = Q(title__icontains=value) | Q(identifier__icontains=value)
-        return queryset.filter(q)
-
-    def _filter_show_all(self, queryset, name, value) -> QuerySet:
-        """ Filters queryset depending on value of 'show_all' setting
-
-        Args:
-            queryset ():
-            name ():
-            value ():
-
-        Returns:
-
-        """
-        if not value:
-            return queryset.filter(
-                users__in=[self.user],  # requesting user has access
-            )
-        else:
-            return queryset
-
-    def _filter_show_recorded(self, queryset, name, value) -> QuerySet:
-        """ Filters queryset depending on value of 'show_recorded' setting
-
-        Args:
-            queryset ():
-            name ():
-            value ():
-
-        Returns:
-
-        """
-        if not value:
-            return queryset.filter(
-                recorded=None,
-            )
-        else:
-            return queryset
diff --git a/konova/filters.py b/konova/filters.py
new file mode 100644
index 00000000..ace6b4e9
--- /dev/null
+++ b/konova/filters.py
@@ -0,0 +1,311 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 11.01.22
+
+"""
+import django_filters
+from django import forms
+from django.utils.translation import gettext_lazy as _
+from django.contrib.auth.models import User
+from django.db.models import QuerySet, Q
+
+from intervention.inputs import DummyFilterInput
+from konova.models import Parcel, District
+
+
+class AbstractTableFilter(django_filters.FilterSet):
+    """ TableFilter for Intervention model
+
+    """
+    q = django_filters.Filter(
+        method='_filter_by_keyword',
+        # Since we use a custom search bar in the template, we need to 'render' this filter
+        # as 'anonymous' HiddenInput (no id, no name). This way our custom search bar's id and name won't be
+        # overwritten with these id and name (which would be equal)
+        # This way we can use the simple filter method mapping for a parameter without using a predefined widget!
+        widget=DummyFilterInput(),
+    )
+
+    class Meta:
+        abstract = True
+
+    def __init__(self, user: User, *args, **kwargs):
+        self.user = user
+        super().__init__(*args, **kwargs)
+
+    def _filter_by_keyword(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value of search bar input
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        value = value.strip()
+        # build filter expression
+        q = Q(title__icontains=value) | Q(identifier__icontains=value)
+        return queryset.filter(q)
+
+
+class GeoReferencedTableFilterMixin(django_filters.FilterSet):
+    """ A mixin for AbstractTableFilter
+
+    Specialized on filtering GeoReferenced model types
+
+    """
+    # Parcel gmrkng
+    di = django_filters.CharFilter(
+        method="filter_district",
+        label=_(""),
+        label_suffix=_(""),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("District"),
+                "title": _("Search for district")
+            }
+        ),
+    )
+    # Parcel gmrkng
+    pg = django_filters.CharFilter(
+        method="filter_gmrkng",
+        label=_(""),
+        label_suffix=_(""),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Parcel gmrkng"),
+                "title": _("Search for parcel gmrkng")
+            }
+        ),
+    )
+    # Parcel
+    p = django_filters.CharFilter(
+        method="filter_parcel",
+        label=_(""),
+        label_suffix=_(""),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Parcel"),
+                "title": _("Search for parcel")
+            }
+        ),
+    )
+    # Parcel counter
+    pc = django_filters.CharFilter(
+        method="filter_parcel_counter",
+        label=_(""),
+        label_suffix=_(""),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Parcel counter"),
+                "title": _("Search for parcel counter")
+            }
+        ),
+    )
+
+    # Parcel counter
+    pn = django_filters.CharFilter(
+        method="filter_parcel_number",
+        label=_(""),
+        label_suffix=_(""),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Parcel number"),
+                "title": _("Search for parcel number")
+            }
+        ),
+    )
+
+    class Meta:
+        abstract = True
+
+    def _filter_parcel_reference(self, queryset, name, value, filter_value) -> QuerySet:
+        """ Filters the parcel entries by a given filter_value.
+
+        filter_value may already include further filter annotations like 'xy__icontains'
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+            filter_value ():
+
+        Returns:
+
+        """
+        _filter = {
+            filter_value: value
+        }
+        matching_parcels = Parcel.objects.filter(
+            **_filter
+        )
+        related_geoms = matching_parcels.values(
+            "geometries"
+        ).distinct()
+        queryset = queryset.filter(
+            geometry__id__in=related_geoms
+        )
+        return queryset
+
+    def filter_district(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value for 'Gemarkung'
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        matching_districts = District.objects.filter(
+            krs=value
+        )
+        matching_parcels = Parcel.objects.filter(
+            district__in=matching_districts
+        )
+        related_geoms = matching_parcels.values(
+            "geometries"
+        ).distinct()
+        queryset = queryset.filter(
+            geometry__id__in=related_geoms
+        )
+        return queryset
+
+    def filter_gmrkng(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value for 'Gemarkung'
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        queryset = self._filter_parcel_reference(queryset, name, value, "gmrkng__istartswith")
+        return queryset
+
+    def filter_parcel(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value for 'Parcel'
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        value = value.replace("-", "")
+        queryset = self._filter_parcel_reference(queryset, name, value, "flr")
+        return queryset
+
+    def filter_parcel_counter(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value for 'Parcel'
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        value = value.replace("-", "")
+        queryset = self._filter_parcel_reference(queryset, name, value, "flrstck_zhlr")
+        return queryset
+
+    def filter_parcel_number(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value for 'Parcel'
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        value = value.replace("-", "")
+        queryset = self._filter_parcel_reference(queryset, name, value, "flrstck_nnr")
+        return queryset
+
+
+class ShareableTableFilterMixin(django_filters.FilterSet):
+    """ A mixin for AbstractTableFilter
+
+    Specialized on filtering shareable model types
+
+    """
+    sa = django_filters.BooleanFilter(
+        method='filter_show_all',
+        label=_("Show unshared"),
+        label_suffix=_(""),
+        widget=forms.CheckboxInput()
+    )
+
+    class Meta:
+        abstract = True
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.user is None:
+            raise AttributeError("User must be set for further filtering!")
+
+    def filter_show_all(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value of 'show_all' setting
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        if not value:
+            return queryset.filter(
+                users__in=[self.user],  # requesting user has access
+            )
+        else:
+            return queryset
+
+
+class RecordableTableFilterMixin(django_filters.FilterSet):
+    """ A mixin for AbstractTableFilter
+
+    Specialized on filtering recordable model types
+
+    """
+    sr = django_filters.BooleanFilter(
+        method='filter_show_recorded',
+        label=_("Show recorded"),
+        label_suffix=_(""),
+        widget=forms.CheckboxInput()
+    )
+
+    class Meta:
+        abstract = True
+
+    def filter_show_recorded(self, queryset, name, value) -> QuerySet:
+        """ Filters queryset depending on value of 'show_recorded' setting
+
+        Args:
+            queryset ():
+            name ():
+            value ():
+
+        Returns:
+
+        """
+        if not value:
+            return queryset.filter(
+                recorded=None,
+            )
+        else:
+            return queryset
diff --git a/konova/models/geometry.py b/konova/models/geometry.py
index aad39d6f..0a380b48 100644
--- a/konova/models/geometry.py
+++ b/konova/models/geometry.py
@@ -110,9 +110,13 @@ class Geometry(BaseResource):
         underlying_parcels = []
         for result in fetched_parcels:
             fetched_parcel = result[typename]
+            # There could be parcels which include the word 'Flur',
+            # which needs to be deleted and just keep the numerical values
+            ## THIS CAN BE REMOVED IN THE FUTURE, WHEN 'Flur' WON'T OCCUR ANYMORE!
+            flr_val = fetched_parcel["ave:flur"].replace("Flur ", "")
             parcel_obj = Parcel.objects.get_or_create(
                 gmrkng=fetched_parcel["ave:gemarkung"],
-                flr=fetched_parcel["ave:flur"],
+                flr=flr_val,
                 flrstck_nnr=fetched_parcel['ave:flstnrnen'],
                 flrstck_zhlr=fetched_parcel['ave:flstnrzae'],
             )[0]
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 2edf9a00a3a2bca27cb79905575d3ca11179826d..65defeed94e56e2d8d0c68b2d053d54b629a1b04 100644
GIT binary patch
delta 9312
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
AN&o-=

delta 9042
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
F{{!X>zo`HK

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index a83b6aab..453d065d 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -6,20 +6,22 @@
 #: compensation/filters.py:71 compensation/forms/modalForms.py:34
 #: compensation/forms/modalForms.py:45 compensation/forms/modalForms.py:61
 #: compensation/forms/modalForms.py:238 compensation/forms/modalForms.py:316
-#: intervention/filters.py:26 intervention/filters.py:40
-#: intervention/filters.py:47 intervention/filters.py:48
+#: intervention/filters.py:25 intervention/filters.py:31
 #: intervention/forms/forms.py:52 intervention/forms/forms.py:154
 #: intervention/forms/forms.py:166 intervention/forms/modalForms.py:125
 #: intervention/forms/modalForms.py:138 intervention/forms/modalForms.py:151
-#: konova/forms.py:140 konova/forms.py:241 konova/forms.py:312
-#: konova/forms.py:339 konova/forms.py:349 konova/forms.py:362
-#: konova/forms.py:374 konova/forms.py:392 user/forms.py:38
+#: konova/filters.py:64 konova/filters.py:65 konova/filters.py:76
+#: konova/filters.py:77 konova/filters.py:88 konova/filters.py:89
+#: konova/filters.py:100 konova/filters.py:101 konova/filters.py:113
+#: konova/filters.py:114 konova/forms.py:140 konova/forms.py:241
+#: konova/forms.py:312 konova/forms.py:339 konova/forms.py:349
+#: konova/forms.py:362 konova/forms.py:374 konova/forms.py:392 user/forms.py:38
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-07 15:32+0100\n"
+"POT-Creation-Date: 2022-01-11 09:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1197,22 +1199,14 @@ msgstr "EMA {} bearbeitet"
 msgid "EMA removed"
 msgstr "EMA entfernt"
 
-#: intervention/filters.py:25
+#: intervention/filters.py:24
 msgid "Show unshared"
 msgstr "Nicht freigegebene anzeigen"
 
-#: intervention/filters.py:39
+#: intervention/filters.py:30
 msgid "Show recorded"
 msgstr "Verzeichnete anzeigen"
 
-#: intervention/filters.py:51
-msgid "District"
-msgstr "Gemarkung"
-
-#: intervention/filters.py:52
-msgid "Search for district"
-msgstr "Nach Gemarkung suchen"
-
 #: intervention/forms/forms.py:44
 msgid "Construction XY; Location ABC"
 msgstr "Bauvorhaben XY; Flur ABC"
@@ -1521,6 +1515,46 @@ msgstr ""
 "somit nichts eingeben, bearbeiten oder sonstige Aktionen ausführen. "
 "Kontaktieren Sie bitte einen Administrator. +++"
 
+#: konova/filters.py:68
+msgid "District"
+msgstr "Kreis"
+
+#: konova/filters.py:69
+msgid "Search for district"
+msgstr "Nach Kreis suchen"
+
+#: konova/filters.py:80
+msgid "Parcel gmrkng"
+msgstr "Gemarkung"
+
+#: konova/filters.py:81
+msgid "Search for parcel gmrkng"
+msgstr "Nach Gemarkung suchen"
+
+#: konova/filters.py:92 konova/templates/konova/includes/parcels.html:18
+msgid "Parcel"
+msgstr "Flur"
+
+#: konova/filters.py:93
+msgid "Search for parcel"
+msgstr "Nach Flur suchen"
+
+#: konova/filters.py:104 konova/templates/konova/includes/parcels.html:19
+msgid "Parcel counter"
+msgstr "Flurstückzähler"
+
+#: konova/filters.py:105
+msgid "Search for parcel counter"
+msgstr "Nach Flurstückzähler suchen"
+
+#: konova/filters.py:117 konova/templates/konova/includes/parcels.html:20
+msgid "Parcel number"
+msgstr "Flurstücknenner"
+
+#: konova/filters.py:118
+msgid "Search for parcel number"
+msgstr "Nach Flurstücknenner suchen"
+
 #: konova/forms.py:37 templates/form/collapsable/form.html:62
 msgid "Save"
 msgstr "Speichern"
@@ -1687,18 +1721,6 @@ msgstr "Kreis"
 msgid "Gemarkung"
 msgstr "Gemarkung"
 
-#: konova/templates/konova/includes/parcels.html:18
-msgid "Parcel"
-msgstr "Flur"
-
-#: konova/templates/konova/includes/parcels.html:19
-msgid "Parcel counter"
-msgstr "Flurstückzähler"
-
-#: konova/templates/konova/includes/parcels.html:20
-msgid "Parcel number"
-msgstr "Flurstücknenner"
-
 #: konova/templates/konova/widgets/generate-content-input.html:6
 msgid "Generate new"
 msgstr "Neu generieren"

From f92ec7fde7a4e12dfbaffaa0c2fd9574b1f5affc Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Tue, 11 Jan 2022 14:28:34 +0100
Subject: [PATCH 2/9] # 61 Filter frontend

* optimizes minor parts of table-filter initialization and queryset passing
---
 compensation/tables.py  | 6 ++++--
 ema/tables.py           | 3 ++-
 intervention/filters.py | 1 -
 intervention/tables.py  | 3 ++-
 konova/utils/tables.py  | 4 +---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/compensation/tables.py b/compensation/tables.py
index df7ec3eb..2784af23 100644
--- a/compensation/tables.py
+++ b/compensation/tables.py
@@ -67,7 +67,8 @@ class CompensationTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: Compensation):
         """ Renders the id column for a compensation
@@ -207,7 +208,8 @@ class EcoAccountTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: EcoAccount):
         """ Renders the id column for an eco account
diff --git a/ema/tables.py b/ema/tables.py
index 9055059d..884bac54 100644
--- a/ema/tables.py
+++ b/ema/tables.py
@@ -65,7 +65,8 @@ class EmaTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: Ema):
         """ Renders the id column for a EMA
diff --git a/intervention/filters.py b/intervention/filters.py
index 1dad9d36..01a3abe5 100644
--- a/intervention/filters.py
+++ b/intervention/filters.py
@@ -21,4 +21,3 @@ class InterventionTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
diff --git a/intervention/tables.py b/intervention/tables.py
index 103d419a..b0da7d04 100644
--- a/intervention/tables.py
+++ b/intervention/tables.py
@@ -71,7 +71,8 @@ class InterventionTable(BaseTable):
             data=request.GET,
             queryset=qs,
         )
-        super().__init__(request, self.filter, *args, **kwargs)
+        kwargs["queryset"] = self.filter.qs
+        super().__init__(request, *args, **kwargs)
 
     def render_id(self, value, record: Intervention):
         """ Renders the id column for an intervention
diff --git a/konova/utils/tables.py b/konova/utils/tables.py
index 9d0329f3..6a3ef88e 100644
--- a/konova/utils/tables.py
+++ b/konova/utils/tables.py
@@ -31,10 +31,8 @@ class BaseTable(tables.tables.Table):
             "class": "table table-hover table-responsive-md table-responsive-sm",
         }
 
-    def __init__(self, request: HttpRequest = None, filter_set=None, queryset=None, *args, **kwargs):
+    def __init__(self, request: HttpRequest = None, queryset=None, *args, **kwargs):
         self.user = request.user or None
-        if filter_set is not None:
-            queryset = filter_set.qs
         kwargs["data"] = queryset
         kwargs["request"] = request
         super().__init__(*args, **kwargs)

From d8607d9ade13f7c82d37c4abe69e17794164e2f0 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Tue, 11 Jan 2022 15:19:16 +0100
Subject: [PATCH 3/9] # 61 Filter backend

* refactors XYTableFilter classes to hold query_filter and checkbox_filter which are separate instances of django_filter.FilterSets
* improves render ability for frontend
---
 compensation/filters.py      | 66 ++++++++++++++++++++++++++++++------
 intervention/filters.py      | 32 ++++++++++-------
 konova/filters.py            | 31 +++++++++++++----
 templates/generic_index.html | 11 ++++--
 4 files changed, 110 insertions(+), 30 deletions(-)

diff --git a/compensation/filters.py b/compensation/filters.py
index 1595b985..b44b900a 100644
--- a/compensation/filters.py
+++ b/compensation/filters.py
@@ -10,15 +10,11 @@ from django.utils.translation import gettext_lazy as _
 from django import forms
 from django.db.models import QuerySet
 
-from konova.filters import AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, \
-    RecordableTableFilterMixin
+from konova.filters import QueryTableFilter, CheckboxTableFilter
 
 
-class CompensationTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, RecordableTableFilterMixin):
-    """ TableFilter for compensations
-
-    Based widely on InterventionTableFilter.
-    Just some minor changes for Compensation model.
+class CheckboxCompensationTableFilter(CheckboxTableFilter):
+    """ Specialization of regular CheckboxTableFilter for compensation model
 
     """
 
@@ -59,12 +55,36 @@ class CompensationTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin
             return queryset
 
 
-class EcoAccountTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, RecordableTableFilterMixin):
-    """ TableFilter for eco accounts
+class CompensationTableFilter:
+    """ TableFilter for compensations
 
-    Just some minor changes for EcoAccount model.
+    Based widely on InterventionTableFilter.
+    Just some minor changes for Compensation model.
 
     """
+    query_filter = None
+    checkbox_filter = None
+    qs = None
+
+    def __init__(self, *args, **kwargs):
+        user = kwargs.get("user", None)
+        qs = kwargs.get("queryset", None)
+        request_data = kwargs.get("data", None)
+
+        self.query_filter = QueryTableFilter(
+            user=user,
+            data=request_data,
+            queryset=qs,
+        )
+        self.checkbox_filter = CheckboxCompensationTableFilter(
+            user=user,
+            data=request_data,
+            queryset=self.query_filter.qs,
+        )
+        self.qs = self.checkbox_filter.qs
+
+
+class CheckboxEcoAccountTableFilter(CheckboxTableFilter):
     sr = django_filters.BooleanFilter(
         method='filter_only_show_unrecorded',
         label=_("Show only unrecorded"),
@@ -107,3 +127,29 @@ class EcoAccountTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin,
             )
         else:
             return queryset
+
+
+class EcoAccountTableFilter:
+    """ TableFilter for eco accounts
+
+    """
+    query_filter = None
+    checkbox_filter = None
+    qs = None
+
+    def __init__(self, *args, **kwargs):
+        user = kwargs.get("user", None)
+        qs = kwargs.get("queryset", None)
+        request_data = kwargs.get("data", None)
+
+        self.query_filter = QueryTableFilter(
+            user=user,
+            data=request_data,
+            queryset=qs,
+        )
+        self.checkbox_filter = CheckboxEcoAccountTableFilter(
+            user=user,
+            data=request_data,
+            queryset=self.query_filter.qs,
+        )
+        self.qs = self.checkbox_filter.qs
diff --git a/intervention/filters.py b/intervention/filters.py
index 01a3abe5..c6b61156 100644
--- a/intervention/filters.py
+++ b/intervention/filters.py
@@ -5,19 +5,27 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 22.07.21
 
 """
-from intervention.models import Intervention
-from konova.filters import AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, \
-    RecordableTableFilterMixin
+from konova.filters import QueryTableFilter, CheckboxTableFilter
 
 
-class InterventionTableFilter(AbstractTableFilter, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, RecordableTableFilterMixin):
-    """ TableFilter for Intervention model
-
-    """
-
-    class Meta:
-        model = Intervention
-        fields = []
+class InterventionTableFilter:
+    query_filter = None
+    checkbox_filter = None
+    qs = None
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        user = kwargs.get("user", None)
+        qs = kwargs.get("queryset", None)
+        request_data = kwargs.get("data", None)
+
+        self.query_filter = QueryTableFilter(
+            user=user,
+            data=request_data,
+            queryset=qs,
+        )
+        self.checkbox_filter = CheckboxTableFilter(
+            user=user,
+            data=request_data,
+            queryset=self.query_filter.qs,
+        )
+        self.qs = self.checkbox_filter.qs
diff --git a/konova/filters.py b/konova/filters.py
index ace6b4e9..9b3461c6 100644
--- a/konova/filters.py
+++ b/konova/filters.py
@@ -19,8 +19,17 @@ class AbstractTableFilter(django_filters.FilterSet):
     """ TableFilter for Intervention model
 
     """
+    class Meta:
+        abstract = True
+
+    def __init__(self, user: User, *args, **kwargs):
+        self.user = user
+        super().__init__(*args, **kwargs)
+
+
+class KeywordTableFilterMixin(django_filters.FilterSet):
     q = django_filters.Filter(
-        method='_filter_by_keyword',
+        method='filter_by_keyword',
         # Since we use a custom search bar in the template, we need to 'render' this filter
         # as 'anonymous' HiddenInput (no id, no name). This way our custom search bar's id and name won't be
         # overwritten with these id and name (which would be equal)
@@ -31,11 +40,7 @@ class AbstractTableFilter(django_filters.FilterSet):
     class Meta:
         abstract = True
 
-    def __init__(self, user: User, *args, **kwargs):
-        self.user = user
-        super().__init__(*args, **kwargs)
-
-    def _filter_by_keyword(self, queryset, name, value) -> QuerySet:
+    def filter_by_keyword(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of search bar input
 
         Args:
@@ -309,3 +314,17 @@ class RecordableTableFilterMixin(django_filters.FilterSet):
             )
         else:
             return queryset
+
+
+class QueryTableFilter(AbstractTableFilter, KeywordTableFilterMixin, GeoReferencedTableFilterMixin):
+    """ TableFilter holding different filter options for query related filtering
+
+    """
+    pass
+
+
+class CheckboxTableFilter(AbstractTableFilter, ShareableTableFilterMixin, RecordableTableFilterMixin):
+    """ TableFilter holding different filter options for checkbox related filtering
+
+    """
+    pass
diff --git a/templates/generic_index.html b/templates/generic_index.html
index cf3253a3..66ab6525 100644
--- a/templates/generic_index.html
+++ b/templates/generic_index.html
@@ -41,7 +41,7 @@
             <div class="row my-1">
                 <div class="col-sm-12 col-md-8 col-lg-6">
                         <div class="input-group">
-                            <input id="id_{{table.filter.filters.q.field_name}}" name="{{table.filter.filters.q.field_name}}" type="text" class="form-control" aria-label="{% trans 'Search for keywords' %}" placeholder="{% trans 'Search' %}" value="{{ request.GET.q }}">
+                            <input id="id_{{table.filter.query_filter.filters.q.field_name}}" name="{{table.filter.query_filter.filters.q.field_name}}" type="text" class="form-control" aria-label="{% trans 'Search for keywords' %}" placeholder="{% trans 'Search' %}" value="{{ request.GET.q }}">
                             <div class="input-group-append" title="{% trans 'Start search' %}">
                                 <button type="submit" class="btn btn-default input-group-text">
                                     <span class="">
@@ -82,11 +82,18 @@
                         </div>
                         <div id="filter" class="collapse" aria-labelledby="filterHeader">
                             <div class="card-body">
-                                    {{ table.filter.form.as_p }}
+                                <div class="row">
+                                    {{table.filter.query_filter.form.as_p}}
+                                </div>
+                                <div class="row">
+                                    {{table.filter.checkbox_filter.form.as_p}}
+                                </div>
+                                <div class="row">
                                     <button class="btn btn-default" title="{% trans 'Filter' %}">
                                         {% fa5_icon 'filter' %}
                                         {% trans 'Apply filter' %}
                                     </button>
+                                </div>
                             </div>
                         </div>
                     </div>

From 972405a720cf58c1f71f91ca9cd9b54c3761abbf Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Tue, 11 Jan 2022 16:32:33 +0100
Subject: [PATCH 4/9] # 61 Filter frontend

* finished filter frontend
---
 konova/filters.py                     | 27 ++++++++++++++++++++-------
 templates/filter/checkbox_filter.html |  5 +++++
 templates/filter/query_filter.html    | 10 ++++++++++
 templates/generic_index.html          | 13 +++++++++----
 4 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 templates/filter/checkbox_filter.html
 create mode 100644 templates/filter/query_filter.html

diff --git a/konova/filters.py b/konova/filters.py
index 9b3461c6..00445828 100644
--- a/konova/filters.py
+++ b/konova/filters.py
@@ -71,7 +71,8 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
         widget=forms.TextInput(
             attrs={
                 "placeholder": _("District"),
-                "title": _("Search for district")
+                "title": _("Search for district"),
+                "class": "form-control",
             }
         ),
     )
@@ -83,7 +84,8 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
         widget=forms.TextInput(
             attrs={
                 "placeholder": _("Parcel gmrkng"),
-                "title": _("Search for parcel gmrkng")
+                "title": _("Search for parcel gmrkng"),
+                "class": "form-control",
             }
         ),
     )
@@ -95,7 +97,8 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
         widget=forms.TextInput(
             attrs={
                 "placeholder": _("Parcel"),
-                "title": _("Search for parcel")
+                "title": _("Search for parcel"),
+                "class": "form-control",
             }
         ),
     )
@@ -107,7 +110,8 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
         widget=forms.TextInput(
             attrs={
                 "placeholder": _("Parcel counter"),
-                "title": _("Search for parcel counter")
+                "title": _("Search for parcel counter"),
+                "class": "form-control",
             }
         ),
     )
@@ -120,7 +124,8 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet):
         widget=forms.TextInput(
             attrs={
                 "placeholder": _("Parcel number"),
-                "title": _("Search for parcel number")
+                "title": _("Search for parcel number"),
+                "class": "form-control",
             }
         ),
     )
@@ -251,7 +256,11 @@ class ShareableTableFilterMixin(django_filters.FilterSet):
         method='filter_show_all',
         label=_("Show unshared"),
         label_suffix=_(""),
-        widget=forms.CheckboxInput()
+        widget=forms.CheckboxInput(
+            attrs={
+                "class": "form-check-input",
+            }
+        )
     )
 
     class Meta:
@@ -291,7 +300,11 @@ class RecordableTableFilterMixin(django_filters.FilterSet):
         method='filter_show_recorded',
         label=_("Show recorded"),
         label_suffix=_(""),
-        widget=forms.CheckboxInput()
+        widget=forms.CheckboxInput(
+            attrs={
+                "class": "form-check-input",
+            }
+        )
     )
 
     class Meta:
diff --git a/templates/filter/checkbox_filter.html b/templates/filter/checkbox_filter.html
new file mode 100644
index 00000000..93410368
--- /dev/null
+++ b/templates/filter/checkbox_filter.html
@@ -0,0 +1,5 @@
+{% for field in form %}
+    <div class="form-check form-check-inline">
+        {{field}}  <label class="form-check-label" for="id_{{field.name}}">{{field.label}}</label>
+    </div>
+{% endfor %}
\ No newline at end of file
diff --git a/templates/filter/query_filter.html b/templates/filter/query_filter.html
new file mode 100644
index 00000000..24c867a9
--- /dev/null
+++ b/templates/filter/query_filter.html
@@ -0,0 +1,10 @@
+<div class="form-row align-items-center">
+    {% for field in form %}
+        {% if not field.is_hidden %}
+        <div class="col-auto">
+            {{field}}
+        </div>
+        {% else %}
+        {% endif %}
+    {% endfor %}
+</div>
\ No newline at end of file
diff --git a/templates/generic_index.html b/templates/generic_index.html
index 66ab6525..cd2c3269 100644
--- a/templates/generic_index.html
+++ b/templates/generic_index.html
@@ -83,12 +83,17 @@
                         <div id="filter" class="collapse" aria-labelledby="filterHeader">
                             <div class="card-body">
                                 <div class="row">
-                                    {{table.filter.query_filter.form.as_p}}
+                                    {% with table.filter.query_filter.form as form %}
+                                        {% include 'filter/query_filter.html' %}
+                                    {% endwith %}
                                 </div>
-                                <div class="row">
-                                    {{table.filter.checkbox_filter.form.as_p}}
+                                <div class="row mt-3">
+                                    {% with table.filter.checkbox_filter.form as form %}
+                                        {% include 'filter/checkbox_filter.html' %}
+                                    {% endwith %}
                                 </div>
-                                <div class="row">
+                                <hr>
+                                <div class="row mt-3">
                                     <button class="btn btn-default" title="{% trans 'Filter' %}">
                                         {% fa5_icon 'filter' %}
                                         {% trans 'Apply filter' %}

From 4631f278787e63c6d6a9b62d57426185062ba103 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Tue, 11 Jan 2022 17:29:36 +0100
Subject: [PATCH 5/9] # 61 Filter frontend

* adds filtering for file number
* updates translations
---
 compensation/filters.py         |  22 +++++-
 konova/filters.py               |  27 ++++++-
 locale/de/LC_MESSAGES/django.mo | Bin 29698 -> 29827 bytes
 locale/de/LC_MESSAGES/django.po | 121 +++++++++++++++++---------------
 4 files changed, 110 insertions(+), 60 deletions(-)

diff --git a/compensation/filters.py b/compensation/filters.py
index b44b900a..b4dab866 100644
--- a/compensation/filters.py
+++ b/compensation/filters.py
@@ -8,11 +8,23 @@ Created on: 29.07.21
 import django_filters
 from django.utils.translation import gettext_lazy as _
 from django import forms
-from django.db.models import QuerySet
+from django.db.models import QuerySet, Q
 
 from konova.filters import QueryTableFilter, CheckboxTableFilter
 
 
+class QueryCompensationTableFilter(QueryTableFilter):
+    """ Specialization of regular QueryTableFilter for compensation model
+
+    """
+    def filter_file_number(self, queryset, name, value) -> QuerySet:
+        queryset = queryset.filter(
+            Q(intervention__responsible__registration_file_number__icontains=value) |
+            Q(intervention__responsible__conservation_file_number__icontains=value)
+        )
+        return queryset
+
+
 class CheckboxCompensationTableFilter(CheckboxTableFilter):
     """ Specialization of regular CheckboxTableFilter for compensation model
 
@@ -71,7 +83,7 @@ class CompensationTableFilter:
         qs = kwargs.get("queryset", None)
         request_data = kwargs.get("data", None)
 
-        self.query_filter = QueryTableFilter(
+        self.query_filter = QueryCompensationTableFilter(
             user=user,
             data=request_data,
             queryset=qs,
@@ -89,7 +101,11 @@ class CheckboxEcoAccountTableFilter(CheckboxTableFilter):
         method='filter_only_show_unrecorded',
         label=_("Show only unrecorded"),
         label_suffix=_(""),
-        widget=forms.CheckboxInput()
+        widget=forms.CheckboxInput(
+            attrs={
+                "class": "form-check-input",
+            }
+        )
     )
 
     def filter_show_all(self, queryset, name, value) -> QuerySet:
diff --git a/konova/filters.py b/konova/filters.py
index 00445828..1364aeb1 100644
--- a/konova/filters.py
+++ b/konova/filters.py
@@ -57,6 +57,28 @@ class KeywordTableFilterMixin(django_filters.FilterSet):
         return queryset.filter(q)
 
 
+class FileNumberTableFilterMixin(django_filters.FilterSet):
+    rf = django_filters.CharFilter(
+        method="filter_file_number",
+        label=_(""),
+        label_suffix=_(""),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("File number"),
+                "title": _("Search for file number"),
+                "class": "form-control",
+            }
+        ),
+    )
+
+    def filter_file_number(self, queryset, name, value) -> QuerySet:
+        queryset = queryset.filter(
+            Q(responsible__registration_file_number__icontains=value) |
+            Q(responsible__conservation_file_number__icontains=value)
+        )
+        return queryset
+
+
 class GeoReferencedTableFilterMixin(django_filters.FilterSet):
     """ A mixin for AbstractTableFilter
 
@@ -329,7 +351,10 @@ class RecordableTableFilterMixin(django_filters.FilterSet):
             return queryset
 
 
-class QueryTableFilter(AbstractTableFilter, KeywordTableFilterMixin, GeoReferencedTableFilterMixin):
+class QueryTableFilter(AbstractTableFilter,
+                       KeywordTableFilterMixin,
+                       FileNumberTableFilterMixin,
+                       GeoReferencedTableFilterMixin):
     """ TableFilter holding different filter options for query related filtering
 
     """
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 65defeed94e56e2d8d0c68b2d053d54b629a1b04..1246234f1e0debae2285b00e000c54893295026c 100644
GIT binary patch
delta 9226
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

delta 9101
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

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 453d065d..cb6b2a81 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -3,25 +3,26 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: compensation/filters.py:71 compensation/forms/modalForms.py:34
+#: compensation/filters.py:91 compensation/forms/modalForms.py:34
 #: compensation/forms/modalForms.py:45 compensation/forms/modalForms.py:61
 #: compensation/forms/modalForms.py:238 compensation/forms/modalForms.py:316
-#: intervention/filters.py:25 intervention/filters.py:31
 #: intervention/forms/forms.py:52 intervention/forms/forms.py:154
 #: intervention/forms/forms.py:166 intervention/forms/modalForms.py:125
 #: intervention/forms/modalForms.py:138 intervention/forms/modalForms.py:151
-#: konova/filters.py:64 konova/filters.py:65 konova/filters.py:76
-#: konova/filters.py:77 konova/filters.py:88 konova/filters.py:89
-#: konova/filters.py:100 konova/filters.py:101 konova/filters.py:113
-#: konova/filters.py:114 konova/forms.py:140 konova/forms.py:241
-#: konova/forms.py:312 konova/forms.py:339 konova/forms.py:349
-#: konova/forms.py:362 konova/forms.py:374 konova/forms.py:392 user/forms.py:38
+#: konova/filters.py:63 konova/filters.py:64 konova/filters.py:91
+#: konova/filters.py:92 konova/filters.py:104 konova/filters.py:105
+#: konova/filters.py:117 konova/filters.py:118 konova/filters.py:130
+#: konova/filters.py:131 konova/filters.py:144 konova/filters.py:145
+#: konova/filters.py:280 konova/filters.py:324 konova/forms.py:140
+#: konova/forms.py:241 konova/forms.py:312 konova/forms.py:339
+#: konova/forms.py:349 konova/forms.py:362 konova/forms.py:374
+#: konova/forms.py:392 user/forms.py:38
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-11 09:31+0100\n"
+"POT-Creation-Date: 2022-01-11 17:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -147,7 +148,7 @@ msgstr "Geprüft"
 #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9
 #: analysis/templates/analysis/reports/includes/intervention/laws.html:20
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:18
-#: compensation/tables.py:41 compensation/tables.py:181
+#: compensation/tables.py:41 compensation/tables.py:182
 #: compensation/templates/compensation/detail/compensation/view.html:77
 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31
 #: compensation/templates/compensation/detail/eco_account/view.html:44
@@ -233,7 +234,7 @@ msgstr "Kompensationsart"
 
 #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:15
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:29
-#: compensation/tables.py:84
+#: compensation/tables.py:85
 #: compensation/templates/compensation/detail/compensation/view.html:19
 #: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28
 msgid "Compensation"
@@ -278,14 +279,14 @@ msgstr "Typ"
 
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:24
 #: intervention/forms/modalForms.py:306 intervention/forms/modalForms.py:313
-#: intervention/tables.py:88
+#: intervention/tables.py:89
 #: intervention/templates/intervention/detail/view.html:19
 #: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22
 msgid "Intervention"
 msgstr "Eingriff"
 
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:34
-#: compensation/tables.py:224
+#: compensation/tables.py:226
 #: compensation/templates/compensation/detail/eco_account/view.html:19
 #: intervention/forms/modalForms.py:279 intervention/forms/modalForms.py:286
 #: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34
@@ -300,12 +301,12 @@ msgstr "Altfälle"
 msgid "Before"
 msgstr "Vor"
 
-#: compensation/filters.py:70
+#: compensation/filters.py:90
 msgid "Show only unrecorded"
 msgstr "Nur unverzeichnete anzeigen"
 
 #: compensation/forms/forms.py:32 compensation/tables.py:25
-#: compensation/tables.py:166 ema/tables.py:28 intervention/forms/forms.py:26
+#: compensation/tables.py:167 ema/tables.py:28 intervention/forms/forms.py:26
 #: intervention/tables.py:23
 #: intervention/templates/intervention/detail/includes/compensations.html:30
 msgid "Identifier"
@@ -316,7 +317,7 @@ msgid "Generated automatically"
 msgstr "Automatisch generiert"
 
 #: compensation/forms/forms.py:44 compensation/tables.py:30
-#: compensation/tables.py:171
+#: compensation/tables.py:172
 #: compensation/templates/compensation/detail/compensation/includes/documents.html:28
 #: compensation/templates/compensation/detail/compensation/view.html:31
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28
@@ -635,65 +636,65 @@ msgstr ""
 "Es wurde bereits mehr Fläche abgebucht, als Sie nun als abbuchbar einstellen "
 "wollen. Kontaktieren Sie die für die Abbuchungen verantwortlichen Nutzer!"
 
-#: compensation/tables.py:47 compensation/tables.py:187 ema/tables.py:44
+#: compensation/tables.py:47 compensation/tables.py:188 ema/tables.py:44
 #: intervention/tables.py:51
 msgid "Editable"
 msgstr "Freigegeben"
 
-#: compensation/tables.py:53 compensation/tables.py:193 ema/tables.py:50
+#: compensation/tables.py:53 compensation/tables.py:194 ema/tables.py:50
 #: intervention/tables.py:57
 msgid "Last edit"
 msgstr "Zuletzt bearbeitet"
 
-#: compensation/tables.py:84 compensation/tables.py:224 ema/tables.py:82
-#: intervention/tables.py:88
+#: compensation/tables.py:85 compensation/tables.py:226 ema/tables.py:83
+#: intervention/tables.py:89
 msgid "Open {}"
 msgstr "Öffne {}"
 
-#: compensation/tables.py:105 intervention/tables.py:107
+#: compensation/tables.py:106 intervention/tables.py:108
 msgid "Not checked yet"
 msgstr "Noch nicht geprüft"
 
-#: compensation/tables.py:110 intervention/tables.py:112
+#: compensation/tables.py:111 intervention/tables.py:113
 msgid "Checked on {} by {}"
 msgstr "Am {} von {} geprüft worden"
 
-#: compensation/tables.py:129
+#: compensation/tables.py:130
 #: compensation/templates/compensation/detail/compensation/view.html:80
 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56
 #: compensation/templates/compensation/detail/eco_account/view.html:47
-#: ema/tables.py:101 ema/templates/ema/detail/view.html:38
-#: intervention/tables.py:131
+#: ema/tables.py:102 ema/templates/ema/detail/view.html:38
+#: intervention/tables.py:132
 #: intervention/templates/intervention/detail/view.html:85
 msgid "Not recorded yet"
 msgstr "Noch nicht verzeichnet"
 
-#: compensation/tables.py:134 compensation/tables.py:262 ema/tables.py:106
-#: intervention/tables.py:136
+#: compensation/tables.py:135 compensation/tables.py:264 ema/tables.py:107
+#: intervention/tables.py:137
 msgid "Recorded on {} by {}"
 msgstr "Am {} von {} verzeichnet worden"
 
-#: compensation/tables.py:158 compensation/tables.py:284 ema/tables.py:129
-#: intervention/tables.py:159
+#: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:130
+#: intervention/tables.py:160
 msgid "Full access granted"
 msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden"
 
-#: compensation/tables.py:158 compensation/tables.py:284 ema/tables.py:129
-#: intervention/tables.py:159
+#: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:130
+#: intervention/tables.py:160
 msgid "Access not granted"
 msgstr "Nicht freigegeben - Datensatz nur lesbar"
 
-#: compensation/tables.py:176
+#: compensation/tables.py:177
 #: compensation/templates/compensation/detail/eco_account/view.html:35
 #: konova/templates/konova/widgets/progressbar.html:3
 msgid "Available"
 msgstr "Verfügbar"
 
-#: compensation/tables.py:202
+#: compensation/tables.py:203
 msgid "Eco Accounts"
 msgstr "Ökokonten"
 
-#: compensation/tables.py:257
+#: compensation/tables.py:259
 msgid "Not recorded yet. Can not be used for deductions, yet."
 msgstr ""
 "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden."
@@ -1179,7 +1180,7 @@ msgstr ""
 "Maßnahmen aus Ersatzzahlungen, die nach 2015 rechtskräftig wurden, werden "
 "durch die Stiftung Natur und Umwelt verwaltet."
 
-#: ema/tables.py:82 templates/navbars/navbar.html:43
+#: ema/tables.py:83 templates/navbars/navbar.html:43
 msgid "EMA"
 msgstr ""
 
@@ -1199,14 +1200,6 @@ msgstr "EMA {} bearbeitet"
 msgid "EMA removed"
 msgstr "EMA entfernt"
 
-#: intervention/filters.py:24
-msgid "Show unshared"
-msgstr "Nicht freigegebene anzeigen"
-
-#: intervention/filters.py:30
-msgid "Show recorded"
-msgstr "Verzeichnete anzeigen"
-
 #: intervention/forms/forms.py:44
 msgid "Construction XY; Location ABC"
 msgstr "Bauvorhaben XY; Flur ABC"
@@ -1376,11 +1369,11 @@ msgstr ""
 msgid "Revocation"
 msgstr "Widerspruch"
 
-#: intervention/tables.py:176
+#: intervention/tables.py:177
 msgid "No revocation"
 msgstr "Kein Widerspruch"
 
-#: intervention/tables.py:182
+#: intervention/tables.py:183
 msgid "Revocation from {}, added on {} by {}"
 msgstr "Widerspruch vom {}, am {} von {} hinzugefügt"
 
@@ -1515,46 +1508,62 @@ msgstr ""
 "somit nichts eingeben, bearbeiten oder sonstige Aktionen ausführen. "
 "Kontaktieren Sie bitte einen Administrator. +++"
 
+#: konova/filters.py:67
+msgid "File number"
+msgstr "Aktenzeichen"
+
 #: konova/filters.py:68
+msgid "Search for file number"
+msgstr "Nach Aktenzeichen suchen"
+
+#: konova/filters.py:95
 msgid "District"
 msgstr "Kreis"
 
-#: konova/filters.py:69
+#: konova/filters.py:96
 msgid "Search for district"
 msgstr "Nach Kreis suchen"
 
-#: konova/filters.py:80
+#: konova/filters.py:108
 msgid "Parcel gmrkng"
 msgstr "Gemarkung"
 
-#: konova/filters.py:81
+#: konova/filters.py:109
 msgid "Search for parcel gmrkng"
 msgstr "Nach Gemarkung suchen"
 
-#: konova/filters.py:92 konova/templates/konova/includes/parcels.html:18
+#: konova/filters.py:121 konova/templates/konova/includes/parcels.html:18
 msgid "Parcel"
 msgstr "Flur"
 
-#: konova/filters.py:93
+#: konova/filters.py:122
 msgid "Search for parcel"
 msgstr "Nach Flur suchen"
 
-#: konova/filters.py:104 konova/templates/konova/includes/parcels.html:19
+#: konova/filters.py:134 konova/templates/konova/includes/parcels.html:19
 msgid "Parcel counter"
 msgstr "Flurstückzähler"
 
-#: konova/filters.py:105
+#: konova/filters.py:135
 msgid "Search for parcel counter"
 msgstr "Nach Flurstückzähler suchen"
 
-#: konova/filters.py:117 konova/templates/konova/includes/parcels.html:20
+#: konova/filters.py:148 konova/templates/konova/includes/parcels.html:20
 msgid "Parcel number"
 msgstr "Flurstücknenner"
 
-#: konova/filters.py:118
+#: konova/filters.py:149
 msgid "Search for parcel number"
 msgstr "Nach Flurstücknenner suchen"
 
+#: konova/filters.py:279
+msgid "Show unshared"
+msgstr "Nicht freigegebene anzeigen"
+
+#: konova/filters.py:323
+msgid "Show recorded"
+msgstr "Verzeichnete anzeigen"
+
 #: konova/forms.py:37 templates/form/collapsable/form.html:62
 msgid "Save"
 msgstr "Speichern"
@@ -1921,11 +1930,11 @@ msgstr "Starte Suche"
 msgid "Results per page"
 msgstr "Treffer pro Seite"
 
-#: templates/generic_index.html:82 templates/generic_index.html:88
+#: templates/generic_index.html:82 templates/generic_index.html:99
 msgid "Filter"
 msgstr ""
 
-#: templates/generic_index.html:90
+#: templates/generic_index.html:101
 msgid "Apply filter"
 msgstr "Filter anwenden"
 

From 0cb65ae7208d97c1c5fb3c7f044cefef970085e3 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 12 Jan 2022 08:56:49 +0100
Subject: [PATCH 6/9] # 61 Filter offices frontend/backend

* adds filters for registration and conservation offices
* adds SelectionTableFilter as new holder for these types of filter components
---
 compensation/filters.py      | 33 ++++++++++++++--
 intervention/filters.py      | 10 ++++-
 konova/filters.py            | 76 ++++++++++++++++++++++++++++++++++++
 templates/generic_index.html | 15 +++++++
 4 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/compensation/filters.py b/compensation/filters.py
index b4dab866..3e3df60e 100644
--- a/compensation/filters.py
+++ b/compensation/filters.py
@@ -10,7 +10,22 @@ from django.utils.translation import gettext_lazy as _
 from django import forms
 from django.db.models import QuerySet, Q
 
-from konova.filters import QueryTableFilter, CheckboxTableFilter
+from konova.filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter
+
+
+class SelectionCompensationTableFilter(SelectionTableFilter):
+    """ Specialization of regular SelectionTableFilter for compensation model
+
+    """
+    def filter_reg_office(self, queryset, name, value):
+        return queryset.filter(
+            intervention__responsible__registration_office=value
+        )
+
+    def filter_cons_office(self, queryset, name, value):
+        return queryset.filter(
+            intervention__responsible__conservation_office=value
+        )
 
 
 class QueryCompensationTableFilter(QueryTableFilter):
@@ -74,6 +89,7 @@ class CompensationTableFilter:
     Just some minor changes for Compensation model.
 
     """
+    selection_filter = None
     query_filter = None
     checkbox_filter = None
     qs = None
@@ -83,11 +99,16 @@ class CompensationTableFilter:
         qs = kwargs.get("queryset", None)
         request_data = kwargs.get("data", None)
 
-        self.query_filter = QueryCompensationTableFilter(
+        self.selection_filter = SelectionCompensationTableFilter(
             user=user,
             data=request_data,
             queryset=qs,
         )
+        self.query_filter = QueryCompensationTableFilter(
+            user=user,
+            data=request_data,
+            queryset=self.selection_filter.qs,
+        )
         self.checkbox_filter = CheckboxCompensationTableFilter(
             user=user,
             data=request_data,
@@ -149,6 +170,7 @@ class EcoAccountTableFilter:
     """ TableFilter for eco accounts
 
     """
+    selection_filter = None
     query_filter = None
     checkbox_filter = None
     qs = None
@@ -158,11 +180,16 @@ class EcoAccountTableFilter:
         qs = kwargs.get("queryset", None)
         request_data = kwargs.get("data", None)
 
-        self.query_filter = QueryTableFilter(
+        self.selection_filter = SelectionTableFilter(
             user=user,
             data=request_data,
             queryset=qs,
         )
+        self.query_filter = QueryTableFilter(
+            user=user,
+            data=request_data,
+            queryset=self.selection_filter.qs,
+        )
         self.checkbox_filter = CheckboxEcoAccountTableFilter(
             user=user,
             data=request_data,
diff --git a/intervention/filters.py b/intervention/filters.py
index c6b61156..4b452089 100644
--- a/intervention/filters.py
+++ b/intervention/filters.py
@@ -5,10 +5,11 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 22.07.21
 
 """
-from konova.filters import QueryTableFilter, CheckboxTableFilter
+from konova.filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter
 
 
 class InterventionTableFilter:
+    selection_filter = None
     query_filter = None
     checkbox_filter = None
     qs = None
@@ -18,11 +19,16 @@ class InterventionTableFilter:
         qs = kwargs.get("queryset", None)
         request_data = kwargs.get("data", None)
 
-        self.query_filter = QueryTableFilter(
+        self.selection_filter = SelectionTableFilter(
             user=user,
             data=request_data,
             queryset=qs,
         )
+        self.query_filter = QueryTableFilter(
+            user=user,
+            data=request_data,
+            queryset=self.selection_filter.qs,
+        )
         self.checkbox_filter = CheckboxTableFilter(
             user=user,
             data=request_data,
diff --git a/konova/filters.py b/konova/filters.py
index 1364aeb1..4a112872 100644
--- a/konova/filters.py
+++ b/konova/filters.py
@@ -6,11 +6,14 @@ Created on: 11.01.22
 
 """
 import django_filters
+from dal_select2.widgets import ModelSelect2
 from django import forms
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 from django.db.models import QuerySet, Q
 
+from codelist.models import KonovaCode
+from codelist.settings import CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID
 from intervention.inputs import DummyFilterInput
 from konova.models import Parcel, District
 
@@ -351,6 +354,79 @@ class RecordableTableFilterMixin(django_filters.FilterSet):
             return queryset
 
 
+class RegistrationOfficeTableFilterMixin(django_filters.FilterSet):
+    """ A mixin for AbstractTableFilter
+
+    Specialized on filtering for related registration offices
+
+    """
+    ro = django_filters.ModelChoiceFilter(
+        method="filter_reg_office",
+        label=_(""),
+        label_suffix=_(""),
+        queryset=KonovaCode.objects.filter(
+            is_archived=False,
+            is_leaf=True,
+            code_lists__in=[CODELIST_REGISTRATION_OFFICE_ID],
+        ),
+        widget=ModelSelect2(
+            url="codes-registration-office-autocomplete",
+            attrs={
+                "data-placeholder": _("Registration office"),
+                "title": _("Search for registration office"),
+                "class": "",
+            }
+        ),
+    )
+
+    def filter_reg_office(self, queryset, name, value):
+        qs = queryset.filter(
+            responsible__registration_office=value
+        )
+        return qs
+
+
+class ConservationOfficeTableFilterMixin(django_filters.FilterSet):
+    """ A mixin for AbstractTableFilter
+
+    Specialized on filtering for related conservation offices
+
+    """
+    co = django_filters.ModelChoiceFilter(
+        method="filter_cons_office",
+        label=_(""),
+        label_suffix=_(""),
+        queryset=KonovaCode.objects.filter(
+            is_archived=False,
+            is_leaf=True,
+            code_lists__in=[CODELIST_CONSERVATION_OFFICE_ID],
+        ),
+        widget=ModelSelect2(
+            url="codes-conservation-office-autocomplete",
+            attrs={
+                "data-placeholder": _("Conservation office"),
+                "title": _("Search for conservation office"),
+                "class": "",
+            }
+        ),
+    )
+
+    def filter_cons_office(self, queryset, name, value):
+        qs = queryset.filter(
+            responsible__conservation_office=value
+        )
+        return qs
+
+
+class SelectionTableFilter(AbstractTableFilter,
+                           RegistrationOfficeTableFilterMixin,
+                           ConservationOfficeTableFilterMixin):
+    """ TableFilter holding different filter options for selection related filtering
+
+    """
+    pass
+
+
 class QueryTableFilter(AbstractTableFilter,
                        KeywordTableFilterMixin,
                        FileNumberTableFilterMixin,
diff --git a/templates/generic_index.html b/templates/generic_index.html
index cd2c3269..13080726 100644
--- a/templates/generic_index.html
+++ b/templates/generic_index.html
@@ -3,6 +3,16 @@
 {% load django_tables2 %}
 {% load i18n static fontawesome_5 %}
 
+{% block head %}
+    {% comment %}
+        dal documentation (django-autocomplete-light) states using form.media for adding needed scripts.
+        This does not work properly with modal forms, as the scripts are not loaded properly inside the modal.
+        Therefore the script linkages from form.media have been extracted and put inside dal/scripts.html to ensure
+        these scripts are loaded when needed.
+    {% endcomment %}
+    {% include 'dal/scripts.html' %}
+{% endblock %}
+
 {% block body %}
     <div class="col-md">
         {% if table.title %}
@@ -83,6 +93,11 @@
                         <div id="filter" class="collapse" aria-labelledby="filterHeader">
                             <div class="card-body">
                                 <div class="row">
+                                    {% with table.filter.selection_filter.form as form %}
+                                        {% include 'filter/query_filter.html' %}
+                                    {% endwith %}
+                                </div>
+                                <div class="row mt-3">
                                     {% with table.filter.query_filter.form as form %}
                                         {% include 'filter/query_filter.html' %}
                                     {% endwith %}

From 59a541397e75a8e0997423a5f7789012ec1b2526 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 12 Jan 2022 09:23:22 +0100
Subject: [PATCH 7/9] # 61 Filter code enhancement

* reorganizes code
---
 compensation/filters.py    | 33 +++++++++++++--------------------
 intervention/filters.py    | 18 +++++++-----------
 konova/filters.py          | 23 ++++++++++++-----------
 konova/tests/test_views.py |  2 ++
 4 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/compensation/filters.py b/compensation/filters.py
index 3e3df60e..62c22bd1 100644
--- a/compensation/filters.py
+++ b/compensation/filters.py
@@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from django import forms
 from django.db.models import QuerySet, Q
 
-from konova.filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter
+from konova.filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter, AbstractTableFilter
 
 
 class SelectionCompensationTableFilter(SelectionTableFilter):
@@ -82,30 +82,26 @@ class CheckboxCompensationTableFilter(CheckboxTableFilter):
             return queryset
 
 
-class CompensationTableFilter:
+class CompensationTableFilter(AbstractTableFilter):
     """ TableFilter for compensations
 
     Based widely on InterventionTableFilter.
     Just some minor changes for Compensation model.
 
     """
-    selection_filter = None
-    query_filter = None
-    checkbox_filter = None
-    qs = None
+    def __init__(self, user=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
-    def __init__(self, *args, **kwargs):
-        user = kwargs.get("user", None)
+        self.user = user
         qs = kwargs.get("queryset", None)
         request_data = kwargs.get("data", None)
 
+        # Overwrite all filters for special needs of compensations
         self.selection_filter = SelectionCompensationTableFilter(
-            user=user,
             data=request_data,
             queryset=qs,
         )
         self.query_filter = QueryCompensationTableFilter(
-            user=user,
             data=request_data,
             queryset=self.selection_filter.qs,
         )
@@ -114,6 +110,7 @@ class CompensationTableFilter:
             data=request_data,
             queryset=self.query_filter.qs,
         )
+        # Overwrite final queryset as well
         self.qs = self.checkbox_filter.qs
 
 
@@ -166,27 +163,22 @@ class CheckboxEcoAccountTableFilter(CheckboxTableFilter):
             return queryset
 
 
-class EcoAccountTableFilter:
+class EcoAccountTableFilter(AbstractTableFilter):
     """ TableFilter for eco accounts
 
     """
-    selection_filter = None
-    query_filter = None
-    checkbox_filter = None
-    qs = None
-
-    def __init__(self, *args, **kwargs):
-        user = kwargs.get("user", None)
+    def __init__(self, user=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.user = user
         qs = kwargs.get("queryset", None)
         request_data = kwargs.get("data", None)
 
+        # Pipe the queryset through all needed filters
         self.selection_filter = SelectionTableFilter(
-            user=user,
             data=request_data,
             queryset=qs,
         )
         self.query_filter = QueryTableFilter(
-            user=user,
             data=request_data,
             queryset=self.selection_filter.qs,
         )
@@ -195,4 +187,5 @@ class EcoAccountTableFilter:
             data=request_data,
             queryset=self.query_filter.qs,
         )
+        # Overwrite the final queryset result
         self.qs = self.checkbox_filter.qs
diff --git a/intervention/filters.py b/intervention/filters.py
index 4b452089..0d927573 100644
--- a/intervention/filters.py
+++ b/intervention/filters.py
@@ -5,27 +5,22 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 22.07.21
 
 """
-from konova.filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter
+from konova.filters import AbstractTableFilter, SelectionTableFilter, QueryTableFilter, CheckboxTableFilter
 
 
-class InterventionTableFilter:
-    selection_filter = None
-    query_filter = None
-    checkbox_filter = None
-    qs = None
-
-    def __init__(self, *args, **kwargs):
-        user = kwargs.get("user", None)
+class InterventionTableFilter(AbstractTableFilter):
+    def __init__(self, user=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.user = user
         qs = kwargs.get("queryset", None)
         request_data = kwargs.get("data", None)
 
+        # Pipe the queryset through all needed filters
         self.selection_filter = SelectionTableFilter(
-            user=user,
             data=request_data,
             queryset=qs,
         )
         self.query_filter = QueryTableFilter(
-            user=user,
             data=request_data,
             queryset=self.selection_filter.qs,
         )
@@ -35,3 +30,4 @@ class InterventionTableFilter:
             queryset=self.query_filter.qs,
         )
         self.qs = self.checkbox_filter.qs
+
diff --git a/konova/filters.py b/konova/filters.py
index 4a112872..6244c35a 100644
--- a/konova/filters.py
+++ b/konova/filters.py
@@ -19,16 +19,18 @@ from konova.models import Parcel, District
 
 
 class AbstractTableFilter(django_filters.FilterSet):
-    """ TableFilter for Intervention model
+    """ Base TableFilter for all models
 
     """
+    selection_filter = None
+    query_filter = None
+    checkbox_filter = None
+    qs = None
+    user = None
+
     class Meta:
         abstract = True
 
-    def __init__(self, user: User, *args, **kwargs):
-        self.user = user
-        super().__init__(*args, **kwargs)
-
 
 class KeywordTableFilterMixin(django_filters.FilterSet):
     q = django_filters.Filter(
@@ -292,9 +294,10 @@ class ShareableTableFilterMixin(django_filters.FilterSet):
         abstract = True
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        self.user = kwargs.pop("user", None)
         if self.user is None:
             raise AttributeError("User must be set for further filtering!")
+        super().__init__(*args, **kwargs)
 
     def filter_show_all(self, queryset, name, value) -> QuerySet:
         """ Filters queryset depending on value of 'show_all' setting
@@ -418,8 +421,7 @@ class ConservationOfficeTableFilterMixin(django_filters.FilterSet):
         return qs
 
 
-class SelectionTableFilter(AbstractTableFilter,
-                           RegistrationOfficeTableFilterMixin,
+class SelectionTableFilter(RegistrationOfficeTableFilterMixin,
                            ConservationOfficeTableFilterMixin):
     """ TableFilter holding different filter options for selection related filtering
 
@@ -427,8 +429,7 @@ class SelectionTableFilter(AbstractTableFilter,
     pass
 
 
-class QueryTableFilter(AbstractTableFilter,
-                       KeywordTableFilterMixin,
+class QueryTableFilter(KeywordTableFilterMixin,
                        FileNumberTableFilterMixin,
                        GeoReferencedTableFilterMixin):
     """ TableFilter holding different filter options for query related filtering
@@ -437,7 +438,7 @@ class QueryTableFilter(AbstractTableFilter,
     pass
 
 
-class CheckboxTableFilter(AbstractTableFilter, ShareableTableFilterMixin, RecordableTableFilterMixin):
+class CheckboxTableFilter(ShareableTableFilterMixin, RecordableTableFilterMixin):
     """ TableFilter holding different filter options for checkbox related filtering
 
     """
diff --git a/konova/tests/test_views.py b/konova/tests/test_views.py
index d31726ff..dad44297 100644
--- a/konova/tests/test_views.py
+++ b/konova/tests/test_views.py
@@ -404,6 +404,7 @@ class AutocompleteTestCase(BaseViewTestCase):
         cls.atcmplt_code_comp_process = reverse("codes-process-type-autocomplete")
         cls.atcmplt_code_comp_reg_off = reverse("codes-registration-office-autocomplete")
         cls.atcmplt_code_comp_cons_off = reverse("codes-conservation-office-autocomplete")
+        cls.atcmplt_code_share_user = reverse("share-user-autocomplete")
 
     def _test_views_anonymous_user(self):
         # ATTENTION: As of the current state of django-autocomplete-light, there is no way to check on authenticated
@@ -421,6 +422,7 @@ class AutocompleteTestCase(BaseViewTestCase):
             self.atcmplt_code_comp_process,
             self.atcmplt_code_comp_reg_off,
             self.atcmplt_code_comp_cons_off,
+            self.atcmplt_code_share_user,
         ]
         self.assert_url_fail(client, urls)
 

From 07b079d1b69990152a87acb0414d8659d7a9ae26 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 12 Jan 2022 10:11:47 +0100
Subject: [PATCH 8/9] # 61 General table enhancements

* enhances rendering of tables
* enhances rendering of filter section
* reorganizes table filter codes into konova/filters/ folder and splits into mixins and table_filters
---
 compensation/filters.py                  |  2 +-
 compensation/tables.py                   |  6 +--
 ema/filters.py                           |  2 -
 ema/tables.py                            |  4 +-
 intervention/filters.py                  |  2 +-
 intervention/tables.py                   |  4 +-
 konova/filters/__init__.py               |  7 ++++
 konova/{filters.py => filters/mixins.py} | 47 ++--------------------
 konova/filters/table_filters.py          | 50 ++++++++++++++++++++++++
 konova/utils/tables.py                   | 39 +++++++++---------
 templates/generic_index.html             | 46 ++++++++++++----------
 11 files changed, 113 insertions(+), 96 deletions(-)
 create mode 100644 konova/filters/__init__.py
 rename konova/{filters.py => filters/mixins.py} (91%)
 create mode 100644 konova/filters/table_filters.py

diff --git a/compensation/filters.py b/compensation/filters.py
index 62c22bd1..eb8a5b7d 100644
--- a/compensation/filters.py
+++ b/compensation/filters.py
@@ -10,7 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from django import forms
 from django.db.models import QuerySet, Q
 
-from konova.filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter, AbstractTableFilter
+from konova.filters.table_filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter, AbstractTableFilter
 
 
 class SelectionCompensationTableFilter(SelectionTableFilter):
diff --git a/compensation/tables.py b/compensation/tables.py
index 2784af23..6e6a190b 100644
--- a/compensation/tables.py
+++ b/compensation/tables.py
@@ -16,11 +16,11 @@ from django.utils.translation import gettext_lazy as _
 from compensation.filters import CompensationTableFilter, EcoAccountTableFilter
 from compensation.models import Compensation, EcoAccount
 from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT
-from konova.utils.tables import BaseTable
+from konova.utils.tables import BaseTable, TableRenderMixin
 import django_tables2 as tables
 
 
-class CompensationTable(BaseTable):
+class CompensationTable(BaseTable, TableRenderMixin):
     id = tables.Column(
         verbose_name=_("Identifier"),
         orderable=True,
@@ -162,7 +162,7 @@ class CompensationTable(BaseTable):
         return format_html(html)
 
 
-class EcoAccountTable(BaseTable):
+class EcoAccountTable(BaseTable, TableRenderMixin):
     id = tables.Column(
         verbose_name=_("Identifier"),
         orderable=True,
diff --git a/ema/filters.py b/ema/filters.py
index 2817d6dc..70b93da0 100644
--- a/ema/filters.py
+++ b/ema/filters.py
@@ -5,8 +5,6 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 19.08.21
 
 """
-from django.db.models import QuerySet
-
 from compensation.filters import EcoAccountTableFilter
 
 
diff --git a/ema/tables.py b/ema/tables.py
index 884bac54..d30f3e36 100644
--- a/ema/tables.py
+++ b/ema/tables.py
@@ -14,12 +14,12 @@ from django.urls import reverse
 import django_tables2 as tables
 
 from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT
-from konova.utils.tables import BaseTable
+from konova.utils.tables import BaseTable, TableRenderMixin
 from ema.filters import EmaTableFilter
 from ema.models import Ema
 
 
-class EmaTable(BaseTable):
+class EmaTable(BaseTable, TableRenderMixin):
     """
     Since EMA and compensation are basically the same, we can reuse CompensationTableFilter and extend the EMA filter
     in the future by inheriting.
diff --git a/intervention/filters.py b/intervention/filters.py
index 0d927573..976c9767 100644
--- a/intervention/filters.py
+++ b/intervention/filters.py
@@ -5,7 +5,7 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 22.07.21
 
 """
-from konova.filters import AbstractTableFilter, SelectionTableFilter, QueryTableFilter, CheckboxTableFilter
+from konova.filters.table_filters import AbstractTableFilter, SelectionTableFilter, QueryTableFilter, CheckboxTableFilter
 
 
 class InterventionTableFilter(AbstractTableFilter):
diff --git a/intervention/tables.py b/intervention/tables.py
index b0da7d04..0ed003fa 100644
--- a/intervention/tables.py
+++ b/intervention/tables.py
@@ -14,11 +14,11 @@ from django.utils.translation import gettext_lazy as _
 from intervention.filters import InterventionTableFilter
 from intervention.models import Intervention
 from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT, DEFAULT_DATE_FORMAT
-from konova.utils.tables import BaseTable
+from konova.utils.tables import BaseTable, TableRenderMixin
 import django_tables2 as tables
 
 
-class InterventionTable(BaseTable):
+class InterventionTable(BaseTable, TableRenderMixin):
     id = tables.Column(
         verbose_name=_("Identifier"),
         orderable=True,
diff --git a/konova/filters/__init__.py b/konova/filters/__init__.py
new file mode 100644
index 00000000..0529e022
--- /dev/null
+++ b/konova/filters/__init__.py
@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 12.01.22
+
+"""
diff --git a/konova/filters.py b/konova/filters/mixins.py
similarity index 91%
rename from konova/filters.py
rename to konova/filters/mixins.py
index 6244c35a..5625ff36 100644
--- a/konova/filters.py
+++ b/konova/filters/mixins.py
@@ -2,36 +2,21 @@
 Author: Michel Peltriaux
 Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
 Contact: michel.peltriaux@sgdnord.rlp.de
-Created on: 11.01.22
+Created on: 12.01.22
 
 """
 import django_filters
-from dal_select2.widgets import ModelSelect2
 from django import forms
-from django.utils.translation import gettext_lazy as _
-from django.contrib.auth.models import User
 from django.db.models import QuerySet, Q
+from django.utils.translation import gettext_lazy as _
+from dal_select2.widgets import ModelSelect2
 
 from codelist.models import KonovaCode
-from codelist.settings import CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID
+from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_REGISTRATION_OFFICE_ID
 from intervention.inputs import DummyFilterInput
 from konova.models import Parcel, District
 
 
-class AbstractTableFilter(django_filters.FilterSet):
-    """ Base TableFilter for all models
-
-    """
-    selection_filter = None
-    query_filter = None
-    checkbox_filter = None
-    qs = None
-    user = None
-
-    class Meta:
-        abstract = True
-
-
 class KeywordTableFilterMixin(django_filters.FilterSet):
     q = django_filters.Filter(
         method='filter_by_keyword',
@@ -419,27 +404,3 @@ class ConservationOfficeTableFilterMixin(django_filters.FilterSet):
             responsible__conservation_office=value
         )
         return qs
-
-
-class SelectionTableFilter(RegistrationOfficeTableFilterMixin,
-                           ConservationOfficeTableFilterMixin):
-    """ TableFilter holding different filter options for selection related filtering
-
-    """
-    pass
-
-
-class QueryTableFilter(KeywordTableFilterMixin,
-                       FileNumberTableFilterMixin,
-                       GeoReferencedTableFilterMixin):
-    """ TableFilter holding different filter options for query related filtering
-
-    """
-    pass
-
-
-class CheckboxTableFilter(ShareableTableFilterMixin, RecordableTableFilterMixin):
-    """ TableFilter holding different filter options for checkbox related filtering
-
-    """
-    pass
diff --git a/konova/filters/table_filters.py b/konova/filters/table_filters.py
new file mode 100644
index 00000000..8dca6d5f
--- /dev/null
+++ b/konova/filters/table_filters.py
@@ -0,0 +1,50 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: michel.peltriaux@sgdnord.rlp.de
+Created on: 12.01.22
+
+"""
+import django_filters
+
+from konova.filters.mixins import RegistrationOfficeTableFilterMixin, ConservationOfficeTableFilterMixin, \
+    KeywordTableFilterMixin, FileNumberTableFilterMixin, GeoReferencedTableFilterMixin, ShareableTableFilterMixin, \
+    RecordableTableFilterMixin
+
+
+class AbstractTableFilter(django_filters.FilterSet):
+    """ Base TableFilter for all models
+
+    """
+    selection_filter = None
+    query_filter = None
+    checkbox_filter = None
+    qs = None
+    user = None
+
+    class Meta:
+        abstract = True
+
+
+class SelectionTableFilter(RegistrationOfficeTableFilterMixin,
+                           ConservationOfficeTableFilterMixin):
+    """ TableFilter holding different filter options for selection related filtering
+
+    """
+    pass
+
+
+class QueryTableFilter(KeywordTableFilterMixin,
+                       FileNumberTableFilterMixin,
+                       GeoReferencedTableFilterMixin):
+    """ TableFilter holding different filter options for query related filtering
+
+    """
+    pass
+
+
+class CheckboxTableFilter(ShareableTableFilterMixin, RecordableTableFilterMixin):
+    """ TableFilter holding different filter options for checkbox related filtering
+
+    """
+    pass
\ No newline at end of file
diff --git a/konova/utils/tables.py b/konova/utils/tables.py
index 6a3ef88e..d3a0406b 100644
--- a/konova/utils/tables.py
+++ b/konova/utils/tables.py
@@ -5,15 +5,13 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 25.11.20
 
 """
-import uuid
 
-from django import forms
 from django.core.paginator import PageNotAnInteger, EmptyPage
 from django.http import HttpRequest
 from django.utils.html import format_html
 import django_tables2 as tables
 
-from konova.forms import BaseForm
+from konova.models import BaseObject
 from konova.settings import PAGE_SIZE_DEFAULT, PAGE_PARAM, RESULTS_PER_PAGE_PARAM, PAGE_SIZE_OPTIONS
 
 
@@ -147,22 +145,21 @@ class BaseTable(tables.tables.Table):
         )
 
 
-class ChoicesColumnForm(BaseForm):
-    select = forms.ChoiceField(
-        choices=[],
-        label="",
-        label_suffix="",
-        widget=forms.Select(
-            attrs={
-                "onchange": "submit();",
-            }
-        )
-    )
+class TableRenderMixin:
+    """ Holds different render methods for general purposes
 
-    def __init__(self, *args, **kwargs):
-        self.action_url = kwargs.pop("action_url", None)
-        self.choices = kwargs.pop("choices", [])
-        super().__init__(*args, **kwargs)
-        self.auto_id += "_" + str(uuid.uuid4())
-        if len(self.choices) > 0:
-            self.fields["select"].choices = self.choices
+    """
+    def render_t(self, value, record: BaseObject):
+        """ Renders a BaseObject title
+
+        Args:
+            value ():
+            record ():
+
+        Returns:
+
+        """
+        max_length = 75
+        if len(value) > max_length:
+            value = f"{value[:max_length]}..."
+        return value
\ No newline at end of file
diff --git a/templates/generic_index.html b/templates/generic_index.html
index 13080726..729be8e4 100644
--- a/templates/generic_index.html
+++ b/templates/generic_index.html
@@ -92,27 +92,31 @@
                         </div>
                         <div id="filter" class="collapse" aria-labelledby="filterHeader">
                             <div class="card-body">
-                                <div class="row">
-                                    {% with table.filter.selection_filter.form as form %}
-                                        {% include 'filter/query_filter.html' %}
-                                    {% endwith %}
-                                </div>
-                                <div class="row mt-3">
-                                    {% with table.filter.query_filter.form as form %}
-                                        {% include 'filter/query_filter.html' %}
-                                    {% endwith %}
-                                </div>
-                                <div class="row mt-3">
-                                    {% with table.filter.checkbox_filter.form as form %}
-                                        {% include 'filter/checkbox_filter.html' %}
-                                    {% endwith %}
-                                </div>
-                                <hr>
-                                <div class="row mt-3">
-                                    <button class="btn btn-default" title="{% trans 'Filter' %}">
-                                        {% fa5_icon 'filter' %}
-                                        {% trans 'Apply filter' %}
-                                    </button>
+                                <div class="">
+                                    <div class="">
+                                        {% with table.filter.selection_filter.form as form %}
+                                            {% include 'filter/query_filter.html' %}
+                                        {% endwith %}
+                                    </div>
+                                    <hr>
+                                    <div class="mt-3">
+                                        {% with table.filter.query_filter.form as form %}
+                                            {% include 'filter/query_filter.html' %}
+                                        {% endwith %}
+                                    </div>
+                                    <hr>
+                                    <div class="mt-3">
+                                        {% with table.filter.checkbox_filter.form as form %}
+                                            {% include 'filter/checkbox_filter.html' %}
+                                        {% endwith %}
+                                    </div>
+                                    <hr>
+                                    <div class="mt-3">
+                                        <button class="btn btn-default" title="{% trans 'Filter' %}">
+                                            {% fa5_icon 'filter' %}
+                                            {% trans 'Apply filter' %}
+                                        </button>
+                                    </div>
                                 </div>
                             </div>
                         </div>

From b96dcd373a487769b2eec9a66cb0a8433052c70f Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 12 Jan 2022 10:15:57 +0100
Subject: [PATCH 9/9] # 61 EcoAccount Filter

* adds specialized SelectionTableFilter for EcoAccount (and EMA) which only provides filtering by conservation office
---
 compensation/filters.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/compensation/filters.py b/compensation/filters.py
index eb8a5b7d..d028e3ce 100644
--- a/compensation/filters.py
+++ b/compensation/filters.py
@@ -10,6 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from django import forms
 from django.db.models import QuerySet, Q
 
+from konova.filters.mixins import ConservationOfficeTableFilterMixin
 from konova.filters.table_filters import QueryTableFilter, CheckboxTableFilter, SelectionTableFilter, AbstractTableFilter
 
 
@@ -163,6 +164,15 @@ class CheckboxEcoAccountTableFilter(CheckboxTableFilter):
             return queryset
 
 
+class SelectionEcoAccountTableFilter(ConservationOfficeTableFilterMixin):
+    """ Special selection table filter for eco accounts
+
+    EcoAccounts only need a selection filter for conservation office
+
+    """
+    pass
+
+
 class EcoAccountTableFilter(AbstractTableFilter):
     """ TableFilter for eco accounts
 
@@ -174,7 +184,7 @@ class EcoAccountTableFilter(AbstractTableFilter):
         request_data = kwargs.get("data", None)
 
         # Pipe the queryset through all needed filters
-        self.selection_filter = SelectionTableFilter(
+        self.selection_filter = SelectionEcoAccountTableFilter(
             data=request_data,
             queryset=qs,
         )