diff --git a/redmine_reporter/formatter.py b/redmine_reporter/formatter.py index 06d1aa0..ec685b6 100644 --- a/redmine_reporter/formatter.py +++ b/redmine_reporter/formatter.py @@ -19,6 +19,23 @@ def get_version(issue: Issue) -> str: return str(getattr(issue, 'fixed_version', '')) +def hours_to_human(hours: float) -> str: + if hours <= 0: + return "0ч" + + total_minutes = round(hours * 60) + h = total_minutes // 60 + m = total_minutes % 60 + parts = [] + + if h: + parts.append(f"{h}ч") + if m: + parts.append(f"{m}м") + + return " ".join(parts) if parts else "0ч" + + def format_compact(issue_hours: List[Tuple[Issue, float]]) -> str: lines = [] prev_project = None @@ -31,7 +48,7 @@ def format_compact(issue_hours: List[Tuple[Issue, float]]) -> str: 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} | {hours:.2f}h") + lines.append(f"{display_project} | {display_version} | {issue.id}. {issue.subject} | {status} | {hours_to_human(hours)}") prev_project = project prev_version = version @@ -60,7 +77,7 @@ def format_table(issue_hours: List[Tuple[Issue, float]]) -> str: display_version, f"{issue.id}. {issue.subject}", status_ru, - f"{hours:.2f}h" + hours_to_human(hours) ]) prev_project = project