Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8030d3d0ec | ||
|
|
bf3352d82c | ||
|
|
832204c3d8 | ||
|
|
3dfcdcd3b5 | ||
|
|
bffb7a1085 | ||
|
|
13f8394512 |
@@ -12,6 +12,7 @@
|
|||||||
const { runGeneration } = require('./order-controller');
|
const { runGeneration } = require('./order-controller');
|
||||||
const directus = require('../../services/directus-service');
|
const directus = require('../../services/directus-service');
|
||||||
const { countLetterPages } = require('../../lib/svg-generator');
|
const { countLetterPages } = require('../../lib/svg-generator');
|
||||||
|
const { getFormatKind } = require('../../lib/page-layout');
|
||||||
const { replacePlaceholders } = require('../../services/placeholder-service');
|
const { replacePlaceholders } = require('../../services/placeholder-service');
|
||||||
|
|
||||||
// Directus-Formatschlüssel → Backend-Formate
|
// Directus-Formatschlüssel → Backend-Formate
|
||||||
@@ -55,6 +56,9 @@ function buildDocuments(order, entries) {
|
|||||||
// Datei-Produkte (z. B. Unterschriftenservice): das „Schriftstück" ist das vom
|
// Datei-Produkte (z. B. Unterschriftenservice): das „Schriftstück" ist das vom
|
||||||
// Kunden hochgeladene Dokument – es wird NICHT generiert. Kuverts hingegen schon.
|
// Kunden hochgeladene Dokument – es wird NICHT generiert. Kuverts hingegen schon.
|
||||||
const istDatei = order.product?.input_mode === 'datei';
|
const istDatei = order.product?.input_mode === 'datei';
|
||||||
|
// Postkarte: Text links, Absender+Empfänger rechts, Briefmarkenfeld frei – ein SVG
|
||||||
|
// je Karte (kein separater Umschlag). Erkennung über die render_format-Art.
|
||||||
|
const istPostkarte = getFormatKind(letterFormat) === 'postkarte';
|
||||||
// Kuvert-only-Produkt: es wird KEIN Schriftstück generiert, nur die (adressierten)
|
// Kuvert-only-Produkt: es wird KEIN Schriftstück generiert, nur die (adressierten)
|
||||||
// Kuverts. Etwaige hochgeladene PDF-Briefe liegen als source_files am Auftrag.
|
// Kuverts. Etwaige hochgeladene PDF-Briefe liegen als source_files am Auftrag.
|
||||||
const istKuvertOnly = order.product?.type === 'envelope';
|
const istKuvertOnly = order.product?.type === 'envelope';
|
||||||
@@ -78,9 +82,25 @@ function buildDocuments(order, entries) {
|
|||||||
// Briefnummer 1 gehört. Vorschau nummeriert identisch (siehe skrift-orders).
|
// Briefnummer 1 gehört. Vorschau nummeriert identisch (siehe skrift-orders).
|
||||||
const nr = Number(entry.letter_number) || (i + 1);
|
const nr = Number(entry.letter_number) || (i + 1);
|
||||||
|
|
||||||
if (!istDatei && !istKuvertOnly) {
|
// Abweichender Text je Schriftstück hat Vorrang; sonst Standardtext.
|
||||||
// Abweichender Text je Schriftstück (#5) hat Vorrang; sonst Standardtext.
|
|
||||||
const briefText = (entry.text && String(entry.text).trim()) ? entry.text : (order.text_template || '');
|
const briefText = (entry.text && String(entry.text).trim()) ? entry.text : (order.text_template || '');
|
||||||
|
|
||||||
|
// Postkarte: EIN Dokument mit Text + Absender + Empfänger (über Marker getrennt).
|
||||||
|
if (istPostkarte) {
|
||||||
|
const recip = addressText(entry);
|
||||||
|
const sender = order.envelope_sender ? String(order.envelope_sender).trim() : '';
|
||||||
|
let combined = String(briefText || '');
|
||||||
|
if (sender) combined += `[[pk_abs]]${sender}`;
|
||||||
|
if (recip) combined += `[[pk_adr]]${recip}`;
|
||||||
|
documents.push({
|
||||||
|
index: nr, type: 'postcard', text: combined, format: letterFormat, font,
|
||||||
|
placeholders, fontScale: fontScaleLetter, realisticHandwriting: realistisch,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Kein Schriftstück erzeugen, wenn kein Text hinterlegt ist (z. B. „nur Kuverts drucken").
|
||||||
|
if (!istDatei && !istKuvertOnly && String(briefText).trim()) {
|
||||||
documents.push({
|
documents.push({
|
||||||
index: nr,
|
index: nr,
|
||||||
type: 'letter',
|
type: 'letter',
|
||||||
@@ -169,6 +189,7 @@ async function generateFromDirectus(req, res, next) {
|
|||||||
rawText: order.text_template || null,
|
rawText: order.text_template || null,
|
||||||
// Absender fürs Kuvert (manuelle Aufträge): oben links, Empfänger unten rechts.
|
// Absender fürs Kuvert (manuelle Aufträge): oben links, Empfänger unten rechts.
|
||||||
envelopeSender: order.envelope_sender || null,
|
envelopeSender: order.envelope_sender || null,
|
||||||
|
envelopeSenderScale: Number(order.envelope_sender_scale) || 1,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ const fsSync = require('fs');
|
|||||||
const path = require('path');
|
const path = require('path');
|
||||||
const config = require('../../config');
|
const config = require('../../config');
|
||||||
const { scriptalizeBatch } = require('../../services/scriptalizer-service');
|
const { scriptalizeBatch } = require('../../services/scriptalizer-service');
|
||||||
const { generateLetterSVG, generateEnvelopeSVG, generateLetterPages } = require('../../lib/svg-generator');
|
const { generateLetterSVG, generateEnvelopeSVG, generatePostcardSVG, generateLetterPages } = require('../../lib/svg-generator');
|
||||||
const { replacePlaceholders, generateAllCSVs } = require('../../services/placeholder-service');
|
const { replacePlaceholders, generateAllCSVs } = require('../../services/placeholder-service');
|
||||||
const { TAB_MARKER } = require('../../lib/svg-font-engine');
|
const { TAB_MARKER } = require('../../lib/svg-font-engine');
|
||||||
|
|
||||||
@@ -220,7 +220,7 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
|||||||
|
|
||||||
for (const letter of fontLetters) {
|
for (const letter of fontLetters) {
|
||||||
const raw = letter.processedText;
|
const raw = letter.processedText;
|
||||||
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|\[\[seitenumbruch\]\]|[&|])/gi);
|
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|\[\[seitenumbruch\]\]|\[\[pk_abs\]\]|\[\[pk_adr\]\]|[&|])/gi);
|
||||||
const segments = [], markers = [];
|
const segments = [], markers = [];
|
||||||
for (let i = 0; i < parts.length; i++) {
|
for (let i = 0; i < parts.length; i++) {
|
||||||
if (i % 2 === 0) segments.push(parts[i]);
|
if (i % 2 === 0) segments.push(parts[i]);
|
||||||
@@ -272,6 +272,7 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
|||||||
const letter = processedLetters[i];
|
const letter = processedLetters[i];
|
||||||
const absoluteIndex = letter.index !== undefined ? letter.index : i;
|
const absoluteIndex = letter.index !== undefined ? letter.index : i;
|
||||||
const isEnv = letter.type === 'envelope';
|
const isEnv = letter.type === 'envelope';
|
||||||
|
const isPostcard = letter.type === 'postcard';
|
||||||
const pad = String(absoluteIndex).padStart(3, '0');
|
const pad = String(absoluteIndex).padStart(3, '0');
|
||||||
|
|
||||||
// Mehrseitiger Brief → N Seiten-Dateien letter_NNN_pM.svg (Seite 1..N).
|
// Mehrseitiger Brief → N Seiten-Dateien letter_NNN_pM.svg (Seite 1..N).
|
||||||
@@ -330,7 +331,12 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
|||||||
if (isEnv) {
|
if (isEnv) {
|
||||||
svgResult = generateEnvelopeSVG(
|
svgResult = generateEnvelopeSVG(
|
||||||
scriptalizedText, letter.format, letter.envelopeType,
|
scriptalizedText, letter.format, letter.envelopeType,
|
||||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, sender: metadata.envelopeSender || '' }
|
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, sender: metadata.envelopeSender || '', senderScale: metadata.envelopeSenderScale || 1 }
|
||||||
|
);
|
||||||
|
} else if (isPostcard) {
|
||||||
|
svgResult = generatePostcardSVG(
|
||||||
|
scriptalizedText, letter.format,
|
||||||
|
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, senderScale: metadata.envelopeSenderScale || 1 }
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
svgResult = generateLetterSVG(
|
svgResult = generateLetterSVG(
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ const { scriptalizeBatch } = require("../../services/scriptalizer-service");
|
|||||||
const {
|
const {
|
||||||
generateLetterSVG,
|
generateLetterSVG,
|
||||||
generateEnvelopeSVG,
|
generateEnvelopeSVG,
|
||||||
|
generatePostcardSVG,
|
||||||
generateLetterPages,
|
generateLetterPages,
|
||||||
} = require("../../lib/svg-generator");
|
} = require("../../lib/svg-generator");
|
||||||
const {
|
const {
|
||||||
@@ -101,7 +102,7 @@ async function generateBatch(req, res, next) {
|
|||||||
for (const letter of processedLetters) {
|
for (const letter of processedLetters) {
|
||||||
const raw = letter.processedText;
|
const raw = letter.processedText;
|
||||||
// Splitten an \t UND [[signaturN]] (mit capture-Gruppe → Marker bleiben erhalten)
|
// Splitten an \t UND [[signaturN]] (mit capture-Gruppe → Marker bleiben erhalten)
|
||||||
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|\[\[seitenumbruch\]\]|[&|])/gi);
|
const parts = raw.split(/(\t|\[\[signatur\d+\]\]|\[\[seitenumbruch\]\]|\[\[pk_abs\]\]|\[\[pk_adr\]\]|[&|])/gi);
|
||||||
const segments = [], markers = [];
|
const segments = [], markers = [];
|
||||||
for (let i = 0; i < parts.length; i++) {
|
for (let i = 0; i < parts.length; i++) {
|
||||||
if (i % 2 === 0) segments.push(parts[i]);
|
if (i % 2 === 0) segments.push(parts[i]);
|
||||||
@@ -167,7 +168,7 @@ async function generateBatch(req, res, next) {
|
|||||||
if (letter.type === "envelope") {
|
if (letter.type === "envelope") {
|
||||||
const svgResult = generateEnvelopeSVG(
|
const svgResult = generateEnvelopeSVG(
|
||||||
scriptalizedText, letter.format, letter.envelopeType,
|
scriptalizedText, letter.format, letter.envelopeType,
|
||||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, sender: letter.sender || '' }
|
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, sender: letter.sender || '', senderScale: letter.senderScale || 1 }
|
||||||
);
|
);
|
||||||
if (svgResult.overflow) hasOverflow = true;
|
if (svgResult.overflow) hasOverflow = true;
|
||||||
const filename = `envelope_${pad}.svg`;
|
const filename = `envelope_${pad}.svg`;
|
||||||
@@ -177,6 +178,19 @@ async function generateBatch(req, res, next) {
|
|||||||
lineCount: svgResult.lineCount, lineLimit: svgResult.lineLimit, overflow: svgResult.overflow,
|
lineCount: svgResult.lineCount, lineLimit: svgResult.lineLimit, overflow: svgResult.overflow,
|
||||||
recipientName: null,
|
recipientName: null,
|
||||||
});
|
});
|
||||||
|
} else if (letter.type === "postcard") {
|
||||||
|
const svgResult = generatePostcardSVG(scriptalizedText, letter.format, {
|
||||||
|
font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false,
|
||||||
|
fontScale: letter.fontScale, senderScale: letter.senderScale || 1,
|
||||||
|
});
|
||||||
|
if (svgResult.overflow) hasOverflow = true;
|
||||||
|
const filename = `letter_${pad}.svg`;
|
||||||
|
await fs.writeFile(path.join(sessionDir, filename), svgResult.svg, "utf8");
|
||||||
|
files.push({
|
||||||
|
index: absoluteIndex, filename, url: `/api/preview/${finalSessionId}/${filename}`,
|
||||||
|
lineCount: svgResult.lineCount, lineLimit: svgResult.lineLimit, overflow: svgResult.overflow,
|
||||||
|
recipientName,
|
||||||
|
});
|
||||||
} else if (letter.multiPage) {
|
} else if (letter.multiPage) {
|
||||||
// Mehrseitiger Brief: Text fließt über N Seiten – kein Überlauf-Fehler.
|
// Mehrseitiger Brief: Text fließt über N Seiten – kein Überlauf-Fehler.
|
||||||
const { pages } = generateLetterPages(scriptalizedText, letter.format, {
|
const { pages } = generateLetterPages(scriptalizedText, letter.format, {
|
||||||
|
|||||||
@@ -21,11 +21,14 @@ const DEFAULT_PAGE_FORMATS = {
|
|||||||
din_lang: { widthMm: 220, heightMm: 110 },
|
din_lang: { widthMm: 220, heightMm: 110 },
|
||||||
c6: { widthMm: 162, heightMm: 114 },
|
c6: { widthMm: 162, heightMm: 114 },
|
||||||
};
|
};
|
||||||
|
// Art des Formats (brief/umschlag/postkarte) – steuert, WAS generiert wird.
|
||||||
|
const DEFAULT_KINDS = { a4: 'brief', a6p: 'brief', a6l: 'brief', din_lang: 'umschlag', c6: 'umschlag' };
|
||||||
|
|
||||||
// Live-Cache (wird von applyRenderFormats ersetzt). Start = Defaults.
|
// Live-Cache (wird von applyRenderFormats ersetzt). Start = Defaults.
|
||||||
let LINE_LIMITS = { ...DEFAULT_LINE_LIMITS };
|
let LINE_LIMITS = { ...DEFAULT_LINE_LIMITS };
|
||||||
let FORMAT_LAYOUTS = { ...DEFAULT_FORMAT_LAYOUTS };
|
let FORMAT_LAYOUTS = { ...DEFAULT_FORMAT_LAYOUTS };
|
||||||
let PAGE_FORMATS = { ...DEFAULT_PAGE_FORMATS };
|
let PAGE_FORMATS = { ...DEFAULT_PAGE_FORMATS };
|
||||||
|
let KINDS = { ...DEFAULT_KINDS };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Übernimmt Format-Definitionen aus Directus (render_formats) in den Cache.
|
* Übernimmt Format-Definitionen aus Directus (render_formats) in den Cache.
|
||||||
@@ -37,9 +40,11 @@ function applyRenderFormats(rows) {
|
|||||||
const pf = { ...DEFAULT_PAGE_FORMATS };
|
const pf = { ...DEFAULT_PAGE_FORMATS };
|
||||||
const fl = { ...DEFAULT_FORMAT_LAYOUTS };
|
const fl = { ...DEFAULT_FORMAT_LAYOUTS };
|
||||||
const ll = { ...DEFAULT_LINE_LIMITS };
|
const ll = { ...DEFAULT_LINE_LIMITS };
|
||||||
|
const kn = { ...DEFAULT_KINDS };
|
||||||
for (const r of Array.isArray(rows) ? rows : []) {
|
for (const r of Array.isArray(rows) ? rows : []) {
|
||||||
const k = String(r.key || '').toLowerCase();
|
const k = String(r.key || '').toLowerCase();
|
||||||
if (!k) continue;
|
if (!k) continue;
|
||||||
|
if (r.kind) kn[k] = String(r.kind).toLowerCase();
|
||||||
if (r.page_width_mm && r.page_height_mm) {
|
if (r.page_width_mm && r.page_height_mm) {
|
||||||
pf[k] = { widthMm: Number(r.page_width_mm), heightMm: Number(r.page_height_mm) };
|
pf[k] = { widthMm: Number(r.page_width_mm), heightMm: Number(r.page_height_mm) };
|
||||||
}
|
}
|
||||||
@@ -57,7 +62,12 @@ function applyRenderFormats(rows) {
|
|||||||
PAGE_FORMATS = pf;
|
PAGE_FORMATS = pf;
|
||||||
FORMAT_LAYOUTS = fl;
|
FORMAT_LAYOUTS = fl;
|
||||||
LINE_LIMITS = ll;
|
LINE_LIMITS = ll;
|
||||||
signaledMisses.clear();
|
KINDS = kn;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Art eines Formats (brief/umschlag/postkarte). Unbekannt → 'brief'.
|
||||||
|
function getFormatKind(format) {
|
||||||
|
return KINDS[String(format).toLowerCase()] || 'brief';
|
||||||
}
|
}
|
||||||
|
|
||||||
// mm in Pixel umrechnen
|
// mm in Pixel umrechnen
|
||||||
@@ -72,12 +82,12 @@ function mmToPx(mm) {
|
|||||||
// stündliche Aktualisierung abzuwarten. Für DIESEN Aufruf greift noch der
|
// stündliche Aktualisierung abzuwarten. Für DIESEN Aufruf greift noch der
|
||||||
// Default – der nächste Aufruf hat das Format.
|
// Default – der nächste Aufruf hat das Format.
|
||||||
let missHandler = null;
|
let missHandler = null;
|
||||||
const signaledMisses = new Set();
|
|
||||||
function setFormatMissHandler(fn) { missHandler = fn; }
|
function setFormatMissHandler(fn) { missHandler = fn; }
|
||||||
function signalMiss(key) {
|
function signalMiss(key) {
|
||||||
const k = String(key || '').toLowerCase();
|
const k = String(key || '').toLowerCase();
|
||||||
if (!missHandler || !k || signaledMisses.has(k)) return;
|
if (!missHandler || !k) return;
|
||||||
signaledMisses.add(k);
|
// Kein „schon gemeldet"-Merker mehr: sonst blieb ein Key hängen, wenn die
|
||||||
|
// Nachlade-Drossel gerade griff. Die Drossel im Handler verhindert Dauerfeuer.
|
||||||
try { missHandler(k); } catch { /* egal */ }
|
try { missHandler(k); } catch { /* egal */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,6 +150,7 @@ module.exports = {
|
|||||||
getLayoutForFormat,
|
getLayoutForFormat,
|
||||||
getPageDimensions,
|
getPageDimensions,
|
||||||
getLineLimit,
|
getLineLimit,
|
||||||
|
getFormatKind,
|
||||||
escapeXml,
|
escapeXml,
|
||||||
applyRenderFormats,
|
applyRenderFormats,
|
||||||
setFormatMissHandler,
|
setFormatMissHandler,
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ function generateEnvelopeSVG(text, format, type, options = {}) {
|
|||||||
// type === 'recipient' / 'free'. Ist ein Absender gesetzt, sitzt der
|
// type === 'recipient' / 'free'. Ist ein Absender gesetzt, sitzt der
|
||||||
// Empfänger UNTEN RECHTS (klassisches Kuvert), sonst wie bisher oben links.
|
// Empfänger UNTEN RECHTS (klassisches Kuvert), sonst wie bisher oben links.
|
||||||
const hatAbsender = !!String(options.sender || '').trim();
|
const hatAbsender = !!String(options.sender || '').trim();
|
||||||
const maxWidthPx = Math.min(widthPx - marginLeftPx - 20, widthPx * (hatAbsender ? 0.48 : 0.6));
|
const maxWidthPx = Math.min(widthPx - marginLeftPx - 20, widthPx * (hatAbsender ? 0.36 : 0.6));
|
||||||
|
|
||||||
lines = wrapTextToLinesByWidth({
|
lines = wrapTextToLinesByWidth({
|
||||||
text: String(text || ''),
|
text: String(text || ''),
|
||||||
@@ -307,8 +307,11 @@ function generateEnvelopeSVG(text, format, type, options = {}) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (hatAbsender) {
|
if (hatAbsender) {
|
||||||
startX = Math.max(marginLeftPx, Math.round(widthPx * 0.48));
|
// Empfänger unten rechts – bewusst über Höhen-/Breiten-Anteile, damit der
|
||||||
startY = Math.max(marginTopPx + fontSizePx, heightPx - marginTopPx - lines.length * lineHeightPx + fontSizePx);
|
// große Kuvert-Rand (marginTop bis ~50 % der Höhe) nicht alles nach oben zieht.
|
||||||
|
startX = Math.round(widthPx * 0.60);
|
||||||
|
const untenBaseline = heightPx * 0.80; // unterste Zeile ~20 % über der Unterkante
|
||||||
|
startY = Math.round(untenBaseline - Math.max(0, lines.length - 1) * lineHeightPx);
|
||||||
} else {
|
} else {
|
||||||
startX = marginLeftPx;
|
startX = marginLeftPx;
|
||||||
startY = marginTopPx + fontSizePx;
|
startY = marginTopPx + fontSizePx;
|
||||||
@@ -354,18 +357,22 @@ function generateEnvelopeSVG(text, format, type, options = {}) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Absender oben links (kleiner) – nur wenn gesetzt und kein zentrierter Freitext.
|
// Absender oben links – nur wenn gesetzt und kein zentrierter Freitext.
|
||||||
const absender = String(options.sender || '').trim();
|
const absender = String(options.sender || '').trim();
|
||||||
if (absender && type !== 'custom') {
|
if (absender && type !== 'custom') {
|
||||||
const absSize = fontSizePx * 0.62;
|
// Eigene Absender-Größe (Prozent, 1 = 100%). Grundgröße = Empfänger-Grundschrift
|
||||||
const absLH = lineHeightPx * 0.62;
|
// (früher fix 0.62 → zu klein). Über options.senderScale prozentual einstellbar.
|
||||||
|
const senderScale = Math.max(0.5, Math.min(2, Number(options.senderScale) || 1));
|
||||||
|
const absSize = FONT_SIZE_PX * senderScale;
|
||||||
|
const absLH = lineHeightPx * (absSize / fontSizePx);
|
||||||
const absLines = absender.split('\n').map((l) => l.replace(/\s+$/, ''));
|
const absLines = absender.split('\n').map((l) => l.replace(/\s+$/, ''));
|
||||||
const absPaths = layoutTextToPaths({
|
const absPaths = layoutTextToPaths({
|
||||||
lines: absLines,
|
lines: absLines,
|
||||||
fontFileName: fontConfig.file,
|
fontFileName: fontConfig.file,
|
||||||
fontSizePx: absSize,
|
fontSizePx: absSize,
|
||||||
startX: marginLeftPx,
|
// Echt oben links – unabhängig vom großen Kuvert-Rand.
|
||||||
startY: marginTopPx + absSize,
|
startX: Math.round(widthPx * 0.06),
|
||||||
|
startY: Math.round(heightPx * 0.14),
|
||||||
lineHeightPx: absLH,
|
lineHeightPx: absLH,
|
||||||
realisticHandwriting: options.realisticHandwriting ?? false,
|
realisticHandwriting: options.realisticHandwriting ?? false,
|
||||||
});
|
});
|
||||||
@@ -405,6 +412,114 @@ function generateEnvelopeSVG(text, format, type, options = {}) {
|
|||||||
return { svg: svg.trim(), overflow: lineCount > lineLimit, lineCount, lineLimit };
|
return { svg: svg.trim(), overflow: lineCount > lineLimit, lineCount, lineLimit };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Postkarten-Marker: teilen den (bereits scriptalisierten) Text in Body/Absender/
|
||||||
|
// Empfänger. Werden in der Scriptalisierung wie [[signaturN]] als Marker erhalten.
|
||||||
|
const PK_ABS = '[[pk_abs]]';
|
||||||
|
const PK_ADR = '[[pk_adr]]';
|
||||||
|
function splitPostcardText(text) {
|
||||||
|
let rest = String(text || '');
|
||||||
|
let recipient = '';
|
||||||
|
let sender = '';
|
||||||
|
const iAdr = rest.indexOf(PK_ADR);
|
||||||
|
if (iAdr >= 0) { recipient = rest.slice(iAdr + PK_ADR.length); rest = rest.slice(0, iAdr); }
|
||||||
|
const iAbs = rest.indexOf(PK_ABS);
|
||||||
|
if (iAbs >= 0) { sender = rest.slice(iAbs + PK_ABS.length); rest = rest.slice(0, iAbs); }
|
||||||
|
return { body: rest.trim(), sender: sender.trim(), recipient: recipient.trim() };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Postkarte (einseitig): Text auf der LINKEN Hälfte, Absender + Empfänger auf der
|
||||||
|
* RECHTEN Hälfte, Briefmarkenfeld (leerer Bereich) oben rechts. Für A6/DIN-lang-
|
||||||
|
* Postkarten – ein SVG je Karte (ein Plotter-Durchlauf). Der Text kommt bereits
|
||||||
|
* scriptalisiert an und enthält die Marker [[pk_abs]] / [[pk_adr]].
|
||||||
|
*/
|
||||||
|
function generatePostcardSVG(text, format, options = {}) {
|
||||||
|
const fontKey = normalizeFontKey(options.font);
|
||||||
|
const fontConfig = SVG_FONT_CONFIG[fontKey];
|
||||||
|
const realistic = options.realisticHandwriting ?? false;
|
||||||
|
|
||||||
|
const { widthPx, heightPx, widthMm, heightMm } = getPageDimensions(format);
|
||||||
|
const { marginTopPx, marginLeftPx, lineHeightPx: baseLineHeightPx } = getLayoutForFormat(format);
|
||||||
|
|
||||||
|
const { body, sender, recipient } = splitPostcardText(text);
|
||||||
|
|
||||||
|
const fontScale = Math.max(0.8, Math.min(1.5, Number(options.fontScale) || 1));
|
||||||
|
const fontSizePx = FONT_SIZE_PX * fontScale;
|
||||||
|
const lineHeightPx = baseLineHeightPx * fontScale;
|
||||||
|
|
||||||
|
// Zonen: linke Hälfte Text, rechte Hälfte Adresse; Briefmarke oben rechts frei.
|
||||||
|
const textLeft = marginLeftPx;
|
||||||
|
const textRight = widthPx * 0.48;
|
||||||
|
const textWidth = Math.max(mmToPx(30), textRight - textLeft);
|
||||||
|
const addrLeft = widthPx * 0.52;
|
||||||
|
const addrRight = widthPx - mmToPx(8);
|
||||||
|
const addrWidth = Math.max(mmToPx(30), addrRight - addrLeft);
|
||||||
|
const stampW = mmToPx(25);
|
||||||
|
const stampX = widthPx - mmToPx(6) - stampW;
|
||||||
|
|
||||||
|
const paths = [];
|
||||||
|
let bodyLineCount = 0;
|
||||||
|
|
||||||
|
// Text links.
|
||||||
|
if (body) {
|
||||||
|
const bodyLines = wrapTextToLinesByWidth({ text: body, maxWidthPx: textWidth, fontFileName: fontConfig.file, fontSizePx });
|
||||||
|
bodyLineCount = bodyLines.length;
|
||||||
|
paths.push(...layoutTextToPaths({
|
||||||
|
lines: bodyLines, fontFileName: fontConfig.file, fontSizePx,
|
||||||
|
startX: textLeft, startY: marginTopPx + fontSizePx, lineHeightPx, realisticHandwriting: realistic,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Absender klein oben in der Adresszone, links neben dem Briefmarkenfeld.
|
||||||
|
if (sender) {
|
||||||
|
const senderScale = Math.max(0.5, Math.min(2, Number(options.senderScale) || 1));
|
||||||
|
const senderSize = FONT_SIZE_PX * 0.7 * senderScale;
|
||||||
|
const senderLH = lineHeightPx * (senderSize / fontSizePx);
|
||||||
|
const senderWidth = Math.max(mmToPx(30), Math.min(addrWidth, stampX - addrLeft - mmToPx(3)));
|
||||||
|
const senderLines = wrapTextToLinesByWidth({ text: sender, maxWidthPx: senderWidth, fontFileName: fontConfig.file, fontSizePx: senderSize });
|
||||||
|
paths.push(...layoutTextToPaths({
|
||||||
|
lines: senderLines, fontFileName: fontConfig.file, fontSizePx: senderSize,
|
||||||
|
startX: addrLeft, startY: mmToPx(8) + senderSize, lineHeightPx: senderLH, realisticHandwriting: realistic,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empfänger in der unteren Hälfte der Adresszone (klassische Anschriftzone).
|
||||||
|
if (recipient) {
|
||||||
|
const recLines = wrapTextToLinesByWidth({ text: recipient, maxWidthPx: addrWidth, fontFileName: fontConfig.file, fontSizePx });
|
||||||
|
const recBottom = heightPx * 0.90;
|
||||||
|
const recStartY = recBottom - Math.max(0, recLines.length - 1) * lineHeightPx;
|
||||||
|
paths.push(...layoutTextToPaths({
|
||||||
|
lines: recLines, fontFileName: fontConfig.file, fontSizePx,
|
||||||
|
startX: addrLeft, startY: recStartY, lineHeightPx, realisticHandwriting: realistic,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
const pathElements = paths
|
||||||
|
.map((p) => `<path d="${escapeXml(p.d)}"
|
||||||
|
transform="${p.transform}"
|
||||||
|
stroke="#000000"
|
||||||
|
stroke-width="0.6"
|
||||||
|
fill="none"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
vector-effect="non-scaling-stroke"
|
||||||
|
/>`)
|
||||||
|
.join('\n ');
|
||||||
|
|
||||||
|
const svg = `<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
|
width="${widthMm}mm"
|
||||||
|
height="${heightMm}mm"
|
||||||
|
viewBox="0 0 ${widthPx} ${heightPx}">
|
||||||
|
<rect x="0" y="0" width="${widthPx}" height="${heightPx}" fill="#FFFFFF" />
|
||||||
|
${pathElements}
|
||||||
|
</svg>`;
|
||||||
|
|
||||||
|
// Überlauf: passt der Text in die linke Hälfte (Höhe)?
|
||||||
|
const available = heightPx - (marginTopPx + fontSizePx) - fontSizePx * 0.5;
|
||||||
|
const lineLimit = Math.max(1, Math.floor(available / lineHeightPx) + 1);
|
||||||
|
return { svg: svg.trim(), overflow: bodyLineCount > lineLimit, lineCount: bodyLineCount, lineLimit };
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mehrseitiges Schriftstück: Der Text fließt automatisch über so viele Seiten,
|
* Mehrseitiges Schriftstück: Der Text fließt automatisch über so viele Seiten,
|
||||||
* wie nötig (linesPerPage = Zeilenlimit des Formats). Ein erzwungener Umbruch ist
|
* wie nötig (linesPerPage = Zeilenlimit des Formats). Ein erzwungener Umbruch ist
|
||||||
@@ -500,6 +615,7 @@ function countLetterPages(text, format, options = {}) {
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
generateLetterSVG,
|
generateLetterSVG,
|
||||||
generateEnvelopeSVG,
|
generateEnvelopeSVG,
|
||||||
|
generatePostcardSVG,
|
||||||
generateLetterPages,
|
generateLetterPages,
|
||||||
countLetterPages
|
countLetterPages
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -27,10 +27,11 @@ async function refreshRenderFormats() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unbekanntes Format angefragt → sofort nachladen (max. alle 30 s, damit ein
|
// Unbekanntes Format angefragt → sofort nachladen (max. alle 5 s, damit ein
|
||||||
// dauerhaft unbekanntes Format kein Dauerfeuer auslöst).
|
// dauerhaft unbekanntes Format kein Dauerfeuer auslöst). Neu in Directus angelegte
|
||||||
|
// Formate sind damit ohne Backend-Neustart binnen weniger Sekunden aktiv.
|
||||||
setFormatMissHandler((key) => {
|
setFormatMissHandler((key) => {
|
||||||
if (Date.now() - lastFormatRefresh < 30 * 1000) return;
|
if (Date.now() - lastFormatRefresh < 5 * 1000) return;
|
||||||
console.log(`[Formate] Unbekanntes Format "${key}" angefragt – lade Formate nach.`);
|
console.log(`[Formate] Unbekanntes Format "${key}" angefragt – lade Formate nach.`);
|
||||||
refreshRenderFormats();
|
refreshRenderFormats();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ async function directusFetch(path, options = {}) {
|
|||||||
async function fetchOrder(orderId) {
|
async function fetchOrder(orderId) {
|
||||||
const fields = [
|
const fields = [
|
||||||
'id', 'order_number', 'customer_email', 'font', 'status',
|
'id', 'order_number', 'customer_email', 'font', 'status',
|
||||||
'needs_envelope', 'envelope_labeling', 'envelope_text', 'envelope_format', 'envelope_sender',
|
'needs_envelope', 'envelope_labeling', 'envelope_text', 'envelope_format', 'envelope_sender', 'envelope_sender_scale',
|
||||||
'text_template', 'motif_mode', 'own_cards', 'entries_count', 'preview_session',
|
'text_template', 'motif_mode', 'own_cards', 'entries_count', 'preview_session',
|
||||||
'source_file', 'product.key', 'product.type', 'product.input_mode', 'format.key',
|
'source_file', 'product.key', 'product.type', 'product.input_mode', 'format.key',
|
||||||
'font_scale_letter', 'font_scale_envelope', 'signatures_manual', 'multi_page', 'realistic',
|
'font_scale_letter', 'font_scale_envelope', 'signatures_manual', 'multi_page', 'realistic',
|
||||||
@@ -106,7 +106,7 @@ async function fetchAssetBuffer(fileId) {
|
|||||||
async function fetchRenderFormats() {
|
async function fetchRenderFormats() {
|
||||||
return directusFetch(
|
return directusFetch(
|
||||||
'/items/render_formats?filter[active][_eq]=true&limit=-1' +
|
'/items/render_formats?filter[active][_eq]=true&limit=-1' +
|
||||||
'&fields=key,page_width_mm,page_height_mm,margin_top_mm,margin_left_mm,margin_right_mm,line_height_factor,line_limit',
|
'&fields=key,kind,page_width_mm,page_height_mm,margin_top_mm,margin_left_mm,margin_right_mm,line_height_factor,line_limit',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user