From 09be33fd84affa9e3244d017892913b15b5cbc90 Mon Sep 17 00:00:00 2001 From: Bastien Chanot Date: Wed, 27 May 2026 07:12:46 +0200 Subject: [PATCH] fix(pdf): use plain logo in header, -com in footer, enlarge footer logos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Header: faunosteo_logo_horizontal (no .com) - Footer: faunosteo-horizontal-com (with .com branding) - Footer Faunosteo logo: 60x23 → 80x30 - Footer ZenQuality logo: 50x12 → 70x16 Co-Authored-By: Claude Opus 4.6 (1M context) --- src/pdf/export.ts | 19 +++++++++++++------ src/pdf/render/footer.ts | 8 ++++---- src/pdf/render/logo.ts | 7 ++++++- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/pdf/export.ts b/src/pdf/export.ts index 11a6e672..1894efeb 100644 --- a/src/pdf/export.ts +++ b/src/pdf/export.ts @@ -8,7 +8,7 @@ import { addObservationPage } from './render/observationPage' import { addConclusionPage } from './render/conclusionPage' import { attachReportJson } from './attachment' import { drawFooter } from './render/footer' -import { loadFaunosteoLogo, loadZenqualityLogo } from './render/logo' +import { loadFaunosteoLogo, loadFaunosteoComLogo, loadZenqualityLogo } from './render/logo' import { loadSvg } from '@/anatomy/svgLoader' import { parseSvgBones } from '@/anatomy/svgConvention' import { getSpecies } from '@/domain/species/registry' @@ -103,14 +103,21 @@ export async function exportReportToPdf( const zoneLabels = await buildZoneLabels(report) const findingsTree = await loadSpeciesFindings(report.animal.speciesId) - let logoPdfImage = null + let headerLogoPdf = null + let footerLogoPdf = null let zqLogoPdfImage = null try { - const logoPngBytes = await loadFaunosteoLogo() - logoPdfImage = await pdfDoc.embedPng(logoPngBytes) + const bytes = await loadFaunosteoLogo() + headerLogoPdf = await pdfDoc.embedPng(bytes) } catch (err) { console.warn('Faunosteo logo embed failed:', err) } + try { + const bytes = await loadFaunosteoComLogo() + footerLogoPdf = await pdfDoc.embedPng(bytes) + } catch (err) { + console.warn('Faunosteo -com logo embed failed:', err) + } try { const zqPngBytes = await loadZenqualityLogo() zqLogoPdfImage = await pdfDoc.embedPng(zqPngBytes) @@ -118,7 +125,7 @@ export async function exportReportToPdf( console.warn('ZenQuality logo embed failed:', err) } - const headerAssets = { logoPng: logoPdfImage } + const headerAssets = { logoPng: headerLogoPdf } const totalObs = report.observations.length for (let i = 0; i < totalObs; i += 1) { @@ -137,7 +144,7 @@ export async function exportReportToPdf( await addConclusionPage(pdfDoc, report, fonts, locale, headerAssets) const pages = pdfDoc.getPages() - const footerAssets = { logoPng: logoPdfImage, zqLogoPng: zqLogoPdfImage } + const footerAssets = { logoPng: footerLogoPdf, zqLogoPng: zqLogoPdfImage } pages.forEach((page, idx) => { drawFooter(page, fonts, idx + 1, pages.length, locale, footerAssets) }) diff --git a/src/pdf/render/footer.ts b/src/pdf/render/footer.ts index 9e4650d1..82585371 100644 --- a/src/pdf/render/footer.ts +++ b/src/pdf/render/footer.ts @@ -26,8 +26,8 @@ export function drawFooter( const muted = rgb(0.42, 0.39, 0.35) const accent = rgb(0.28, 0.56, 0.42) - const logoW = 60 - const logoH = 23 + const logoW = 80 + const logoH = 30 const rowY = FOOTER_BASE_Y + 14 const separatorY = rowY + logoH + 6 @@ -56,8 +56,8 @@ export function drawFooter( const poweredLabel = `${dict['footer.powered_by']} ` const poweredLabelW = fonts.bodyRegular.widthOfTextAtSize(poweredLabel, FONT_SIZE) - const zqLogoW = 50 - const zqLogoH = 12 + const zqLogoW = 70 + const zqLogoH = 16 const zqFallback = 'zenquality.fr' const zqFallbackW = fonts.bodyRegular.widthOfTextAtSize(zqFallback, FONT_SIZE) const poweredBlockW = assets.zqLogoPng diff --git a/src/pdf/render/logo.ts b/src/pdf/render/logo.ts index 15fe470d..f16f4de7 100644 --- a/src/pdf/render/logo.ts +++ b/src/pdf/render/logo.ts @@ -1,4 +1,5 @@ -const FAUNOSTEO_LOGO = '/assets/faunosteo-horizontal-com-512.png' +const FAUNOSTEO_LOGO = '/assets/faunosteo_logo_horizontal-512.png' +const FAUNOSTEO_COM_LOGO = '/assets/faunosteo-horizontal-com-512.png' const ZENQUALITY_LOGO = '/brand/zenquality-logo-fr.png' async function fetchPngBytes(path: string): Promise { @@ -11,6 +12,10 @@ export async function loadFaunosteoLogo(): Promise { return fetchPngBytes(FAUNOSTEO_LOGO) } +export async function loadFaunosteoComLogo(): Promise { + return fetchPngBytes(FAUNOSTEO_COM_LOGO) +} + export async function loadZenqualityLogo(): Promise { return fetchPngBytes(ZENQUALITY_LOGO) }