diff --git a/compensation/tables/__init__.py b/compensation/tables/__init__.py new file mode 100644 index 00000000..ca978536 --- /dev/null +++ b/compensation/tables/__init__.py @@ -0,0 +1,7 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: ksp-servicestelle@sgdnord.rlp.de +Created on: 18.08.22 + +""" diff --git a/compensation/tables.py b/compensation/tables/compensation.py similarity index 54% rename from compensation/tables.py rename to compensation/tables/compensation.py index 1373f2cd..92fe1840 100644 --- a/compensation/tables.py +++ b/compensation/tables/compensation.py @@ -1,19 +1,19 @@ """ Author: Michel Peltriaux Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany -Contact: michel.peltriaux@sgdnord.rlp.de -Created on: 01.12.20 +Contact: ksp-servicestelle@sgdnord.rlp.de +Created on: 18.08.22 """ -from konova.utils.message_templates import DATA_IS_UNCHECKED, DATA_CHECKED_ON_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE from django.http import HttpRequest from django.template.loader import render_to_string from django.urls import reverse from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ -from compensation.filters import CompensationTableFilter, EcoAccountTableFilter -from compensation.models import Compensation, EcoAccount +from compensation.filters import CompensationTableFilter +from compensation.models import Compensation +from konova.utils.message_templates import DATA_IS_UNCHECKED, DATA_CHECKED_ON_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE from konova.utils.tables import BaseTable, TableRenderMixin import django_tables2 as tables @@ -187,160 +187,3 @@ class CompensationTable(BaseTable, TableRenderMixin): icn_class="fas fa-edit rlp-r-inv" if has_access else "far fa-edit", ) return format_html(html) - - -class EcoAccountTable(BaseTable, TableRenderMixin): - id = tables.Column( - verbose_name=_("Identifier"), - orderable=True, - accessor="identifier", - ) - t = tables.Column( - verbose_name=_("Title"), - orderable=True, - accessor="title", - ) - d = tables.Column( - verbose_name=_("Parcel gmrkng"), - orderable=True, - accessor="geometry", - ) - av = tables.Column( - verbose_name=_("Available"), - orderable=True, - empty_values=[], - attrs={ - "th": { - "class": "w-20", - } - } - ) - r = tables.Column( - verbose_name=_("Recorded"), - orderable=True, - empty_values=[], - accessor="recorded", - ) - e = tables.Column( - verbose_name=_("Editable"), - orderable=True, - empty_values=[], - accessor="users", - ) - lm = tables.Column( - verbose_name=_("Last edit"), - orderable=True, - accessor="modified__timestamp", - ) - - class Meta(BaseTable.Meta): - template_name = "django_tables2/bootstrap4.html" - - def __init__(self, request: HttpRequest, *args, **kwargs): - self.title = _("Eco Accounts") - self.add_new_url = reverse("compensation:acc:new") - qs = kwargs.get("queryset", None) - self.filter = EcoAccountTableFilter( - user=request.user, - data=request.GET, - queryset=qs, - ) - 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 - - Args: - value (str): The identifier value - record (EcoAccount): The eco account record - - Returns: - - """ - html = "" - html += self.render_link( - tooltip=_("Open {}").format(_("Eco-account")), - href=reverse("compensation:acc:detail", args=(record.id,)), - txt=value, - new_tab=False, - ) - return format_html(html) - - def render_av(self, value, record: EcoAccount): - """ Renders the available column for an eco account - - Args: - value (str): The identifier value - record (EcoAccount): The eco account record - - Returns: - - """ - value_total, value_relative = record.get_available_rest() - html = render_to_string("konova/widgets/progressbar.html", {"value": value_relative}) - return format_html(html) - - def render_d(self, value, record: Compensation): - """ Renders the parcel district column for a compensation - - Args: - value (str): The geometry - record (Compensation): The compensation record - - Returns: - - """ - parcels = value.get_underlying_parcels().values_list( - "parcel_group__name", - flat=True - ).distinct() - html = render_to_string( - "table/gmrkng_col.html", - { - "entries": parcels - } - ) - return html - - def render_r(self, value, record: EcoAccount): - """ Renders the recorded column for an eco account - - Args: - value (str): The identifier value - record (EcoAccount): The eco account record - - Returns: - - """ - html = "" - checked = value is not None - tooltip = _("Not recorded yet. Can not be used for deductions, yet.") - if checked: - on = value.get_timestamp_str_formatted() - tooltip = _("Recorded on {} by {}").format(on, record.recorded.user) - html += self.render_bookmark( - tooltip=tooltip, - icn_filled=checked, - ) - return format_html(html) - - def render_e(self, value, record: EcoAccount): - """ Renders the editable column for an eco account - - Args: - value (str): The identifier value - record (EcoAccount): The eco account record - - Returns: - - """ - html = "" - # Do not use value in here, since value does use unprefetched 'users' manager, where record has already - # prefetched users data - has_access = 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", - ) - return format_html(html) diff --git a/compensation/tables/eco_account.py b/compensation/tables/eco_account.py new file mode 100644 index 00000000..0cf4a4ef --- /dev/null +++ b/compensation/tables/eco_account.py @@ -0,0 +1,174 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: ksp-servicestelle@sgdnord.rlp.de +Created on: 18.08.22 + +""" +from django.http import HttpRequest +from django.template.loader import render_to_string +from django.urls import reverse +from django.utils.html import format_html +from django.utils.translation import gettext_lazy as _ + +from compensation.filters import EcoAccountTableFilter +from compensation.models import EcoAccount +from konova.utils.tables import TableRenderMixin, BaseTable + +import django_tables2 as tables + +class EcoAccountTable(BaseTable, TableRenderMixin): + id = tables.Column( + verbose_name=_("Identifier"), + orderable=True, + accessor="identifier", + ) + t = tables.Column( + verbose_name=_("Title"), + orderable=True, + accessor="title", + ) + d = tables.Column( + verbose_name=_("Parcel gmrkng"), + orderable=True, + accessor="geometry", + ) + av = tables.Column( + verbose_name=_("Available"), + orderable=True, + empty_values=[], + attrs={ + "th": { + "class": "w-20", + } + } + ) + r = tables.Column( + verbose_name=_("Recorded"), + orderable=True, + empty_values=[], + accessor="recorded", + ) + e = tables.Column( + verbose_name=_("Editable"), + orderable=True, + empty_values=[], + accessor="users", + ) + lm = tables.Column( + verbose_name=_("Last edit"), + orderable=True, + accessor="modified__timestamp", + ) + + class Meta(BaseTable.Meta): + template_name = "django_tables2/bootstrap4.html" + + def __init__(self, request: HttpRequest, *args, **kwargs): + self.title = _("Eco Accounts") + self.add_new_url = reverse("compensation:acc:new") + qs = kwargs.get("queryset", None) + self.filter = EcoAccountTableFilter( + user=request.user, + data=request.GET, + queryset=qs, + ) + 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 + + Args: + value (str): The identifier value + record (EcoAccount): The eco account record + + Returns: + + """ + html = "" + html += self.render_link( + tooltip=_("Open {}").format(_("Eco-account")), + href=reverse("compensation:acc:detail", args=(record.id,)), + txt=value, + new_tab=False, + ) + return format_html(html) + + def render_av(self, value, record: EcoAccount): + """ Renders the available column for an eco account + + Args: + value (str): The identifier value + record (EcoAccount): The eco account record + + Returns: + + """ + value_total, value_relative = record.get_available_rest() + html = render_to_string("konova/widgets/progressbar.html", {"value": value_relative}) + return format_html(html) + + def render_d(self, value, record): + """ Renders the parcel district column for a compensation + + Args: + value (str): The geometry + record (Compensation): The compensation record + + Returns: + + """ + parcels = value.get_underlying_parcels().values_list( + "parcel_group__name", + flat=True + ).distinct() + html = render_to_string( + "table/gmrkng_col.html", + { + "entries": parcels + } + ) + return html + + def render_r(self, value, record: EcoAccount): + """ Renders the recorded column for an eco account + + Args: + value (str): The identifier value + record (EcoAccount): The eco account record + + Returns: + + """ + html = "" + checked = value is not None + tooltip = _("Not recorded yet. Can not be used for deductions, yet.") + if checked: + on = value.get_timestamp_str_formatted() + tooltip = _("Recorded on {} by {}").format(on, record.recorded.user) + html += self.render_bookmark( + tooltip=tooltip, + icn_filled=checked, + ) + return format_html(html) + + def render_e(self, value, record: EcoAccount): + """ Renders the editable column for an eco account + + Args: + value (str): The identifier value + record (EcoAccount): The eco account record + + Returns: + + """ + html = "" + # Do not use value in here, since value does use unprefetched 'users' manager, where record has already + # prefetched users data + has_access = 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", + ) + return format_html(html) diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py index e12324ce..c1bec047 100644 --- a/compensation/views/compensation.py +++ b/compensation/views/compensation.py @@ -12,7 +12,7 @@ from compensation.forms.modals.compensation_action import NewCompensationActionM EditCompensationActionModalForm, RemoveCompensationActionModalForm from compensation.forms.modals.deadline import NewDeadlineModalForm, EditDeadlineModalForm from compensation.models import Compensation, CompensationState, CompensationAction, CompensationDocument -from compensation.tables import CompensationTable +from compensation.tables.compensation import CompensationTable from intervention.models import Intervention from konova.contexts import BaseContext from konova.decorators import * diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py index 07796d14..51aa925d 100644 --- a/compensation/views/eco_account.py +++ b/compensation/views/eco_account.py @@ -22,7 +22,7 @@ from compensation.forms.modals.document import NewEcoAccountDocumentModalForm from compensation.forms.modals.state import NewCompensationStateModalForm, RemoveCompensationStateModalForm, \ EditCompensationStateModalForm from compensation.models import EcoAccount, EcoAccountDocument, CompensationState, CompensationAction -from compensation.tables import EcoAccountTable +from compensation.tables.eco_account import EcoAccountTable from intervention.forms.modals.deduction import RemoveEcoAccountDeductionModalForm, NewEcoAccountDeductionModalForm, \ EditEcoAccountDeductionModalForm from intervention.forms.modals.share import ShareModalForm