[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
2021-08-26 15:45:24 +02:00
parent 6655ed1f57
commit 8f641daee4
8 changed files with 46 additions and 15 deletions
@@ -239,7 +239,9 @@ class EcoAccount(AbstractCompensation):

        """
        ret_val = 0
-        withdraws = self.withdraws.all()
+        withdraws = self.withdraws.filter(
+            intervention__deleted=None,
+        )
        withdraw_surfaces = withdraws.aggregate(Sum("surface"))["surface__sum"] or 0
        after_states_surfaces = self.after_states.all().aggregate(Sum("surface"))["surface__sum"] or withdraw_surfaces ## no division by zero
        ret_val = after_states_surfaces - withdraw_surfaces