diff --git a/konova/filters/mixins.py b/konova/filters/mixins.py index 5a07e3c2..e6a841ea 100644 --- a/konova/filters/mixins.py +++ b/konova/filters/mixins.py @@ -185,7 +185,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet): """ matching_districts = District.objects.filter( - krs=value + krs__icontains=value ) matching_parcels = Parcel.objects.filter( district__in=matching_districts @@ -209,7 +209,7 @@ class GeoReferencedTableFilterMixin(django_filters.FilterSet): Returns: """ - queryset = self._filter_parcel_reference(queryset, name, value, "gmrkng__istartswith") + queryset = self._filter_parcel_reference(queryset, name, value, "gmrkng__icontains") return queryset def filter_parcel(self, queryset, name, value) -> QuerySet: diff --git a/konova/templates/konova/includes/parcel_table.html b/konova/templates/konova/includes/parcel_table.html new file mode 100644 index 00000000..68904894 --- /dev/null +++ b/konova/templates/konova/includes/parcel_table.html @@ -0,0 +1,32 @@ +{% load i18n %} +
+ {% if parcels|length == 0 %} +
+ {% trans 'Parcels can not be calculated, since no geometry is given.' %} +
+ {% else %} + + + + + + + + + + + + {% for parcel in parcels %} + + + + + + + + {% endfor %} + + +
{% trans 'Kreis' %}{% trans 'Gemarkung' %}{% trans 'Parcel' %}{% trans 'Parcel counter' %}{% trans 'Parcel number' %}
{{parcel.district.krs|default_if_none:"-"}}{{parcel.gmrkng|default_if_none:"-"}}{{parcel.flr|default_if_none:"-"}}{{parcel.flrstck_zhlr|default_if_none:"-"}}{{parcel.flrstck_nnr|default_if_none:"-"}}
+ {% endif %} +
\ No newline at end of file diff --git a/konova/templates/konova/includes/parcels.html b/konova/templates/konova/includes/parcels.html index d73d4610..9ccd9d52 100644 --- a/konova/templates/konova/includes/parcels.html +++ b/konova/templates/konova/includes/parcels.html @@ -1,37 +1,8 @@ {% load i18n %} -
+

{% trans 'Spatial reference' %}

