Aggregate hours and show in table

redmine_reporter/formatter.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Tuple
 from redminelib.resources import Issue
 
 
@@ -19,20 +19,19 @@ def get_version(issue: Issue) -> str:
     return str(getattr(issue, 'fixed_version', '<N/A>'))
 
 
-def format_compact(issues: List[Issue]) -> str:
+def format_compact(issue_hours: List[Tuple[Issue, float]]) -> str:
     lines = []
     prev_project = None
     prev_version = None
 
-    for issue in issues:
+    for issue, hours in issue_hours:
         project = str(issue.project)
         version = get_version(issue)
         status = str(issue.status)
 
         display_project = project if project != prev_project else ""
         display_version = version if (project != prev_project or version != prev_version) else ""
-
-        lines.append(f"{display_project} | {display_version} | {issue.id}. {issue.subject} | {status}")
+        lines.append(f"{display_project} | {display_version} | {issue.id}. {issue.subject} | {status} | {hours:.2f}h")
 
         prev_project = project
         prev_version = version
@@ -40,14 +39,14 @@ def format_compact(issues: List[Issue]) -> str:
     return "\n".join(lines)
 
 
-def format_table(issues: List[Issue]) -> str:
+def format_table(issue_hours: List[Tuple[Issue, float]]) -> str:
     from tabulate import tabulate
 
     rows = [['Проект', 'Версия', 'Задача', 'Статус', 'Затрачено']]
     prev_project = None
     prev_version = None
 
-    for issue in issues:
+    for issue, hours in issue_hours:
         project = str(issue.project)
         version = get_version(issue)
         status_en = str(issue.status)
@@ -61,7 +60,7 @@ def format_table(issues: List[Issue]) -> str:
             display_version,
             f"{issue.id}. {issue.subject}",
             status_ru,
-            ""  # placeholder for spent time (future extension)
+            f"{hours:.2f}h"
         ])
 
         prev_project = project