feat: additional sum for statistic tab (#1116)

Author: MitanOmar

backend/timed/projects/factories.py

@@ -44,6 +44,7 @@ class ProjectFactory(DjangoModelFactory):
 
     name = Faker("catch_phrase")
     estimated_time = Faker("time_delta")
+    total_remaining_effort = Faker("time_delta")
     archived = False
     billed = False
     customer_visible = False
@@ -66,6 +67,7 @@ class TaskFactory(DjangoModelFactory):
 
     name = Faker("company_suffix")
     estimated_time = Faker("time_delta")
+    most_recent_remaining_effort = Faker("time_delta")
     archived = False
     project = SubFactory("timed.projects.factories.ProjectFactory")
     cost_center = SubFactory("timed.projects.factories.CostCenterFactory")

backend/timed/reports/tests/__snapshots__/test_work_report.ambr

@@ -37,10 +37,18 @@ def test_project_statistic_list(
         is_employed=is_employed,
         is_external=False,
     )
-    report = ReportFactory.create(duration=timedelta(hours=1))
+    report = ReportFactory.create(
+        duration=timedelta(hours=1),
+        task__project__total_remaining_effort=timedelta(hours=3),
+        task__project__estimated_time=timedelta(hours=7),
+    )
     project = report.task.project
     ReportFactory.create(duration=timedelta(hours=2), task=report.task)
-    report2 = ReportFactory.create(duration=timedelta(hours=4))
+    report2 = ReportFactory.create(
+        duration=timedelta(hours=4),
+        task__project__total_remaining_effort=timedelta(hours=5),
+        task__project__estimated_time=timedelta(hours=2),
+    )
     project_2 = report2.task.project
     task = TaskFactory(project=report.task.project)
     ReportFactory.create(duration=timedelta(hours=2), task=task)
@@ -65,8 +73,8 @@ def test_project_statistic_list(
                     "amount-offered-currency": project_2.amount_offered_currency,
                     "amount-invoiced": str(project_2.amount_invoiced.amount),
                     "amount-invoiced-currency": project_2.amount_invoiced_currency,
-                    "estimated-time": "00:00:00",
-                    "total-remaining-effort": "00:00:00",
+                    "estimated-time": "02:00:00",
+                    "total-remaining-effort": "05:00:00",
                 },
                 "relationships": {
                     "customer": {
@@ -87,8 +95,8 @@ def test_project_statistic_list(
                     "amount-offered-currency": project.amount_offered_currency,
                     "amount-invoiced": str(project.amount_invoiced.amount),
                     "amount-invoiced-currency": project.amount_invoiced_currency,
-                    "estimated-time": "00:00:00",
-                    "total-remaining-effort": "00:00:00",
+                    "estimated-time": "07:00:00",
+                    "total-remaining-effort": "03:00:00",
                 },
                 "relationships": {
                     "customer": {
@@ -102,6 +110,8 @@ def test_project_statistic_list(
         ]
         assert json["data"] == expected_json
         assert json["meta"]["total-time"] == "09:00:00"
+        assert json["meta"]["total-estimated-time"] == "09:00:00"
+        assert json["meta"]["total-remaining-effort"] == "08:00:00"
 
 
 @pytest.mark.parametrize(

backend/timed/reports/tests/test_project_statistic.py

@@ -37,8 +37,16 @@ def test_task_statistic_list(
         is_employed=is_employed,
         is_external=False,
     )
-    task_z = TaskFactory.create(name="Z")
-    task_test = TaskFactory.create(name="Test")
+    task_z = TaskFactory.create(
+        name="Z",
+        most_recent_remaining_effort=timedelta(hours=3),
+        estimated_time=timedelta(hours=5),
+    )
+    task_test = TaskFactory.create(
+        name="Test",
+        most_recent_remaining_effort=timedelta(hours=7),
+        estimated_time=timedelta(hours=2),
+    )
     ReportFactory.create(duration=timedelta(hours=1), task=task_test)
     ReportFactory.create(duration=timedelta(hours=2), task=task_test)
     ReportFactory.create(duration=timedelta(hours=2), task=task_z)
@@ -63,8 +71,8 @@ def test_task_statistic_list(
                 "attributes": {
                     "duration": "03:00:00",
                     "name": str(task_test.name),
-                    "most-recent-remaining-effort": None,
-                    "estimated-time": "00:00:00",
+                    "most-recent-remaining-effort": "07:00:00",
+                    "estimated-time": "02:00:00",
                 },
                 "relationships": {
                     "project": {
@@ -78,8 +86,8 @@ def test_task_statistic_list(
                 "attributes": {
                     "duration": "02:00:00",
                     "name": str(task_z.name),
-                    "most-recent-remaining-effort": None,
-                    "estimated-time": "00:00:00",
+                    "most-recent-remaining-effort": "03:00:00",
+                    "estimated-time": "05:00:00",
                 },
                 "relationships": {
                     "project": {
@@ -90,6 +98,8 @@ def test_task_statistic_list(
         ]
         assert json["data"] == expected_json
         assert json["meta"]["total-time"] == "05:00:00"
+        assert json["meta"]["total-remaining-effort"] == "10:00:00"
+        assert json["meta"]["total-estimated-time"] == "07:00:00"
 
 
 @pytest.mark.parametrize(

backend/timed/reports/tests/test_task_statistic.py

@@ -9,11 +9,28 @@ class TotalTimeRootMetaMixin:
 
     def get_root_meta(self, _resource, many):
         """Add total hours over whole result (not just page) to meta."""
+        aggregate_list = {"total_time": Sum(self.duration_field)}
+        if "estimated_time" in self.fields:
+            aggregate_list["total_estimated_time"] = Sum("estimated_time")
+        if "total_remaining_effort" in self.fields:
+            aggregate_list["total_remaining_effort"] = Sum("total_remaining_effort")
+        if "most_recent_remaining_effort" in self.fields:
+            aggregate_list["total_remaining_effort"] = Sum(
+                "most_recent_remaining_effort"
+            )
         if many:
             view = self.context["view"]
             queryset = view.filter_queryset(view.get_queryset())
-            data = queryset.aggregate(total_time=Sum(self.duration_field))
+            data = queryset.aggregate(**aggregate_list)
             data["total_time"] = duration_string(data["total_time"] or timedelta(0))
+            if "total_estimated_time" in aggregate_list:
+                data["total_estimated_time"] = duration_string(
+                    data["total_estimated_time"] or timedelta(0)
+                )
+            if "total_remaining_effort" in aggregate_list:
+                data["total_remaining_effort"] = duration_string(
+                    data["total_remaining_effort"] or timedelta(0)
+                )
             return data
         return {}
 

backend/timed/serializers.py

@@ -68,7 +68,7 @@
 
 
   * Task
-    [old] Brown LLC > Synchronized impactful attitude > LLC
+    [old] Brown LLC > Synchronized impactful attitude > Group
     [new] Brown LLC > Synchronized impactful attitude > LLC
 
   * Comment

backend/timed/tracking/tests/__snapshots__/test_report.ambr

@@ -1985,7 +1985,7 @@ def test_report_create_remaining_effort(
         assert task.most_recent_remaining_effort == timedelta(hours=1)
         assert task.project.total_remaining_effort == timedelta(hours=1)
     else:
-        assert task.most_recent_remaining_effort is None
+        assert task.most_recent_remaining_effort == timedelta(0)
         assert task.project.total_remaining_effort == timedelta(0)
 
 

backend/timed/tracking/tests/test_report.py

@@ -97,7 +97,17 @@
                   Total:
                 {{else if (eq column.title "Duration")}}
                   <span class="total">{{humanize-duration
-                      this.total
+                      this.totalDuration
+                      false
+                    }}</span>
+                {{else if (eq column.title "Estimated")}}
+                  <span class="total">{{humanize-duration
+                      this.totalEstimatedTime
+                      false
+                    }}</span>
+                {{else if (eq column.title "Remaining Effort")}}
+                  <span class="total">{{humanize-duration
+                      this.totalRemainingEfforts
                       false
                     }}</span>
                 {{/if}}

frontend/app/components/statistic-list.hbs

@@ -49,7 +49,7 @@ const COLUMN_MAP = {
     { title: "Estimated", path: "estimatedTime", layout: DURATION_LAYOUT },
     { title: "Duration", path: "duration", layout: DURATION_LAYOUT },
     {
-      title: "Remaining effort",
+      title: "Remaining Effort",
       path: "mostRecentRemainingEffort",
       layout: DURATION_LAYOUT,
     },
@@ -91,10 +91,22 @@ export default class StatisticList extends Component {
     return Math.max(maxEstimated, maxDurationWithRemainingEffort);
   }
 
-  get total() {
+  get totalDuration() {
     return parseDjangoDuration(this.value.meta?.["total-time"] ?? null);
   }
 
+  get totalEstimatedTime() {
+    return parseDjangoDuration(
+      this.value.meta?.["total-estimated-time"] ?? null,
+    );
+  }
+
+  get totalRemainingEfforts() {
+    return parseDjangoDuration(
+      this.value.meta?.["total-remaining-effort"] ?? null,
+    );
+  }
+
   get columns() {
     return get(COLUMN_MAP, this.args.type).map((col) => ({
       ...col,