Merge remote-tracking branch 'origin/master'

src/app/pages/event/event.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { DankaService } from '../../services/dankaService';
 import { FamilyService } from '../../services/family-service';
@@ -13,7 +13,7 @@ import { AppSideMenu } from '../../share/side-menu/app-side-menu';
   templateUrl: './event.html',
   styleUrl: './event.scss',
 })
-export class EventPage {
+export class EventPage implements OnInit{
   eventTargets: EventTarget[] = [];
   targetYear: number = new Date().getFullYear();
   selectedEventType: EventType | 'all' = 'all';
@@ -43,33 +43,45 @@ export class EventPage {
     private dankaService: DankaService,
     private familyService: FamilyService,
     private eventService: EventService,
-  ) {
-    this.createEventTargetList();
+  ) { }
+
+  ngOnInit(): void {
+    this.init();
+  }
+
+  async init(): Promise<void> {
+    await this.createEventTargetList();
   }
 
-  createEventTargetList(): void {
+  async createEventTargetList(): Promise<void> {
     this.eventTargets = [];
 
-    this.familyService.getFamilyList().forEach((family) => {
+    const families = await this.familyService.getFamilyList();
+
+    for (const family of families) {
       const birthDate = this.parseDate(family.birthDate);
-      if (!birthDate) {
-        return;
-      }
+      if (!birthDate) continue;
 
       const age = this.targetYear - birthDate.getFullYear();
       const eventTypes = this.getEventTypes(age);
-      if (eventTypes.length === 0) {
-        return;
-      }
+      if (eventTypes.length === 0) continue;
 
-      const danka = this.dankaService.getDankaById(family.dankaId);
-      eventTypes.forEach((eventType) => {
-        if (this.selectedEventType !== 'all' && this.selectedEventType !== eventType) {
-          return;
+      // ★ここが修正ポイント（await）
+      const danka = await this.dankaService.getDankaById(family.dankaId);
+
+      for (const eventType of eventTypes) {
+        if (
+          this.selectedEventType !== 'all' &&
+          this.selectedEventType !== eventType
+        ) {
+          continue;
         }
 
         const id = `${family.id}-${eventType}`;
-        const defaultStatus: EventStatus = Number(family.id) % 2 === 0 ? '案内済' : '未案内';
+
+        const defaultStatus: EventStatus =
+          Number(family.id) % 2 === 0 ? '案内済' : '未案内';
+
         this.eventTargets.push({
           id,
           dankaId: family.dankaId,
@@ -83,12 +95,13 @@ export class EventPage {
           note: family.note,
           status: this.eventService.getEventStatus(id, defaultStatus),
         });
-      });
-    });
+      }
+    }
 
     this.eventTargets.sort(
       (a, b) =>
-        this.getEventSortOrder(a.eventType) - this.getEventSortOrder(b.eventType) ||
+        this.getEventSortOrder(a.eventType) -
+        this.getEventSortOrder(b.eventType) ||
         a.age - b.age ||
         a.name.localeCompare(b.name, 'ja'),
     );

src/app/pages/family-edit/family-edit.ts

@@ -6,6 +6,7 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
+import { OnInit } from '@angular/core';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { AppHeader } from '../../share/header/app-header';
 import { AppSideMenu } from '../../share/side-menu/app-side-menu';
@@ -22,7 +23,7 @@ import { MarriageRelation } from '../../models/marriage-relation';
   templateUrl: './family-edit.html',
   styleUrl: './family-edit.scss',
 })
-export class FamilyEdit {
+export class FamilyEdit implements OnInit{
   danka: Danka | undefined;
   family: Family | undefined;
   families: Family[] = [];
@@ -40,14 +41,26 @@ export class FamilyEdit {
     private route: ActivatedRoute,
     private router: Router,
   ) {
+  }
+
+  ngOnInit(): void {
+    this.init();
+  }
+
+  async init(): Promise<void> {
     this.dankaId = this.route.snapshot.params['dankaId'];
     this.familyId = this.route.snapshot.params['familyId'];
-    this.danka = this.dankaService.getDankaById(this.dankaId);
-    this.families = this.familyService.getFamiliesByDankaId(this.dankaId);
+
     this.relationMode = this.route.snapshot.queryParamMap.get('relationMode') ?? '';
     this.baseFamilyId = this.route.snapshot.queryParamMap.get('baseFamilyId') ?? '';
+
+    // ★ここが重要
+    this.danka = await this.dankaService.getDankaById(this.dankaId);
+    this.families = await this.familyService.getFamiliesByDankaId(this.dankaId);
+
     if (this.familyId) {
-      this.family = this.familyService.getFamilyById(this.familyId);
+      this.family = await this.familyService.getFamilyById(this.familyId);
+
       if (this.family) {
         this.familyForm.patchValue({
           furigana: this.family.furigana,
@@ -60,6 +73,7 @@ export class FamilyEdit {
           spouseId: this.family.spouseId,
           gender: this.family.gender,
         });
+
         this.patchMarriageRelationFields(this.family.id);
       }
     }
@@ -72,7 +86,7 @@ export class FamilyEdit {
     }
 
     if (!this.familyId && this.relationMode === 'child') {
-      const baseFamily = this.familyService.getFamilyById(this.baseFamilyId);
+      const baseFamily = await this.familyService.getFamilyById(this.baseFamilyId);
 
       if (baseFamily?.gender === 'male') {
         this.familyForm.patchValue({

src/app/pages/kakocho-edit/kakocho-edit.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import {
   FormBuilder,
   FormGroup,
@@ -32,7 +32,7 @@ import { Family } from '../../models/family';
   templateUrl: './kakocho-edit.html',
   styleUrl: './kakocho-edit.scss',
 })
-export class KakochoEdit {
+export class KakochoEdit implements OnInit {
   danka?: Danka;
   kakocho?: Kakocho;
   sourceFamily?: Family;
@@ -48,8 +48,6 @@ export class KakochoEdit {
     private route: ActivatedRoute,
     private router: Router,
   ) {
-
-    // フォーム初期化
     this.kakochoForm = this.fb.group({
       name: ['', Validators.required],
       furigana: [''],
@@ -59,34 +57,33 @@ export class KakochoEdit {
       ageAtDeath: [''],
       note: [''],
     });
+  }
+
+  ngOnInit(): void {
+    this.init();
+  }
 
-    // 檀家ID
+  async init(): Promise<void> {
     const dankaId = this.route.snapshot.params['dankaId'];
-    this.dankaId = this.route.snapshot.params['dankaId'];
+    const familyId = this.route.snapshot.queryParams['familyId'];
+    const kakochoId = this.route.snapshot.params['kakochoId'];
+
+    this.dankaId = dankaId;
 
     if (dankaId) {
-      this.danka =
-        this.dankaService.getDankaById(dankaId);
+      this.danka = await this.dankaService.getDankaById(dankaId);
     }
 
-    const familyId = this.route.snapshot.queryParams['familyId'];
     if (familyId) {
-      this.sourceFamily = this.familyService.getFamilyById(familyId);
+      this.sourceFamily = await this.familyService.getFamilyById(familyId);
       this.returnTab = 'family';
     }
 
-    // 編集対象ID
-    const kakochoId =
-      this.route.snapshot.params['kakochoId'];
-
     // 編集モード
     if (kakochoId) {
-
-      this.kakocho =
-        this.kakochoService.getKakochoById(kakochoId);
+      this.kakocho = await this.kakochoService.getKakochoById(kakochoId);
 
       if (this.kakocho) {
-
         this.kakochoForm.patchValue({
           name: this.kakocho.name,
           furigana: this.kakocho.furigana,
@@ -96,9 +93,11 @@ export class KakochoEdit {
           ageAtDeath: this.kakocho.ageAtDeath,
           note: this.kakocho.note,
         });
-
       }
-    } else if (this.sourceFamily) {
+    }
+
+    // 新規（家族からの引き継ぎ）
+    else if (this.sourceFamily) {
       this.kakochoForm.patchValue({
         name: this.sourceFamily.name,
         furigana: this.sourceFamily.furigana,
@@ -107,7 +106,7 @@ export class KakochoEdit {
     }
   }
 
-  saveKakocho(): void {
+  async saveKakocho(): Promise<void> {
 
     // form値取得
     const formValue = this.kakochoForm.value;
@@ -120,7 +119,7 @@ export class KakochoEdit {
         ...formValue,
       };
 
-      this.kakochoService.updateKakocho(
+      await this.kakochoService.updateKakocho(
         updatedKakocho
       );
 
@@ -148,7 +147,7 @@ export class KakochoEdit {
       );
 
       if (this.sourceFamily) {
-        this.familyService.deleteFamily(this.sourceFamily.id);
+        await this.familyService.deleteFamily(this.sourceFamily.id);
       }
     }
 

src/app/services/family-service.ts

@@ -58,4 +58,14 @@ export class FamilyService {
     const ref = doc(db, this.path, id);
     await deleteDoc(ref);
   }
+
+  //家族情報を全件取得する処理
+  async getFamilyList(): Promise<Family[]> {
+    const snap = await getDocs(collection(db, this.path));
+
+    return snap.docs.map(d => ({
+      id: d.id,
+      ...(d.data() as Omit<Family, 'id'>),
+    }));
+  }
 }