Merge branch 'dev' into updated_reports

AI4Bharat · Sep 23, 2024 · 1adae0c · 1adae0c
2 parents 6677f9b + 36ae80b
commit 1adae0c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/backend/organizations/views.py b/backend/organizations/views.py
@@ -2994,11 +2994,16 @@ def cumulative_tasks_count(self, request, pk=None):
 
                 else:
                     reviewer_task_count = (
-                        reviewer_tasks.count() + reviewer_tasks_exported.count()
+                        reviewer_tasks.count()
+                        + reviewer_tasks_exported.count()
+                        + supercheck_tasks_exported.count()
                     )
 
                     annotation_tasks_count = (
-                        annotation_tasks.count() + annotation_tasks_exported.count()
+                        annotation_tasks.count()
+                        + annotation_tasks_exported.count()
+                        + reviewer_tasks_exported.count()
+                        + supercheck_tasks_exported.count()
                     )
 
                     supercheck_tasks_count = (

diff --git a/backend/workspaces/views.py b/backend/workspaces/views.py
@@ -1655,11 +1655,16 @@ def cumulative_tasks_count_all(self, request, pk=None):
 
                 else:
                     reviewer_task_count = (
-                        reviewer_tasks.count() + reviewer_tasks_exported.count()
+                        reviewer_tasks.count()
+                        + reviewer_tasks_exported.count()
+                        + supercheck_tasks_exported.count()
                     )
 
                     annotation_tasks_count = (
-                        annotation_tasks.count() + annotation_tasks_exported.count()
+                        annotation_tasks.count()
+                        + annotation_tasks_exported.count()
+                        + reviewer_tasks_exported.count()
+                        + supercheck_tasks_exported.count()
                     )
 
                     supercheck_tasks_count = (