From 9324ba7a9b7fb91048c5823845c7547fb43aa7ad Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Wed, 6 Mar 2024 15:46:10 +0100
Subject: [PATCH] WIP: Filling XLSX
---
.../table_json_conversion/fill_xlsx.py | 33 +++++++++++++------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/caosadvancedtools/table_json_conversion/fill_xlsx.py b/src/caosadvancedtools/table_json_conversion/fill_xlsx.py
index cca0735f..5e53fd14 100644
--- a/src/caosadvancedtools/table_json_conversion/fill_xlsx.py
+++ b/src/caosadvancedtools/table_json_conversion/fill_xlsx.py
@@ -57,11 +57,12 @@ def _get_path_rows(worksheet):
return rows
-def _generate_path_col_mapping(workbook):
- rt_col = _get_row_type_column_index(workbook)
+def _next_row_index(sheet) -> int:
+ """Return the index for the next data row.
- for col in workbook.columns:
- pass
+This is defined as the first row without any content.
+"""
+ return sheet.max_row
class TemplateFiller:
@@ -117,10 +118,15 @@ class TemplateFiller:
assert len(common_path) >= 1
self._sheet_index[".".join(common_path)] = SimpleNamespace(
- common_path=common_path, sheetname=sheetname, sheet=sheet)
+ common_path=common_path, sheetname=sheetname, sheet=sheet, col_index=col_index)
def _handle_data(self, data: dict, current_path: List[str] = None):
"""Handle the data and write it into ``workbook``.
+
+Parameters
+----------
+data: dict
+ The data at the current path position. Elements may be dicts, lists or simple scalar values.
"""
if current_path is None:
current_path = []
@@ -129,24 +135,31 @@ class TemplateFiller:
if isinstance(content, list):
if not content:
continue
+ # Must be all of the same type.
assert len(set(type(entry) for entry in content)) == 1
if isinstance(content[0], dict):
# An array of objects: must go into exploded sheet
for entry in content:
self._handle_data(data=entry, current_path=path)
continue
- for entry in content:
- pass
- else:
- self._handle_single_data(data=content, current_path=path)
+ self._handle_simple_data(data=content, current_path=path)
- def _handle_single_data(self, data, current_path: List[str]):
+ def _handle_simple_data(self, data, current_path: List[str]):
"""Enter this single data item into the workbook.
+
+Parameters
+----------
+data: dict
+ The data at the current path position. Must be single items (dict or simple scalar) or lists of
+ simple values.
"""
sheet = self._sheet_index[".".join(current_path)].sheet
+ next_row = _next_row_index(sheet)
for name, content in data.items():
if isinstance(content, list):
# TODO handle later
+ # scalar elements: semicolon separated
+ # nested dicts: recurse
continue
if isinstance(content, dict):
pass
--
GitLab