fixes doc generation and renderers 3
All checks were successful
Deploy Plattform-Core (Int) / test (push) Successful in 1m2s
Deploy Plattform-Core (Int) / deploy (push) Successful in 9s

This commit is contained in:
ValueOn AG 2026-06-03 17:15:20 +02:00
parent 60bb771158
commit b7503e0272
5 changed files with 14 additions and 10 deletions

View file

@ -120,9 +120,11 @@ class RendererDocx(BaseRenderer):
doc = Document()
self.logger.debug(f"_generateDocxFromJson: Document created in {time.time() - start_time:.2f}s")
# Apply unified style (always provided by mainServiceGeneration.renderReport)
style_start = time.time()
self.logger.debug("_generateDocxFromJson: About to get style set")
if not unifiedStyle:
from modules.serviceCenter.services.serviceGeneration.styleDefaults import resolveStyle
unifiedStyle = resolveStyle(None)
styleSet = self._convertUnifiedStyleToInternal(unifiedStyle)
self._unifiedStyle = unifiedStyle
self._styleSet = styleSet

View file

@ -229,11 +229,9 @@ class RendererPdf(BaseRenderer):
# memory simultaneously. Collected here, deleted after the build.
self._tempImageFiles = []
try:
self._unifiedStyle = unifiedStyle
if unifiedStyle:
styles = self._convertUnifiedStyleToInternal(unifiedStyle)
else:
styles = self._convertUnifiedStyleToInternal({})
from modules.serviceCenter.services.serviceGeneration.styleDefaults import resolveStyle
self._unifiedStyle = unifiedStyle or resolveStyle(None)
styles = self._convertUnifiedStyleToInternal(self._unifiedStyle)
for level in range(1, 7):
hKey = f"heading{level}"
if hKey not in styles:
@ -934,7 +932,7 @@ class RendererPdf(BaseRenderer):
code = _normalizePdfMonospaceText(code)
elements = []
fs = code_style_def.get("font_size", 9)
mono = code_style_def.get("font", "Courier")
mono = _resolveFontFamily(code_style_def.get("font", "Courier"))
textColorFallback = styles.get("colors", {}).get("primary", "#24292e")

View file

@ -92,7 +92,8 @@ class RendererPptx(BaseRenderer):
import re
if not style:
style = {}
from modules.serviceCenter.services.serviceGeneration.styleDefaults import resolveStyle
style = resolveStyle(None)
internalStyle = self._convertUnifiedStyleToInternal(style)
styles = internalStyle
self._styles = styles

View file

@ -136,7 +136,9 @@ class RendererXlsx(BaseRenderer):
self.services.utils.debugLogToFile(f"EXCEL JSON CONTENT TYPE: {type(jsonContent)}", "EXCEL_RENDERER")
self.services.utils.debugLogToFile(f"EXCEL JSON CONTENT KEYS: {list(jsonContent.keys()) if isinstance(jsonContent, dict) else 'Not a dict'}", "EXCEL_RENDERER")
# Store unified style for use by inline-run helpers
if not style:
from modules.serviceCenter.services.serviceGeneration.styleDefaults import resolveStyle
style = resolveStyle(None)
self._unifiedStyle = style
# Convert unified style to internal format

View file

@ -232,8 +232,9 @@ def test_normalize_pdf_monospace_replaces_box_drawing():
def test_pdf_heading_font_sizes_strictly_decrease():
"""H3 must not fall back to H1 styles (previous bug: ## smaller than ###)."""
from modules.serviceCenter.services.serviceGeneration.styleDefaults import resolveStyle
renderer = RendererPdf(services=_fakeServices())
styles = renderer._getDefaultStyleSet()
styles = renderer._convertUnifiedStyleToInternal(resolveStyle(None))
assert styles["heading1"]["font_size"] > styles["heading2"]["font_size"] > styles["heading3"]["font_size"]
assert renderer._defaultHeadingStyleDef(2)["font_size"] > renderer._defaultHeadingStyleDef(3)["font_size"]
if REPORTLAB_AVAILABLE: