IT-Naturschutz/konova
7
0
Fork 0
Code Issues 7 Pull Requests Actions Projects Releases 47 Wiki Activity

Withdraw to deduct

Browse Source 
* refactors all files and variable names
* WIP: Models and attributes
This commit is contained in:
mipel
2021-08-30 11:29:15 +02:00
parent 8a62f6c46b
commit cd5fb9cad6
15 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
compensation/templates/compensation/detail/eco_account/includes/withdraws.html → compensation/templates/compensation/detail/eco_account/includes/deductions.html
View File

@@ -1,17 +1,17 @@
{% load i18n l10n fontawesome_5 humanize %}
<div id="eco-account-withdraws" class="card">
<div id="eco-account-deductions" class="card">
<div class="card-header rlp-r">
<div class="row">
<div class="col-sm-6">
<h5>
<span class="badge badge-light">{{withdraws.count}}</span>
{% trans 'Eco Account Withdraws' %}
<span class="badge badge-light">{{deductions.count}}</span>
{% trans 'Eco Account Deductions' %}
</h5>
</div>
<div class="col-sm-6">
<div class="d-flex justify-content-end">
{% if is_default_member and has_access %}
<button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-withdraw' obj.id %}" title="{% trans 'Add new withdraw' %}">
<button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
{% fa5_icon 'plus' %}
{% fa5_icon 'tree' %}
</button>
@@ -42,25 +42,25 @@
</tr>
</thead>
<tbody>
{% for withdraw in withdraws %}
{% for deduction in deductions %}
<tr>
<td class="align-middle">
<a href="{% url 'intervention:open' withdraw.intervention.id %}">
{{ withdraw.intervention.identifier }}
<a href="{% url 'intervention:open' deduction.intervention.id %}">
{{ deduction.intervention.identifier }}
</a>
</td>
<td class="align-middle">
{% if withdraw.intervention.recorded %}
<em title='{{ withdraw.intervention.recorded_tooltip }}' class='fas fa-bookmark registered-bookmark'></em>
{% if deduction.intervention.recorded %}
<em title='{{ deduction.intervention.recorded_tooltip }}' class='fas fa-bookmark registered-bookmark'></em>
{% else %}
<em title='{{ withdraw.intervention.recorded_tooltip }}' class='far fa-bookmark'></em>
<em title='{{ deduction.intervention.recorded_tooltip }}' class='far fa-bookmark'></em>
{% endif %}
</td>
<td class="align-middle">{{ withdraw.surface|floatformat:2|intcomma }} m²</td>
<td class="align-middle">{{ withdraw.created.timestamp|default_if_none:""|naturalday}}</td>
<td class="align-middle">{{ deduction.surface|floatformat:2|intcomma }} m²</td>
<td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
<td>
{% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:withdraw-remove' withdraw.account.id withdraw.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Withdraw' %}">
<button data-form-url="{% url 'compensation:deduction-remove' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
{% fa5_icon 'trash' %}
</button>
{% endif %}

2
compensation/templates/compensation/detail/eco_account/view.html
View File

@@ -110,7 +110,7 @@
{% include 'compensation/detail/eco_account/includes/documents.html' %}
</div>
<div class="col-sm-12 col-md-12 col-lg-6">
{% include 'compensation/detail/eco_account/includes/withdraws.html' %}
{% include 'compensation/detail/eco_account/includes/deductions.html' %}
</div>
</div>