From 988ee0fe93645bd06c46d5f497011cf6e473f883 Mon Sep 17 00:00:00 2001 From: Sean Date: Fri, 26 Jun 2020 14:31:22 +0200 Subject: [PATCH] Render left pdf footer image and page number Using the web worker, the PDF page number in combination with a left footer image could not be rendered together. --- client/src/app/core/pdf-services/pdf-worker.worker.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/src/app/core/pdf-services/pdf-worker.worker.ts b/client/src/app/core/pdf-services/pdf-worker.worker.ts index ad4f5361f..aca302976 100644 --- a/client/src/app/core/pdf-services/pdf-worker.worker.ts +++ b/client/src/app/core/pdf-services/pdf-worker.worker.ts @@ -77,10 +77,14 @@ function addPageNumbers(data: any): void { data.doc.footer = (currentPage, pageCount) => { const footer = data.doc.tmpfooter; + + // if the tmpfooter starts with an image, the pagenumber will be found in column 1 + const pageNumberColIndex = !!footer.columns[0].image ? 1 : 0; + // "%PAGENR% needs to be found once. After that, the same position should always update page numbers" - if (footer.columns[0].stack[0] === '%PAGENR%' || countPageNumbers) { + if (footer.columns[pageNumberColIndex]?.stack[0] === '%PAGENR%' || countPageNumbers) { countPageNumbers = true; - footer.columns[0].stack[0] = `${currentPage} / ${pageCount}`; + footer.columns[pageNumberColIndex].stack[0] = `${currentPage} / ${pageCount}`; } return footer; };