From 4452405b152306d0eacd20417dad7c916d610c39 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 31 Jan 2022 08:06:41 +0100 Subject: [PATCH 01/12] # 71 Shortcut buttons enhanced * adds bootstrap class to prevent link style rendering * reorganizes templates for home view into separate quickstart templates --- konova/templates/konova/home.html | 116 +----------------- .../includes/quickstart/compensations.html | 37 ++++++ .../includes/quickstart/ecoaccounts.html | 42 +++++++ .../includes/quickstart/interventions.html | 37 ++++++ news/templates/news/dashboard-news.html | 2 +- 5 files changed, 120 insertions(+), 114 deletions(-) create mode 100644 konova/templates/konova/includes/quickstart/compensations.html create mode 100644 konova/templates/konova/includes/quickstart/ecoaccounts.html create mode 100644 konova/templates/konova/includes/quickstart/interventions.html diff --git a/konova/templates/konova/home.html b/konova/templates/konova/home.html index 533bbba3..d6499532 100644 --- a/konova/templates/konova/home.html +++ b/konova/templates/konova/home.html @@ -7,123 +7,13 @@
-

- {% trans 'Intervention' %} -

-
- -
-
- {% fa5_icon 'pencil-ruler' %} -
-
- -
-
-
{% trans 'Total' %}
-
{{total_intervention_count|intcomma}}
-
-
-
{% trans 'Shared with you' %}
-
{{user_intervention_count|intcomma}}
-
-
-
-
-
- - - -
-
- - - -
-
-
+ {% include 'konova/includes/quickstart/interventions.html' %}
-
-

- {% trans 'Compensation' %} -

-
- -
-
- {% fa5_icon 'leaf' %} -
-
- -
-
-
{% trans 'Total' %}
-
{{total_compensation_count|intcomma}}
-
-
-
{% trans 'Shared with you' %}
-
{{user_compensation_count|intcomma}}
-
-
-
-
-
- - - -
-
- - - -
-
-
+ {% include 'konova/includes/quickstart/compensations.html' %}
- -
-

- {% trans 'Eco-account' %} -

-
- -
-
- {% fa5_icon 'tree' %} -
-
- -
-
-
{% trans 'Total' %}
-
{{total_eco_count|intcomma}}
-
-
-
{% trans 'Shared with you' %}
-
{{user_eco_count|intcomma}}
-
-
-
-
-
-
-
- - - -
-
- - - -
-
-
-
-
-
+ {% include 'konova/includes/quickstart/ecoaccounts.html' %}
diff --git a/konova/templates/konova/includes/quickstart/compensations.html b/konova/templates/konova/includes/quickstart/compensations.html new file mode 100644 index 00000000..347bbef1 --- /dev/null +++ b/konova/templates/konova/includes/quickstart/compensations.html @@ -0,0 +1,37 @@ +{% load i18n fontawesome_5 humanize %} + +

+ {% trans 'Compensation' %} +

+
+ +
+
+ {% fa5_icon 'leaf' %} +
+
+ +
+
+
{% trans 'Total' %}
+
{{total_compensation_count|intcomma}}
+
+
+
{% trans 'Shared with you' %}
+
{{user_compensation_count|intcomma}}
+
+
+
+
+
+ + + +
+
+ + + +
+
+
\ No newline at end of file diff --git a/konova/templates/konova/includes/quickstart/ecoaccounts.html b/konova/templates/konova/includes/quickstart/ecoaccounts.html new file mode 100644 index 00000000..aa5cc68a --- /dev/null +++ b/konova/templates/konova/includes/quickstart/ecoaccounts.html @@ -0,0 +1,42 @@ +{% load i18n fontawesome_5 humanize %} + +

+ {% trans 'Eco-account' %} +

