Bump version: 1.2.0

.gitignore

@@ -85,3 +85,6 @@ secrets.json
 # Temporary files
 *.tmp
 *.bak
+
+# Just in case
+report.odt

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redmine-reporter"
-version = "1.1.0"
+version = "1.2.0"
 description = "Redmine time-entry based issue reporter for internal use"
 readme = "README.md"
 authors = [{ name = "Artem Kokos", email = "artem-kokos@mail.ru" }]

redmine_reporter/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.2.0"

redmine_reporter/formatter_odt.py

@@ -4,6 +4,7 @@ from redminelib.resources import Issue
 from odf.opendocument import load
 from odf.text import P
 from odf.table import Table, TableColumn, TableRow, TableCell
+from odf.style import Style, TableColumnProperties, TableCellProperties
 
 from .formatter import get_version, hours_to_human, STATUS_TRANSLATION
 from .utils import get_month_name_from_range
@@ -28,6 +29,10 @@ def format_odt(
     header_paragraph = P(stylename=para_style_name, text=header_text)
     doc.text.addElement(header_paragraph)
 
+    # Добавляем пустую строку (новый параграф без текста)
+    empty_paragraph = P(stylename=para_style_name, text="")
+    doc.text.addElement(empty_paragraph)
+
     # Группировка: project - version - [(issue, hours, status_ru)]
     projects = {}
     for issue, hours in issue_hours:
@@ -42,16 +47,42 @@ def format_odt(
             projects[project][version] = []
         projects[project][version].append((issue, hours, status_ru))
 
-    # Создаём таблицу
-    table = Table(name="Report")
-    for _ in range(5):
-        table.addElement(TableColumn())
+    # Создаем стиль для ячеек таблицы
+    cell_style_name = "TableCellStyle"
+    cell_style = Style(name=cell_style_name, family="table-cell")
+
+    # Устанавливаем отступы (Padding)
+    cell_props = TableCellProperties(
+        padding="0.04in",
+        border="0.05pt solid #000000"
+    )
+    cell_style.addElement(cell_props)
+    doc.automaticstyles.addElement(cell_style)
+
+    # Создаем стиль для всей таблицы (опционально, но может понадобиться)
+    table_style_name = "ReportTableStyle"
+    table_style = Style(name=table_style_name, family="table")
+
+    # Создаем таблицу и применяем стиль
+    table = Table(name="Report", stylename=table_style_name)
+
+    # Добавляем стили для каждой колонки (ширины)
+    column_widths = ["1.56in", "1.63in", "3.93in", "1.56in", "1.43in"]
+
+    for i, width in enumerate(column_widths):
+        col_style_name = f"col{i+1}"
+        col_style = Style(name=col_style_name, family="table-column")
+        col_props = TableColumnProperties(columnwidth=width, breakbefore="auto")
+        col_style.addElement(col_props)
+        doc.automaticstyles.addElement(col_style)
+
+        table.addElement(TableColumn(stylename=col_style))
 
     # Заголовки
     header_row = TableRow()
     headers = ["Наименование Проекта", "Номер версии*", "Задача", "Статус Готовность*", "Затрачено за отчетный период"]
     for text in headers:
-        cell = TableCell()
+        cell = TableCell(stylename=cell_style_name)
         p = P(stylename=para_style_name, text=text)
         cell.addElement(p)
         header_row.addElement(cell)
@@ -71,7 +102,7 @@ def format_odt(
 
                 # Ячейка "Проект" - только в первой строке всего проекта
                 if first_version_in_project and first_row_in_version:
-                    cell_project = TableCell()
+                    cell_project = TableCell(stylename=cell_style_name)
                     cell_project.setAttribute("numberrowsspanned", str(total_project_rows))
                     p = P(stylename=para_style_name, text=project)
                     cell_project.addElement(p)
@@ -79,7 +110,7 @@ def format_odt(
 
                 # Ячейка "Версия" - только в первой строке каждой версии
                 if first_row_in_version:
-                    cell_version = TableCell()
+                    cell_version = TableCell(stylename=cell_style_name)
                     cell_version.setAttribute("numberrowsspanned", str(row_span_version))
                     p = P(stylename=para_style_name, text=version)
                     cell_version.addElement(p)
@@ -90,24 +121,23 @@ def format_odt(
                     pass
 
                 # Остальные колонки
-                task_cell = TableCell()
+                task_cell = TableCell(stylename=cell_style_name)
                 p = P(stylename=para_style_name, text=f"{issue.id}. {issue.subject}")
                 task_cell.addElement(p)
                 row.addElement(task_cell)
 
-                status_cell = TableCell()
+                status_cell = TableCell(stylename=cell_style_name)
                 p = P(stylename=para_style_name, text=status_ru)
                 status_cell.addElement(p)
                 row.addElement(status_cell)
 
-                time_cell = TableCell()
+                time_cell = TableCell(stylename=cell_style_name)
                 p = P(stylename=para_style_name, text=hours_to_human(hours))
                 time_cell.addElement(p)
                 row.addElement(time_cell)
 
                 table.addElement(row)
-
-            first_version_in_project = False
+                first_version_in_project = False
 
     doc.text.addElement(table)
     return doc