diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html
index f03c22b2..4e5d721a 100644
--- a/compensation/templates/compensation/detail/eco_account/view.html
+++ b/compensation/templates/compensation/detail/eco_account/view.html
@@ -58,7 +58,7 @@
{{obj.responsible.conservation_office.str_as_office|default_if_none:""}} |
- {% trans 'Conversation office file number' %} |
+ {% trans 'Conservation office file number' %} |
{{obj.responsible.conservation_file_number|default_if_none:""}} |
diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html
index 640711b2..941e47c1 100644
--- a/ema/templates/ema/detail/view.html
+++ b/ema/templates/ema/detail/view.html
@@ -43,7 +43,7 @@
{{obj.responsible.conservation_office.str_as_office|default_if_none:""}} |
- {% trans 'Conversation office file number' %} |
+ {% trans 'Conservation office file number' %} |
{{obj.responsible.conservation_file_number|default_if_none:""}} |
diff --git a/intervention/forms.py b/intervention/forms.py
index 2b1ce398..20ed4034 100644
--- a/intervention/forms.py
+++ b/intervention/forms.py
@@ -14,6 +14,9 @@ from django.db import transaction
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
+from codelist.models import KonovaCode
+from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_PROCESS_TYPE_ID, CODELIST_LAW_ID, \
+ CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID
from compensation.models import EcoAccountDeduction, EcoAccount
from intervention.models import Intervention, Revocation, RevocationDocument
from konova.forms import BaseForm, BaseModalForm
@@ -30,51 +33,93 @@ class NewInterventionForm(BaseForm):
label=_("Identifier"),
label_suffix="",
max_length=255,
- help_text=_("Generated automatically if none was given"),
- required=False,
+ help_text=_("Generated automatically"),
)
title = forms.CharField(
label=_("Title"),
label_suffix="",
+ help_text=_("An explanatory name"),
max_length=255,
)
- type = forms.CharField(
- label=_("Type"),
+ type = forms.ModelChoiceField(
+ label=_("Process type"),
label_suffix="",
- max_length=255,
- help_text=_("Which intervention type is this"),
+ required=False,
+ queryset=KonovaCode.objects.filter(
+ is_archived=False,
+ is_leaf=True,
+ code_lists__in=[CODELIST_PROCESS_TYPE_ID],
+ ),
+ widget=autocomplete.ModelSelect2(
+ url="codes-process-type-autocomplete",
+ attrs={
+ }
+ ),
)
- law = forms.CharField(
+ laws = forms.ModelMultipleChoiceField(
label=_("Law"),
label_suffix="",
+ help_text=_("Multiple selection possible"),
+ required=False,
+ queryset=KonovaCode.objects.filter(
+ is_archived=False,
+ is_leaf=True,
+ code_lists__in=[CODELIST_LAW_ID],
+ ),
+ widget=autocomplete.ModelSelect2Multiple(
+ url="codes-law-autocomplete",
+ attrs={
+ }
+ ),
+ )
+ registration_office = forms.ModelChoiceField(
+ label=_("Registration office"),
+ label_suffix="",
+ required=False,
+ queryset=KonovaCode.objects.filter(
+ is_archived=False,
+ is_leaf=True,
+ code_lists__in=[CODELIST_REGISTRATION_OFFICE_ID],
+ ),
+ widget=autocomplete.ModelSelect2(
+ url="codes-registration-office-autocomplete",
+ attrs={
+ }
+ ),
+ )
+ conservation_office = forms.ModelChoiceField(
+ label=_("Conservation office"),
+ label_suffix="",
+ required=False,
+ queryset=KonovaCode.objects.filter(
+ is_archived=False,
+ is_leaf=True,
+ code_lists__in=[CODELIST_CONSERVATION_OFFICE_ID],
+ ),
+ widget=autocomplete.ModelSelect2(
+ url="codes-conservation-office-autocomplete",
+ attrs={
+ }
+ ),
+ )
+ registration_office_file_number = forms.CharField(
+ label=_("Registration office file number"),
+ label_suffix="",
max_length=255,
- help_text=_("Based on which law"),
+ required=False,
+ )
+ conservation_office_file_number = forms.CharField(
+ label=_("Conservation office file number"),
+ label_suffix="",
+ max_length=255,
+ required=False,
)
handler = forms.CharField(
label=_("Intervention handler"),
label_suffix="",
max_length=255,
- help_text=_("Who performs the intervention"),
- )
- data_provider = forms.ModelChoiceField(
- label=_("Data provider"),
- label_suffix="",
- help_text=_("Who provides the data for the intervention"),
- queryset=Organisation.objects.all(),
- widget=autocomplete.ModelSelect2(
- url="other-orgs-autocomplete",
- attrs={
- "data-placeholder": _("Organization"),
- "data-minimum-input-length": 3,
- }
- ),
- )
- data_provider_detail = forms.CharField(
- label=_("Data provider details"),
- label_suffix="",
- max_length=255,
- help_text=_("Further details"),
required=False,
+ help_text=_("Who performs the intervention"),
)
geometry = gis_forms.MultiPolygonField(
widget=gis_forms.OSMWidget(
@@ -90,16 +135,6 @@ class NewInterventionForm(BaseForm):
label_suffix="",
help_text=_("Where does the intervention take place")
)
- documents = forms.FileField(
- widget=forms.ClearableFileInput(
- attrs={
- "multiple": True,
- }
- ),
- label=_("Files"),
- label_suffix="",
- required=False,
- )
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -112,12 +147,9 @@ class NewInterventionForm(BaseForm):
identifier = self.cleaned_data.get("identifier", None)
title = self.cleaned_data.get("title", None)
_type = self.cleaned_data.get("type", None)
- law = self.cleaned_data.get("law", None)
+ laws = self.cleaned_data.get("laws", None)
handler = self.cleaned_data.get("handler", None)
- data_provider = self.cleaned_data.get("data_provider", None)
- data_provider_detail = self.cleaned_data.get("data_provider_detail", None)
geometry = self.cleaned_data.get("geometry", Polygon())
- documents = self.cleaned_data.get("documents", []) or []
action = UserActionLogEntry.objects.create(
user=user,
@@ -127,10 +159,8 @@ class NewInterventionForm(BaseForm):
identifier=identifier,
title=title,
type=_type,
- law=law,
+ laws=laws,
handler=handler,
- data_provider=data_provider,
- data_provider_detail=data_provider_detail,
geometry=geometry,
created=action,
)
diff --git a/intervention/models.py b/intervention/models.py
index 3a8f7ac3..f05b0ddb 100644
--- a/intervention/models.py
+++ b/intervention/models.py
@@ -298,7 +298,7 @@ class Intervention(BaseObject):
ret_msgs.append(_("Registration office file number missing"))
if not self.responsible.conservation_file_number or len(self.responsible.conservation_file_number) == 0:
- ret_msgs.append(_("Conversation office file number missing"))
+ ret_msgs.append(_("Conservation office file number missing"))
except AttributeError:
# responsible data not found
ret_msgs.append(_("Responsible data missing"))
diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html
index a279013a..c5f169c1 100644
--- a/intervention/templates/intervention/detail/view.html
+++ b/intervention/templates/intervention/detail/view.html
@@ -56,7 +56,7 @@
{{intervention.responsible.conservation_office.str_as_office|default_if_none:""}} |
- {% trans 'Conversation office file number' %} |
+ {% trans 'Conservation office file number' %} |
{{intervention.responsible.conservation_file_number|default_if_none:""}} |
diff --git a/intervention/templates/intervention/new/view.html b/intervention/templates/intervention/new/view.html
new file mode 100644
index 00000000..eb37e6b7
--- /dev/null
+++ b/intervention/templates/intervention/new/view.html
@@ -0,0 +1,6 @@
+{% extends 'base.html' %}
+{% load i18n l10n %}
+
+{% block body %}
+ {% include 'form/main_data_collapse_form.html' %}
+{% endblock %}
\ No newline at end of file
diff --git a/intervention/views.py b/intervention/views.py
index eb8cab4f..4c0d1c9a 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -58,7 +58,7 @@ def new_view(request: HttpRequest):
Returns:
"""
- template = "konova/form.html"
+ template = "intervention/new/view.html"
form = NewInterventionForm(request.POST or None)
if request.method == "POST":
if form.is_valid():
diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index 60e4e9a5..990b6643 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -60,6 +60,10 @@ a {
color: var(--rlp-red);
}
+input[type=text] {
+ width: 100%;
+}
+
.body-content{
margin: 1rem 0rem 0 0rem;
}
diff --git a/konova/urls.py b/konova/urls.py
index 37909256..46b48e54 100644
--- a/konova/urls.py
+++ b/konova/urls.py
@@ -19,7 +19,7 @@ from django.urls import path, include
from konova.autocompletes import OrganisationAutocomplete, NonOfficialOrganisationAutocomplete, EcoAccountAutocomplete, \
InterventionAutocomplete, CompensationActionCodeAutocomplete, BiotopeCodeAutocomplete, LawCodeAutocomplete, \
- RegistrationOfficeCodeAutocomplete, ConservationOfficeCodeAutocomplete
+ RegistrationOfficeCodeAutocomplete, ConservationOfficeCodeAutocomplete, ProcessTypeCodeAutocomplete
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, remove_deadline_view
@@ -49,6 +49,7 @@ urlpatterns = [
path("atcmplt/codes/compensation-action", CompensationActionCodeAutocomplete.as_view(), name="codes-compensation-action-autocomplete"),
path("atcmplt/codes/biotope", BiotopeCodeAutocomplete.as_view(), name="codes-biotope-autocomplete"),
path("atcmplt/codes/law", LawCodeAutocomplete.as_view(), name="codes-law-autocomplete"),
+ path("atcmplt/codes/prc-type", ProcessTypeCodeAutocomplete.as_view(), name="codes-process-type-autocomplete"),
path("atcmplt/codes/reg-off", RegistrationOfficeCodeAutocomplete.as_view(), name="codes-registration-office-autocomplete"),
path("atcmplt/codes/cons-off", ConservationOfficeCodeAutocomplete.as_view(), name="codes-conservation-office-autocomplete"),
]
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 51178b8f..3ec4be48 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 757a35b9..bebb2d53 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -7,16 +7,16 @@
#: compensation/forms.py:67 compensation/forms.py:264 compensation/forms.py:345
#: intervention/filters.py:26 intervention/filters.py:40
#: intervention/filters.py:47 intervention/filters.py:48
-#: intervention/forms.py:322 intervention/forms.py:334
-#: intervention/forms.py:347 konova/forms.py:108 konova/forms.py:252
-#: konova/forms.py:287 konova/forms.py:292 konova/forms.py:304
-#: konova/forms.py:316 konova/forms.py:336 user/forms.py:38
+#: intervention/forms.py:352 intervention/forms.py:364
+#: intervention/forms.py:377 konova/forms.py:139 konova/forms.py:282
+#: konova/forms.py:317 konova/forms.py:322 konova/forms.py:334
+#: konova/forms.py:346 konova/forms.py:366 user/forms.py:38
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 12:44+0200\n"
+"POT-Creation-Date: 2021-09-21 14:24+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -53,16 +53,16 @@ msgstr "Zahlung wird an diesem Datum erwartet"
#: ema/templates/ema/detail/includes/actions.html:34
#: ema/templates/ema/detail/includes/deadlines.html:34
#: ema/templates/ema/detail/includes/documents.html:31
-#: intervention/forms.py:346
+#: intervention/forms.py:376
#: intervention/templates/intervention/detail/includes/documents.html:31
#: intervention/templates/intervention/detail/includes/payments.html:34
#: intervention/templates/intervention/detail/includes/revocation.html:38
-#: konova/forms.py:315
+#: konova/forms.py:345
msgid "Comment"
msgstr "Kommentar"
#: compensation/forms.py:68 compensation/forms.py:265 compensation/forms.py:346
-#: intervention/forms.py:348 konova/forms.py:317
+#: intervention/forms.py:378 konova/forms.py:347
msgid "Additional comment, maximum {} letters"
msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
@@ -97,11 +97,11 @@ msgstr "Biotoptyp wählen"
#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36
#: ema/templates/ema/detail/includes/states-after.html:36
#: ema/templates/ema/detail/includes/states-before.html:36
-#: intervention/forms.py:479
+#: intervention/forms.py:517
msgid "Surface"
msgstr "Fläche"
-#: compensation/forms.py:155 intervention/forms.py:481
+#: compensation/forms.py:155 intervention/forms.py:519
msgid "in m²"
msgstr ""
@@ -117,7 +117,7 @@ msgstr "Geben Sie die Daten des neuen Zustandes ein"
msgid "Added state"
msgstr "Zustand hinzugefügt"
-#: compensation/forms.py:185 konova/forms.py:168
+#: compensation/forms.py:185 konova/forms.py:198
msgid "Object removed"
msgstr "Objekt entfernt"
@@ -133,7 +133,7 @@ msgstr "Fristart wählen"
#: 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
-#: intervention/forms.py:321
+#: intervention/forms.py:351
msgid "Date"
msgstr "Datum"
@@ -257,7 +257,7 @@ msgstr ""
"wollen. Kontaktieren Sie die für die Abbuchungen verantwortlichen Nutzer!"
#: compensation/tables.py:24 compensation/tables.py:164 ema/tables.py:28
-#: intervention/forms.py:30 intervention/tables.py:23
+#: intervention/forms.py:33 intervention/tables.py:23
#: intervention/templates/intervention/detail/includes/compensations.html:30
msgid "Identifier"
msgstr "Kennung"
@@ -268,18 +268,18 @@ msgstr "Kennung"
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:28
#: compensation/templates/compensation/detail/eco_account/view.html:31
#: ema/tables.py:33 ema/templates/ema/detail/includes/documents.html:28
-#: ema/templates/ema/detail/view.html:24 intervention/forms.py:37
+#: ema/templates/ema/detail/view.html:24 intervention/forms.py:39
#: intervention/tables.py:28
#: intervention/templates/intervention/detail/includes/compensations.html:33
#: intervention/templates/intervention/detail/includes/documents.html:28
-#: intervention/templates/intervention/detail/view.html:31 konova/forms.py:286
+#: intervention/templates/intervention/detail/view.html:31 konova/forms.py:316
msgid "Title"
msgstr "Bezeichnung"
#: compensation/tables.py:34
#: compensation/templates/compensation/detail/compensation/view.html:43
#: intervention/tables.py:33
-#: intervention/templates/intervention/detail/view.html:63 user/models.py:48
+#: intervention/templates/intervention/detail/view.html:68 user/models.py:48
msgid "Checked"
msgstr "Geprüft"
@@ -289,7 +289,7 @@ msgstr "Geprüft"
#: compensation/templates/compensation/detail/eco_account/view.html:44
#: ema/tables.py:38 ema/templates/ema/detail/view.html:28
#: intervention/tables.py:39
-#: intervention/templates/intervention/detail/view.html:77 user/models.py:49
+#: intervention/templates/intervention/detail/view.html:82 user/models.py:49
msgid "Recorded"
msgstr "Verzeichnet"
@@ -331,13 +331,13 @@ msgstr "Am {} von {} geprüft worden"
#: compensation/templates/compensation/detail/compensation/view.html:60
#: compensation/templates/compensation/detail/eco_account/view.html:47
#: ema/tables.py:101 ema/templates/ema/detail/view.html:31
-#: intervention/models.py:360 intervention/tables.py:131
-#: intervention/templates/intervention/detail/view.html:80
+#: intervention/models.py:352 intervention/tables.py:131
+#: intervention/templates/intervention/detail/view.html:85
msgid "Not recorded yet"
msgstr "Noch nicht verzeichnet"
#: compensation/tables.py:133 compensation/tables.py:260 ema/tables.py:106
-#: intervention/models.py:365 intervention/tables.py:136
+#: intervention/models.py:357 intervention/tables.py:136
msgid "Recorded on {} by {}"
msgstr "Am {} von {} verzeichnet worden"
@@ -363,7 +363,7 @@ msgstr "Ökokonten"
#: compensation/tables.py:222
#: compensation/templates/compensation/detail/eco_account/view.html:19
-#: intervention/forms.py:463 intervention/forms.py:470
+#: intervention/forms.py:501 intervention/forms.py:508
#: konova/templates/konova/home.html:88 templates/navbar.html:34
msgid "Eco-account"
msgstr "Ökokonto"
@@ -455,7 +455,7 @@ msgstr "Frist/Termin hinzufügen"
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28
-#: ema/templates/ema/detail/includes/deadlines.html:28 intervention/forms.py:42
+#: ema/templates/ema/detail/includes/deadlines.html:28
msgid "Type"
msgstr "Typ"
@@ -476,7 +476,7 @@ msgstr "Dokumente"
#: compensation/templates/compensation/detail/eco_account/includes/documents.html:14
#: ema/templates/ema/detail/includes/documents.html:14
#: intervention/templates/intervention/detail/includes/documents.html:14
-#: konova/forms.py:335
+#: konova/forms.py:365
msgid "Add new document"
msgstr "Neues Dokument hinzufügen"
@@ -546,7 +546,7 @@ msgid "compensates intervention"
msgstr "kompensiert Eingriff"
#: compensation/templates/compensation/detail/compensation/view.html:50
-#: intervention/templates/intervention/detail/view.html:70
+#: intervention/templates/intervention/detail/view.html:75
msgid "Checked on "
msgstr "Geprüft am "
@@ -554,29 +554,35 @@ msgstr "Geprüft am "
#: compensation/templates/compensation/detail/compensation/view.html:64
#: compensation/templates/compensation/detail/eco_account/view.html:51
#: ema/templates/ema/detail/view.html:35
-#: intervention/templates/intervention/detail/view.html:70
-#: intervention/templates/intervention/detail/view.html:84
+#: intervention/templates/intervention/detail/view.html:75
+#: intervention/templates/intervention/detail/view.html:89
msgid "by"
msgstr "von"
#: compensation/templates/compensation/detail/compensation/view.html:64
#: compensation/templates/compensation/detail/eco_account/view.html:51
#: ema/templates/ema/detail/view.html:35
-#: intervention/templates/intervention/detail/view.html:84
+#: intervention/templates/intervention/detail/view.html:89
msgid "Recorded on "
msgstr "Verzeichnet am"
#: compensation/templates/compensation/detail/compensation/view.html:71
-#: compensation/templates/compensation/detail/eco_account/view.html:83
+#: compensation/templates/compensation/detail/eco_account/view.html:70
#: ema/templates/ema/detail/view.html:54
-#: intervention/templates/intervention/detail/view.html:103
+msgid "Funded by"
+msgstr "Gefördert mit"
+
+#: compensation/templates/compensation/detail/compensation/view.html:84
+#: compensation/templates/compensation/detail/eco_account/view.html:83
+#: ema/templates/ema/detail/view.html:67
+#: intervention/templates/intervention/detail/view.html:108
msgid "Last modified"
msgstr "Zuletzt bearbeitet"
-#: compensation/templates/compensation/detail/compensation/view.html:79
+#: compensation/templates/compensation/detail/compensation/view.html:92
#: compensation/templates/compensation/detail/eco_account/view.html:91
-#: ema/templates/ema/detail/view.html:69 intervention/forms.py:255
-#: intervention/templates/intervention/detail/view.html:111
+#: ema/templates/ema/detail/view.html:82 intervention/forms.py:285
+#: intervention/templates/intervention/detail/view.html:116
msgid "Shared with"
msgstr "Freigegeben für"
@@ -625,38 +631,38 @@ msgstr "Abbuchung entfernen"
#: intervention/templates/intervention/detail/view.html:30
#: intervention/templates/intervention/detail/view.html:34
#: intervention/templates/intervention/detail/view.html:38
-#: intervention/templates/intervention/detail/view.html:42
-#: intervention/templates/intervention/detail/view.html:46
-#: intervention/templates/intervention/detail/view.html:50
-#: intervention/templates/intervention/detail/view.html:54
-#: intervention/templates/intervention/detail/view.html:58
-#: intervention/templates/intervention/detail/view.html:90
-#: intervention/templates/intervention/detail/view.html:94
+#: intervention/templates/intervention/detail/view.html:47
+#: intervention/templates/intervention/detail/view.html:51
+#: intervention/templates/intervention/detail/view.html:55
+#: intervention/templates/intervention/detail/view.html:59
+#: intervention/templates/intervention/detail/view.html:63
+#: intervention/templates/intervention/detail/view.html:95
+#: intervention/templates/intervention/detail/view.html:99
msgid "Missing"
msgstr "Fehlt"
#: compensation/templates/compensation/detail/eco_account/view.html:58
-#: ema/templates/ema/detail/view.html:42
-#: intervention/templates/intervention/detail/view.html:51
+#: ema/templates/ema/detail/view.html:42 intervention/forms.py:91
+#: intervention/templates/intervention/detail/view.html:56
msgid "Conservation office"
-msgstr "Naturschutzbehörde"
+msgstr "Eintragungsstelle"
#: compensation/templates/compensation/detail/eco_account/view.html:62
-#: ema/templates/ema/detail/view.html:46
-#: intervention/templates/intervention/detail/view.html:55
-msgid "Conversation office file number"
-msgstr "Aktenzeichen Naturschutzbehörde"
+#: ema/templates/ema/detail/view.html:46 intervention/forms.py:112
+#: intervention/templates/intervention/detail/view.html:60
+msgid "Conservation office file number"
+msgstr "Aktenzeichen Eintragungsstelle"
#: compensation/templates/compensation/detail/eco_account/view.html:66
-#: ema/templates/ema/detail/view.html:50 intervention/forms.py:54
-#: intervention/templates/intervention/detail/view.html:59
+#: ema/templates/ema/detail/view.html:50 intervention/forms.py:118
+#: intervention/templates/intervention/detail/view.html:64
msgid "Intervention handler"
msgstr "Eingriffsverursacher"
-#: compensation/templates/compensation/detail/eco_account/view.html:70
-msgid "Funded by"
-msgstr "Gefördert mit"
-
+#: compensation/templates/compensation/detail/eco_account/view.html:78
+#: ema/templates/ema/detail/view.html:62
+msgid "None"
+msgstr ""
#: compensation/views/compensation_views.py:123
#: compensation/views/eco_account_views.py:190 ema/views.py:128
@@ -767,120 +773,111 @@ msgstr "Gemarkung"
msgid "Search for district"
msgstr "Nach Gemarkung suchen"
-#: intervention/forms.py:33
-msgid "Generated automatically if none was given"
-msgstr "Wird automatisch erzeugt, falls nicht angegeben"
+#: intervention/forms.py:36
+msgid "Generated automatically"
+msgstr "Automatisch generiert"
+
+#: intervention/forms.py:41
+msgid "An explanatory name"
+msgstr "Aussagekräftiger Titel"
#: intervention/forms.py:45
-msgid "Which intervention type is this"
-msgstr "Welcher Eingriffstyp"
+#: intervention/templates/intervention/detail/view.html:35
+msgid "Process type"
+msgstr "Verfahrenstyp"
-#: intervention/forms.py:48
+#: intervention/forms.py:60
#: intervention/templates/intervention/detail/view.html:39
msgid "Law"
msgstr "Gesetz"
-#: intervention/forms.py:51
-msgid "Based on which law"
-msgstr "Basiert auf welchem Recht"
+#: intervention/forms.py:62
+msgid "Multiple selection possible"
+msgstr "Mehrfachauswahl möglich"
-#: intervention/forms.py:57
+#: intervention/forms.py:76
+#: intervention/templates/intervention/detail/view.html:48
+msgid "Registration office"
+msgstr "Zulassungsbehörde"
+
+#: intervention/forms.py:106
+#: intervention/templates/intervention/detail/view.html:52
+msgid "Registration office file number"
+msgstr "Aktenzeichen Zulassungsbehörde"
+
+#: intervention/forms.py:122
msgid "Who performs the intervention"
msgstr "Wer führt den Eingriff durch"
-#: intervention/forms.py:60
-msgid "Data provider"
-msgstr "Datenbereitsteller"
-
-#: intervention/forms.py:62
-msgid "Who provides the data for the intervention"
-msgstr "Wer stellt die Daten für den Eingriff zur Verfügung"
-
-#: intervention/forms.py:67
-msgid "Organization"
-msgstr "Organisation"
-
-#: intervention/forms.py:73
-msgid "Data provider details"
-msgstr "Datenbereitsteller Details"
-
-#: intervention/forms.py:76
-msgid "Further details"
-msgstr "Weitere Details"
-
-#: intervention/forms.py:89
+#: intervention/forms.py:134
msgid "Map"
msgstr "Karte"
-#: intervention/forms.py:91
+#: intervention/forms.py:136
msgid "Where does the intervention take place"
msgstr "Wo findet der Eingriff statt"
-#: intervention/forms.py:99
-msgid "Files"
-msgstr "Dateien"
-
-#: intervention/forms.py:106
+#: intervention/forms.py:141
msgid "New intervention"
msgstr "Neuer Eingriff"
-#: intervention/forms.py:148
+#: intervention/forms.py:178
msgid "Edit intervention"
msgstr "Eingriff bearbeiten"
-#: intervention/forms.py:244
+#: intervention/forms.py:274
msgid "Share link"
msgstr "Freigabelink"
-#: intervention/forms.py:246
+#: intervention/forms.py:276
msgid "Send this link to users who you want to have writing access on the data"
msgstr "Andere Nutzer erhalten über diesen Link Zugriff auf die Daten"
-#: intervention/forms.py:258
+#: intervention/forms.py:288
msgid "Remove check to remove access for this user"
msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen"
-#: intervention/forms.py:269
+#: intervention/forms.py:299
#: intervention/templates/intervention/detail/includes/controls.html:15
msgid "Share"
msgstr "Freigabe"
-#: intervention/forms.py:270
+#: intervention/forms.py:300
msgid "Share settings for {}"
msgstr "Freigabe Einstellungen für {}"
-#: intervention/forms.py:323
+#: intervention/forms.py:353
msgid "Date of revocation"
msgstr "Datum des Widerspruchs"
-#: intervention/forms.py:333
+#: intervention/forms.py:363
#: intervention/templates/intervention/detail/includes/revocation.html:35
msgid "Document"
msgstr "Dokument"
-#: intervention/forms.py:336 konova/forms.py:305
+#: intervention/forms.py:366 konova/forms.py:335
msgid "Must be smaller than 15 Mb"
msgstr "Muss kleiner als 15 Mb sein"
-#: intervention/forms.py:359
+#: intervention/forms.py:389
#: intervention/templates/intervention/detail/includes/revocation.html:18
msgid "Add revocation"
msgstr "Widerspruch hinzufügen"
-#: intervention/forms.py:399
+#: intervention/forms.py:429
msgid "Checked intervention data"
msgstr "Eingriffsdaten geprüft"
-#: intervention/forms.py:405
+#: intervention/forms.py:435
msgid "Checked compensations data and payments"
msgstr "Kompensationen und Zahlungen geprüft"
-#: intervention/forms.py:413
+#: intervention/forms.py:443
#: intervention/templates/intervention/detail/includes/controls.html:19
msgid "Run check"
msgstr "Prüfung vornehmen"
-#: intervention/forms.py:414 konova/forms.py:389
+#: intervention/forms.py:444 konova/forms.py:419
msgid ""
"I, {} {}, confirm that all necessary control steps have been performed by "
"myself."
@@ -888,30 +885,30 @@ msgstr ""
"Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt "
"wurden:"
-#: intervention/forms.py:465
+#: intervention/forms.py:503
msgid "Only recorded accounts can be selected for deductions"
msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
-#: intervention/forms.py:484 intervention/forms.py:491
+#: intervention/forms.py:522 intervention/forms.py:529
#: intervention/tables.py:88
#: intervention/templates/intervention/detail/view.html:19
#: konova/templates/konova/home.html:11 templates/navbar.html:22
msgid "Intervention"
msgstr "Eingriff"
-#: intervention/forms.py:486
+#: intervention/forms.py:524
msgid "Only shared interventions can be selected"
msgstr "Nur freigegebene Eingriffe können gewählt werden"
-#: intervention/forms.py:499
+#: intervention/forms.py:537
msgid "New Deduction"
msgstr "Neue Abbuchung"
-#: intervention/forms.py:500
+#: intervention/forms.py:538
msgid "Enter the information for a new deduction from a chosen eco-account"
msgstr "Geben Sie die Informationen für eine neue Abbuchung ein."
-#: intervention/forms.py:536
+#: intervention/forms.py:574
msgid ""
"Eco-account {} is not recorded yet. You can only deduct from recorded "
"accounts."
@@ -919,7 +916,7 @@ msgstr ""
"Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von "
"verzeichneten Ökokonten erfolgen."
-#: intervention/forms.py:549
+#: intervention/forms.py:587
msgid ""
"The account {} has not enough surface for a deduction of {} m². There are "
"only {} m² left"
@@ -927,38 +924,38 @@ msgstr ""
"Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend "
"Restfläche. Es stehen noch {} m² zur Verfügung."
-#: intervention/models.py:306
+#: intervention/models.py:298
msgid "Registration office file number missing"
msgstr "Aktenzeichen Zulassungsbehörde fehlt"
-#: intervention/models.py:309
-msgid "Conversation office file number missing"
+#: intervention/models.py:301
+msgid "Conservation office file number missing"
msgstr "Aktenzeichen Naturschutzbehörde fehlt"
-#: intervention/models.py:312
+#: intervention/models.py:304
msgid "Responsible data missing"
msgstr "Daten zu Verantwortlichen fehlen"
-#: intervention/models.py:326
+#: intervention/models.py:318
msgid "Revocation exists"
msgstr "Widerspruch liegt vor"
-#: intervention/models.py:329
+#: intervention/models.py:321
msgid "Registration date missing"
msgstr "Datum Zulassung bzw. Satzungsbeschluss fehlt"
-#: intervention/models.py:332
+#: intervention/models.py:324
msgid "Binding on missing"
msgstr "Datum Bestandskraft fehlt"
-#: intervention/models.py:334
+#: intervention/models.py:326
msgid "Legal data missing"
msgstr "Rechtliche Daten fehlen"
#: intervention/tables.py:45
#: intervention/templates/intervention/detail/includes/revocation.html:8
#: intervention/templates/intervention/detail/includes/revocation.html:55
-#: intervention/templates/intervention/detail/view.html:99
+#: intervention/templates/intervention/detail/view.html:104
msgid "Revocation"
msgstr "Widerspruch"
@@ -1020,27 +1017,15 @@ msgstr "Vom"
msgid "Remove revocation"
msgstr "Widerspruch entfernen"
-#: intervention/templates/intervention/detail/view.html:35
-msgid "Process type"
-msgstr "Verfahrenstyp"
-
-#: intervention/templates/intervention/detail/view.html:43
-msgid "Registration office"
-msgstr "Zulassungsbehörde"
-
-#: intervention/templates/intervention/detail/view.html:47
-msgid "Registration office file number"
-msgstr "Aktenzeichen Zulassungsbehörde"
-
-#: intervention/templates/intervention/detail/view.html:91
+#: intervention/templates/intervention/detail/view.html:96
msgid "Registration date"
msgstr "Datum Zulassung bzw. Satzungsbeschluss"
-#: intervention/templates/intervention/detail/view.html:95
+#: intervention/templates/intervention/detail/view.html:100
msgid "Binding on"
msgstr "Datum Bestandskraft"
-#: intervention/templates/intervention/detail/view.html:98
+#: intervention/templates/intervention/detail/view.html:103
msgid "Exists"
msgstr "vorhanden"
@@ -1131,56 +1116,56 @@ msgstr "Hierfür müssen Sie einer anderen Nutzergruppe angehören!"
msgid "Not editable"
msgstr "Nicht editierbar"
-#: konova/forms.py:107 konova/forms.py:251
+#: konova/forms.py:138 konova/forms.py:281
msgid "Confirm"
msgstr "Bestätige"
-#: konova/forms.py:119 konova/forms.py:260
+#: konova/forms.py:150 konova/forms.py:290
msgid "Remove"
msgstr "Löschen"
-#: konova/forms.py:121
+#: konova/forms.py:152
msgid "You are about to remove {} {}"
msgstr "Sie sind dabei {} {} zu löschen"
-#: konova/forms.py:261
+#: konova/forms.py:291
msgid "Are you sure?"
msgstr "Sind Sie sicher?"
-#: konova/forms.py:291
+#: konova/forms.py:321
msgid "Created on"
msgstr "Erstellt"
-#: konova/forms.py:293
+#: konova/forms.py:323
msgid "When has this file been created? Important for photos."
msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
-#: konova/forms.py:303
+#: konova/forms.py:333
#: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231
msgid "File"
msgstr "Datei"
-#: konova/forms.py:366
+#: konova/forms.py:396
msgid "Added document"
msgstr "Dokument hinzugefügt"
-#: konova/forms.py:380
+#: konova/forms.py:410
msgid "Confirm record"
msgstr "Verzeichnen bestätigen"
-#: konova/forms.py:388
+#: konova/forms.py:418
msgid "Record data"
msgstr "Daten verzeichnen"
-#: konova/forms.py:395
+#: konova/forms.py:425
msgid "Confirm unrecord"
msgstr "Entzeichnen bestätigen"
-#: konova/forms.py:396
+#: konova/forms.py:426
msgid "Unrecord data"
msgstr "Daten entzeichnen"
-#: konova/forms.py:397
+#: konova/forms.py:427
msgid "I, {} {}, confirm that this data must be unrecorded."
msgstr ""
"Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen."
@@ -1326,17 +1311,47 @@ msgid "Contact"
msgstr "Kontakt"
#: templates/form/generic_table_form.html:23
+#: templates/form/main_data_collapse_form.html:58
msgid "Cancel"
msgstr "Abbrechen"
#: templates/form/generic_table_form.html:27
+#: templates/form/main_data_collapse_form.html:62
msgid "Save"
msgstr "Speichern"
-#: templates/form/generic_table_form_body.html:23
+#: templates/form/generic_table_form_body.html:24
msgid "Fields with * are required."
msgstr "* sind Pflichtfelder."
+#: templates/form/main_data_collapse_form.html:13
+msgid ""
+"\n"
+" First enter the most basic data. Of course you can "
+"change everything later.\n"
+" All further data, like documents or further details, can "
+"be added in the detail view after saving\n"
+" your new entry.\n"
+" "
+msgstr ""
+"\n"
+"Geben Sie zunächst die grundlegenden Daten ein. Sie können diese später immer noch ändern.\n"
+"Alle weiteren Daten, wie Dokumente oder weitere Details, können nach dem Speichern des neuen Eintrags hinzugefügt "
+"werden.\n"
+" "
+
+#: templates/form/main_data_collapse_form.html:19
+msgid "Open the input topic with a simple click."
+msgstr "Mit einem Linksklick öffnen Sie den jeweiligen Formularbereich."
+
+#: templates/form/main_data_collapse_form.html:29
+msgid "General data"
+msgstr "Allgemeine Daten"
+
+#: templates/form/main_data_collapse_form.html:44
+msgid "Geometry"
+msgstr "Geometrie"
+
#: templates/generic_index.html:28
msgid "New entry"
msgstr "Neuer Eintrag"
@@ -2693,6 +2708,30 @@ msgstr ""
msgid "A fontawesome icon field"
msgstr ""
+#~ msgid "Which intervention type is this"
+#~ msgstr "Welcher Eingriffstyp"
+
+#~ msgid "Based on which law"
+#~ msgstr "Basiert auf welchem Recht"
+
+#~ msgid "Data provider"
+#~ msgstr "Datenbereitsteller"
+
+#~ msgid "Who provides the data for the intervention"
+#~ msgstr "Wer stellt die Daten für den Eingriff zur Verfügung"
+
+#~ msgid "Organization"
+#~ msgstr "Organisation"
+
+#~ msgid "Data provider details"
+#~ msgstr "Datenbereitsteller Details"
+
+#~ msgid "Further details"
+#~ msgstr "Weitere Details"
+
+#~ msgid "Files"
+#~ msgstr "Dateien"
+
#~ msgid "Transfer note"
#~ msgstr "Verwendungszweck"
diff --git a/templates/form/generic_table_form.html b/templates/form/generic_table_form.html
index d5cbef4a..165f5290 100644
--- a/templates/form/generic_table_form.html
+++ b/templates/form/generic_table_form.html
@@ -18,12 +18,12 @@
{% csrf_token %}
{% include 'form/generic_table_form_body.html' %}
-
+
-
diff --git a/templates/form/generic_table_form_body.html b/templates/form/generic_table_form_body.html
index dbd6290a..0f9b790e 100644
--- a/templates/form/generic_table_form_body.html
+++ b/templates/form/generic_table_form_body.html
@@ -6,6 +6,7 @@
+
{{ field.help_text }}
|
diff --git a/templates/form/main_data_collapse_form.html b/templates/form/main_data_collapse_form.html
new file mode 100644
index 00000000..08e1bd15
--- /dev/null
+++ b/templates/form/main_data_collapse_form.html
@@ -0,0 +1,65 @@
+{% load i18n l10n fontawesome_5 %}
+
\ No newline at end of file
|