Merge pull request '177_Minor_enhancements' (#178) from 177_Minor_enhancements into master
Reviewed-on: SGD-Nord/konova#178
This commit is contained in:
		
						commit
						10c86af314
					
				@ -22,6 +22,7 @@ class TimespanReportForm(BaseForm):
 | 
			
		||||
    date_from = forms.DateField(
 | 
			
		||||
        label_suffix="",
 | 
			
		||||
        label=_("From"),
 | 
			
		||||
        help_text=_("Entries created from..."),
 | 
			
		||||
        widget=forms.DateInput(
 | 
			
		||||
            attrs={
 | 
			
		||||
                "type": "date",
 | 
			
		||||
@ -34,6 +35,7 @@ class TimespanReportForm(BaseForm):
 | 
			
		||||
    date_to = forms.DateField(
 | 
			
		||||
        label_suffix="",
 | 
			
		||||
        label=_("To"),
 | 
			
		||||
        help_text=_("Entries created until..."),
 | 
			
		||||
        widget=forms.DateInput(
 | 
			
		||||
            attrs={
 | 
			
		||||
                "type": "date",
 | 
			
		||||
 | 
			
		||||
@ -15,40 +15,40 @@
 | 
			
		||||
        <thead>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <th scope="col">{% trans 'Area of responsibility' %}</th>
 | 
			
		||||
            <th scope="col">{% trans 'Total' %}</th>
 | 
			
		||||
            <th scope="col">{% trans 'Number single areas' %}</th>
 | 
			
		||||
            <th scope="col">{% fa5_icon 'star' %} {% trans 'Checked' %}</th>
 | 
			
		||||
            <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
            <th scope="col">{% trans 'Number single areas' %}</th>
 | 
			
		||||
            <th scope="col">{% trans 'Total' %}</th>
 | 
			
		||||
        </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{% trans 'Conservation office by law' %}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_unb_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.num_single_surfaces_total_unb|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_unb_checked_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_unb_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.num_single_surfaces_total_unb|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_unb_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{% trans 'Land-use planning' %}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_tbp_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.num_single_surfaces_total_tbp|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_tbp_checked_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_tbp_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.num_single_surfaces_total_tbp|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_tbp_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{% trans 'Other registration office' %}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_other_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.num_single_surfaces_total_other|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_other_checked_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_other_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.num_single_surfaces_total_other|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.compensation_report.queryset_registration_office_other_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td><strong>{% trans 'Total' %}</strong></td>
 | 
			
		||||
                <td><strong>{{report.compensation_report.queryset_count|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
                <td><strong>{{report.compensation_report.num_single_surfaces_total|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
                <td><strong>{{report.compensation_report.queryset_checked_count|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
                <td><strong>{{report.compensation_report.queryset_recorded_count|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
                <td><strong>{{report.compensation_report.num_single_surfaces_total|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
                <td><strong>{{report.compensation_report.queryset_count|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
 | 
			
		||||
@ -10,14 +10,14 @@
 | 
			
		||||
    <table class="table table-hover">
 | 
			
		||||
        <thead>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th scope="col" class="w-25">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
                <th scope="col">{% trans 'Total' %}</th>
 | 
			
		||||
                <th scope="col" class="w-25">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{{report.eco_account_report.queryset_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.eco_account_report.queryset_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.eco_account_report.queryset_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
 | 
			
		||||
@ -1,22 +1,37 @@
 | 
			
		||||
{% load i18n fontawesome_5 ksp_filters %}
 | 
			
		||||
 | 
			
		||||
<h3>{% trans 'Deductions' %}</h3>
 | 
			
		||||
<strong>
 | 
			
		||||
    {% blocktrans %}
 | 
			
		||||
    Recorded = Counts the deductions whose interventions have been recorded
 | 
			
		||||
    {% endblocktrans %}
 | 
			
		||||
</strong>
 | 
			
		||||
<div class="table-container">
 | 
			
		||||
    <table class="table table-hover">
 | 
			
		||||
        <thead>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %} {% trans 'Surface' %}</th>
 | 
			
		||||
                <th scope="col" class="w-25">{% trans 'Total' %}</th>
 | 
			
		||||
                <th scope="col" class="w-25">{% trans 'Total' %} {% trans 'Surface' %}</th>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %} {% trans 'Surface' %}</th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{{report.eco_account_report.queryset_deductions_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.eco_account_report.recorded_deductions_sq_m|default_if_zero:"-"}}m²</td>
 | 
			
		||||
                <td>{{report.eco_account_report.queryset_deductions_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.eco_account_report.deductions_sq_m|default_if_zero:"-"}}m²</td>
 | 
			
		||||
                <td>
 | 
			
		||||
                    {{report.eco_account_report.deductions_sq_m|default_if_zero:"-"}}
 | 
			
		||||
                    {% if report.eco_account_report.deductions_sq_m > 0 %}
 | 
			
		||||
                        m²
 | 
			
		||||
                    {% endif %}
 | 
			
		||||
                </td>
 | 
			
		||||
                <td>{{report.eco_account_report.queryset_deductions_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>
 | 
			
		||||
                    {{report.eco_account_report.recorded_deductions_sq_m|default_if_zero:"-"}}
 | 
			
		||||
                    {% if report.eco_account_report.recorded_deductions_sq_m > 0 %}
 | 
			
		||||
                        m²
 | 
			
		||||
                    {% endif %}
 | 
			
		||||
                </td>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
 | 
			
		||||
@ -14,16 +14,16 @@
 | 
			
		||||
    <table class="table table-hover">
 | 
			
		||||
        <thead>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th scope="col" class="w-25">{% trans 'Total' %}</th>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'star' %} {% trans 'Checked' %}</th>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
                <th scope="col" class="w-25">{% trans 'Total' %}</th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{{report.intervention_report.queryset_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.intervention_report.queryset_checked_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.intervention_report.queryset_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.intervention_report.queryset_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
 | 
			
		||||
@ -5,29 +5,29 @@
 | 
			
		||||
        <thead>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <th class="w-25" scope="col">{% trans 'Compensation type' %}</th>
 | 
			
		||||
            <th class="w-25" scope="col">{% trans 'Total' %}</th>
 | 
			
		||||
            <th class="w-25" scope="col">{% fa5_icon 'star' %} {% trans 'Checked' %}</th>
 | 
			
		||||
            <th class="w-25" scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
            <th class="w-25" scope="col">{% trans 'Total' %}</th>
 | 
			
		||||
        </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <th>{% trans 'Compensation' %}</th>
 | 
			
		||||
            <td>{{report.intervention_report.compensation_sum|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.compensation_sum_checked|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.compensation_sum_recorded|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.compensation_sum|default_if_zero:"-"}}</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <th>{% trans 'Payment' %}</th>
 | 
			
		||||
            <td>{{report.intervention_report.payment_sum|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.payment_sum_checked|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.payment_sum_recorded|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.payment_sum|default_if_zero:"-"}}</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        <tr>
 | 
			
		||||
            <th>{% trans 'Deductions' %}</th>
 | 
			
		||||
            <td>{{report.intervention_report.deduction_sum|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.deduction_sum_checked|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.deduction_sum_recorded|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{report.intervention_report.deduction_sum|default_if_zero:"-"}}</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
 | 
			
		||||
@ -13,15 +13,15 @@
 | 
			
		||||
            <th class="w-25" scope="col">
 | 
			
		||||
                {% trans 'Law' %}
 | 
			
		||||
            </th>
 | 
			
		||||
            <th scope="col">
 | 
			
		||||
                {% trans 'Total' %}
 | 
			
		||||
            </th>
 | 
			
		||||
            <th scope="col">
 | 
			
		||||
                {% fa5_icon 'star' %} {% trans 'Checked' %}
 | 
			
		||||
            </th>
 | 
			
		||||
            <th scope="col">
 | 
			
		||||
                {% fa5_icon 'bookmark' %} {% trans 'Recorded' %}
 | 
			
		||||
            </th>
 | 
			
		||||
            <th scope="col">
 | 
			
		||||
                {% trans 'Total' %}
 | 
			
		||||
            </th>
 | 
			
		||||
        </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
@ -34,16 +34,16 @@
 | 
			
		||||
                    {{law.long_name}}
 | 
			
		||||
                </small>
 | 
			
		||||
            </td>
 | 
			
		||||
            <td>{{law.num|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{law.num_checked|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{law.num_recorded|default_if_zero:"-"}}</td>
 | 
			
		||||
            <td>{{law.num|default_if_zero:"-"}}</td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        {% endfor %}
 | 
			
		||||
        <tr>
 | 
			
		||||
            <td><strong>{% trans 'Total' %}</strong></td>
 | 
			
		||||
            <td><strong>{{report.intervention_report.law_sum|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
            <td><strong>{{report.intervention_report.law_sum_checked|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
            <td><strong>{{report.intervention_report.law_sum_recorded|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
            <td><strong>{{report.intervention_report.law_sum|default_if_zero:"-"}}</strong></td>
 | 
			
		||||
        </tr>
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
 | 
			
		||||
@ -14,26 +14,26 @@
 | 
			
		||||
    <table class="table table-hover">
 | 
			
		||||
        <thead>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th scope="col" class="w-25">{% fa5_icon 'star' %} {% trans 'Type' %}</th>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
                <th scope="col" class="w-25">{% trans 'Type' %}</th>
 | 
			
		||||
                <th scope="col">{% trans 'Total' %}</th>
 | 
			
		||||
                <th scope="col">{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}</th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{% trans 'Intervention' %}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_intervention_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_intervention_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_intervention_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{% trans 'Compensation' %}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_comps_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_comps_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_comps_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <td>{% trans 'Eco-account' %}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_acc_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_acc_count|default_if_zero:"-"}}</td>
 | 
			
		||||
                <td>{{report.old_data_report.queryset_acc_recorded_count|default_if_zero:"-"}}</td>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
 | 
			
		||||
@ -10,7 +10,7 @@
 | 
			
		||||
                                {% fa5_icon 'pencil-ruler' %}
 | 
			
		||||
                                {% trans 'Old interventions' %}
 | 
			
		||||
                            </h5>
 | 
			
		||||
                            <span>{% trans 'Before' %} 16.06.2018</span>
 | 
			
		||||
                            <span>{% trans 'Binding date before' %} 16.06.2018</span>
 | 
			
		||||
                        </div>
 | 
			
		||||
                    </div>
 | 
			
		||||
                </div>
 | 
			
		||||
 | 
			
		||||
@ -108,7 +108,7 @@ class TempExcelFile:
 | 
			
		||||
        for _iter_entry in _iter_obj:
 | 
			
		||||
            j = 0
 | 
			
		||||
            for _iter_attr in _attrs:
 | 
			
		||||
                _new_cell = ws.cell(start_cell.row + i, start_cell.column + j, getattr(_iter_entry, _iter_attr))
 | 
			
		||||
                _new_cell = ws.cell(start_cell.row + i, start_cell.column + j, _iter_entry.get(_iter_attr, "MISSING"))
 | 
			
		||||
                _new_cell.border = border_style
 | 
			
		||||
                j += 1
 | 
			
		||||
            i += 1
 | 
			
		||||
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							@ -7,7 +7,8 @@ Created on: 16.11.20
 | 
			
		||||
"""
 | 
			
		||||
from django.http import HttpRequest
 | 
			
		||||
 | 
			
		||||
from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE, TAB_TITLE_IDENTIFIER
 | 
			
		||||
from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE, TAB_TITLE_IDENTIFIER, \
 | 
			
		||||
    IMPRESSUM_LINK
 | 
			
		||||
from konova.sub_settings.django_settings import EMAIL_REPLY_TO
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -25,6 +26,7 @@ class BaseContext:
 | 
			
		||||
            "user": request.user,
 | 
			
		||||
            "current_role": None,
 | 
			
		||||
            "help_link": HELP_LINK,
 | 
			
		||||
            "impressum_link": IMPRESSUM_LINK,
 | 
			
		||||
            "CONTACT_MAIL": EMAIL_REPLY_TO,
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -11,3 +11,4 @@ BASE_TITLE = "KSP - Kompensationsverzeichnis Service Portal"
 | 
			
		||||
BASE_FRONTEND_TITLE = "Kompensationsverzeichnis Service Portal"
 | 
			
		||||
TAB_TITLE_IDENTIFIER = "tab_title"
 | 
			
		||||
HELP_LINK = "https://dienste.naturschutz.rlp.de/doku/doku.php?id=ksp:start"
 | 
			
		||||
IMPRESSUM_LINK = "https://naturschutz.rlp.de/index.php?q=impressum"
 | 
			
		||||
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							@ -26,7 +26,7 @@ msgid ""
 | 
			
		||||
msgstr ""
 | 
			
		||||
"Project-Id-Version: PACKAGE VERSION\n"
 | 
			
		||||
"Report-Msgid-Bugs-To: \n"
 | 
			
		||||
"POT-Creation-Date: 2022-05-31 13:05+0200\n"
 | 
			
		||||
"POT-Creation-Date: 2022-06-21 14:11+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"
 | 
			
		||||
@ -40,11 +40,19 @@ msgstr ""
 | 
			
		||||
msgid "From"
 | 
			
		||||
msgstr "Vom"
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:36
 | 
			
		||||
#: analysis/forms.py:25
 | 
			
		||||
msgid "Entries created from..."
 | 
			
		||||
msgstr "Einträge erstellt seit..."
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:37
 | 
			
		||||
msgid "To"
 | 
			
		||||
msgstr "Bis"
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:47 compensation/forms/forms.py:77
 | 
			
		||||
#: analysis/forms.py:38
 | 
			
		||||
msgid "Entries created until..."
 | 
			
		||||
msgstr "Einträge erstellt bis..."
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:49 compensation/forms/forms.py:77
 | 
			
		||||
#: compensation/templates/compensation/detail/eco_account/view.html:59
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:16
 | 
			
		||||
#: compensation/utils/quality.py:100 ema/templates/ema/detail/view.html:49
 | 
			
		||||
@ -56,11 +64,11 @@ msgstr "Bis"
 | 
			
		||||
msgid "Conservation office"
 | 
			
		||||
msgstr "Eintragungsstelle"
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:49 compensation/forms/forms.py:79
 | 
			
		||||
#: analysis/forms.py:51 compensation/forms/forms.py:79
 | 
			
		||||
msgid "Select the responsible office"
 | 
			
		||||
msgstr "Verantwortliche Stelle"
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:58 compensation/forms/forms.py:88
 | 
			
		||||
#: analysis/forms.py:60 compensation/forms/forms.py:88
 | 
			
		||||
#: compensation/forms/forms.py:118 compensation/forms/forms.py:199
 | 
			
		||||
#: intervention/forms/forms.py:64 intervention/forms/forms.py:81
 | 
			
		||||
#: intervention/forms/forms.py:97 intervention/forms/forms.py:113
 | 
			
		||||
@ -69,15 +77,15 @@ msgstr "Verantwortliche Stelle"
 | 
			
		||||
msgid "Click for selection"
 | 
			
		||||
msgstr "Auswählen..."
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:65
 | 
			
		||||
#: analysis/forms.py:67
 | 
			
		||||
msgid "Generate report"
 | 
			
		||||
msgstr "Bericht generieren"
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:66
 | 
			
		||||
#: analysis/forms.py:68
 | 
			
		||||
msgid "Select a timespan and the desired conservation office"
 | 
			
		||||
msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle"
 | 
			
		||||
 | 
			
		||||
#: analysis/forms.py:69 konova/forms.py:227
 | 
			
		||||
#: analysis/forms.py:71 konova/forms.py:227
 | 
			
		||||
msgid "Continue"
 | 
			
		||||
msgstr "Weiter"
 | 
			
		||||
 | 
			
		||||
@ -135,9 +143,29 @@ msgid "Area of responsibility"
 | 
			
		||||
msgstr "Zuständigkeitsbereich"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:18
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:47
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/amount.html:13
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:13
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:14
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/amount.html:17
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/laws.html:17
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/laws.html:43
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:18
 | 
			
		||||
#: 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"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:19
 | 
			
		||||
msgid "Number single areas"
 | 
			
		||||
msgstr "Einzelflächen"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:20
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/amount.html:18
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/laws.html:20
 | 
			
		||||
#: compensation/tables.py:38
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/view.html:74
 | 
			
		||||
#: intervention/tables.py:38
 | 
			
		||||
@ -146,14 +174,14 @@ msgstr "Zuständigkeitsbereich"
 | 
			
		||||
msgid "Checked"
 | 
			
		||||
msgstr "Geprüft"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:19
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/amount.html:13
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:8
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/amount.html:18
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/laws.html:20
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:18
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:21
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/amount.html:14
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:15
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:16
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/amount.html:19
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/laws.html:23
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:19
 | 
			
		||||
#: compensation/tables.py:44 compensation/tables.py:219
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/view.html:93
 | 
			
		||||
#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31
 | 
			
		||||
@ -165,26 +193,6 @@ msgstr "Geprüft"
 | 
			
		||||
msgid "Recorded"
 | 
			
		||||
msgstr "Verzeichnet"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:20
 | 
			
		||||
msgid "Number single areas"
 | 
			
		||||
msgstr "Einzelflächen"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:21
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:47
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/amount.html:14
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:10
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/amount.html:19
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10
 | 
			
		||||
#: 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/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"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/compensation/amount.html:26
 | 
			
		||||
msgid "Conservation office by law"
 | 
			
		||||
msgstr "Naturschutzbehörde (§17 Abs.3 BNatSchG)"
 | 
			
		||||
@ -213,8 +221,18 @@ msgstr "Ökokonten"
 | 
			
		||||
msgid "Deductions"
 | 
			
		||||
msgstr "Abbuchungen"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:5
 | 
			
		||||
msgid ""
 | 
			
		||||
"\n"
 | 
			
		||||
"    Recorded = Counts the deductions whose interventions have been recorded\n"
 | 
			
		||||
"    "
 | 
			
		||||
msgstr ""
 | 
			
		||||
"\n"
 | 
			
		||||
"Verzeichnet = Anzahl der Abbuchungen welche zu bereits verzeichneten "
 | 
			
		||||
"Eingriffen gehören    "
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:14
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:16
 | 
			
		||||
#: compensation/forms/modalForms.py:187
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/includes/states-after.html:36
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/includes/states-before.html:36
 | 
			
		||||
@ -307,8 +325,8 @@ msgid "Old interventions"
 | 
			
		||||
msgstr "Altfälle"
 | 
			
		||||
 | 
			
		||||
#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13
 | 
			
		||||
msgid "Before"
 | 
			
		||||
msgstr "Vor"
 | 
			
		||||
msgid "Binding date before"
 | 
			
		||||
msgstr "Bestandskraft- bzw. Rechtskraftdatum vor"
 | 
			
		||||
 | 
			
		||||
#: compensation/filters.py:122
 | 
			
		||||
msgid "Show only unrecorded"
 | 
			
		||||
@ -415,6 +433,7 @@ msgid "Company Mustermann"
 | 
			
		||||
msgstr "Firma Mustermann"
 | 
			
		||||
 | 
			
		||||
#: compensation/forms/forms.py:143
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:34
 | 
			
		||||
msgid "Is CEF"
 | 
			
		||||
msgstr "Ist CEF-Maßnahme"
 | 
			
		||||
 | 
			
		||||
@ -423,6 +442,7 @@ msgid "Optionally: Whether this compensation is a CEF compensation?"
 | 
			
		||||
msgstr "Optional: Handelt es sich um eine CEF-Maßnahme?"
 | 
			
		||||
 | 
			
		||||
#: compensation/forms/forms.py:156
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:44
 | 
			
		||||
msgid "Is coherence keeping"
 | 
			
		||||
msgstr "Ist Kohärenzsicherungsmaßnahme"
 | 
			
		||||
 | 
			
		||||
@ -434,7 +454,10 @@ msgstr "Optional: Handelt es sich um eine Kohärenzsicherungsmaßnahme?"
 | 
			
		||||
#: compensation/forms/forms.py:169
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/view.html:44
 | 
			
		||||
#: compensation/templates/compensation/detail/eco_account/view.html:75
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:24
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:24
 | 
			
		||||
#: ema/templates/ema/detail/view.html:61
 | 
			
		||||
#: ema/templates/ema/report/report.html:24
 | 
			
		||||
msgid "Is PIK"
 | 
			
		||||
msgstr "Ist PIK Maßnahme"
 | 
			
		||||
 | 
			
		||||
@ -673,14 +696,14 @@ msgstr ""
 | 
			
		||||
msgid "Pieces"
 | 
			
		||||
msgstr "Stück"
 | 
			
		||||
 | 
			
		||||
#: compensation/models/eco_account.py:56
 | 
			
		||||
#: compensation/models/eco_account.py:55
 | 
			
		||||
msgid ""
 | 
			
		||||
"Deductable surface can not be larger than existing surfaces in after states"
 | 
			
		||||
msgstr ""
 | 
			
		||||
"Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht "
 | 
			
		||||
"überschreiten"
 | 
			
		||||
 | 
			
		||||
#: compensation/models/eco_account.py:63
 | 
			
		||||
#: compensation/models/eco_account.py:62
 | 
			
		||||
msgid ""
 | 
			
		||||
"Deductable surface can not be smaller than the sum of already existing "
 | 
			
		||||
"deductions. Please contact the responsible users for the deductions!"
 | 
			
		||||
@ -972,7 +995,12 @@ msgstr "Fehlende Flächenmengen laut Zielzustand: "
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/view.html:57
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/view.html:67
 | 
			
		||||
#: compensation/templates/compensation/detail/eco_account/view.html:78
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:27
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:37
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:47
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:27
 | 
			
		||||
#: ema/templates/ema/detail/view.html:64
 | 
			
		||||
#: ema/templates/ema/report/report.html:27
 | 
			
		||||
#: venv/lib/python3.7/site-packages/django/forms/widgets.py:710
 | 
			
		||||
msgid "Yes"
 | 
			
		||||
msgstr "Ja"
 | 
			
		||||
@ -981,7 +1009,12 @@ msgstr "Ja"
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/view.html:59
 | 
			
		||||
#: compensation/templates/compensation/detail/compensation/view.html:69
 | 
			
		||||
#: compensation/templates/compensation/detail/eco_account/view.html:80
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:29
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:39
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:49
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:29
 | 
			
		||||
#: ema/templates/ema/detail/view.html:66
 | 
			
		||||
#: ema/templates/ema/report/report.html:29
 | 
			
		||||
#: venv/lib/python3.7/site-packages/django/forms/widgets.py:711
 | 
			
		||||
msgid "No"
 | 
			
		||||
msgstr "Nein"
 | 
			
		||||
@ -1018,10 +1051,10 @@ 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:24
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:37
 | 
			
		||||
#: compensation/templates/compensation/report/compensation/report.html:54
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:47
 | 
			
		||||
#: ema/templates/ema/detail/view.html:71
 | 
			
		||||
#: ema/templates/ema/report/report.html:24
 | 
			
		||||
#: ema/templates/ema/report/report.html:34
 | 
			
		||||
#: intervention/templates/intervention/detail/view.html:113
 | 
			
		||||
#: intervention/templates/intervention/report/report.html:87
 | 
			
		||||
msgid "Last modified"
 | 
			
		||||
@ -1123,11 +1156,11 @@ msgstr "Maßnahmenträger"
 | 
			
		||||
msgid "Report"
 | 
			
		||||
msgstr "Bericht"
 | 
			
		||||
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:24
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:34
 | 
			
		||||
msgid "Deductions for"
 | 
			
		||||
msgstr "Abbuchungen für"
 | 
			
		||||
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:32
 | 
			
		||||
#: compensation/templates/compensation/report/eco_account/report.html:42
 | 
			
		||||
#: intervention/templates/intervention/report/report.html:53
 | 
			
		||||
#: intervention/templates/intervention/report/report.html:74
 | 
			
		||||
msgid "None"
 | 
			
		||||
@ -4300,6 +4333,9 @@ msgstr ""
 | 
			
		||||
msgid "Unable to connect to qpid with SASL mechanism %s"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#~ msgid "Before"
 | 
			
		||||
#~ msgstr "Vor"
 | 
			
		||||
 | 
			
		||||
#~ msgid "Groups"
 | 
			
		||||
#~ msgstr "Gruppen"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,7 @@
 | 
			
		||||
                <a href="{{ help_link }}" target="_blank">{% trans 'Help' %}</a>
 | 
			
		||||
            </span>
 | 
			
		||||
            <span class="col-sm-auto footer-link">
 | 
			
		||||
                <a href="{% url 'home' %}">{% trans 'Impressum' %}</a>
 | 
			
		||||
                <a href="{{ impressum_link }}" target="_blank">{% trans 'Impressum' %}</a>
 | 
			
		||||
            </span>
 | 
			
		||||
            <span class="col-sm-auto footer-link">
 | 
			
		||||
                <a href="mailto:{{CONTACT_MAIL}}">{% trans 'Contact' %}</a>
 | 
			
		||||
 | 
			
		||||
@ -14,12 +14,14 @@
 | 
			
		||||
{% endblock %}
 | 
			
		||||
 | 
			
		||||
{% block body %}
 | 
			
		||||
    <div class="col-md">
 | 
			
		||||
    <div>
 | 
			
		||||
        {% if table.title %}
 | 
			
		||||
            <div class="row">
 | 
			
		||||
                <h3>
 | 
			
		||||
                    {{ table.title }}
 | 
			
		||||
                </h3>
 | 
			
		||||
                <div class="col-md">
 | 
			
		||||
                    <h3>
 | 
			
		||||
                        {{ table.title }}
 | 
			
		||||
                    </h3>
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
            {% if table.subtitle %}
 | 
			
		||||
                <div class="row mb-2">
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user