Merge pull request #159 from icefoganalytics/test

Report fonts
ytgov · Sep 26, 2023 · f3ab7fa · f3ab7fa
2 parents 5e0756b + 4d2703a
commit f3ab7fa
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,9 @@ RUN apk add --no-cache \
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
     PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
+COPY fonts/*.ttf /usr/share/fonts
+RUN fc-cache -fv
+
 RUN mkdir /home/node/app && chown -R node:node /home/node/app
 RUN mkdir /home/node/web && chown -R node:node /home/node/web
 

diff --git a/fonts/segoeui.ttf b/fonts/segoeui.ttf
diff --git a/fonts/segoeuib.ttf b/fonts/segoeuib.ttf
diff --git a/fonts/segoeuii.ttf b/fonts/segoeuii.ttf
diff --git a/fonts/segoeuil.ttf b/fonts/segoeuil.ttf
diff --git a/fonts/segoeuisl.ttf b/fonts/segoeuisl.ttf
diff --git a/fonts/segoeuiz.ttf b/fonts/segoeuiz.ttf
diff --git a/fonts/seguibl.ttf b/fonts/seguibl.ttf
diff --git a/fonts/seguibli.ttf b/fonts/seguibli.ttf
diff --git a/fonts/seguili.ttf b/fonts/seguili.ttf
diff --git a/fonts/seguisb.ttf b/fonts/seguisb.ttf
diff --git a/fonts/seguisbi.ttf b/fonts/seguisbi.ttf
diff --git a/fonts/seguisli.ttf b/fonts/seguisli.ttf
diff --git a/src/api/routes/admin/csl-certificate-audit-report-router.ts b/src/api/routes/admin/csl-certificate-audit-report-router.ts
@@ -16,9 +16,7 @@ const RELEVANT_LOAN_TYPES = [4, 5];
 cslCertificateAuditReportRouter.get(
   "/:FROM_DATE/:TO_DATE/:ACADEMIC_YEAR.:format",
   [param("ACADEMIC_YEAR").isInt().notEmpty(), param("FROM_DATE").notEmpty(), param("TO_DATE").notEmpty()],
-  //ReturnValidationErrors,
   async (req: Request, res: Response) => {
-    //const { filter = true } = req.query;
     const { FROM_DATE, TO_DATE, ACADEMIC_YEAR, format } = req.params;
 
     try {
@@ -53,7 +51,6 @@ cslCertificateAuditReportRouter.get(
           and d.csl_cert_seq_number IS NOT NULL
           and m.msfaa_status = 'Received'
         ORDER BY 1, CASE WHEN rt.id IN (${RELEVANT_LOAN_TYPES.join(",")}) THEN 1 ELSE 2 END, due_date, rt.id`);
-
 
       let data = {
         currentDate: new Date(),

diff --git a/src/api/templates/layouts/report-layout.handlebars b/src/api/templates/layouts/report-layout.handlebars
@@ -13,8 +13,8 @@
 
     /* Example CSS Styling */
     body {
-      font-family: Calibri;
-      font-size: 11pt;
+      font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+      font-size: 10pt;
       line-height: 1.2;
       margin: 30px;
       color: #000;
@@ -118,7 +118,7 @@
     .table th, .table td {
       text-align: left;
       padding: 1px 5px;
-      font-size: 13px
+      font-size: 12px
     }
   </style>
 </head>