[EcoAccount] See recorded state of withdraw #6

* adds prefiltering of withdraws --> excludes withdraws of as deleted flagged interventions
* renders intervention-recorded icon into eco account withdraws details view
* fixes bug in case of document deleting which does not contain any files
* renames RecordForm into RecordModalForm for more clarity

intervention/forms.py

@@ -413,6 +413,8 @@ class RunCheckForm(BaseModalForm):
         super().__init__(*args, **kwargs)
         self.form_title = _("Run check")
         self.form_caption = _("I, {} {}, confirm that all necessary control steps have been performed by myself.").format(self.user.first_name, self.user.last_name)
+        # Disable automatic w-100 setting for this type of modal form. Looks kinda strange
+        self.fields["confirm"].widget.attrs["class"] = ""
 
     def is_valid(self):
         super_result = super().is_valid()

intervention/models.py

@@ -7,10 +7,12 @@ Created on: 17.11.20
 """
 from django.contrib.auth.models import User
 from django.contrib.gis.db import models
+from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
 
 from konova.models import BaseObject, Geometry, UuidModel, BaseResource
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
+from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT
 from konova.utils import generators
 from organisation.models import Organisation
 from user.models import UserActionLogEntry
@@ -45,7 +47,8 @@ class Revocation(BaseResource):
 
     def delete(self):
         # Make sure related objects are being removed as well
-        self.document.delete()
+        if self.document:
+            self.document.delete()
         super().delete()
 
 
@@ -248,3 +251,13 @@ class Intervention(BaseObject):
             x,
             y,
         )
+
+    @property
+    def recorded_tooltip(self):
+        tooltip = _("Not recorded yet")
+        if self.recorded:
+            value = self.recorded.timestamp
+            value = localtime(value)
+            on = value.strftime(DEFAULT_DATE_TIME_FORMAT)
+            tooltip = _("Recorded on {} by {}").format(on, self.recorded.user)
+        return tooltip

intervention/views.py

@@ -10,7 +10,7 @@ from intervention.models import Intervention, Revocation
 from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
 from konova.decorators import *
-from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm, RecordForm
+from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm, RecordModalForm
 from konova.sub_settings.django_settings import DEFAULT_DATE_FORMAT
 from konova.utils.message_templates import FORM_INVALID, INTERVENTION_INVALID
 from konova.utils.user_checks import in_group
@@ -372,7 +372,7 @@ def record_view(request: HttpRequest, id: str):
 
     """
     intervention = get_object_or_404(Intervention, id=id)
-    form = RecordForm(request.POST or None, instance=intervention, user=request.user)
+    form = RecordModalForm(request.POST or None, instance=intervention, user=request.user)
     msg_succ = _("{} unrecorded") if intervention.recorded else _("{} recorded")
     msg_succ = msg_succ.format(intervention.identifier)
     return form.process_request(