Add exclude extra visits from utilised budget count

dimagi · Oct 5, 2023 · f68d309 · f68d309
1 parent f344db3
commit f68d309
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/commcare_connect/opportunity/models.py b/commcare_connect/opportunity/models.py
@@ -81,8 +81,7 @@ def claimed_budget(self):
 
     @property
     def utilised_budget(self):
-        # Todo: Exclude extra visits from this count
-        user_visits = UserVisit.objects.filter(opportunity=self).count()
+        user_visits = UserVisit.objects.filter(opportunity=self).exclude(status=VisitValidationStatus.extra).count()
         return user_visits
 
 
@@ -200,6 +199,7 @@ class VisitValidationStatus(models.TextChoices):
     pending = "pending", gettext("Pending")
     approved = "approved", gettext("Approved")
     rejected = "rejected", gettext("Rejected")
+    extra = "extra", gettext("Extra")
 
 
 class Payment(models.Model):