Merge pull request #4876 from tsiegleauq/refactor-PDF-TOC

Fix PDF TOC header
2019-07-25 09:42:42 +02:00 · 2019-07-25 09:42:42 +02:00 · d330a4ca97
commit d330a4ca97
parent 20cbe37d74 31ab7d387c
1 changed files with 7 additions and 2 deletions
--- a/client/src/app/site/motions/services/motion-pdf-catalog.service.ts
+++ b/client/src/app/site/motions/services/motion-pdf-catalog.service.ts
@ -132,7 +132,7 @@ export class MotionPdfCatalogService {
                            body: [
                                [
                                    {
-                                        text: category.getTitle(),
+                                        text: category.nameWithParentAbove,
                                        style: !!category.parent ? 'tocSubcategoryTitle' : 'tocCategoryTitle'
                                    }
                                ]
@ -158,7 +158,12 @@ export class MotionPdfCatalogService {
                    }

                    catTocBody.push(
-                        this.pdfService.createTocTableDef(tocBody, StyleType.CATEGORY_SECTION, layout, header)
+                        this.pdfService.createTocTableDef(
+                            tocBody,
+                            StyleType.CATEGORY_SECTION,
+                            layout,
+                            header ? JSON.parse(JSON.stringify(header)) : null
+                        )
                    );

                    catTocBody.push(this.pdfService.getPageBreak());