Merge remote-tracking branch 'origin/master'

.firebase/hosting.ZGlzdFxrYWlteW8tbWFuYWdlbWVudA.cache

@@ -0,0 +1,7 @@
+browser/styles-5INURTSO.css,1780145996852,46b50c321b39e89a491b6727a01628c34245605a30beb3e7414c5e01cff90e6e
+prerendered-routes.json,1780145996846,acea2ed63a273ab4ca21a5071e93c8246d013bca031410b2d34087a30f99602d
+index.html,1780146161811,2d2b0c813628a70bd46d4e7ccc22c7b650055109ba37923dd6adf82a3fa68b7e
+3rdpartylicenses.txt,1780145996835,7b48241c2f7b9524001508fcb167ceab86499bc8633fb62758ee57ccdeb7ebaf
+browser/index.html,1780145996835,49759a68c1f76e959a03b6b184c12b6a527dcbfc9fd7ea26fa2337b0ebdb8e2c
+browser/favicon.ico,1779604170218,a905b13e228420df3dbe746dfb656d37a49736494c0737d00e007c8dc7319912
+browser/main-V5P7I3DP.js,1780145996852,4ff36ce4802f457be1e4087158575592549e05102e0f141d0943903ef607dc64

.firebase/hosting.ZGlzdFxrYWlteW8tbWFuYWdlbWVudFxicm93c2Vy.cache

@@ -0,0 +1,4 @@
+styles-5INURTSO.css,1780147055905,46b50c321b39e89a491b6727a01628c34245605a30beb3e7414c5e01cff90e6e
+index.html,1780147055905,49759a68c1f76e959a03b6b184c12b6a527dcbfc9fd7ea26fa2337b0ebdb8e2c
+favicon.ico,1779604170218,a905b13e228420df3dbe746dfb656d37a49736494c0737d00e007c8dc7319912
+main-V5P7I3DP.js,1780147055907,4ff36ce4802f457be1e4087158575592549e05102e0f141d0943903ef607dc64

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "dankamanagement-39a6a"
+  }
+}

angular.json

@@ -2,7 +2,8 @@
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "cli": {
-    "packageManager": "npm"
+    "packageManager": "npm",
+    "analytics": false
   },
   "newProjectRoot": "projects",
   "projects": {
@@ -43,8 +44,8 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "4kB",
-                  "maximumError": "8kB"
+                  "maximumWarning": "20kB",
+                  "maximumError": "30kB"
                 }
               ],
               "outputHashing": "all"

firebase.json

