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

Fixes and improvements

Browse Source 
* moves diff_states message back to table top for direct presentation in compensation/detail/view.html
* removes diff_states rendering in deadline card in compensation/detail/view.html
* fixes before_state adding based on GET parameter
* refactors UserActionlogEntryEnum into a UserAction TextChoice (Django 3.x)
* adds ordering of compensation states depending on surface value
* refactors ServerMessageImportance from enum into TextChoice (Django 3.x)
* adds/updates translations
This commit is contained in:
mipel
2021-08-03 17:22:41 +02:00
parent 816600535a
commit cd5b2e264b
17 changed files with 215 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compensation/templates/compensation/detail/includes/deadlines.html
View File

@@ -57,10 +57,5 @@
{% endfor %}
</tbody>
</table>
{% if sum_before_states > sum_after_states %}
<div class="row alert alert-danger">
{% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
</div>
{% endif %}
</div>
</div>

12
compensation/templates/compensation/detail/includes/states-after.html
View File

@@ -21,6 +21,11 @@
</div>
</div>
<div class="card-body scroll-300">
{% if sum_before_states > sum_after_states %}
<div class="row alert alert-danger">
{% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
</div>
{% endif %}
<table class="table table-hover">
<thead>
<tr>
@@ -36,7 +41,7 @@
</tr>
</thead>
<tbody>
{% for state in comp.after_states.all %}
{% for state in after_states %}
<tr>
<td class="align-middle">
{{ state.biotope_type }}
@@ -53,10 +58,5 @@
{% endfor %}
</tbody>
</table>
{% if sum_before_states > sum_after_states %}
<div class="row alert alert-danger">
{% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
</div>
{% endif %}
</div>
</div>

12
compensation/templates/compensation/detail/includes/states-before.html
View File

@@ -21,6 +21,11 @@
</div>
</div>
<div class="card-body scroll-300">
{% if sum_before_states < sum_after_states %}
<div class="row alert alert-danger">
{% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
</div>
{% endif %}
<table class="table table-hover">
<thead>
<tr>
@@ -36,7 +41,7 @@
</tr>
</thead>
<tbody>
{% for state in comp.before_states.all %}
{% for state in before_states %}
<tr>
<td class="align-middle">
{{ state.biotope_type }}
@@ -53,10 +58,5 @@
{% endfor %}
</tbody>
</table>
{% if sum_before_states < sum_after_states %}
<div class="row alert alert-danger">
{% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
</div>
{% endif %}
</div>
</div>