+
+ +
+
+ {% fa5_icon 'tree' %} +
+
+ +
+
+
{% trans 'Total' %}
+
{{total_eco_count|intcomma}}
+
+
+
{% trans 'Shared with you' %}
+
{{user_eco_count|intcomma}}
+
+
+
+
+
+
+
+ + + +
+
+ + + +
+
+
+
+ +
\ No newline at end of file diff --git a/konova/templates/konova/includes/quickstart/interventions.html b/konova/templates/konova/includes/quickstart/interventions.html new file mode 100644 index 00000000..965faeb6 --- /dev/null +++ b/konova/templates/konova/includes/quickstart/interventions.html @@ -0,0 +1,37 @@ +{% load i18n fontawesome_5 humanize %} + +

+ {% trans 'Intervention' %} +

+
+ +
+
+ {% fa5_icon 'pencil-ruler' %} +
+
+ +
+
+
{% trans 'Total' %}
+
{{total_intervention_count|intcomma}}
+
+
+
{% trans 'Shared with you' %}
+
{{user_intervention_count|intcomma}}
+
+
+
+
+
+ + + +
+
+ + + +
+
+
\ No newline at end of file diff --git a/news/templates/news/dashboard-news.html b/news/templates/news/dashboard-news.html index 6301e2cc..f6aa9c6d 100644 --- a/news/templates/news/dashboard-news.html +++ b/news/templates/news/dashboard-news.html @@ -17,7 +17,7 @@ {% endfor %}
- +
{% trans 'Older ...' %}
From 8979149e562990e876323ad45485b41feba127b1 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 31 Jan 2022 10:14:46 +0100 Subject: [PATCH 02/12] # 89 Ecoaccount recorded state reset (fix) * fixes bug where recorded state of eco account has been reset, if a deduction is created from the detail view of the ecoaccount itself --- compensation/models/compensation.py | 6 ++++-- intervention/forms/modalForms.py | 2 +- intervention/models/intervention.py | 7 +++++-- konova/models/object.py | 7 +++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/compensation/models/compensation.py b/compensation/models/compensation.py index 89d6dc2f..66035579 100644 --- a/compensation/models/compensation.py +++ b/compensation/models/compensation.py @@ -310,17 +310,19 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin): ) return docs - def mark_as_edited(self, user: User, request: HttpRequest = None, edit_comment: str = None): + def mark_as_edited(self, user: User, request: HttpRequest = None, edit_comment: str = None, reset_recorded: bool = True): """ Performs internal logic for setting the recordedd/checked state of the related intervention Args: user (User): The performing user request (HttpRequest): The performing request + edit_comment (str): Additional comment for the log entry + reset_recorded (bool): Whether the record-state of the object should be reset Returns: """ - self.intervention.mark_as_edited(user, request, edit_comment) + self.intervention.mark_as_edited(user, request, edit_comment, reset_recorded) def is_ready_for_publish(self) -> bool: """ Not inherited by RecordableObjectMixin diff --git a/intervention/forms/modalForms.py b/intervention/forms/modalForms.py index 063a912a..06997235 100644 --- a/intervention/forms/modalForms.py +++ b/intervention/forms/modalForms.py @@ -370,7 +370,7 @@ class NewDeductionModalForm(BaseModalForm): def save(self): deduction = self.instance.add_deduction(self) - self.instance.mark_as_edited(self.user, self.request) + self.instance.mark_as_edited(self.user, self.request, reset_recorded=False) return deduction diff --git a/intervention/models/intervention.py b/intervention/models/intervention.py index d1a11e40..398c00fa 100644 --- a/intervention/models/intervention.py +++ b/intervention/models/intervention.py @@ -250,17 +250,20 @@ class Intervention(BaseObject, ShareableObjectMixin, RecordableObjectMixin, Chec ) return deduction - def mark_as_edited(self, performing_user: User, request: HttpRequest = None, edit_comment: str = None): + def mark_as_edited(self, performing_user: User, request: HttpRequest = None, edit_comment: str = None, reset_recorded: bool = True): """ In case the object or a related object changed, internal processes need to be started, such as unrecord and uncheck Args: performing_user (User): The user which performed the editing action + request (HttpRequest): The used request for this action + edit_comment (str): Additional comment for the log entry + reset_recorded (bool): Whether the record-state of the object should be reset Returns: """ - super().mark_as_edited(performing_user, request) + super().mark_as_edited(performing_user, request, edit_comment, reset_recorded) if self.checked: self.set_unchecked() diff --git a/konova/models/object.py b/konova/models/object.py index 78672b4e..723d0eb2 100644 --- a/konova/models/object.py +++ b/konova/models/object.py @@ -262,12 +262,15 @@ class RecordableObjectMixin(models.Model): return action - def mark_as_edited(self, performing_user: User, request: HttpRequest = None, edit_comment: str = None): + def mark_as_edited(self, performing_user: User, request: HttpRequest = None, edit_comment: str = None, reset_recorded: bool = True): """ In case the object or a related object changed, internal processes need to be started, such as unrecord and uncheck Args: performing_user (User): The user which performed the editing action + request (HttpRequest): The used request for this action + edit_comment (str): Additional comment for the log entry + reset_recorded (bool): Whether the record-state of the object should be reset Returns: @@ -277,7 +280,7 @@ class RecordableObjectMixin(models.Model): self.log.add(action) self.save() - if self.recorded: + if self.recorded and reset_recorded: action = self.set_unrecorded(performing_user) self.log.add(action) if request: From d0c6449c39505de9098ddc3cdd8bc17bf30944ff Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 31 Jan 2022 10:52:35 +0100 Subject: [PATCH 03/12] # 88 Additional biotope codes * adds codelist 975 to project * adds new form field for adding extra biotope information --- .../management/commands/update_codelist.py | 3 +- codelist/settings.py | 1 + compensation/forms/modalForms.py | 19 ++++++++++- konova/autocompletes.py | 33 ++++++++++++++++++- konova/static/css/konova.css | 3 ++ konova/urls.py | 3 +- 6 files changed, 58 insertions(+), 4 deletions(-) diff --git a/codelist/management/commands/update_codelist.py b/codelist/management/commands/update_codelist.py index 5bb55b6a..aa6e45a9 100644 --- a/codelist/management/commands/update_codelist.py +++ b/codelist/management/commands/update_codelist.py @@ -13,7 +13,7 @@ from codelist.models import KonovaCode, KonovaCodeList from codelist.settings import CODELIST_INTERVENTION_HANDLER_ID, CODELIST_CONSERVATION_OFFICE_ID, \ CODELIST_REGISTRATION_OFFICE_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, CODELIST_COMPENSATION_HANDLER_ID, \ CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_CLASS_ID, CODELIST_COMPENSATION_ADDITIONAL_TYPE_ID, \ - CODELIST_BASE_URL, CODELIST_PROCESS_TYPE_ID + CODELIST_BASE_URL, CODELIST_PROCESS_TYPE_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID from konova.management.commands.setup import BaseKonovaCommand from konova.settings import PROXIES @@ -33,6 +33,7 @@ class Command(BaseKonovaCommand): CODELIST_CONSERVATION_OFFICE_ID, CODELIST_REGISTRATION_OFFICE_ID, CODELIST_BIOTOPES_ID, + CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_LAW_ID, CODELIST_COMPENSATION_HANDLER_ID, CODELIST_COMPENSATION_ACTION_ID, diff --git a/codelist/settings.py b/codelist/settings.py index 15c523ac..012dc9b4 100644 --- a/codelist/settings.py +++ b/codelist/settings.py @@ -14,6 +14,7 @@ CODELIST_INTERVENTION_HANDLER_ID = 903 # CLMassnahmeträger CODELIST_CONSERVATION_OFFICE_ID = 907 # CLNaturschutzbehörden CODELIST_REGISTRATION_OFFICE_ID = 1053 # CLZulassungsbehörden CODELIST_BIOTOPES_ID = 974 # CL_EIV_Biotoptypen +CODELIST_BIOTOPES_EXTRA_CODES_ID = 975 # CLZusatzbezeichnung CODELIST_LAW_ID = 1048 # CLVerfahrensrecht CODELIST_PROCESS_TYPE_ID = 44382 # CLVerfahrenstyp diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index 885db951..53fdf3c2 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -14,7 +14,7 @@ from django.shortcuts import render from django.utils.translation import pgettext_lazy as _con, gettext_lazy as _ from codelist.models import KonovaCode -from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_COMPENSATION_ACTION_ID +from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID from compensation.models import CompensationDocument, EcoAccountDocument from konova.contexts import BaseContext from konova.forms import BaseModalForm, NewDocumentForm @@ -127,6 +127,23 @@ class NewStateModalForm(BaseModalForm): } ), ) + biotope_extra = forms.ModelChoiceField( + label=_("Biotope additional type"), + label_suffix="", + required=False, + help_text=_("Select an additional biotope type"), + queryset=KonovaCode.objects.filter( + is_archived=False, + is_leaf=True, + code_lists__in=[CODELIST_BIOTOPES_EXTRA_CODES_ID], + ), + widget=autocomplete.ModelSelect2Multiple( + url="codes-biotope-extra-type-autocomplete", + attrs={ + "data-placeholder": _("Biotope additional type"), + } + ), + ) surface = forms.DecimalField( min_value=0.00, decimal_places=2, diff --git a/konova/autocompletes.py b/konova/autocompletes.py index bee8dad8..cbe42b0c 100644 --- a/konova/autocompletes.py +++ b/konova/autocompletes.py @@ -11,7 +11,8 @@ from django.db.models import Q from codelist.models import KonovaCode from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, \ - CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_PROCESS_TYPE_ID + CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_PROCESS_TYPE_ID, \ + CODELIST_BIOTOPES_EXTRA_CODES_ID from compensation.models import EcoAccount from intervention.models import Intervention @@ -192,6 +193,36 @@ class BiotopeCodeAutocomplete(KonovaCodeAutocomplete): return f"{result.long_name} ({result.short_name})" +class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete): + """ + Due to limitations of the django dal package, we need to subclass for each code list + """ + group_by_related = "parent" + related_field_name = "long_name" + + def __init__(self, *args, **kwargs): + self.c = CODELIST_BIOTOPES_EXTRA_CODES_ID + super().__init__(*args, **kwargs) + + def order_by(self, qs): + """ Orders by a predefined value + + Wrapped in a function to provide inheritance-based different orders + + Args: + qs (QuerySet): The queryset to be ordered + + Returns: + qs (QuerySet): The ordered queryset + """ + return qs.order_by( + "parent__long_name", + ) + + def get_result_label(self, result): + return f"{result.long_name} ({result.short_name})" + + class LawCodeAutocomplete(KonovaCodeAutocomplete): """ Due to limitations of the django dal package, we need to subclass for each code list diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css index 294287ea..a088cc30 100644 --- a/konova/static/css/konova.css +++ b/konova/static/css/konova.css @@ -229,4 +229,7 @@ No other approach worked to get the autocomplete fields to full width of parent } .select2-results__option--highlighted{ background-color: var(--rlp-red) !important; +} +.select2-container--default .select2-results > .select2-results__options{ + max-height: 500px !important; } \ No newline at end of file diff --git a/konova/urls.py b/konova/urls.py index 642b1445..96c716a8 100644 --- a/konova/urls.py +++ b/konova/urls.py @@ -20,7 +20,7 @@ from django.urls import path, include from konova.autocompletes import EcoAccountAutocomplete, \ InterventionAutocomplete, CompensationActionCodeAutocomplete, BiotopeCodeAutocomplete, LawCodeAutocomplete, \ RegistrationOfficeCodeAutocomplete, ConservationOfficeCodeAutocomplete, ProcessTypeCodeAutocomplete, \ - ShareUserAutocomplete + ShareUserAutocomplete, BiotopeExtraCodeAutocomplete 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 @@ -48,6 +48,7 @@ urlpatterns = [ path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="interventions-autocomplete"), path("atcmplt/codes/comp/action", CompensationActionCodeAutocomplete.as_view(), name="codes-compensation-action-autocomplete"), path("atcmplt/codes/biotope", BiotopeCodeAutocomplete.as_view(), name="codes-biotope-autocomplete"), + path("atcmplt/codes/biotope/extra", BiotopeExtraCodeAutocomplete.as_view(), name="codes-biotope-extra-type-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"), From 68eb773e43343df7e7e736fd78e85a380a99b7e9 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 31 Jan 2022 11:26:24 +0100 Subject: [PATCH 04/12] # 88 Extra biotope codes * adds additional biotope konovaCodes to CompensationState model * increases rpp for Autocompletion * adds/updates translations --- compensation/forms/modalForms.py | 2 +- compensation/models/compensation.py | 2 + compensation/models/state.py | 15 +++- konova/autocompletes.py | 2 + locale/de/LC_MESSAGES/django.mo | Bin 36202 -> 36407 bytes locale/de/LC_MESSAGES/django.po | 109 ++++++++++++++++------------ 6 files changed, 80 insertions(+), 50 deletions(-) diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index 53fdf3c2..c70d52a3 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -127,7 +127,7 @@ class NewStateModalForm(BaseModalForm): } ), ) - biotope_extra = forms.ModelChoiceField( + biotope_extra = forms.ModelMultipleChoiceField( label=_("Biotope additional type"), label_suffix="", required=False, diff --git a/compensation/models/compensation.py b/compensation/models/compensation.py index 66035579..46ea4520 100644 --- a/compensation/models/compensation.py +++ b/compensation/models/compensation.py @@ -114,6 +114,8 @@ class AbstractCompensation(BaseObject, GeoReferencedMixin): biotope_type=form_data["biotope_type"], surface=form_data["surface"], ) + state_additional_types = form_data["biotope_extra"] + state.biotope_extra_types.set(state_additional_types) if is_before_state: self.before_states.add(state) else: diff --git a/compensation/models/state.py b/compensation/models/state.py index 01aad147..a4b8fafb 100644 --- a/compensation/models/state.py +++ b/compensation/models/state.py @@ -8,7 +8,7 @@ Created on: 16.11.21 from django.db import models from codelist.models import KonovaCode -from codelist.settings import CODELIST_BIOTOPES_ID +from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID from compensation.managers import CompensationStateManager from konova.models import UuidModel @@ -26,7 +26,18 @@ class CompensationState(UuidModel): "code_lists__in": [CODELIST_BIOTOPES_ID], "is_selectable": True, "is_archived": False, - } + }, + related_name='+', + ) + biotope_extra_types = models.ManyToManyField( + KonovaCode, + blank=True, + limit_choices_to={ + "code_lists__in": [CODELIST_BIOTOPES_EXTRA_CODES_ID], + "is_selectable": True, + "is_archived": False, + }, + related_name='+', ) surface = models.FloatField() diff --git a/konova/autocompletes.py b/konova/autocompletes.py index cbe42b0c..a5d6ea66 100644 --- a/konova/autocompletes.py +++ b/konova/autocompletes.py @@ -95,6 +95,7 @@ class KonovaCodeAutocomplete(Select2GroupQuerySetView): * c: Search inside a special codelist """ + paginate_by = 50 def order_by(self, qs): """ Orders by a predefined value @@ -199,6 +200,7 @@ class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete): """ group_by_related = "parent" related_field_name = "long_name" + paginate_by = 200 def __init__(self, *args, **kwargs): self.c = CODELIST_BIOTOPES_EXTRA_CODES_ID diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index cb58ae7f8b439c804a3b076f7d39b7817f299f24..f93f41b81480d48317ed29762378762fe4593c75 100644 GIT binary patch delta 10665 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 YIu#1cm^Y}pf5sD64&RIyAJ)qLe~i|_4*&oF diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 40c27fe3..2c57d8dd 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # #: compensation/filters.py:122 compensation/forms/modalForms.py:34 #: compensation/forms/modalForms.py:45 compensation/forms/modalForms.py:61 -#: compensation/forms/modalForms.py:238 compensation/forms/modalForms.py:316 +#: compensation/forms/modalForms.py:255 compensation/forms/modalForms.py:333 #: intervention/forms/forms.py:52 intervention/forms/forms.py:154 #: intervention/forms/forms.py:166 intervention/forms/modalForms.py:125 #: intervention/forms/modalForms.py:138 intervention/forms/modalForms.py:151 @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-28 16:27+0100\n" +"POT-Creation-Date: 2022-01-31 10:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,7 +95,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:299 +#: compensation/forms/modalForms.py:316 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" @@ -177,8 +177,9 @@ msgstr "Einzelflächen" #: analysis/templates/analysis/reports/includes/intervention/laws.html:23 #: analysis/templates/analysis/reports/includes/intervention/laws.html:43 #: analysis/templates/analysis/reports/includes/old_data/amount.html:19 -#: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61 -#: konova/templates/konova/home.html:100 +#: konova/templates/konova/includes/quickstart/compensations.html:16 +#: konova/templates/konova/includes/quickstart/ecoaccounts.html:16 +#: konova/templates/konova/includes/quickstart/interventions.html:16 msgid "Total" msgstr "Insgesamt" @@ -212,7 +213,7 @@ msgstr "Abbuchungen" #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 -#: compensation/forms/modalForms.py:133 +#: compensation/forms/modalForms.py:150 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:36 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 @@ -240,7 +241,8 @@ msgstr "Kompensationsart" #: analysis/templates/analysis/reports/includes/old_data/amount.html:29 #: compensation/tables.py:85 #: compensation/templates/compensation/detail/compensation/view.html:19 -#: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28 +#: konova/templates/konova/includes/quickstart/compensations.html:4 +#: templates/navbars/navbar.html:28 msgid "Compensation" msgstr "Kompensation" @@ -285,7 +287,8 @@ msgstr "Typ" #: intervention/forms/modalForms.py:306 intervention/forms/modalForms.py:313 #: intervention/tables.py:89 #: intervention/templates/intervention/detail/view.html:19 -#: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22 +#: konova/templates/konova/includes/quickstart/interventions.html:4 +#: templates/navbars/navbar.html:22 msgid "Intervention" msgstr "Eingriff" @@ -293,7 +296,8 @@ msgstr "Eingriff" #: compensation/tables.py:226 #: compensation/templates/compensation/detail/eco_account/view.html:19 #: intervention/forms/modalForms.py:279 intervention/forms/modalForms.py:286 -#: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 +#: konova/templates/konova/includes/quickstart/ecoaccounts.html:4 +#: templates/navbars/navbar.html:34 msgid "Eco-account" msgstr "Ökokonto" @@ -350,7 +354,7 @@ msgid "Compensation XY; Location ABC" msgstr "Kompensation XY; Flur ABC" #: compensation/forms/forms.py:57 compensation/forms/modalForms.py:60 -#: compensation/forms/modalForms.py:237 compensation/forms/modalForms.py:315 +#: compensation/forms/modalForms.py:254 compensation/forms/modalForms.py:332 #: compensation/templates/compensation/detail/compensation/includes/actions.html:34 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 #: compensation/templates/compensation/detail/compensation/includes/documents.html:31 @@ -478,8 +482,8 @@ msgstr "Fällig am" msgid "Due on which date" msgstr "Zahlung wird an diesem Datum erwartet" -#: compensation/forms/modalForms.py:62 compensation/forms/modalForms.py:239 -#: compensation/forms/modalForms.py:317 intervention/forms/modalForms.py:152 +#: compensation/forms/modalForms.py:62 compensation/forms/modalForms.py:256 +#: compensation/forms/modalForms.py:334 intervention/forms/modalForms.py:152 #: konova/forms.py:375 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -500,31 +504,39 @@ msgstr "Biotoptyp" msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modalForms.py:136 intervention/forms/modalForms.py:297 +#: compensation/forms/modalForms.py:131 compensation/forms/modalForms.py:143 +msgid "Biotope additional type" +msgstr "Zusatzbezeichnung" + +#: compensation/forms/modalForms.py:134 +msgid "Select an additional biotope type" +msgstr "Zusatzbezeichnung wählen" + +#: compensation/forms/modalForms.py:153 intervention/forms/modalForms.py:297 msgid "in m²" msgstr "" -#: compensation/forms/modalForms.py:147 +#: compensation/forms/modalForms.py:164 msgid "New state" msgstr "Neuer Zustand" -#: compensation/forms/modalForms.py:148 +#: compensation/forms/modalForms.py:165 msgid "Insert data for the new state" msgstr "Geben Sie die Daten des neuen Zustandes ein" -#: compensation/forms/modalForms.py:155 konova/forms.py:190 +#: compensation/forms/modalForms.py:172 konova/forms.py:190 msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms/modalForms.py:209 +#: compensation/forms/modalForms.py:226 msgid "Deadline Type" msgstr "Fristart" -#: compensation/forms/modalForms.py:212 +#: compensation/forms/modalForms.py:229 msgid "Select the deadline type" msgstr "Fristart wählen" -#: compensation/forms/modalForms.py:221 +#: compensation/forms/modalForms.py:238 #: 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 @@ -532,27 +544,27 @@ msgstr "Fristart wählen" msgid "Date" msgstr "Datum" -#: compensation/forms/modalForms.py:224 +#: compensation/forms/modalForms.py:241 msgid "Select date" msgstr "Datum wählen" -#: compensation/forms/modalForms.py:251 +#: compensation/forms/modalForms.py:268 msgid "New deadline" msgstr "Neue Frist" -#: compensation/forms/modalForms.py:252 +#: compensation/forms/modalForms.py:269 msgid "Insert data for the new deadline" msgstr "Geben Sie die Daten der neuen Frist ein" -#: compensation/forms/modalForms.py:270 +#: compensation/forms/modalForms.py:287 msgid "Action Type" msgstr "Maßnahmentyp" -#: compensation/forms/modalForms.py:273 +#: compensation/forms/modalForms.py:290 msgid "Select the action type" msgstr "Maßnahmentyp wählen" -#: compensation/forms/modalForms.py:282 +#: compensation/forms/modalForms.py:299 #: compensation/templates/compensation/detail/compensation/includes/actions.html:38 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:38 #: compensation/templates/compensation/detail/compensation/includes/documents.html:35 @@ -578,23 +590,23 @@ msgstr "Maßnahmentyp wählen" msgid "Action" msgstr "Aktionen" -#: compensation/forms/modalForms.py:287 +#: compensation/forms/modalForms.py:304 msgid "Unit" msgstr "Einheit" -#: compensation/forms/modalForms.py:290 +#: compensation/forms/modalForms.py:307 msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms/modalForms.py:302 +#: compensation/forms/modalForms.py:319 msgid "Insert the amount" msgstr "Menge eingeben" -#: compensation/forms/modalForms.py:328 +#: compensation/forms/modalForms.py:345 msgid "New action" msgstr "Neue Maßnahme" -#: compensation/forms/modalForms.py:329 +#: compensation/forms/modalForms.py:346 msgid "Insert data for the new action" msgstr "Geben Sie die Daten der neuen Maßnahme ein" @@ -876,13 +888,13 @@ msgstr "Ist CEF Maßnahme" #: compensation/templates/compensation/detail/compensation/view.html:56 #: venv/lib/python3.7/site-packages/django/forms/widgets.py:710 msgid "Yes" -msgstr "" +msgstr "Ja" #: compensation/templates/compensation/detail/compensation/view.html:48 #: compensation/templates/compensation/detail/compensation/view.html:58 #: venv/lib/python3.7/site-packages/django/forms/widgets.py:711 msgid "No" -msgstr "" +msgstr "Nein" #: compensation/templates/compensation/detail/compensation/view.html:53 msgid "Is Coherence keeping compensation" @@ -1725,21 +1737,6 @@ msgstr "" msgid "English" msgstr "" -#: konova/templates/konova/home.html:27 konova/templates/konova/home.html:65 -#: konova/templates/konova/home.html:104 -msgid "Shared with you" -msgstr "Für Sie freigegeben" - -#: konova/templates/konova/home.html:35 konova/templates/konova/home.html:73 -#: konova/templates/konova/home.html:114 -msgid "Create" -msgstr "Neu" - -#: konova/templates/konova/home.html:40 konova/templates/konova/home.html:78 -#: konova/templates/konova/home.html:119 -msgid "Show" -msgstr "Anzeigen" - #: konova/templates/konova/includes/parcels.html:3 msgid "Spatial reference" msgstr "Raumreferenz" @@ -1764,6 +1761,24 @@ msgstr "Kreis" msgid "Gemarkung" msgstr "Gemarkung" +#: konova/templates/konova/includes/quickstart/compensations.html:20 +#: konova/templates/konova/includes/quickstart/ecoaccounts.html:20 +#: konova/templates/konova/includes/quickstart/interventions.html:20 +msgid "Shared with you" +msgstr "Für Sie freigegeben" + +#: konova/templates/konova/includes/quickstart/compensations.html:28 +#: konova/templates/konova/includes/quickstart/ecoaccounts.html:30 +#: konova/templates/konova/includes/quickstart/interventions.html:28 +msgid "Create" +msgstr "Neu" + +#: konova/templates/konova/includes/quickstart/compensations.html:33 +#: konova/templates/konova/includes/quickstart/ecoaccounts.html:35 +#: konova/templates/konova/includes/quickstart/interventions.html:33 +msgid "Show" +msgstr "Anzeigen" + #: konova/templates/konova/widgets/generate-content-input.html:6 msgid "Generate new" msgstr "Neu generieren" From 2439f37b6916ea76b9479fa483acde067b3020a0 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 31 Jan 2022 12:21:42 +0100 Subject: [PATCH 05/12] #88 Extra biotope codes templates * extends the detail view templates for all compensation related models to render extra CompensationState details as well * reduces number of landing page news from 4 to 3 * improves .card-text in favor of .scroll-150 * improves .card font size --- .../detail/compensation/includes/states-after.html | 14 ++++++++++++-- .../compensation/includes/states-before.html | 14 ++++++++++++-- .../detail/eco_account/includes/states-after.html | 14 ++++++++++++-- .../detail/eco_account/includes/states-before.html | 14 ++++++++++++-- .../ema/detail/includes/states-after.html | 14 ++++++++++++-- .../ema/detail/includes/states-before.html | 14 ++++++++++++-- konova/static/css/konova.css | 13 ++++++------- konova/templates/konova/includes/comment_card.html | 2 +- konova/views.py | 2 +- news/templates/news/dashboard-news.html | 2 +- news/templates/news/index.html | 2 +- 11 files changed, 82 insertions(+), 23 deletions(-) diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html index f8dd00a4..3f0b4eef 100644 --- a/compensation/templates/compensation/detail/compensation/includes/states-after.html +++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html @@ -29,9 +29,12 @@ - + @@ -48,8 +51,15 @@ + -
+ {% trans 'Biotope type' %} + {% trans 'Biotope additional type' %} + {% trans 'Surface' %} {{ state.biotope_type }} + {% for biotope_extra in state.biotope_extra_types.all %} +
+ {{ biotope_extra.long_name }} +
+ {% endfor %} + 		{{ state.surface|floatformat:2 }} m² + {% if is_default_member and has_access %}