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

Merge branch 'master' into test

Browse Source 
# Conflicts:
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po
This commit is contained in:
mpeltriaux
2023-08-30 09:12:02 +02:00
parent a2b44a9c45 1437d16092
commit e9086cbbcd
13 changed files with 170 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compensation/models/compensation.py
View File

@@ -22,7 +22,7 @@ from compensation.utils.quality import CompensationQualityChecker
from konova.models import BaseObject, AbstractDocument, Deadline, generate_document_file_upload_path, \
GeoReferencedMixin, DeadlineType, ResubmitableObjectMixin
from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, COMPENSATION_REMOVED_TEMPLATE, \
DOCUMENT_REMOVED_TEMPLATE, DEADLINE_REMOVED, ADDED_DEADLINE, \
DOCUMENT_REMOVED_TEMPLATE, DEADLINE_REMOVED, DEADLINE_ADDED, \
COMPENSATION_ACTION_REMOVED, COMPENSATION_STATE_REMOVED, INTERVENTION_HAS_REVOCATIONS_TEMPLATE
from user.models import UserActionLogEntry
@@ -76,7 +76,7 @@ class AbstractCompensation(BaseObject,
self.save()
self.deadlines.add(deadline)
self.mark_as_edited(user, edit_comment=ADDED_DEADLINE)
self.mark_as_edited(user, edit_comment=DEADLINE_ADDED)
return deadline
def remove_deadline(self, form):
@@ -200,7 +200,9 @@ class AbstractCompensation(BaseObject,
Returns:
"""
return qs.aggregate(Sum("surface"))["surface__sum"] or 0
val = qs.aggregate(Sum("surface"))["surface__sum"] or 0
val = float('{:0.2f}'.format(val))
return val
def quality_check(self) -> CompensationQualityChecker:
""" Performs data quality check