From 25d53bcd26abc2e3d96d4048e02641efe7a18f1f Mon Sep 17 00:00:00 2001 From: sgempi <149714719+sgempi@users.noreply.github.com> Date: Thu, 11 Jul 2024 13:20:55 +0200 Subject: [PATCH] enhacement #77 - Project and Identifier in PDF (#78) * added project and identifier in PDF in the following form (en): Project: 001 - Project name * placed project and identifier below the report title * print ' -' in PDF only if project has a name --- backend/pdf/expenseReport.ts | 17 ++++++++++++++++- backend/pdf/healthCareCost.ts | 15 +++++++++++++++ backend/pdf/travel.ts | 16 +++++++++++++++- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/backend/pdf/expenseReport.ts b/backend/pdf/expenseReport.ts index c1dda61..a8cec38 100644 --- a/backend/pdf/expenseReport.ts +++ b/backend/pdf/expenseReport.ts @@ -105,7 +105,21 @@ function drawGeneralInformation(page: pdf_lib.PDFPage, expenseReport: ExpenseRep font: opts.font, color: opts.textColor }) - + //Project identifier and name + var y = y - opts.fontSize * 1.5 + page.drawText( + i18n.t('labels.project', { lng: opts.language }) + + ': ' + + expenseReport.project.identifier + + (expenseReport.project.name ? ' - ' + expenseReport.project.name : ''), + { + x: opts.xStart, + y: y, + size: opts.fontSize, + font: opts.font, + color: opts.textColor + } + ) // Traveler var y = y - opts.fontSize * 1.5 * 1.5 page.drawText( @@ -140,6 +154,7 @@ function drawGeneralInformation(page: pdf_lib.PDFPage, expenseReport: ExpenseRep font: opts.font, color: opts.textColor }) + return y } diff --git a/backend/pdf/healthCareCost.ts b/backend/pdf/healthCareCost.ts index 23f1b9f..004c260 100644 --- a/backend/pdf/healthCareCost.ts +++ b/backend/pdf/healthCareCost.ts @@ -117,6 +117,21 @@ function drawGeneralInformation(page: pdf_lib.PDFPage, healthCareCost: HealthCar color: opts.textColor }) + //Project identifier and name + var y = y - opts.fontSize * 1.5 + page.drawText( + i18n.t('labels.project', { lng: opts.language }) + + ': ' + + healthCareCost.project.identifier + + (healthCareCost.project.name ? ' - ' + healthCareCost.project.name : ''), + { + x: opts.xStart, + y: y, + size: opts.fontSize, + font: opts.font, + color: opts.textColor + } + ) // Isurance + patientName var y = y - opts.fontSize * 1.5 * 1.5 page.drawText( diff --git a/backend/pdf/travel.ts b/backend/pdf/travel.ts index af6eaee..7a6d1e3 100644 --- a/backend/pdf/travel.ts +++ b/backend/pdf/travel.ts @@ -127,7 +127,21 @@ function drawGeneralTravelInformation(page: pdf_lib.PDFPage, travel: Travel, opt font: opts.font, color: opts.textColor }) - + //Project identifier and name + var y = y - opts.fontSize * 1.5 + page.drawText( + i18n.t('labels.project', { lng: opts.language }) + + ': ' + + travel.project.identifier + + (travel.project.name ? ' - ' + travel.project.name : ''), + { + x: opts.xStart, + y: y, + size: opts.fontSize, + font: opts.font, + color: opts.textColor + } + ) // Traveler var y = y - opts.fontSize * 1.5 * 1.5 page.drawText(