Tighten configuration and export handling
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
from typing import List, Tuple, cast
|
||||
|
||||
from redminelib.resources import Issue
|
||||
|
||||
from .types import ReportRow
|
||||
from .utils import get_version, hours_to_human
|
||||
|
||||
@@ -33,9 +35,7 @@ def build_grouped_report(
|
||||
"""
|
||||
|
||||
# Защитная сортировка -- гарантирует корректную группировку независимо от порядка на входе
|
||||
issue_hours = sorted(
|
||||
issue_hours, key=lambda x: (str(x[0].project), get_version(x[0]))
|
||||
)
|
||||
issue_hours = sorted(issue_hours, key=lambda x: (str(x[0].project), get_version(x[0])))
|
||||
|
||||
rows: List[ReportRow] = []
|
||||
prev_project: str = ""
|
||||
@@ -49,9 +49,7 @@ def build_grouped_report(
|
||||
time_text = hours_to_human(hours) if fill_time else ""
|
||||
|
||||
display_project = project if project != prev_project else ""
|
||||
display_version = (
|
||||
version if (project != prev_project or version != prev_version) else ""
|
||||
)
|
||||
display_version = version if (project != prev_project or version != prev_version) else ""
|
||||
|
||||
rows.append(
|
||||
cast(
|
||||
|
||||
Reference in New Issue
Block a user