duration and utilized

commcare_connect/opportunity/models.py

@@ -5,6 +5,7 @@
 from django.conf import settings
 from django.db import models
 from django.db.models import Count, F, Max, Q, Sum
+from django.utils.dateparse import parse_datetime
 from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext
@@ -129,15 +130,10 @@ def claimed_budget(self):
 
     @property
     def utilised_budget(self):
-        completed_works = CompletedWork.objects.filter(opportunity_access__opportunity=self)
-        payment_unit_counts = completed_works.values("payment_unit").annotate(
-            completed_count=Count("id"), amount=F("payment_unit__amount")
-        )
+        users = OpportunityAccess.objects.filter(opportunity=self)
         utilised = 0
-        for payment_unit_count in payment_unit_counts:
-            completed_count = payment_unit_count["completed_count"]
-            amount = payment_unit_count["amount"]
-            utilised += completed_count * amount
+        for u in users:
+            utilised += u.payment_accrued
         return utilised
 
     @property
@@ -586,6 +582,18 @@ def __setattr__(self, name, value):
     def images(self):
         return BlobMeta.objects.filter(parent_id=self.xform_id, content_type__startswith="image/")
 
+    @property
+    def duration(self):
+        duration = None
+        start = self.form_json["metadata"].get("timeStart")
+        end = self.form_json["metatdata"].get("timeEnd")
+        if start and end:
+            try:
+                duration = parse_datetime(end) - parse_datetime(start)
+            except (TypeError, ValueError):
+                pass
+        return duration
+
 
 class OpportunityClaim(models.Model):
     opportunity_access = models.OneToOneField(OpportunityAccess, on_delete=models.CASCADE)

commcare_connect/opportunity/tables.py

@@ -62,6 +62,7 @@ class UserVisitTable(OrgContextTable):
     )
     reason = columns.Column("Rejected Reason", accessor="reason", visible=False)
     justification = columns.Column("Justification", accessor="justification", visible=False)
+    duration = columns.Column("Duration", accessor="duration", visible=False)
 
     deliver_unit = columns.Column("Unit Name", accessor="deliver_unit__name")
     entity_id = columns.Column("Entity ID", accessor="entity_id", visible=False)

commcare_connect/opportunity/tests/test_export.py

@@ -59,9 +59,9 @@ def test_export_user_visit_data(mobile_user_with_connect_link):
 
     assert exporter.export("csv") == (
         "Visit ID,Visit date,Status,Username,Name of User,Unit Name,Rejected Reason,"
-        "Entity ID,Entity Name,Flags,form.name,form.group.q\r\n"
-        f",{date1.isoformat()},Pending,{username},{name},{deliver_unit.name},,,,,test_form1,\r\n"
-        f",{date2.isoformat()},Pending,{username},{name},{deliver_unit.name},,abc,A B C,,test_form2,b\r\n"
+        "Duration,Entity ID,Entity Name,Flags,form.name,form.group.q\r\n"
+        f",{date1.isoformat()},Pending,{username},{name},{deliver_unit.name},,,,,,test_form1,\r\n"
+        f",{date2.isoformat()},Pending,{username},{name},{deliver_unit.name},,,abc,A B C,,test_form2,b\r\n"
     )