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

Minor enhancements

Browse Source 
* refactors eco account rest surface calculation into designated method get_available_rest()
* refactors placeholder setter for BaseForm
* adds automatic eco account identifier generating on saving
* fixes ServerMessageImportance template tag
This commit is contained in:
mipel
2021-08-11 14:17:43 +02:00
parent 5f85f49636
commit c8b6d001ef
8 changed files with 77 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compensation/views/eco_account_views.py
View File

@@ -95,8 +95,7 @@ def open_view(request: HttpRequest, id: str):
diff_states = abs(sum_before_states - sum_after_states)
# Calculate rest of available surface for withdraws
withdraw_surfaces = acc.get_surface_withdraws() or 0
available = int(((sum_after_states - withdraw_surfaces) / sum_after_states) * 100)
available = acc.get_available_rest(as_percentage=True)
context = {
"obj": acc,
@@ -106,8 +105,8 @@ def open_view(request: HttpRequest, id: str):
"after_states": after_states,
"sum_before_states": sum_before_states,
"sum_after_states": sum_after_states,
"available": available,
"diff_states": diff_states,
"available": available,
"is_default_member": in_group(_user, DEFAULT_GROUP),
"is_zb_member": in_group(_user, ZB_GROUP),
"is_ets_member": in_group(_user, ETS_GROUP),