Compare commits
167
Commits
1.26
..
a6ff00acf8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a6ff00acf8 | ||
|
|
8de467ec24 | ||
|
|
238a9c4db8 | ||
|
|
d24fb0e0f5 | ||
|
|
7fe5340995 | ||
|
|
606f1ed311 | ||
|
|
59fca60134 | ||
|
|
b6b740a31c | ||
|
|
7c200d9034 | ||
|
|
750715105e | ||
|
|
a994554650 | ||
|
|
4c7c667bdb | ||
|
|
7e136f4022 | ||
|
|
c8a39e62eb | ||
|
|
1393491fb7 | ||
|
|
b1ca199b85 | ||
|
|
3354ad1f68 | ||
|
|
960b681ab9 | ||
|
|
e99b371d5d | ||
|
|
ba7f5edc33 | ||
|
|
3aa7b4874e | ||
|
|
8ade4c2f7a | ||
|
|
67be62a869 | ||
|
|
5a8d20047f | ||
|
|
74d4ee49cc | ||
|
|
e8b583d4c6 | ||
|
|
f57fa4cc20 | ||
|
|
b0f72584e2 | ||
|
|
2bbc780c0b | ||
|
|
15a1bbe771 | ||
|
|
9965ce2d2c | ||
|
|
89f309abd2 | ||
|
|
f134948685 | ||
|
|
1e525b90a9 | ||
|
|
63a516e7d6 | ||
|
|
2399ca9bf9 | ||
|
|
c48ccd5334 | ||
|
|
e2f8fc9c6d | ||
|
|
fac658e52c | ||
|
|
d6a65dd59a | ||
|
|
cbc8acf6f6 | ||
|
|
31de477f26 | ||
|
|
19b6e633df | ||
|
|
b98f821c98 | ||
|
|
5421de4e80 | ||
|
|
a7a0044fc5 | ||
|
|
36552b3886 | ||
|
|
a766c4dbe8 | ||
|
|
8126781b77 | ||
|
|
a6a66d7499 | ||
|
|
1c0b67693d | ||
|
|
ce6bb6b23b | ||
|
|
0b8176db2e | ||
|
|
3a299a040a | ||
|
|
3c5206139b | ||
|
|
6c53f39a28 | ||
|
|
64d8f47174 | ||
|
|
f5f3246e89 | ||
|
|
ad8961ab82 | ||
|
|
c2c8630c82 | ||
|
|
dce9e1fc71 | ||
|
|
2b84bab1d0 | ||
|
|
303583daa1 | ||
|
|
d07b2ffbfb | ||
|
|
335800c44b | ||
|
|
5766cfde47 | ||
|
|
2ed3fcc0f9 | ||
|
|
bf72295615 | ||
|
|
6b860f8ea5 | ||
|
|
2fa2fa547b | ||
|
|
3de956872c | ||
|
|
1c8e3992d6 | ||
|
|
e6e9e141c8 | ||
|
|
f8ece06ee8 | ||
|
|
149a351bfd | ||
|
|
0164717b8e | ||
|
|
104952bfc3 | ||
|
|
f96241c8d1 | ||
|
|
ac6b534f58 | ||
|
|
06910cd69a | ||
|
|
a48ba520fc | ||
|
|
9f18aa5890 | ||
|
|
ab3bd84f3b | ||
|
|
f829cd5a4c | ||
|
|
0f2bf95b71 | ||
|
|
6a307016ec | ||
|
|
51017ef8fa | ||
|
|
05560534bc | ||
|
|
c882173e78 | ||
|
|
1d94211428 | ||
|
|
37357080d8 | ||
|
|
5afa13ac92 | ||
|
|
416cad1c8f | ||
|
|
b5f83b7163 | ||
|
|
20cfb5f345 | ||
|
|
88c96b95f2 | ||
|
|
f6c500b02a | ||
|
|
d702cd8716 | ||
|
|
329cdd4838 | ||
|
|
1b70024a29 | ||
|
|
58206853ee | ||
|
|
6356398c40 | ||
|
|
8519922d78 | ||
|
|
5ac0654fd4 | ||
|
|
6c07a81b4f | ||
|
|
ba45b4f961 | ||
|
|
280de82a52 | ||
|
|
6022e2d879 | ||
|
|
1996efcc0d | ||
|
|
80569119cb | ||
|
|
98e71d4e8a | ||
|
|
fec7191ac2 | ||
|
|
9b1085f206 | ||
|
|
b35d175a5c | ||
|
|
7f5fb022ac | ||
|
|
2d3314ab18 | ||
|
|
8b489f013d | ||
|
|
16ce5506d8 | ||
|
|
e440bf8372 | ||
|
|
607db267e6 | ||
|
|
352ca64e09 | ||
|
|
f2b735da6e | ||
|
|
6f7cfb713e | ||
|
|
103b703ee9 | ||
|
|
daf8b1dce6 | ||
|
|
c088affd74 | ||
|
|
ecc727c991 | ||
|
|
632569fa5d | ||
|
|
6c6cbb7396 | ||
|
|
5e6bfdf77e | ||
|
|
35e5e18b79 | ||
|
|
c0e8c6bd84 | ||
|
|
64541b76c5 | ||
|
|
f65b9262cb | ||
|
|
2765d0548e | ||
|
|
951f810ce5 | ||
|
|
d2c177d448 | ||
|
|
299727a7b4 | ||
|
|
b97976b2c5 | ||
|
|
20241661ff | ||
|
|
ad5c0bea67 | ||
|
|
80a44277bc | ||
|
|
5c2b5affc9 | ||
|
|
cd99743d1e | ||
|
|
b39432be1a | ||
|
|
03f9a33e54 | ||
|
|
699a9c1e76 | ||
|
|
4dfd02291e | ||
|
|
e7ca485a88 | ||
|
|
8319cbfe17 | ||
|
|
4a023e9f10 | ||
|
|
4100f96dc6 | ||
|
|
ca24f098e4 | ||
|
|
80dcd62199 | ||
|
|
0cfd3da728 | ||
|
|
e141851a87 | ||
|
|
89ec67999b | ||
|
|
ec38daaedc | ||
|
|
45c0826a84 | ||
|
|
45a383cf85 | ||
|
|
90aff209f9 | ||
|
|
13528e91e9 | ||
|
|
04179d633c | ||
|
|
0a241305d3 | ||
|
|
31565a0bc4 | ||
|
|
af747417d3 | ||
|
|
c6606c4151 |
No files matched your search
+36
@@ -0,0 +1,36 @@
|
||||
# Nutze ein schlankes Python-Image
|
||||
FROM python:3.13-slim-trixie
|
||||
|
||||
ENV PYTHONUNBUFFERED 1
|
||||
|
||||
WORKDIR /konova
|
||||
|
||||
# Installiere System-Abhängigkeiten
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
gdal-bin redis-server nginx \
|
||||
&& rm -rf /var/lib/apt/lists/* # Platz sparen
|
||||
|
||||
# Erstelle benötigte Verzeichnisse & setze Berechtigungen
|
||||
RUN mkdir -p /var/log/nginx /var/log/gunicorn /var/lib/nginx /tmp/nginx_client_body \
|
||||
&& touch /var/log/nginx/access.log /var/log/nginx/error.log \
|
||||
&& chown -R root:root /var/log/nginx /var/lib/nginx /tmp/nginx_client_body
|
||||
|
||||
# Kopiere und installiere Python-Abhängigkeiten
|
||||
COPY ./requirements.txt /konova/
|
||||
RUN pip install --upgrade pip && pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
# Entferne Standard-Nginx-Site und ersetze sie durch eigene Config
|
||||
RUN rm -rf /etc/nginx/sites-enabled/default
|
||||
COPY ./nginx.conf /etc/nginx/conf.d
|
||||
|
||||
# Kopiere restliche Projektdateien
|
||||
COPY . /konova/
|
||||
|
||||
# Sammle statische Dateien
|
||||
RUN python manage.py collectstatic --noinput
|
||||
|
||||
# Exponiere Ports
|
||||
#EXPOSE 80 6379 8000
|
||||
|
||||
# Setze Entrypoint
|
||||
ENTRYPOINT ["/konova/docker-entrypoint.sh"]
|
||||
@@ -4,6 +4,7 @@ the database postgresql and the css library bootstrap as well as the icon packag
|
||||
fontawesome for a modern look, following best practices from the industry.
|
||||
|
||||
## Background processes
|
||||
### !!! For non-docker run
|
||||
Konova uses celery for background processing. To start the worker you need to run
|
||||
```shell
|
||||
$ celery -A konova worker -l INFO
|
||||
@@ -18,3 +19,58 @@ Technical documention is provided in the projects git wiki.
|
||||
A user documentation is not available (and not needed, yet).
|
||||
|
||||
|
||||
# Docker
|
||||
To run the docker-compose as expected, you need to take the following steps:
|
||||
|
||||
1. Create a database containing docker, using an appropriate Dockerfile, e.g. the following
|
||||
```
|
||||
version: '3.3'
|
||||
services:
|
||||
postgis:
|
||||
image: postgis/postgis
|
||||
restart: always
|
||||
container_name: postgis-docker
|
||||
ports:
|
||||
- 5433:5432
|
||||
volumes:
|
||||
- db-volume:/var/lib/postgresql/data
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=postgres
|
||||
- POSTGRES_USER=postgres
|
||||
networks:
|
||||
- db-network-bridge
|
||||
|
||||
networks:
|
||||
db-network-bridge:
|
||||
driver: "bridge"
|
||||
|
||||
volumes:
|
||||
db-volume:
|
||||
```
|
||||
This Dockerfile creates a Docker container running postgresql and postgis, creates the default superuser postgres,
|
||||
creates a named volume for persisting the database and creates a new network bridge, which **must be used by any other
|
||||
container, which wants to write/read on this database**.
|
||||
|
||||
2. Make sure the name of the network bridge above matches the network in the konova docker-compose.yml
|
||||
3. Get into the running postgis container (`docker exec -it postgis-docker bash`) and create new databases, users and so on. Make sure the database `konova` exists now!
|
||||
4. Replace all `CHANGE_ME_xy` values inside of konova/docker-compose.yml for your installation. Make sure the `SSO_HOST` holds the proper SSO host, e.g. for the arnova project `arnova.example.org` (Arnova must be installed and the webserver configured as well, of course)
|
||||
5. Take a look on konova/settings.py and konova/sub_settings/django_settings.py. Again: Replace all occurences of `CHANGE_ME` with proper values for your installation.
|
||||
1. Make sure you have the proper host strings added to `ALLOWED_HOSTS` inside of django_settings.py.
|
||||
6. Build and run the docker setup using `docker-compose build` and `docker-compose start` from the main directory of this project (where the docker-compose.yml lives)
|
||||
7. Run migrations! To do so, get into the konova service container (`docker exec -it konova-docker bash`) and run the needed commands (`python manage.py makemigrations LIST_OF_ALL_MIGRATABLE_APPS`, then `python manage.py migrate`)
|
||||
8. Run the setup command `python manage.py setup` and follow the instructions on the CLI
|
||||
9. To enable **SMTP** mail support, make sure your host machine (the one where the docker container run) has the postfix service configured properly. Make sure the `mynetworks` variable is xtended using the docker network bridge ip, created in the postgis container and used by the konova services.
|
||||
1. **Hint**: You can find out this easily by trying to perform a test mail in the running konova web application (which will fail, of course). Then take a look to the latest entries in `/var/log/mail.log` on your host machine. The failed IP will be displayed there.
|
||||
2. **Please note**: This installation guide is based on SMTP using postfix!
|
||||
3. Restart the postfix service on your host machine to reload the new configuration (`service postfix restart`)
|
||||
10. Finally, make sure your host machine webserver passes incoming requests properly to the docker nginx webserver of konova. A proper nginx config for the host machine may look like this:
|
||||
```
|
||||
server {
|
||||
server_name konova.domain.org;
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:KONOVA_NGINX_DOCKER_PORT/;
|
||||
proxy_set_header Host $host;
|
||||
}
|
||||
}
|
||||
```
|
||||
@@ -0,0 +1,21 @@
|
||||
services:
|
||||
konova:
|
||||
external_links:
|
||||
- postgis:db
|
||||
- arnova-nginx-server:arnova
|
||||
build: .
|
||||
image: "ksp/konova:x.y"
|
||||
container_name: "konova-docker"
|
||||
command: ./docker-entrypoint.sh
|
||||
restart: always
|
||||
volumes:
|
||||
- /data/apps/konova/uploaded_files:/konova_uploaded_files
|
||||
ports:
|
||||
- "1337:80"
|
||||
|
||||
# Instead of an own, new network, we need to connect to the existing one, which is provided by the postgis container
|
||||
# NOTE: THIS NETWORK MUST EXIST
|
||||
networks:
|
||||
default:
|
||||
name: postgis_nat_it_backend
|
||||
external: true
|
||||
Executable
+27
@@ -0,0 +1,27 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e # Beende Skript bei Fehlern
|
||||
set -o pipefail # Fehler in Pipelines nicht ignorieren
|
||||
|
||||
# Starte Redis
|
||||
redis-server --daemonize yes
|
||||
|
||||
# Starte Celery Worker im Hintergrund
|
||||
celery -A konova worker --loglevel=info &
|
||||
|
||||
# Starte Nginx als Hintergrundprozess
|
||||
nginx -g "daemon off;" &
|
||||
|
||||
# Setze Gunicorn Worker-Anzahl (Standard: (2*CPUs)+1)
|
||||
WORKERS=${GUNICORN_WORKERS:-$((2 * $(nproc) + 1))}
|
||||
|
||||
# Stelle sicher, dass Logs existieren
|
||||
mkdir -p /var/log/gunicorn
|
||||
touch /var/log/gunicorn/access.log /var/log/gunicorn/error.log
|
||||
|
||||
# Starte Gunicorn als Hauptprozess
|
||||
exec gunicorn --workers="$WORKERS" konova.wsgi:application \
|
||||
--bind=0.0.0.0:8000 \
|
||||
--access-logfile /var/log/gunicorn/access.log \
|
||||
--error-logfile /var/log/gunicorn/error.log \
|
||||
--access-logformat '%({x-real-ip}i)s via %(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'
|
||||
@@ -191,11 +191,10 @@ STATICFILES_DIRS = [
|
||||
]
|
||||
|
||||
# EMAIL (see https://docs.djangoproject.com/en/dev/topics/email/)
|
||||
|
||||
# CHANGE_ME !!! ONLY FOR DEVELOPMENT !!!
|
||||
if DEBUG:
|
||||
# ONLY FOR DEVELOPMENT NEEDED
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
|
||||
EMAIL_FILE_PATH = '/tmp/app-messages' # change this to a proper location
|
||||
EMAIL_FILE_PATH = '/tmp/app-messages'
|
||||
|
||||
DEFAULT_FROM_EMAIL = env("DEFAULT_FROM_EMAIL") # The default email address for the 'from' element
|
||||
SERVER_EMAIL = DEFAULT_FROM_EMAIL # The default email sender address, which is used by Django to send errors via mail
|
||||
|
||||
@@ -12,7 +12,7 @@ from django.contrib.gis.geos.prototypes.io import WKTWriter
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from konova.settings import GEOM_MAX_VERTICES
|
||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
|
||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP, DEFAULT_SRID
|
||||
|
||||
|
||||
class GeometryProcessor:
|
||||
@@ -50,7 +50,7 @@ class GeometryProcessor:
|
||||
return geometry.num_coords <= GEOM_MAX_VERTICES
|
||||
|
||||
@staticmethod
|
||||
def is_valid_4326(geometry):
|
||||
def is_valid_4326(geometry: MultiPolygon) -> bool:
|
||||
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:4326
|
||||
|
||||
Args:
|
||||
@@ -59,13 +59,69 @@ class GeometryProcessor:
|
||||
Returns:
|
||||
ret_val (bool): Whether the geometry is valid EPSG:4326
|
||||
"""
|
||||
assert geometry.srid == DEFAULT_SRID
|
||||
return GeometryProcessor.is_valid_coord_range(
|
||||
geometry,
|
||||
-90.0,
|
||||
90.0,
|
||||
-180.0,
|
||||
180.0,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_valid_25832(geometry: MultiPolygon) -> bool:
|
||||
""" Checks whether a given geometry's coordinates are in a valid range to be of EPSG:25832
|
||||
|
||||
Args:
|
||||
geometry: The geometry
|
||||
|
||||
Returns:
|
||||
ret_val (bool): Whether the geometry is valid EPSG:25832
|
||||
"""
|
||||
assert geometry.srid == DEFAULT_SRID_RLP
|
||||
return GeometryProcessor.is_valid_coord_range(
|
||||
geometry,
|
||||
166_000,
|
||||
834_000,
|
||||
0,
|
||||
9_329_000,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def is_valid_coord_range(geometry: MultiPolygon,
|
||||
min_x:float|int,
|
||||
max_x:float|int,
|
||||
min_y:float|int,
|
||||
max_y: float|int) -> bool:
|
||||
""" Checks whether a given geometry's coordinates are in a valid range defined by input parameters
|
||||
|
||||
Args:
|
||||
geometry: The geometry
|
||||
min_x (float|int): The min x value
|
||||
max_x (float|int): The max x value
|
||||
min_y (float|int): The min y value
|
||||
max_y (float|int): The max y value
|
||||
|
||||
Returns:
|
||||
ret_val (bool): Whether the geometry's coordinates stays inside the defined range
|
||||
"""
|
||||
if not geometry.centroid.coords:
|
||||
# No coordinates at all found, therefore technically proper 4326
|
||||
return True
|
||||
|
||||
try:
|
||||
lat,lon = geometry.centroid.coords
|
||||
return (-90.0 <= lat <= 90.0) and (-180.0 <= lon <= 180.0)
|
||||
env_min_x = geometry.envelope.min_x
|
||||
env_max_x = geometry.envelope.max_x
|
||||
env_min_y = geometry.envelope.min_y
|
||||
env_max_y = geometry.envelope.max_x
|
||||
|
||||
valid = (
|
||||
min_x <= env_min_x and
|
||||
env_max_x <= max_x and
|
||||
min_y <= env_min_y and
|
||||
env_max_y <= max_y
|
||||
)
|
||||
return valid
|
||||
except IndexError:
|
||||
return False
|
||||
|
||||
@@ -124,6 +180,24 @@ class GeometryProcessor:
|
||||
is_area_valid = geom.area > 1 # > 1m² (SRID:25832)
|
||||
return is_area_valid
|
||||
|
||||
@staticmethod
|
||||
def is_valid_geometry(geom: gdal.OGRGeometry) -> bool:
|
||||
""" Checks whether the geometry is technically valid
|
||||
|
||||
Args:
|
||||
geom (OGRGeometry): The geom
|
||||
|
||||
Returns:
|
||||
|
||||
"""
|
||||
try:
|
||||
# Check geometry validity by triggering some low cost processing like centroid calculation
|
||||
geom.centroid
|
||||
geom.boundary
|
||||
return True
|
||||
except gdal.GDALException as e:
|
||||
return False
|
||||
|
||||
|
||||
class GeoJsonValidator:
|
||||
""" GeoJson Validator validates geojson (e.g. from API or form input)
|
||||
@@ -204,7 +278,7 @@ class GeoJsonValidator:
|
||||
features = self._input_geojson.get("features", [])
|
||||
|
||||
is_input_geojson_empty = len(self._input_geojson) == 0
|
||||
no_features_in_input_found = not features
|
||||
no_features_in_input_found = len(features) == 0
|
||||
|
||||
if not is_input_geojson_empty and no_features_in_input_found:
|
||||
# check if _input_geojson is a feature itself
|
||||
@@ -217,7 +291,6 @@ class GeoJsonValidator:
|
||||
else:
|
||||
self.__add_error("Input does not seem to be geojson")
|
||||
return
|
||||
|
||||
try:
|
||||
validated_features = self.__validate_single_features(features)
|
||||
except AssertionError as e:
|
||||
@@ -250,7 +323,13 @@ class GeoJsonValidator:
|
||||
g = gdal.OGRGeometry(feature_geom, srs=self._srs)
|
||||
if g.empty:
|
||||
continue
|
||||
|
||||
if not GeometryProcessor.is_valid_geometry(g):
|
||||
raise AssertionError(_("This feature holds malicious parts and can not be processed!"))
|
||||
|
||||
g = GeometryProcessor.cast_to_rlp_srid(g)
|
||||
if not GeometryProcessor.is_valid_25832(g):
|
||||
raise AssertionError(_("This feature does not hold valid EPSG:25832 coordinates:\n {}".format(g.geojson)))
|
||||
|
||||
geometry_has_unwanted_dimensions = g.coord_dim > 2
|
||||
if geometry_has_unwanted_dimensions:
|
||||
|
||||
@@ -9,6 +9,7 @@ import json
|
||||
from json import JSONDecodeError
|
||||
|
||||
import requests
|
||||
from django.contrib.gis import gdal
|
||||
|
||||
from konova.sub_settings import schneider_settings
|
||||
from konova.sub_settings.lanis_settings import DEFAULT_SRID
|
||||
@@ -35,7 +36,10 @@ class ParcelFetcher:
|
||||
if geom.area < buffer_threshold:
|
||||
# Fallback for malicious geometries which are way too small and would disappear on negative buffering
|
||||
geom = geometry.geom
|
||||
geom.transform(DEFAULT_SRID)
|
||||
try:
|
||||
geom.transform(DEFAULT_SRID)
|
||||
except gdal.GDALException as e:
|
||||
raise ValueError(f"{str(e)}\nCould not transform geometry (id: {geometry.id}) to {DEFAULT_SRID}:\n {geom.geojson}")
|
||||
self.geojson = geom.ewkt
|
||||
self.results = []
|
||||
|
||||
|
||||
Binary file not shown.
@@ -30,7 +30,7 @@
|
||||
#: 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/geometry_form.py:31 konova/forms/modals/document_form.py:26
|
||||
#: konova/forms/modals/document_form.py:36
|
||||
#: konova/forms/modals/document_form.py:50
|
||||
#: konova/forms/modals/document_form.py:62
|
||||
@@ -45,7 +45,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-12-14 17:23+0100\n"
|
||||
"POT-Creation-Date: 2026-09-17 16:25+0200\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"
|
||||
@@ -129,6 +129,7 @@ msgstr ""
|
||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:3
|
||||
#: compensation/forms/modals/compensation_action.py:66
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:50
|
||||
#: intervention/templates/intervention/detail/includes/deductions.html:31
|
||||
msgid "Amount"
|
||||
msgstr "Menge"
|
||||
@@ -334,6 +335,7 @@ msgstr "Typ"
|
||||
|
||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:24
|
||||
#: compensation/tables/compensation.py:87
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:47
|
||||
#: intervention/forms/modals/deduction.py:58
|
||||
#: intervention/forms/modals/deduction.py:65 intervention/tables.py:92
|
||||
#: intervention/templates/intervention/detail/view.html:19
|
||||
@@ -448,7 +450,8 @@ 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:121
|
||||
#: compensation/views/compensation/compensation.py:96
|
||||
#: compensation/views/compensation/compensation.py:160
|
||||
msgid "New compensation"
|
||||
msgstr "Neue Kompensation"
|
||||
|
||||
@@ -475,7 +478,8 @@ msgid "When did the parties agree on this?"
|
||||
msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
|
||||
|
||||
#: compensation/forms/eco_account.py:73
|
||||
#: compensation/views/eco_account/eco_account.py:105
|
||||
#: compensation/views/eco_account/eco_account.py:77
|
||||
#: compensation/views/eco_account/eco_account.py:127
|
||||
msgid "New Eco-Account"
|
||||
msgstr "Neues Ökokonto"
|
||||
|
||||
@@ -503,7 +507,8 @@ msgstr ""
|
||||
|
||||
#: compensation/forms/eco_account.py:257
|
||||
msgid "Please contact the responsible conservation office to find a solution!"
|
||||
msgstr "Kontaktieren Sie die zuständige Naturschutzbehörde um eine Lösung zu finden!"
|
||||
msgstr ""
|
||||
"Kontaktieren Sie die zuständige Naturschutzbehörde um eine Lösung zu finden!"
|
||||
|
||||
#: compensation/forms/mixins.py:37
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:63
|
||||
@@ -818,6 +823,7 @@ msgstr "Am {} von {} verzeichnet worden"
|
||||
|
||||
#: compensation/tables/eco_account.py:39
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:36
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:34
|
||||
#: konova/templates/konova/widgets/progressbar.html:3
|
||||
msgid "Available"
|
||||
msgstr "Verfügbar"
|
||||
@@ -948,7 +954,7 @@ msgstr "Wiedervorlage"
|
||||
|
||||
#: compensation/templates/compensation/detail/compensation/includes/controls.html:20
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:34
|
||||
#: ema/templates/ema/detail/includes/controls.html:34
|
||||
#: ema/templates/ema/detail/includes/controls.html:32
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:39
|
||||
msgid "Edit"
|
||||
msgstr "Bearbeiten"
|
||||
@@ -962,7 +968,7 @@ msgstr "Log anzeigen"
|
||||
|
||||
#: compensation/templates/compensation/detail/compensation/includes/controls.html:27
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:41
|
||||
#: ema/templates/ema/detail/includes/controls.html:41
|
||||
#: ema/templates/ema/detail/includes/controls.html:43
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:46
|
||||
msgid "Delete"
|
||||
msgstr "Löschen"
|
||||
@@ -1154,7 +1160,7 @@ msgstr "Verzeichnet am"
|
||||
#: compensation/templates/compensation/detail/compensation/view.html:107
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:85
|
||||
#: compensation/templates/compensation/report/compensation/report.html:54
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:47
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:75
|
||||
#: ema/templates/ema/detail/view.html:71
|
||||
#: ema/templates/ema/report/report.html:34
|
||||
#: intervention/templates/intervention/detail/view.html:113
|
||||
@@ -1188,7 +1194,7 @@ msgid "other users"
|
||||
msgstr "weitere Nutzer"
|
||||
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:18
|
||||
#: ema/templates/ema/detail/includes/controls.html:18
|
||||
#: ema/templates/ema/detail/includes/controls.html:19
|
||||
#: intervention/forms/modals/share.py:62
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:18
|
||||
#: intervention/tests/unit/test_forms.py:150
|
||||
@@ -1258,11 +1264,11 @@ msgstr "Maßnahmenträger"
|
||||
msgid "Report"
|
||||
msgstr "Bericht"
|
||||
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:34
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:43
|
||||
msgid "Deductions for"
|
||||
msgstr "Abbuchungen für"
|
||||
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:42
|
||||
#: compensation/templates/compensation/report/eco_account/report.html:64
|
||||
#: intervention/templates/intervention/report/report.html:53
|
||||
#: intervention/templates/intervention/report/report.html:66
|
||||
#: intervention/templates/intervention/report/report.html:76
|
||||
@@ -1292,40 +1298,44 @@ msgstr ""
|
||||
msgid "Responsible data"
|
||||
msgstr "Daten zu den verantwortlichen Stellen"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:52
|
||||
#: compensation/views/compensation/compensation.py:53
|
||||
msgid "Compensations - Overview"
|
||||
msgstr "Kompensationen - Übersicht"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:167
|
||||
#: compensation/views/compensation/compensation.py:203
|
||||
#: compensation/views/compensation/compensation.py:261
|
||||
#: compensation/views/eco_account/eco_account.py:169
|
||||
#: compensation/views/eco_account/eco_account.py:224 ema/views/ema.py:175
|
||||
#: ema/views/ema.py:229 intervention/views/intervention.py:176
|
||||
#: intervention/views/intervention.py:230
|
||||
msgid "Edit {}"
|
||||
msgstr "Bearbeite {}"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:242
|
||||
#: konova/utils/message_templates.py:40
|
||||
msgid "Compensation {} edited"
|
||||
msgstr "Kompensation {} bearbeitet"
|
||||
|
||||
#: compensation/views/compensation/compensation.py:190
|
||||
#: compensation/views/eco_account/eco_account.py:168 ema/views/ema.py:173
|
||||
#: intervention/views/intervention.py:175
|
||||
msgid "Edit {}"
|
||||
msgstr "Bearbeite {}"
|
||||
|
||||
#: compensation/views/compensation/report.py:35
|
||||
#: compensation/views/eco_account/report.py:35 ema/views/report.py:35
|
||||
#: intervention/views/report.py:36
|
||||
msgid "Report {}"
|
||||
msgstr "Bericht {}"
|
||||
|
||||
#: compensation/views/eco_account/eco_account.py:49
|
||||
#: compensation/views/eco_account/eco_account.py:51
|
||||
msgid "Eco-account - Overview"
|
||||
msgstr "Ökokonten - Übersicht"
|
||||
|
||||
#: compensation/views/eco_account/eco_account.py:82
|
||||
#: compensation/views/eco_account/eco_account.py:108
|
||||
msgid "Eco-Account {} added"
|
||||
msgstr "Ökokonto {} hinzugefügt"
|
||||
|
||||
#: compensation/views/eco_account/eco_account.py:145
|
||||
#: compensation/views/eco_account/eco_account.py:205
|
||||
msgid "Eco-Account {} edited"
|
||||
msgstr "Ökokonto {} bearbeitet"
|
||||
|
||||
#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:107
|
||||
#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:79
|
||||
#: ema/views/ema.py:129
|
||||
msgid "New EMA"
|
||||
msgstr "Neue EMA hinzufügen"
|
||||
|
||||
@@ -1357,11 +1367,11 @@ msgstr "Ersatzzahlungsmaßnahme"
|
||||
msgid "EMAs - Overview"
|
||||
msgstr "EMAs - Übersicht"
|
||||
|
||||
#: ema/views/ema.py:85
|
||||
#: ema/views/ema.py:111
|
||||
msgid "EMA {} added"
|
||||
msgstr "EMA {} hinzugefügt"
|
||||
|
||||
#: ema/views/ema.py:150
|
||||
#: ema/views/ema.py:211
|
||||
msgid "EMA {} edited"
|
||||
msgstr "EMA {} bearbeitet"
|
||||
|
||||
@@ -1425,7 +1435,7 @@ msgstr "Datum Bestandskraft bzw. Rechtskraft"
|
||||
|
||||
#: intervention/forms/intervention.py:216
|
||||
#: intervention/tests/unit/test_forms.py:36
|
||||
#: intervention/views/intervention.py:109
|
||||
#: intervention/views/intervention.py:82 intervention/views/intervention.py:134
|
||||
msgid "New intervention"
|
||||
msgstr "Neuer Eingriff"
|
||||
|
||||
@@ -1661,15 +1671,15 @@ msgstr ""
|
||||
msgid "Check performed"
|
||||
msgstr "Prüfung durchgeführt"
|
||||
|
||||
#: intervention/views/intervention.py:53
|
||||
#: intervention/views/intervention.py:56
|
||||
msgid "Interventions - Overview"
|
||||
msgstr "Eingriffe - Übersicht"
|
||||
|
||||
#: intervention/views/intervention.py:86
|
||||
#: intervention/views/intervention.py:114
|
||||
msgid "Intervention {} added"
|
||||
msgstr "Eingriff {} hinzugefügt"
|
||||
|
||||
#: intervention/views/intervention.py:150
|
||||
#: intervention/views/intervention.py:212
|
||||
msgid "Intervention {} edited"
|
||||
msgstr "Eingriff {} bearbeitet"
|
||||
|
||||
@@ -1797,16 +1807,11 @@ msgstr "Speichern"
|
||||
msgid "Not editable"
|
||||
msgstr "Nicht editierbar"
|
||||
|
||||
#: konova/forms/geometry_form.py:31 konova/utils/quality.py:44
|
||||
#: konova/forms/geometry_form.py:30 konova/utils/quality.py:44
|
||||
#: konova/utils/quality.py:46 templates/form/collapsable/form.html:45
|
||||
msgid "Geometry"
|
||||
msgstr "Geometrie"
|
||||
|
||||
#: konova/forms/geometry_form.py:105
|
||||
msgid "Only surfaces allowed. Points or lines must be buffered."
|
||||
msgstr ""
|
||||
"Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
|
||||
|
||||
#: konova/forms/modals/document_form.py:37
|
||||
msgid "When has this file been created? Important for photos."
|
||||
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
|
||||
@@ -1961,6 +1966,7 @@ msgstr "Raumreferenz"
|
||||
#: konova/templates/konova/includes/parcels/parcels.html:28
|
||||
msgid "No geometry entry found on database. Please contact an admin!"
|
||||
msgstr ""
|
||||
"Keine Geometrie in Datenbank gefunden. Kontaktieren Sie einen Administrator!"
|
||||
|
||||
#: konova/templates/konova/includes/quickstart/compensations.html:20
|
||||
#: konova/templates/konova/includes/quickstart/ecoaccounts.html:20
|
||||
@@ -2006,39 +2012,56 @@ msgstr "In Zwischenablage kopiert"
|
||||
msgid "Search"
|
||||
msgstr "Suchen"
|
||||
|
||||
#: konova/utils/mailer.py:69 konova/utils/mailer.py:146
|
||||
#: konova/utils/geometry/geometry_validator.py:328
|
||||
msgid "This feature holds malicious parts and can not be processed!"
|
||||
msgstr "Teile der Geometrie sind ungültig und können nicht verarbeitet werden!"
|
||||
|
||||
#: konova/utils/geometry/geometry_validator.py:332
|
||||
msgid ""
|
||||
"This feature does not hold valid EPSG:25832 coordinates:\n"
|
||||
" {}"
|
||||
msgstr ""
|
||||
"Dieses Feature enthält keine validen EPSG:25832 Koordinaten:\n"
|
||||
" {}"
|
||||
|
||||
#: konova/utils/geometry/geometry_validator.py:340
|
||||
msgid "Only surfaces allowed. Points or lines must be buffered."
|
||||
msgstr ""
|
||||
"Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
|
||||
|
||||
#: konova/utils/mailer.py:82 konova/utils/mailer.py:159
|
||||
msgid "{} - Shared access removed"
|
||||
msgstr "{} - Zugriff entzogen"
|
||||
|
||||
#: konova/utils/mailer.py:94 konova/utils/mailer.py:120
|
||||
#: konova/utils/mailer.py:107 konova/utils/mailer.py:133
|
||||
msgid "{} - Shared access given"
|
||||
msgstr "{} - Zugriff freigegeben"
|
||||
|
||||
#: konova/utils/mailer.py:172 konova/utils/mailer.py:325
|
||||
#: konova/utils/mailer.py:185 konova/utils/mailer.py:338
|
||||
msgid "{} - Shared data unrecorded"
|
||||
msgstr "{} - Freigegebene Daten entzeichnet"
|
||||
|
||||
#: konova/utils/mailer.py:198 konova/utils/mailer.py:300
|
||||
#: konova/utils/mailer.py:211 konova/utils/mailer.py:313
|
||||
msgid "{} - Shared data recorded"
|
||||
msgstr "{} - Freigegebene Daten verzeichnet"
|
||||
|
||||
#: konova/utils/mailer.py:224 konova/utils/mailer.py:375
|
||||
#: konova/utils/mailer.py:237 konova/utils/mailer.py:388
|
||||
msgid "{} - Shared data checked"
|
||||
msgstr "{} - Freigegebene Daten geprüft"
|
||||
|
||||
#: konova/utils/mailer.py:249 konova/utils/mailer.py:401
|
||||
#: konova/utils/mailer.py:262 konova/utils/mailer.py:414
|
||||
msgid "{} - Deduction changed"
|
||||
msgstr "{} - Abbuchung geändert"
|
||||
|
||||
#: konova/utils/mailer.py:275 konova/utils/mailer.py:350
|
||||
#: konova/utils/mailer.py:288 konova/utils/mailer.py:363
|
||||
msgid "{} - Shared data deleted"
|
||||
msgstr "{} - Freigegebene Daten gelöscht"
|
||||
|
||||
#: konova/utils/mailer.py:422 templates/email/api/verify_token.html:4
|
||||
#: konova/utils/mailer.py:435 templates/email/api/verify_token.html:4
|
||||
msgid "Request for new API token"
|
||||
msgstr "Anfrage für neuen API Token"
|
||||
|
||||
#: konova/utils/mailer.py:447
|
||||
#: konova/utils/mailer.py:460
|
||||
msgid "Resubmission - {}"
|
||||
msgstr "Wiedervorlage - {}"
|
||||
|
||||
@@ -2289,11 +2312,11 @@ msgstr "Neuer Token generiert. Administratoren sind informiert."
|
||||
msgid "missing"
|
||||
msgstr "fehlend"
|
||||
|
||||
#: konova/utils/tables.py:222
|
||||
#: konova/utils/tables.py:224
|
||||
msgid "Full access granted"
|
||||
msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden"
|
||||
|
||||
#: konova/utils/tables.py:222
|
||||
#: konova/utils/tables.py:224
|
||||
msgid "Access not granted"
|
||||
msgstr "Nicht freigegeben - Datensatz nur lesbar"
|
||||
|
||||
@@ -2303,7 +2326,7 @@ msgstr ""
|
||||
"Dieses Datum ist unrealistisch. Geben Sie bitte das korrekte Datum ein "
|
||||
"(>1950)."
|
||||
|
||||
#: konova/views/home.py:75 templates/navbars/navbar.html:16
|
||||
#: konova/views/home.py:76 templates/navbars/navbar.html:16
|
||||
msgid "Home"
|
||||
msgstr "Home"
|
||||
|
||||
@@ -2323,7 +2346,7 @@ msgstr "{} verzeichnet"
|
||||
msgid "Errors found:"
|
||||
msgstr "Fehler gefunden:"
|
||||
|
||||
#: konova/views/remove.py:35
|
||||
#: konova/views/remove.py:34
|
||||
msgid "{} removed"
|
||||
msgstr "{} entfernt"
|
||||
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
server {
|
||||
listen 80;
|
||||
client_max_body_size 25M;
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:8000;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
proxy_redirect off;
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
}
|
||||
|
||||
location /static/ {
|
||||
alias /konova/static/;
|
||||
access_log /var/log/nginx/access.log;
|
||||
autoindex off;
|
||||
types {
|
||||
text/css css;
|
||||
application/javascript js;
|
||||
}
|
||||
}
|
||||
|
||||
error_log /var/log/nginx/error.log;
|
||||
}
|
||||
Reference in new issue
Block a user