Display member tiles recursively
This commit is contained in:
parent
cb79a2755e
commit
ed5bd63bf6
@ -112,7 +112,7 @@ export class Member implements MemberDataApi {
|
||||
|
||||
return firstName.length === 0
|
||||
? this.last_name ?? ""
|
||||
: `${firstName} ${this.last_name ?? ""}`;
|
||||
: `${firstName} ${this.last_name?.toUpperCase() ?? ""}`;
|
||||
}
|
||||
|
||||
get invertedFullName(): string {
|
||||
@ -159,6 +159,13 @@ export class Member implements MemberDataApi {
|
||||
};
|
||||
}
|
||||
|
||||
get displayBirthDeath(): string {
|
||||
let birthDeath = [];
|
||||
if (this.dateOfBirth) birthDeath.push(fmtDate(this.dateOfBirth));
|
||||
if (this.dateOfDeath) birthDeath.push(fmtDate(this.dateOfDeath));
|
||||
return birthDeath.join(" - ");
|
||||
}
|
||||
|
||||
get hasContactInfo(): boolean {
|
||||
return this.email ||
|
||||
this.phone ||
|
||||
|
@ -1,19 +1,19 @@
|
||||
import React from "react";
|
||||
import { Couple } from "../../api/CoupleApi";
|
||||
import { Member, fmtDate } from "../../api/MemberApi";
|
||||
import { Member } from "../../api/MemberApi";
|
||||
import { FamilyTreeNode } from "../../utils/family_tree";
|
||||
|
||||
const FACE_WIDTH = 60;
|
||||
const FACE_HEIGHT = 70;
|
||||
|
||||
const CARD_WIDTH = 90;
|
||||
const CARD_HEIGHT = 80;
|
||||
const CARD_HEIGHT = 110;
|
||||
const SPOUSE_SPACING = 10;
|
||||
const CARD_SPACING = 20;
|
||||
const SIBLINGS_SPACING = 20;
|
||||
const LEVEL_SPACING = 20;
|
||||
|
||||
const COUPLE_CARDS_WIDTH = 2 * CARD_WIDTH + SPOUSE_SPACING;
|
||||
const NAME_CHAR_W = 7.1428;
|
||||
const BIRTH_CHAR_W = 5;
|
||||
|
||||
interface SimpleTreeSpouseInfo {
|
||||
member: Member;
|
||||
@ -27,6 +27,19 @@ interface SimpleTreeNode {
|
||||
width: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the width of a member card
|
||||
*/
|
||||
function memberCardWidth(m: Member): number {
|
||||
const nameWidth = m.fullName.length * NAME_CHAR_W;
|
||||
const birthDeathWidth = m.displayBirthDeath.length * BIRTH_CHAR_W;
|
||||
return Math.max(FACE_WIDTH, nameWidth, birthDeathWidth);
|
||||
}
|
||||
|
||||
function center(container_width: number, el_width: number): number {
|
||||
return Math.floor((container_width - el_width) / 2);
|
||||
}
|
||||
|
||||
function buildSimpleDownTreeNode(
|
||||
tree: FamilyTreeNode,
|
||||
depth: number
|
||||
@ -59,7 +72,9 @@ function buildSimpleDownTreeNode(
|
||||
|
||||
// Compute current level width
|
||||
let levelWidth =
|
||||
(node.spouse ? COUPLE_CARDS_WIDTH : CARD_WIDTH) + CARD_SPACING;
|
||||
memberCardWidth(node.member) +
|
||||
(node.spouse ? SPOUSE_SPACING + memberCardWidth(node.spouse.member) : 0) +
|
||||
CARD_SPACING;
|
||||
|
||||
// Compute down level width
|
||||
const downWidth =
|
||||
@ -122,9 +137,18 @@ function NodeArea(p: {
|
||||
y: number;
|
||||
node: SimpleTreeNode;
|
||||
}): React.ReactElement {
|
||||
const couple_x_offset = Math.floor(
|
||||
(p.node.width - (p.node.spouse ? COUPLE_CARDS_WIDTH : CARD_WIDTH)) / 2
|
||||
);
|
||||
const couple_x_offset =
|
||||
p.x +
|
||||
Math.floor(
|
||||
(p.node.width -
|
||||
(memberCardWidth(p.node.member) +
|
||||
(p.node.spouse
|
||||
? SPOUSE_SPACING + memberCardWidth(p.node.spouse.member)
|
||||
: 0))) /
|
||||
2
|
||||
);
|
||||
|
||||
let downXOffset = p.x;
|
||||
|
||||
return (
|
||||
<>
|
||||
@ -132,11 +156,23 @@ function NodeArea(p: {
|
||||
|
||||
{p.node.spouse && (
|
||||
<MemberCard
|
||||
x={couple_x_offset + CARD_WIDTH + SPOUSE_SPACING}
|
||||
x={couple_x_offset + memberCardWidth(p.node.member) + SPOUSE_SPACING}
|
||||
y={p.y}
|
||||
member={p.node.spouse.member}
|
||||
/>
|
||||
)}
|
||||
|
||||
{p.node.down.map((n) => {
|
||||
const el = (
|
||||
<NodeArea
|
||||
x={downXOffset}
|
||||
y={p.y + CARD_HEIGHT + LEVEL_SPACING}
|
||||
node={n}
|
||||
/>
|
||||
);
|
||||
downXOffset += n.width;
|
||||
return el;
|
||||
})}
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -146,31 +182,41 @@ function MemberCard(p: {
|
||||
y: number;
|
||||
member: Member;
|
||||
}): React.ReactElement {
|
||||
let birthDeath = [];
|
||||
if (p.member.dateOfBirth) birthDeath.push(fmtDate(p.member.dateOfBirth));
|
||||
if (p.member.dateOfDeath) birthDeath.push(fmtDate(p.member.dateOfDeath));
|
||||
|
||||
const w = memberCardWidth(p.member);
|
||||
return (
|
||||
<g transform={`translate(${p.x} ${p.y})`}>
|
||||
<g transform={`translate(${p.x} ${p.y})`} width={w} height={CARD_HEIGHT}>
|
||||
{/* Member image */}
|
||||
{p.member.hasPhoto ? (
|
||||
<image
|
||||
x={center(w, FACE_WIDTH)}
|
||||
href={p.member.thumbnailURL!}
|
||||
height={FACE_HEIGHT}
|
||||
width={FACE_WIDTH}
|
||||
preserveAspectRatio="xMidYMin slice"
|
||||
></image>
|
||||
) : (
|
||||
<GenderlessIcon width={FACE_WIDTH} height={FACE_HEIGHT} />
|
||||
<GenderlessIcon
|
||||
x={center(w, FACE_WIDTH)}
|
||||
width={FACE_WIDTH}
|
||||
height={FACE_HEIGHT}
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* Member text */}
|
||||
<text>
|
||||
<tspan x="0" dy="14">
|
||||
<text y={FACE_HEIGHT}>
|
||||
<tspan
|
||||
x={center(w, p.member.fullName.length * NAME_CHAR_W)}
|
||||
dy="14"
|
||||
font-size="13"
|
||||
>
|
||||
{p.member.fullName}
|
||||
</tspan>
|
||||
<tspan x="0" dy="14" font-size="10">
|
||||
{birthDeath.join(" - ")}
|
||||
<tspan
|
||||
x={center(w, p.member.displayBirthDeath.length * BIRTH_CHAR_W)}
|
||||
dy="14"
|
||||
font-size="10"
|
||||
>
|
||||
{p.member.displayBirthDeath}
|
||||
</tspan>
|
||||
</text>
|
||||
</g>
|
||||
@ -178,11 +224,12 @@ function MemberCard(p: {
|
||||
}
|
||||
|
||||
function GenderlessIcon(p: {
|
||||
x?: number;
|
||||
width: number;
|
||||
height: number;
|
||||
}): React.ReactElement {
|
||||
return (
|
||||
<g>
|
||||
<g transform={`translate(${p.x ?? 0} 0)`}>
|
||||
<rect height={p.height} width={p.width} fill="rgb(59, 85, 96)" />
|
||||
<g transform={`scale(${p.width * 0.001616})`}>
|
||||
<path
|
||||
|
Loading…
Reference in New Issue
Block a user