@@ -0,0 +1,16 @@
+{
+  "hosting": {
+    "public": "dist/kaimyo-management/browser",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
+}

src/app/models/familytreenode.ts

@@ -1,11 +1,14 @@
 import { Family } from "./family";
+import { Kakocho } from "./kakocho";
 
 export interface FamilyTreeNode {
   family: Family;
 
-  spouses: FamilyTreeNode[];
+  kakocho?: Kakocho;   // ★追加（ここが核心）
 
-  children: FamilyTreeNode[];
+  isDeceased: boolean; // ★追加
 
+  spouses: FamilyTreeNode[];
+  children: FamilyTreeNode[];
   parents: FamilyTreeNode[];
 }

src/app/pages/danka-detail/danka-detail.ts

@@ -72,6 +72,13 @@ export class DankaDetail implements OnInit, AfterViewInit {
 
   @ViewChild('familyTreeSvg')
   familyTreeSvg?: ElementRef<SVGSVGElement>;
+  @ViewChild('familyTreeSvg')
+  set svg(el: ElementRef<SVGSVGElement> | undefined) {
+    if (!el) return;
+
+    this.familyTreeSvg = el;
+    this.initializePanZoom();
+  }
   private panZoomInstance: any;
 
   readonly PERSON_WIDTH = 90;
@@ -132,7 +139,8 @@ export class DankaDetail implements OnInit, AfterViewInit {
     this.treeNodes =
       this.familyTreeBuilder.build(
         this.families,
-        this.marriageRelations
+        this.marriageRelations,
+        this.kakocholist
       );
 
     const units =

src/app/services/family-tree-builder.ts

@@ -1,18 +1,19 @@
 import { Injectable } from '@angular/core';
-
 import { Family } from '../models/family';
 import { MarriageRelation } from '../models/marriage-relation';
+import { Kakocho } from '../models/kakocho';
 import { FamilyUnit } from '../models/family-unit';
 import { FamilyUnitNode } from '../models/family-unit-node';
 
+
 export interface FamilyTreeNode {
   family: Family;
-
-  parents: FamilyTreeNode[];
-
-  children: FamilyTreeNode[];
+  kakocho?: Kakocho;
+  isDeceased: boolean;
 
   spouses: FamilyTreeNode[];
+  children: FamilyTreeNode[];
+  parents: FamilyTreeNode[];
 }
 
 @Injectable({
@@ -23,17 +24,27 @@ export class FamilyTreeBuilderService {
   build(
     families: Family[],
     marriages: MarriageRelation[],
+    kakocholist: Kakocho[]
   ): FamilyTreeNode[] {
 
     const nodeMap = new Map<string, FamilyTreeNode>();
 
-    //
-    // ノード生成
-    //
+    const kakochoMap = new Map(
+      kakocholist.map(k => [k.familyId, k])
+    );
+
+    // -----------------------------
+    // ① ノード生成（ここで統合）
+    // -----------------------------
     families.forEach((family) => {
 
+      const kakocho = kakochoMap.get(family.id);
+
       nodeMap.set(family.id, {
         family,
+        kakocho,
+        isDeceased: !!kakocho,
+
         parents: [],
         children: [],
         spouses: [],
@@ -41,134 +52,64 @@ export class FamilyTreeBuilderService {
 
     });
 
-    //
-    // 親子関係生成
-    //
+    // -----------------------------
+    // ② 親子関係
+    // -----------------------------
     families.forEach((family) => {
 
       const childNode = nodeMap.get(family.id);
+      if (!childNode) return;
 
-      if (!childNode) {
-        return;
-      }
-
-      //
-      // 父
-      //
       if (family.fatherId) {
-
-        const fatherNode =
-          nodeMap.get(family.fatherId);
-
-        if (fatherNode) {
-
-          fatherNode.children.push(childNode);
-
-          childNode.parents.push(fatherNode);
+        const father = nodeMap.get(family.fatherId);
+        if (father) {
+          father.children.push(childNode);
+          childNode.parents.push(father);
         }
       }
 
-      //
-      // 母
-      //
       if (family.motherId) {
-
-        const motherNode =
-          nodeMap.get(family.motherId);
-
-        if (motherNode) {
-
-          motherNode.children.push(childNode);
-
-          childNode.parents.push(motherNode);
+        const mother = nodeMap.get(family.motherId);
+        if (mother) {
+          mother.children.push(childNode);
+          childNode.parents.push(mother);
         }
       }
 
     });
 
-    //
-    // 配偶者関係
-    //
+    // -----------------------------
+    // ③ 配偶者関係（current）
+    // -----------------------------
     marriages
-      .filter(
-        (m) =>
-          m.status === 'current',
-      )
-      .forEach((marriage) => {
-
-        const person1 =
-          nodeMap.get(
-            marriage.person1Id,
-          );
-
-        const person2 =
-          nodeMap.get(
-            marriage.person2Id,
-          );
-
-        if (!person1 || !person2) {
-          return;
-        }
-
-        const id1 =
-          Number(person1.family.id);
+      .filter(m => m.status === 'current')
+      .forEach((m) => {
 
-        const id2 =
-          Number(person2.family.id);
+        const p1 = nodeMap.get(m.person1Id);
+        const p2 = nodeMap.get(m.person2Id);
 
-        const owner =
-          id1 < id2
-            ? person1
-            : person2;
+        if (!p1 || !p2) return;
 
-        const spouse =
-          id1 < id2
-            ? person2
-            : person1;
-
-        if (
-          !owner.spouses.some(
-            (s) =>
-              s.family.id ===
-              spouse.family.id,
-          )
-        ) {
-          owner.spouses.push(
-            spouse,
-          );
+        if (!p1.spouses.some(s => s.family.id === p2.family.id)) {
+          p1.spouses.push(p2);
         }
-      });
-
-    //
-    // spouseId フォールバック
-    //
-    families.forEach((family) => {
 
-      if (!family.spouseId) {
-        return;
-      }
+      });
 
-      const person =
-        nodeMap.get(family.id);
+    // -----------------------------
+    // ④ spouseIdフォールバック
+    // -----------------------------
+    families.forEach((f) => {
 
-      const spouse =
-        nodeMap.get(family.spouseId);
+      if (!f.spouseId) return;
 
-      if (!person || !spouse) {
-        return;
-      }
+      const a = nodeMap.get(f.id);
+      const b = nodeMap.get(f.spouseId);
 
-      if (
-        !person.spouses.some(
-          (s) =>
-            s.family.id ===
-            spouse.family.id
-        )
-      ) {
+      if (!a || !b) return;
 
-        person.spouses.push(
-          spouse
-        );
+      if (!a.spouses.some(s => s.family.id === b.family.id)) {
+        a.spouses.push(b);
       }
 
     });
@@ -176,55 +117,22 @@ export class FamilyTreeBuilderService {
     return [...nodeMap.values()];
   }
 
-  /**
-   * 家系図の起点になる人物
-   * (親が登録されていない人物)
-   */
-  getRoots(
-    nodes: FamilyTreeNode[]
-  ): FamilyTreeNode[] {
+  // -----------------------------
+  // Roots
+  // -----------------------------
+  getRoots(nodes: FamilyTreeNode[]): FamilyTreeNode[] {
 
     return nodes.filter(node => {
 
-      if (
-        node.parents.length > 0
-      ) {
-        return false;
-      }
-
-      // 配偶者がいて
-      if (
-        node.spouses.length > 0
-      ) {
+      if (node.parents.length > 0) return false;
 
-        const spouseId =
-          node.spouses[0].family.id;
-
-        // IDが若い方だけRoot
-        return (
-          node.family.id <
-          spouseId
-        );
+      if (node.spouses.length > 0) {
+        const spouseId = node.spouses[0].family.id;
+        return node.family.id < spouseId;
       }
 
       return true;
-
     });
-
-  }
-
-  /**
-   * ID検索
-   */
-  getNodeById(
-    nodes: FamilyTreeNode[],
-    id: string,
-  ): FamilyTreeNode | undefined {
-
-    return nodes.find(
-      (node) =>
-        node.family.id === id,
-    );
   }
 
   buildFamilyUnits(
@@ -238,9 +146,6 @@ export class FamilyTreeBuilderService {
 
     for (const node of nodes) {
 
-      //
-      // 夫婦あり
-      //
       if (node.spouses.length > 0) {
 
         const spouse =
@@ -262,9 +167,6 @@ export class FamilyTreeBuilderService {
 
         processed.add(key);
 
-        //
-        // この夫婦の子供を取得
-        //
         const children =
           nodes
             .filter(child => {
@@ -310,9 +212,6 @@ export class FamilyTreeBuilderService {
 
       } else {
 
-        //
-        // 独身者
-        //
         units.push({
 
           id:
@@ -346,9 +245,6 @@ export class FamilyTreeBuilderService {
     const nodeMap =
       new Map<string, FamilyUnitNode>();
 
-    //
-    // ノード生成
-    //
     units.forEach(unit => {
 
       nodeMap.set(unit.id, {
@@ -363,9 +259,6 @@ export class FamilyTreeBuilderService {
 
     });
 
-    //
-    // 親子リンク
-    //
     units.forEach(parentUnit => {
 
       parentUnit.children.forEach(child => {
@@ -417,5 +310,4 @@ export class FamilyTreeBuilderService {
     );
 
   }
-
 }