-
-
- {% if parcels|length == 0 %} -
- {% blocktrans %} - If the geometry is not empty, the parcels are currently recalculated. Please refresh this page in a few moments. - {% endblocktrans %} -
- {% else %} - - - - - - - - - - - - {% for parcel in parcels %} - - - - - - - - {% endfor %} - - -
{% trans 'Kreis' %}{% trans 'Gemarkung' %}{% trans 'Parcel' %}{% trans 'Parcel counter' %}{% trans 'Parcel number' %}
{{parcel.district.krs|default_if_none:"-"}}{{parcel.gmrkng|default_if_none:"-"}}{{parcel.flr|default_if_none:"-"}}{{parcel.flrstck_zhlr|default_if_none:"-"}}{{parcel.flrstck_nnr|default_if_none:"-"}}
- {% endif %} +
+ + {% trans 'Loading...' %} +
\ No newline at end of file diff --git a/konova/urls.py b/konova/urls.py index 1cd8851d..7f3b8972 100644 --- a/konova/urls.py +++ b/konova/urls.py @@ -23,7 +23,7 @@ from konova.autocompletes import EcoAccountAutocomplete, \ ShareUserAutocomplete, BiotopeExtraCodeAutocomplete, CompensationActionDetailCodeAutocomplete, ShareTeamAutocomplete from konova.settings import SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY, DEBUG from konova.sso.sso import KonovaSSOClient -from konova.views import logout_view, home_view +from konova.views import logout_view, home_view, get_geom_parcels sso_client = KonovaSSOClient(SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY) urlpatterns = [ @@ -39,6 +39,7 @@ urlpatterns = [ path('cl/', include("codelist.urls")), path('analysis/', include("analysis.urls")), path('api/', include("api.urls")), + path('geom//parcels', get_geom_parcels, name="geometry-parcels"), # Autocomplete paths for all apps path("atcmplt/eco-accounts", EcoAccountAutocomplete.as_view(), name="accounts-autocomplete"), diff --git a/konova/views.py b/konova/views.py index f3c53f01..db967e85 100644 --- a/konova/views.py +++ b/konova/views.py @@ -7,20 +7,17 @@ Created on: 16.11.20 """ from django.contrib.auth import logout from django.contrib.auth.decorators import login_required -from django.http import HttpRequest, FileResponse +from django.http import HttpRequest, HttpResponse from django.shortcuts import redirect, render, get_object_or_404 from django.template.loader import render_to_string from django.utils import timezone from django.utils.translation import gettext_lazy as _ -from codelist.models import KonovaCode -from codelist.settings import CODELIST_COMPENSATION_ACTION_ID from compensation.models import Compensation, EcoAccount from intervention.models import Intervention from konova.contexts import BaseContext from konova.decorators import any_group_check -from konova.forms import RemoveModalForm -from konova.models import Deadline +from konova.models import Deadline, Geometry from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER from news.models import ServerMessage from konova.settings import SSO_SERVER_BASE @@ -102,6 +99,46 @@ def home_view(request: HttpRequest): return render(request, template, context) +@login_required +def get_geom_parcels(request: HttpRequest, id: str): + """ Getter for HTMX + + Returns all parcels of the requested geometry rendered into a simple HTML table + + Args: + request (HttpRequest): The incoming request + id (str): The geometry's id + + Returns: + + """ + # HTTP code 286 states that the HTMX should stop polling for updates + # https://htmx.org/docs/#polling + status_code = 286 + template = "konova/includes/parcel_table.html" + geom = get_object_or_404(Geometry, id=id) + parcels = geom.get_underlying_parcels() + geos_geom = geom.geom + + parcels_are_currently_calculated = geos_geom is not None and geos_geom.area > 0 and len(parcels) == 0 + parcels_available = len(parcels) > 0 + no_geometry_given = geos_geom is None + + if parcels_are_currently_calculated: + # Parcels are being calculated right now. Change the status code, so polling stays active for fetching + # resutls after the calculation + status_code = 200 + + if parcels_available or no_geometry_given: + context = { + "parcels": parcels, + } + html = render_to_string(template, context, request) + return HttpResponse(html, status=status_code) + else: + return HttpResponse(None, status=404) + + def get_404_view(request: HttpRequest, exception=None): """ Returns a 404 handling view diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index d7b26eb6..768357b4 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 f6380423..5d05c894 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # #: compensation/filters.py:123 compensation/forms/modalForms.py:36 #: compensation/forms/modalForms.py:47 compensation/forms/modalForms.py:63 -#: compensation/forms/modalForms.py:357 compensation/forms/modalForms.py:464 +#: compensation/forms/modalForms.py:358 compensation/forms/modalForms.py:466 #: intervention/forms/forms.py:54 intervention/forms/forms.py:156 #: intervention/forms/forms.py:168 intervention/forms/modalForms.py:150 #: intervention/forms/modalForms.py:163 intervention/forms/modalForms.py:176 @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-02-21 08:55+0100\n" +"POT-Creation-Date: 2022-02-21 14:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -96,7 +96,7 @@ msgstr "" #: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 #: analysis/templates/analysis/reports/includes/old_data/amount.html:3 -#: compensation/forms/modalForms.py:448 +#: compensation/forms/modalForms.py:450 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" @@ -199,7 +199,7 @@ msgstr "Andere Zulassungsbehörden" #: analysis/templates/analysis/reports/includes/compensation/card_compensation.html:11 #: compensation/tables.py:67 #: intervention/templates/intervention/detail/includes/compensations.html:8 -#: intervention/templates/intervention/report/report.html:49 +#: intervention/templates/intervention/report/report.html:45 msgid "Compensations" msgstr "Kompensationen" @@ -354,7 +354,7 @@ msgid "Compensation XY; Location ABC" msgstr "Kompensation XY; Flur ABC" #: compensation/forms/forms.py:57 compensation/forms/modalForms.py:62 -#: compensation/forms/modalForms.py:356 compensation/forms/modalForms.py:463 +#: compensation/forms/modalForms.py:357 compensation/forms/modalForms.py:465 #: compensation/templates/compensation/detail/compensation/includes/actions.html:35 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 #: compensation/templates/compensation/detail/compensation/includes/documents.html:34 @@ -372,7 +372,7 @@ msgstr "Kompensation XY; Flur ABC" msgid "Comment" msgstr "Kommentar" -#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:465 +#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:467 #: intervention/forms/forms.py:182 msgid "Additional comment" msgstr "Zusätzlicher Kommentar" @@ -483,7 +483,7 @@ msgstr "Fällig am" msgid "Due on which date" msgstr "Zahlung wird an diesem Datum erwartet" -#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:358 +#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:359 #: intervention/forms/modalForms.py:177 konova/forms.py:395 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -533,15 +533,25 @@ msgstr "Geben Sie die Daten des neuen Zustandes ein" msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms/modalForms.py:328 +#: compensation/forms/modalForms.py:272 +#: 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 +#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:62 +#: ema/templates/ema/detail/includes/states-after.html:60 +#: ema/templates/ema/detail/includes/states-before.html:60 +msgid "Edit state" +msgstr "Zustand bearbeiten" + +#: compensation/forms/modalForms.py:329 msgid "Deadline Type" msgstr "Fristart" -#: compensation/forms/modalForms.py:331 +#: compensation/forms/modalForms.py:332 msgid "Select the deadline type" msgstr "Fristart wählen" -#: compensation/forms/modalForms.py:340 +#: compensation/forms/modalForms.py:341 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31 #: ema/templates/ema/detail/includes/deadlines.html:31 @@ -549,23 +559,30 @@ msgstr "Fristart wählen" msgid "Date" msgstr "Datum" -#: compensation/forms/modalForms.py:343 +#: compensation/forms/modalForms.py:344 msgid "Select date" msgstr "Datum wählen" -#: compensation/forms/modalForms.py:370 +#: compensation/forms/modalForms.py:371 msgid "New deadline" msgstr "Neue Frist" -#: compensation/forms/modalForms.py:371 +#: compensation/forms/modalForms.py:372 msgid "Insert data for the new deadline" msgstr "Geben Sie die Daten der neuen Frist ein" -#: compensation/forms/modalForms.py:411 +#: compensation/forms/modalForms.py:385 +#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:59 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:57 +#: ema/templates/ema/detail/includes/deadlines.html:57 +msgid "Edit deadline" +msgstr "Frist/Termin bearbeiten" + +#: compensation/forms/modalForms.py:413 msgid "Action Type" msgstr "Maßnahmentyp" -#: compensation/forms/modalForms.py:414 +#: compensation/forms/modalForms.py:416 msgid "" "An action can consist of multiple different action types. All the selected " "action types are expected to be performed according to the amount and unit " @@ -575,34 +592,41 @@ msgstr "" "hier gewählten Einträge sollen mit der weiter unten angegebenen Einheit und " "Menge umgesetzt werden. " -#: compensation/forms/modalForms.py:419 compensation/forms/modalForms.py:431 +#: compensation/forms/modalForms.py:421 compensation/forms/modalForms.py:433 msgid "Action Type detail" msgstr "Zusatzmerkmal" -#: compensation/forms/modalForms.py:422 +#: compensation/forms/modalForms.py:424 msgid "Select the action type detail" msgstr "Zusatzmerkmal wählen" -#: compensation/forms/modalForms.py:436 +#: compensation/forms/modalForms.py:438 msgid "Unit" msgstr "Einheit" -#: compensation/forms/modalForms.py:439 +#: compensation/forms/modalForms.py:441 msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms/modalForms.py:451 +#: compensation/forms/modalForms.py:453 msgid "Insert the amount" msgstr "Menge eingeben" -#: compensation/forms/modalForms.py:476 +#: compensation/forms/modalForms.py:478 msgid "New action" msgstr "Neue Maßnahme" -#: compensation/forms/modalForms.py:477 +#: compensation/forms/modalForms.py:479 msgid "Insert data for the new action" msgstr "Geben Sie die Daten der neuen Maßnahme ein" +#: compensation/forms/modalForms.py:503 +#: compensation/templates/compensation/detail/compensation/includes/actions.html:68 +#: compensation/templates/compensation/detail/eco_account/includes/actions.html:67 +#: ema/templates/ema/detail/includes/actions.html:65 +msgid "Edit action" +msgstr "Maßnahme bearbeiten" + #: compensation/models/action.py:20 msgid "cm" msgstr "" @@ -767,12 +791,6 @@ msgstr "Aktionen" msgid "No action type details" msgstr "Keine Zusatzmerkmale" -#: compensation/templates/compensation/detail/compensation/includes/actions.html:68 -#: compensation/templates/compensation/detail/eco_account/includes/actions.html:67 -#: ema/templates/ema/detail/includes/actions.html:65 -msgid "Edit action" -msgstr "Maßnahme bearbeiten" - #: compensation/templates/compensation/detail/compensation/includes/actions.html:71 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:70 #: ema/templates/ema/detail/includes/actions.html:68 @@ -827,12 +845,6 @@ msgstr "Termine und Fristen" msgid "Add new deadline" msgstr "Frist/Termin hinzufügen" -#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:59 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:57 -#: ema/templates/ema/detail/includes/deadlines.html:57 -msgid "Edit deadline" -msgstr "Frist/Termin bearbeiten" - #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:62 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:60 #: ema/templates/ema/detail/includes/deadlines.html:60 @@ -866,6 +878,7 @@ msgstr "Erstellt" #: compensation/templates/compensation/detail/eco_account/includes/documents.html:61 #: ema/templates/ema/detail/includes/documents.html:61 #: intervention/templates/intervention/detail/includes/documents.html:65 +#: konova/forms.py:474 msgid "Edit document" msgstr "Dokument bearbeiten" @@ -913,15 +926,6 @@ msgstr "Biotoptyp" msgid "No biotope type details" msgstr "Keine Zusatzbezeichnungen" -#: 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 -#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:62 -#: ema/templates/ema/detail/includes/states-after.html:60 -#: ema/templates/ema/detail/includes/states-before.html:60 -msgid "Edit state" -msgstr "Zustand bearbeiten" - #: compensation/templates/compensation/detail/compensation/includes/states-after.html:65 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:65 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:65 @@ -995,11 +999,11 @@ msgstr "Verzeichnet am" #: compensation/templates/compensation/detail/compensation/view.html:92 #: compensation/templates/compensation/detail/eco_account/view.html:75 #: compensation/templates/compensation/report/compensation/report.html:24 -#: compensation/templates/compensation/report/eco_account/report.html:41 +#: compensation/templates/compensation/report/eco_account/report.html:37 #: ema/templates/ema/detail/view.html:61 -#: ema/templates/ema/report/report.html:28 +#: ema/templates/ema/report/report.html:24 #: intervention/templates/intervention/detail/view.html:108 -#: intervention/templates/intervention/report/report.html:91 +#: intervention/templates/intervention/report/report.html:87 msgid "Last modified" msgstr "Zuletzt bearbeitet" @@ -1054,6 +1058,7 @@ msgid "Recorded on" msgstr "Verzeichnet am" #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:65 +#: intervention/forms/modalForms.py:481 #: intervention/templates/intervention/detail/includes/deductions.html:60 msgid "Edit Deduction" msgstr "Abbuchung bearbeiten" @@ -1087,9 +1092,7 @@ msgid "Missing" msgstr "fehlt" #: compensation/templates/compensation/detail/eco_account/view.html:71 -#: compensation/templates/compensation/report/eco_account/report.html:24 #: ema/templates/ema/detail/view.html:57 -#: ema/templates/ema/report/report.html:24 msgid "Action handler" msgstr "Maßnahmenträger" @@ -1101,26 +1104,26 @@ msgid "Report" msgstr "Bericht" #: compensation/templates/compensation/report/compensation/report.html:45 -#: compensation/templates/compensation/report/eco_account/report.html:62 -#: ema/templates/ema/report/report.html:49 -#: intervention/templates/intervention/report/report.html:108 +#: compensation/templates/compensation/report/eco_account/report.html:58 +#: ema/templates/ema/report/report.html:45 +#: intervention/templates/intervention/report/report.html:104 msgid "Open in browser" msgstr "Im Browser öffnen" #: compensation/templates/compensation/report/compensation/report.html:49 -#: compensation/templates/compensation/report/eco_account/report.html:66 -#: ema/templates/ema/report/report.html:53 -#: intervention/templates/intervention/report/report.html:112 +#: compensation/templates/compensation/report/eco_account/report.html:62 +#: ema/templates/ema/report/report.html:49 +#: intervention/templates/intervention/report/report.html:108 msgid "View in LANIS" msgstr "In LANIS öffnen" -#: compensation/templates/compensation/report/eco_account/report.html:28 +#: compensation/templates/compensation/report/eco_account/report.html:24 msgid "Deductions for" msgstr "Abbuchungen für" -#: compensation/templates/compensation/report/eco_account/report.html:36 -#: intervention/templates/intervention/report/report.html:57 -#: intervention/templates/intervention/report/report.html:78 +#: compensation/templates/compensation/report/eco_account/report.html:32 +#: intervention/templates/intervention/report/report.html:53 +#: intervention/templates/intervention/report/report.html:74 msgid "None" msgstr "-" @@ -1291,7 +1294,6 @@ msgstr "" #: intervention/forms/forms.py:142 #: intervention/templates/intervention/detail/view.html:64 -#: intervention/templates/intervention/report/report.html:45 #: intervention/utils/quality.py:52 msgid "Intervention handler" msgstr "Eingriffsverursacher" @@ -1302,14 +1304,14 @@ msgstr "Wer führt den Eingriff durch" #: intervention/forms/forms.py:155 #: intervention/templates/intervention/detail/view.html:96 -#: intervention/templates/intervention/report/report.html:83 +#: intervention/templates/intervention/report/report.html:79 #: intervention/utils/quality.py:73 msgid "Registration date" msgstr "Datum Zulassung bzw. Satzungsbeschluss" #: intervention/forms/forms.py:167 #: intervention/templates/intervention/detail/view.html:100 -#: intervention/templates/intervention/report/report.html:87 +#: intervention/templates/intervention/report/report.html:83 msgid "Binding on" msgstr "Datum Bestandskraft" @@ -1393,7 +1395,7 @@ msgstr "Kompensationen und Zahlungen geprüft" msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms/modalForms.py:264 konova/forms.py:514 +#: intervention/forms/modalForms.py:264 konova/forms.py:515 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -1454,7 +1456,7 @@ msgid "Eco-account not recorded! Deduction invalid!" msgstr "Ökokonto nicht verzeichnet! Abbuchung ungültig!" #: intervention/templates/intervention/detail/includes/payments.html:8 -#: intervention/templates/intervention/report/report.html:73 +#: intervention/templates/intervention/report/report.html:69 msgid "Payments" msgstr "Ersatzzahlungen" @@ -1493,11 +1495,11 @@ msgstr "Widerspruch entfernen" msgid "Exists" msgstr "vorhanden" -#: intervention/templates/intervention/report/report.html:62 +#: intervention/templates/intervention/report/report.html:58 msgid "Deductions of eco-accounts" msgstr "Abbuchungen von Ökokonten" -#: intervention/templates/intervention/report/report.html:76 +#: intervention/templates/intervention/report/report.html:72 msgid "Exist" msgstr "Vorhanden" @@ -1582,7 +1584,7 @@ msgid "Search for parcel gmrkng" msgstr "Nach Gemarkung suchen" #: konova/filters/mixins.py:111 -#: konova/templates/konova/includes/parcels.html:18 +#: konova/templates/konova/includes/parcel_table.html:13 msgid "Parcel" msgstr "Flur" @@ -1591,7 +1593,7 @@ msgid "Search for parcel" msgstr "Nach Flur suchen" #: konova/filters/mixins.py:124 -#: konova/templates/konova/includes/parcels.html:19 +#: konova/templates/konova/includes/parcel_table.html:14 msgid "Parcel counter" msgstr "Flurstückzähler" @@ -1600,7 +1602,7 @@ msgid "Search for parcel counter" msgstr "Nach Flurstückzähler suchen" #: konova/filters/mixins.py:138 -#: konova/templates/konova/includes/parcels.html:20 +#: konova/templates/konova/includes/parcel_table.html:15 msgid "Parcel number" msgstr "Flurstücknenner" @@ -1670,23 +1672,23 @@ msgstr "Formate: pdf, jpg, png. Maximal 15 MB." msgid "Added document" msgstr "Dokument hinzugefügt" -#: konova/forms.py:505 +#: konova/forms.py:506 msgid "Confirm record" msgstr "Verzeichnen bestätigen" -#: konova/forms.py:513 +#: konova/forms.py:514 msgid "Record data" msgstr "Daten verzeichnen" -#: konova/forms.py:520 +#: konova/forms.py:521 msgid "Confirm unrecord" msgstr "Entzeichnen bestätigen" -#: konova/forms.py:521 +#: konova/forms.py:522 msgid "Unrecord data" msgstr "Daten entzeichnen" -#: konova/forms.py:522 +#: konova/forms.py:523 msgid "I, {} {}, confirm that this data must be unrecorded." msgstr "" "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen." @@ -1735,29 +1737,25 @@ msgstr "" msgid "English" msgstr "" +#: konova/templates/konova/includes/parcel_table.html:5 +msgid "Parcels can not be calculated, since no geometry is given." +msgstr "Flurstücke können nicht berechnet werden, da keine Geometrie eingegeben wurde." + +#: konova/templates/konova/includes/parcel_table.html:11 +msgid "Kreis" +msgstr "Kreis" + +#: konova/templates/konova/includes/parcel_table.html:12 +msgid "Gemarkung" +msgstr "Gemarkung" + #: konova/templates/konova/includes/parcels.html:3 msgid "Spatial reference" msgstr "Raumreferenz" -#: konova/templates/konova/includes/parcels.html:8 -msgid "" -"\n" -" If the geometry is not empty, the parcels are currently " -"recalculated. Please refresh this page in a few moments.\n" -" " -msgstr "" -"\n" -"Falls die Geometrie nicht leer ist, werden die Flurstücke aktuell berechnet. " -"Bitte laden Sie diese Seite in ein paar Augenblicken erneut... \n" -" " - -#: konova/templates/konova/includes/parcels.html:16 -msgid "Kreis" -msgstr "Kreis" - -#: konova/templates/konova/includes/parcels.html:17 -msgid "Gemarkung" -msgstr "Gemarkung" +#: konova/templates/konova/includes/parcels.html:6 +msgid "Loading..." +msgstr "Lade..." #: konova/templates/konova/includes/quickstart/compensations.html:20 #: konova/templates/konova/includes/quickstart/ecoaccounts.html:20 @@ -4167,54 +4165,3 @@ msgstr "" #, python-format msgid "Unable to connect to qpid with SASL mechanism %s" msgstr "" - -#~ msgid "your teams" -#~ msgstr "Team entfernen" - -#~ msgid "Remove check to remove access for this user" -#~ msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen" - -#~ msgid "Select the action type" -#~ msgstr "Maßnahmentyp wählen" - -#~ msgid "No revocation" -#~ msgstr "Kein Widerspruch" - -#~ msgid "Revocation from {}, added on {} by {}" -#~ msgstr "Widerspruch vom {}, am {} von {} hinzugefügt" - -#~ msgid "General data edited" -#~ msgstr "Allgemeine Daten bearbeitet" - -#~ msgid "On registered data edited" -#~ msgstr "Wenn meine freigegebenen Daten bearbeitet wurden" - -#~ msgid "Not recorded" -#~ msgstr "Noch nicht verzeichnet" - -#~ msgid "On new related data" -#~ msgstr "Wenn neue Daten für mich angelegt werden" - -#~ msgid "On disabled share link" -#~ msgstr "Wenn ein Freigabelink deaktiviert wird" - -#~ msgid "Deduct" -#~ msgstr "Abbuchen" - -#~ msgid "No file given!" -#~ msgstr "Keine Datei angegeben!" - -#~ msgid "Added action" -#~ msgstr "Maßnahme hinzugefügt" - -#~ msgid "Share with user" -#~ msgstr "Freigeben für Nutzer" - -#~ msgid "Fundings" -#~ msgstr "Förderungen" - -#~ msgid "Select fundings for this compensation" -#~ msgstr "Wählen Sie ggf. Fördermittelprojekte" - -#~ msgid "Funded by" -#~ msgstr "Gefördert mit" diff --git a/templates/base.html b/templates/base.html index c418daad..30be48ed 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,6 +14,7 @@ Adds script for modal rendering. Script depends on Jquery, therefore it needs to be loaded afterwards. {% endcomment %} + {% block head %} {% endblock %} diff --git a/templates/map/geom_form.html b/templates/map/geom_form.html index 8b9f463d..bc8d0da6 100644 --- a/templates/map/geom_form.html +++ b/templates/map/geom_form.html @@ -10,4 +10,6 @@
{% endif %} {{geom_form.media}} -{{geom_form.geom}} \ No newline at end of file +
+ {{geom_form.geom}} +
diff --git a/templates/public_base.html b/templates/public_base.html index 62193c49..69a25d9b 100644 --- a/templates/public_base.html +++ b/templates/public_base.html @@ -10,6 +10,7 @@ {% bootstrap_javascript jquery='full' %} {% fontawesome_5_static %} + {% block head %} {% endblock %}