diff --git a/codelist/migrations/0002_migrate_975_to_288.py b/codelist/migrations/0002_migrate_975_to_288.py index cf0d87c..b083793 100644 --- a/codelist/migrations/0002_migrate_975_to_288.py +++ b/codelist/migrations/0002_migrate_975_to_288.py @@ -1,5 +1,6 @@ # Generated by Django 5.0.7 on 2024-08-06 13:40 +from django.core.exceptions import ObjectDoesNotExist from django.db import migrations from django.db.models import Q @@ -10,9 +11,12 @@ def migrate_975_to_288(apps, schema_editor): KonovaCodeList = apps.get_model('codelist', 'KonovaCodeList') CompensationState = apps.get_model('compensation', 'CompensationState') - list_288 = KonovaCodeList.objects.get( - id=CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID - ).codes.all() + try: + list_288 = KonovaCodeList.objects.get( + id=CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID + ).codes.all() + except ObjectDoesNotExist: + raise AssertionError("KonovaCodeList 288 does not exist. Did you run 'update_codelist' before migrating?") states_with_extra_code = CompensationState.objects.filter( ~Q(biotope_type_details=None) @@ -42,8 +46,15 @@ class Migration(migrations.Migration): dependencies = [ ('codelist', '0001_initial'), + ('compensation', '0003_auto_20220202_0846'), ] - operations = [ - migrations.RunPython(migrate_975_to_288) - ] + # If migration of codelist is not necessary, this variable can shut down the logic whilst not disturbing the + # migration history + EXECUTE_CODELIST_MIGRATION = True + + operations = [] + + if EXECUTE_CODELIST_MIGRATION: + operations.append(migrations.RunPython(migrate_975_to_288)) + diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html index d832ad1..0a8b88e 100644 --- a/compensation/templates/compensation/detail/compensation/includes/actions.html +++ b/compensation/templates/compensation/detail/compensation/includes/actions.html @@ -11,7 +11,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/compensation/includes/controls.html b/compensation/templates/compensation/detail/compensation/includes/controls.html index 4119480..ef8b92e 100644 --- a/compensation/templates/compensation/detail/compensation/includes/controls.html +++ b/compensation/templates/compensation/detail/compensation/includes/controls.html @@ -11,7 +11,7 @@ {% fa5_icon 'file-alt' %} - {% if has_access %} + {% if is_entry_shared %} diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html index 7f32880..2564fdf 100644 --- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html +++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/compensation/includes/documents.html b/compensation/templates/compensation/detail/compensation/includes/documents.html index 1733827..6e3c780 100644 --- a/compensation/templates/compensation/detail/compensation/includes/documents.html +++ b/compensation/templates/compensation/detail/compensation/includes/documents.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html index 39e6204..15ec95c 100644 --- a/compensation/templates/compensation/detail/compensation/includes/states-after.html +++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/compensation/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html index 25524c0..93249cc 100644 --- a/compensation/templates/compensation/detail/compensation/includes/states-before.html +++ b/compensation/templates/compensation/detail/compensation/includes/states-before.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html index 26800a8..64b2fe4 100644 --- a/compensation/templates/compensation/detail/compensation/view.html +++ b/compensation/templates/compensation/detail/compensation/view.html @@ -123,7 +123,7 @@ {% include 'user/includes/team_data_modal_button.html' %} {% endfor %}
- {% if has_access %} + {% if is_entry_shared %} {% for user in obj.intervention.shared_users %} {% include 'user/includes/contact_modal_button.html' %} {% endfor %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html index d83820a..3c78638 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/actions.html +++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/controls.html b/compensation/templates/compensation/detail/eco_account/includes/controls.html index c26883a..8fafd66 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/controls.html +++ b/compensation/templates/compensation/detail/eco_account/includes/controls.html @@ -11,7 +11,7 @@ {% fa5_icon 'file-alt' %} - {% if has_access %} + {% if is_entry_shared %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html index 4a88b88..b04a611 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html +++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/deductions.html b/compensation/templates/compensation/detail/eco_account/includes/deductions.html index 03f6bf3..9334f3e 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/deductions.html +++ b/compensation/templates/compensation/detail/eco_account/includes/deductions.html @@ -61,7 +61,7 @@ {{ deduction.surface|floatformat:2|intcomma }} m² {{ deduction.created.timestamp|default_if_none:""|naturalday}} - {% if is_default_member and has_access or is_default_member and user in deduction.intervention.shared_users %} + {% if is_default_member and is_entry_shared or is_default_member and user in deduction.intervention.shared_users %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html index bf61f13..8e2b01c 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/documents.html +++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html index 02ac15c..64d7800 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html +++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html index 135c4c0..e268416 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html +++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html index c5bd2c5..750295c 100644 --- a/compensation/templates/compensation/detail/eco_account/view.html +++ b/compensation/templates/compensation/detail/eco_account/view.html @@ -101,7 +101,7 @@ {% include 'user/includes/team_data_modal_button.html' %} {% endfor %}
- {% if has_access %} + {% if is_entry_shared %} {% for user in obj.users.all %} {% include 'user/includes/contact_modal_button.html' %} {% endfor %} diff --git a/compensation/views/compensation/compensation.py b/compensation/views/compensation/compensation.py index 276b8eb..158495c 100644 --- a/compensation/views/compensation/compensation.py +++ b/compensation/views/compensation/compensation.py @@ -259,7 +259,7 @@ def detail_view(request: HttpRequest, id: str): "last_checked_tooltip": last_checked_tooltip, "geom_form": geom_form, "parcels": parcels, - "has_access": is_data_shared, + "is_entry_shared": is_data_shared, "actions": actions, "before_states": before_states, "after_states": after_states, diff --git a/compensation/views/compensation/report.py b/compensation/views/compensation/report.py index e81cb1d..3176c15 100644 --- a/compensation/views/compensation/report.py +++ b/compensation/views/compensation/report.py @@ -67,7 +67,7 @@ def report_view(request: HttpRequest, id: str): "img": qrcode_img_lanis, "url": qrcode_lanis_url, }, - "has_access": False, # disables action buttons during rendering + "is_entry_shared": False, # disables action buttons during rendering "before_states": before_states, "after_states": after_states, "geom_form": geom_form, diff --git a/compensation/views/eco_account/eco_account.py b/compensation/views/eco_account/eco_account.py index b20cf64..798e73c 100644 --- a/compensation/views/eco_account/eco_account.py +++ b/compensation/views/eco_account/eco_account.py @@ -237,7 +237,7 @@ def detail_view(request: HttpRequest, id: str): "obj": acc, "geom_form": geom_form, "parcels": parcels, - "has_access": is_data_shared, + "is_entry_shared": is_data_shared, "before_states": before_states, "after_states": after_states, "sum_before_states": sum_before_states, diff --git a/compensation/views/eco_account/report.py b/compensation/views/eco_account/report.py index 47b2a10..ba8212b 100644 --- a/compensation/views/eco_account/report.py +++ b/compensation/views/eco_account/report.py @@ -73,7 +73,7 @@ def report_view(request: HttpRequest, id: str): "img": qrcode_img_lanis, "url": qrcode_lanis_url, }, - "has_access": False, # disables action buttons during rendering + "is_entry_shared": False, # disables action buttons during rendering "before_states": before_states, "after_states": after_states, "geom_form": geom_form, diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html index 0088bfe..713cb34 100644 --- a/ema/templates/ema/detail/includes/actions.html +++ b/ema/templates/ema/detail/includes/actions.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/ema/templates/ema/detail/includes/controls.html b/ema/templates/ema/detail/includes/controls.html index 182be48..96c7bbb 100644 --- a/ema/templates/ema/detail/includes/controls.html +++ b/ema/templates/ema/detail/includes/controls.html @@ -11,7 +11,7 @@ {% fa5_icon 'file-alt' %} - {% if has_access %} + {% if is_entry_shared %} diff --git a/ema/templates/ema/detail/includes/deadlines.html b/ema/templates/ema/detail/includes/deadlines.html index bc267dd..738ff61 100644 --- a/ema/templates/ema/detail/includes/deadlines.html +++ b/ema/templates/ema/detail/includes/deadlines.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/ema/templates/ema/detail/includes/documents.html b/ema/templates/ema/detail/includes/documents.html index d1f60a0..3ba797a 100644 --- a/ema/templates/ema/detail/includes/documents.html +++ b/ema/templates/ema/detail/includes/documents.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/ema/templates/ema/detail/includes/states-after.html b/ema/templates/ema/detail/includes/states-after.html index fbee289..d82541c 100644 --- a/ema/templates/ema/detail/includes/states-after.html +++ b/ema/templates/ema/detail/includes/states-after.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/ema/templates/ema/detail/includes/states-before.html b/ema/templates/ema/detail/includes/states-before.html index a69709a..336724c 100644 --- a/ema/templates/ema/detail/includes/states-before.html +++ b/ema/templates/ema/detail/includes/states-before.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html index 3e0d701..c91d347 100644 --- a/ema/templates/ema/detail/view.html +++ b/ema/templates/ema/detail/view.html @@ -87,7 +87,7 @@ {% include 'user/includes/team_data_modal_button.html' %} {% endfor %}
- {% if has_access %} + {% if is_entry_shared %} {% for user in obj.users.all %} {% include 'user/includes/contact_modal_button.html' %} {% endfor %} diff --git a/ema/views/ema.py b/ema/views/ema.py index 67fbde5..4136e91 100644 --- a/ema/views/ema.py +++ b/ema/views/ema.py @@ -142,7 +142,7 @@ def detail_view(request: HttpRequest, id: str): geom_form = SimpleGeomForm(instance=ema) parcels = ema.get_underlying_parcels() _user = request.user - is_data_shared = ema.is_shared_with(_user) + is_entry_shared = ema.is_shared_with(_user) # Order states according to surface before_states = ema.before_states.all().order_by("-surface") @@ -167,7 +167,7 @@ def detail_view(request: HttpRequest, id: str): "obj": ema, "geom_form": geom_form, "parcels": parcels, - "has_access": is_data_shared, + "is_entry_shared": is_entry_shared, "before_states": before_states, "after_states": after_states, "sum_before_states": sum_before_states, diff --git a/ema/views/report.py b/ema/views/report.py index 6b7840f..1da1ba6 100644 --- a/ema/views/report.py +++ b/ema/views/report.py @@ -67,7 +67,7 @@ def report_view(request:HttpRequest, id: str): "img": qrcode_img_lanis, "url": qrcode_lanis_url }, - "has_access": False, # disables action buttons during rendering + "is_entry_shared": False, # disables action buttons during rendering "before_states": before_states, "after_states": after_states, "geom_form": geom_form, diff --git a/intervention/templates/intervention/detail/includes/compensations.html b/intervention/templates/intervention/detail/includes/compensations.html index 758d0a8..ad99fd0 100644 --- a/intervention/templates/intervention/detail/includes/compensations.html +++ b/intervention/templates/intervention/detail/includes/compensations.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/intervention/templates/intervention/detail/includes/controls.html b/intervention/templates/intervention/detail/includes/controls.html index 7008c10..89358eb 100644 --- a/intervention/templates/intervention/detail/includes/controls.html +++ b/intervention/templates/intervention/detail/includes/controls.html @@ -11,7 +11,7 @@ {% fa5_icon 'file-alt' %} - {% if has_access %} + {% if is_entry_shared %} diff --git a/intervention/templates/intervention/detail/includes/deductions.html b/intervention/templates/intervention/detail/includes/deductions.html index 66a5504..5e081ac 100644 --- a/intervention/templates/intervention/detail/includes/deductions.html +++ b/intervention/templates/intervention/detail/includes/deductions.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html index 2374694..fd4fa0a 100644 --- a/intervention/templates/intervention/detail/includes/documents.html +++ b/intervention/templates/intervention/detail/includes/documents.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html index 5dde009..44e3602 100644 --- a/intervention/templates/intervention/detail/includes/payments.html +++ b/intervention/templates/intervention/detail/includes/payments.html @@ -10,7 +10,7 @@
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html index 60cedfc..6eb8640 100644 --- a/intervention/templates/intervention/detail/includes/revocation.html +++ b/intervention/templates/intervention/detail/includes/revocation.html @@ -13,7 +13,7 @@ {% comment %} Only show add-button if no revocation exists, yet. {% endcomment %} - {% if is_default_member and has_access and not obj.legal.revocation %} + {% if is_default_member and is_entry_shared and not obj.legal.revocation %}
- {% if is_default_member and has_access %} + {% if is_default_member and is_entry_shared %} diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html index 8a7799d..a0eb601 100644 --- a/intervention/templates/intervention/detail/view.html +++ b/intervention/templates/intervention/detail/view.html @@ -129,7 +129,7 @@ {% include 'user/includes/team_data_modal_button.html' %} {% endfor %}
- {% if has_access %} + {% if is_entry_shared %} {% for user in obj.users.all %} {% include 'user/includes/contact_modal_button.html' %} {% endfor %} diff --git a/intervention/views/intervention.py b/intervention/views/intervention.py index f40498d..be89056 100644 --- a/intervention/views/intervention.py +++ b/intervention/views/intervention.py @@ -185,7 +185,7 @@ def detail_view(request: HttpRequest, id: str): "last_checked": last_checked, "last_checked_tooltip": last_checked_tooltip, "compensations": compensations, - "has_access": is_data_shared, + "is_entry_shared": is_data_shared, "geom_form": geom_form, "is_default_member": _user.in_group(DEFAULT_GROUP), "is_zb_member": _user.in_group(ZB_GROUP), diff --git a/konova/filters/mixins/user_log.py b/konova/filters/mixins/user_log.py new file mode 100644 index 0000000..7ed08df --- /dev/null +++ b/konova/filters/mixins/user_log.py @@ -0,0 +1,55 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: ksp-servicestelle@sgdnord.rlp.de +Created on: 19.08.24 + +""" +import django_filters +from django import forms +from django.db.models import QuerySet, Q +from django.utils.translation import gettext_lazy as _ + + +class UserLoggedTableFilterMixin(django_filters.FilterSet): + ul = django_filters.CharFilter( + method="filter_user_log", + label=_(""), + label_suffix=_(""), + widget=forms.TextInput( + attrs={ + "placeholder": _("Logged user"), + "title": _("Search for entries where this person has been participated according to log history"), + "class": "form-control", + } + ), + ) + + class Meta: + abstract = True + + def filter_user_log(self, queryset, name, value) -> QuerySet: + """ Filters queryset depending on value of input + + Args: + queryset (QuerySet): Incoming (prefiltered) queryset + name (str): Name of input field + value (str): Value of input field + + Returns: + + """ + value = value.replace(",", " ") + value = value.strip() + values = value.split(" ") + + q = Q() + for val in values: + q &= ( + Q(log__user__username__icontains=val) | + Q(log__user__first_name__icontains=val) | + Q(log__user__last_name__icontains=val) + ) + + queryset = queryset.filter(q) + return queryset diff --git a/konova/filters/table_filters.py b/konova/filters/table_filters.py index 323bf1e..a9891d5 100644 --- a/konova/filters/table_filters.py +++ b/konova/filters/table_filters.py @@ -14,6 +14,7 @@ from konova.filters.mixins.office import ConservationOfficeTableFilterMixin, Reg from konova.filters.mixins.record import RecordableTableFilterMixin from konova.filters.mixins.self_created import SelfCreatedTableFilterMixin from konova.filters.mixins.share import ShareableTableFilterMixin +from konova.filters.mixins.user_log import UserLoggedTableFilterMixin class AbstractTableFilter(django_filters.FilterSet): @@ -40,7 +41,8 @@ class SelectionTableFilter(RegistrationOfficeTableFilterMixin, class QueryTableFilter(KeywordTableFilterMixin, FileNumberTableFilterMixin, - GeoReferencedTableFilterMixin): + GeoReferencedTableFilterMixin, + UserLoggedTableFilterMixin): """ TableFilter holding different filter options for query related filtering """ diff --git a/konova/utils/tables.py b/konova/utils/tables.py index 4878548..a3d83dd 100644 --- a/konova/utils/tables.py +++ b/konova/utils/tables.py @@ -216,11 +216,11 @@ class TableRenderMixin: """ html = "" - has_access = record.is_shared_with(self.user) + is_entry_shared = record.is_shared_with(self.user) html += self.render_icn( - tooltip=_("Full access granted") if has_access else _("Access not granted"), - icn_class="fas fa-edit rlp-r-inv" if has_access else "far fa-edit", + tooltip=_("Full access granted") if is_entry_shared else _("Access not granted"), + icn_class="fas fa-edit rlp-r-inv" if is_entry_shared else "far fa-edit", ) return format_html(html) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 16e9861..1769494 100644 Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 11b4622..9bc92c8 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -29,6 +29,7 @@ #: konova/filters/mixins/office.py:25 konova/filters/mixins/office.py:56 #: konova/filters/mixins/office.py:57 konova/filters/mixins/record.py:23 #: konova/filters/mixins/self_created.py:24 konova/filters/mixins/share.py:23 +#: konova/filters/mixins/user_log.py:17 konova/filters/mixins/user_log.py:18 #: konova/forms/geometry_form.py:32 konova/forms/modals/document_form.py:26 #: konova/forms/modals/document_form.py:36 #: konova/forms/modals/document_form.py:50 @@ -43,7 +44,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-16 09:49+0100\n" +"POT-Creation-Date: 2024-08-19 10:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -259,7 +260,7 @@ msgstr "" #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:14 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:16 -#: compensation/forms/modals/state.py:58 +#: compensation/forms/modals/state.py:59 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:36 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 @@ -447,7 +448,7 @@ msgid "Select the intervention for which this compensation compensates" msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist" #: compensation/forms/compensation.py:114 -#: compensation/views/compensation/compensation.py:119 +#: compensation/views/compensation/compensation.py:120 msgid "New compensation" msgstr "Neue Kompensation" @@ -474,7 +475,7 @@ msgid "When did the parties agree on this?" msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?" #: compensation/forms/eco_account.py:72 -#: compensation/views/eco_account/eco_account.py:100 +#: compensation/views/eco_account/eco_account.py:101 msgid "New Eco-Account" msgstr "Neues Ökokonto" @@ -696,46 +697,46 @@ msgid "If there is no date you can enter, please explain why." msgstr "Falls Sie kein Datum angeben können, erklären Sie bitte weshalb." #: compensation/forms/modals/payment.py:108 -#: intervention/templates/intervention/detail/includes/payments.html:59 +#: intervention/templates/intervention/detail/includes/payments.html:67 msgid "Edit payment" msgstr "Zahlung bearbeiten" -#: compensation/forms/modals/state.py:32 +#: compensation/forms/modals/state.py:33 msgid "Biotope Type" msgstr "Biotoptyp" -#: compensation/forms/modals/state.py:35 +#: compensation/forms/modals/state.py:36 msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modals/state.py:39 compensation/forms/modals/state.py:51 +#: compensation/forms/modals/state.py:40 compensation/forms/modals/state.py:52 msgid "Biotope additional type" msgstr "Zusatzbezeichnung" -#: compensation/forms/modals/state.py:42 +#: compensation/forms/modals/state.py:43 msgid "Select an additional biotope type" msgstr "Zusatzbezeichnung wählen" -#: compensation/forms/modals/state.py:61 +#: compensation/forms/modals/state.py:62 #: intervention/forms/modals/deduction.py:49 msgid "in m²" msgstr "" -#: compensation/forms/modals/state.py:72 +#: compensation/forms/modals/state.py:73 #: compensation/tests/compensation/unit/test_forms.py:175 msgid "New state" msgstr "Neuer Zustand" -#: compensation/forms/modals/state.py:73 +#: compensation/forms/modals/state.py:74 #: compensation/tests/compensation/unit/test_forms.py:176 msgid "Insert data for the new state" msgstr "Geben Sie die Daten des neuen Zustandes ein" -#: compensation/forms/modals/state.py:90 konova/forms/modals/base_form.py:32 +#: compensation/forms/modals/state.py:91 konova/forms/modals/base_form.py:32 msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms/modals/state.py:145 +#: compensation/forms/modals/state.py:146 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:62 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:62 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:62 @@ -1287,44 +1288,44 @@ msgstr "" msgid "Responsible data" msgstr "Daten zu den verantwortlichen Stellen" -#: compensation/views/compensation/compensation.py:57 +#: compensation/views/compensation/compensation.py:58 msgid "Compensations - Overview" msgstr "Kompensationen - Übersicht" -#: compensation/views/compensation/compensation.py:180 +#: compensation/views/compensation/compensation.py:181 #: konova/utils/message_templates.py:40 msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" -#: compensation/views/compensation/compensation.py:195 -#: compensation/views/eco_account/eco_account.py:172 ema/views/ema.py:230 -#: intervention/views/intervention.py:251 +#: compensation/views/compensation/compensation.py:196 +#: compensation/views/eco_account/eco_account.py:173 ema/views/ema.py:232 +#: intervention/views/intervention.py:253 msgid "Edit {}" msgstr "Bearbeite {}" #: compensation/views/compensation/report.py:34 #: compensation/views/eco_account/report.py:34 ema/views/report.py:34 -#: intervention/views/report.py:37 +#: intervention/views/report.py:35 msgid "Report {}" msgstr "Bericht {}" -#: compensation/views/eco_account/eco_account.py:52 +#: compensation/views/eco_account/eco_account.py:53 msgid "Eco-account - Overview" msgstr "Ökokonten - Übersicht" -#: compensation/views/eco_account/eco_account.py:85 +#: compensation/views/eco_account/eco_account.py:86 msgid "Eco-Account {} added" msgstr "Ökokonto {} hinzugefügt" -#: compensation/views/eco_account/eco_account.py:157 +#: compensation/views/eco_account/eco_account.py:158 msgid "Eco-Account {} edited" msgstr "Ökokonto {} bearbeitet" -#: compensation/views/eco_account/eco_account.py:286 +#: compensation/views/eco_account/eco_account.py:288 msgid "Eco-account removed" msgstr "Ökokonto entfernt" -#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:101 +#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:102 msgid "New EMA" msgstr "Neue EMA hinzufügen" @@ -1352,19 +1353,19 @@ msgstr "" msgid "Payment funded compensation" msgstr "Ersatzzahlungsmaßnahme" -#: ema/views/ema.py:52 +#: ema/views/ema.py:53 msgid "EMAs - Overview" msgstr "EMAs - Übersicht" -#: ema/views/ema.py:85 +#: ema/views/ema.py:86 msgid "EMA {} added" msgstr "EMA {} hinzugefügt" -#: ema/views/ema.py:215 +#: ema/views/ema.py:217 msgid "EMA {} edited" msgstr "EMA {} bearbeitet" -#: ema/views/ema.py:254 +#: ema/views/ema.py:256 msgid "EMA removed" msgstr "EMA entfernt" @@ -1428,7 +1429,7 @@ msgstr "Datum Bestandskraft bzw. Rechtskraft" #: intervention/forms/intervention.py:216 #: intervention/tests/unit/test_forms.py:36 -#: intervention/views/intervention.py:104 +#: intervention/views/intervention.py:105 msgid "New intervention" msgstr "Neuer Eingriff" @@ -1597,7 +1598,12 @@ msgctxt "money" msgid "Amount" msgstr "Betrag" -#: intervention/templates/intervention/detail/includes/payments.html:62 +#: intervention/templates/intervention/detail/includes/payments.html:61 +#: konova/utils/message_templates.py:25 +msgid "This data is not shared with you" +msgstr "Diese Daten sind für Sie nicht freigegeben" + +#: intervention/templates/intervention/detail/includes/payments.html:70 msgid "Remove payment" msgstr "Zahlung entfernen" @@ -1659,19 +1665,19 @@ msgstr "" msgid "Check performed" msgstr "Prüfung durchgeführt" -#: intervention/views/intervention.py:56 +#: intervention/views/intervention.py:57 msgid "Interventions - Overview" msgstr "Eingriffe - Übersicht" -#: intervention/views/intervention.py:89 +#: intervention/views/intervention.py:90 msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views/intervention.py:234 +#: intervention/views/intervention.py:236 msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views/intervention.py:276 +#: intervention/views/intervention.py:278 msgid "{} removed" msgstr "{} entfernt" @@ -1781,6 +1787,17 @@ msgstr "" "Wenn aktiviert werden auch Einträge angezeigt, die nicht für Sie freigegeben " "sind" +#: konova/filters/mixins/user_log.py:21 +msgid "Logged user" +msgstr "Bearbeitender Nutzer" + +#: konova/filters/mixins/user_log.py:22 +msgid "" +"Search for entries where this person has been participated according to log " +"history" +msgstr "" +"Sucht nach Einträgen, an denen diese Person gearbeitet hat" + #: konova/forms/base_form.py:23 templates/form/collapsable/form.html:62 msgid "Save" msgstr "Speichern" @@ -1911,11 +1928,11 @@ msgstr "Kontrolle am" msgid "Other" msgstr "Sonstige" -#: konova/sub_settings/django_settings.py:166 +#: konova/sub_settings/django_settings.py:157 msgid "German" msgstr "" -#: konova/sub_settings/django_settings.py:167 +#: konova/sub_settings/django_settings.py:158 msgid "English" msgstr "" @@ -2091,10 +2108,6 @@ msgstr "" "Eintrag ist verzeichnet. Um Daten zu bearbeiten, muss der Eintrag erst " "entzeichnet werden." -#: konova/utils/message_templates.py:25 -msgid "This data is not shared with you" -msgstr "Diese Daten sind für Sie nicht freigegeben" - #: konova/utils/message_templates.py:26 msgid "" "Remember: This data has not been shared with you, yet. This means you can " @@ -2817,11 +2830,17 @@ msgstr "Mehr" msgid "Reports" msgstr "Berichte" -#: templates/navbars/navbar.html:56 user/templates/user/index.html:31 +#: templates/navbars/navbar.html:57 +#, fuzzy +#| msgid "Admins" +msgid "Admin" +msgstr "Administratoren" + +#: templates/navbars/navbar.html:59 user/templates/user/index.html:31 msgid "Settings" msgstr "Einstellungen" -#: templates/navbars/navbar.html:57 +#: templates/navbars/navbar.html:60 msgid "Logout" msgstr "Abmelden" @@ -3032,7 +3051,7 @@ msgid "Manage teams" msgstr "" #: user/templates/user/index.html:53 user/templates/user/team/index.html:19 -#: user/views.py:171 +#: user/views/views.py:171 msgid "Teams" msgstr "" @@ -3084,43 +3103,43 @@ msgstr "Token noch nicht freigeschaltet" msgid "Valid until" msgstr "Läuft ab am" -#: user/views.py:35 +#: user/views/views.py:35 msgid "User settings" msgstr "Einstellungen" -#: user/views.py:61 +#: user/views/views.py:61 msgid "Notifications edited" msgstr "Benachrichtigungen bearbeitet" -#: user/views.py:73 +#: user/views/views.py:73 msgid "User notifications" msgstr "Benachrichtigungen" -#: user/views.py:96 +#: user/views/views.py:96 msgid "New token generated. Administrators need to validate." msgstr "Neuer Token generiert. Administratoren sind informiert." -#: user/views.py:107 +#: user/views/views.py:107 msgid "User API token" msgstr "API Nutzer Token" -#: user/views.py:183 +#: user/views/views.py:183 msgid "New team added" msgstr "Neues Team hinzugefügt" -#: user/views.py:198 +#: user/views/views.py:198 msgid "Team edited" msgstr "Team bearbeitet" -#: user/views.py:213 +#: user/views/views.py:213 msgid "Team removed" msgstr "Team gelöscht" -#: user/views.py:228 +#: user/views/views.py:228 msgid "You are not a member of this team" msgstr "Sie sind kein Mitglied dieses Teams" -#: user/views.py:235 +#: user/views/views.py:235 msgid "Left Team" msgstr "Team verlassen"