pierre/GeneIT
1
0
Fork 0
Code Issues Pull Requests 6 Packages Projects Releases Wiki Activity

Minor improvements of simple family tree
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Pierre HUBERT 2023-08-28 09:52:18 +02:00
parent 173303de27
commit 209cfe8965
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geneit_app/src/api/MemberApi.ts
View File

@ -170,6 +170,13 @@ export class Member implements MemberDataApi {
return birthDeath.join(" - "); return birthDeath.join(" - ");
} }
get displayBirthDeathShort(): string {
let birthDeath = [];
if (this.birth_year) birthDeath.push(this.birth_year.toString());
if (this.death_year) birthDeath.push(this.death_year.toString());
return birthDeath.join(" - ");
}
get hasContactInfo(): boolean { get hasContactInfo(): boolean {
return this.email || return this.email ||
this.phone || this.phone ||

14
geneit_app/src/widgets/simple_family_tree/SimpleFamilyTree.tsx
View File

@ -35,7 +35,7 @@ const SPOUSE_SPACING = 10;
/** /**
* Space between two siblings hierachy * Space between two siblings hierachy
*/ */
const SIBLINGS_SPACING = 0; const SIBLINGS_SPACING = 15;
/** /**
* Vertical space between two generations * Vertical space between two generations
@ -76,9 +76,10 @@ interface SimpleTreeNode {
*/ */
function memberCardWidth(m?: Member): number { function memberCardWidth(m?: Member): number {
if (!m) return 0; if (!m) return 0;
const nameWidth = getTextWidth(m.fullName, NAME_FONT); const firstNameWidth = getTextWidth(m.first_name ?? "", NAME_FONT);
const lastNameWidth = getTextWidth(m.lastNameUpperCase ?? "", NAME_FONT);
const birthDeathWidth = getTextWidth(m.displayBirthDeath, BIRTH_FONT); const birthDeathWidth = getTextWidth(m.displayBirthDeath, BIRTH_FONT);
return Math.max(FACE_WIDTH, nameWidth, birthDeathWidth); return Math.max(FACE_WIDTH, firstNameWidth, lastNameWidth, birthDeathWidth);
} }
function center(container_width: number, el_width: number): number { function center(container_width: number, el_width: number): number {
@ -389,12 +390,15 @@ function MemberCard(p: {
{p.member.lastNameUpperCase ?? ""} {p.member.lastNameUpperCase ?? ""}
</tspan> </tspan>
<tspan <tspan
x={center(w, getTextWidth(p.member.displayBirthDeath, BIRTH_FONT))} x={center(
w,
getTextWidth(p.member.displayBirthDeathShort, BIRTH_FONT)
)}
dy="14" dy="14"
font-size="10" font-size="10"
fontFamily="Roboto" fontFamily="Roboto"
> >
{p.member.displayBirthDeath} {p.member.displayBirthDeathShort}
</tspan> </tspan>
</text> </text>
</g> </g>