From 89c378121928fab3da46793e89ca6ef9262cc41a Mon Sep 17 00:00:00 2001 From: Pierre Hubert Date: Wed, 23 Aug 2023 16:19:45 +0200 Subject: [PATCH] Fix special characters --- .../widgets/complex_family_tree/ComplexFamilyTree.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/geneit_app/src/widgets/complex_family_tree/ComplexFamilyTree.tsx b/geneit_app/src/widgets/complex_family_tree/ComplexFamilyTree.tsx index 9d1e7f1..24e4a39 100644 --- a/geneit_app/src/widgets/complex_family_tree/ComplexFamilyTree.tsx +++ b/geneit_app/src/widgets/complex_family_tree/ComplexFamilyTree.tsx @@ -48,9 +48,11 @@ export function ComplexFamilyTree(p: { d.data.dead ? "✝" : "" }`, (d) => { - let s = `${d.data.birthday || ""} ${ - d.data.deathday ? " ✝ " + d.data.deathday : "" - }`; + let birthDeath = []; + if (d.data.birthday) birthDeath.push(d.data.birthday); + if (d.data.deathday) birthDeath.push(d.data.deathday); + + let s = birthDeath.join(" -> "); if (d.data.wedding_state || d.data.dateOfWedding) { let weddingInfo = []; @@ -113,6 +115,8 @@ export function ComplexFamilyTree(p: { dstSVG = dstSVG.replaceAll(`>UNKNOWN<`, `fill="#000">INCONNU<`); + dstSVG = dstSVG.replaceAll("✝", " "); + let womanTiles = getAllIndexes(dstSVG, "card-female"); for (const i of womanTiles) { dstSVG =