added

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

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { DankaService } from '../../services/dankaService';
 import { FamilyService } from '../../services/family-service';
@@ -26,13 +26,14 @@ type KanaRowValue =
   templateUrl: './danka-list.html',
   styleUrl: './danka-list.scss',
 })
-export class DankaList {
+export class DankaList implements OnInit {
   dankaList: Danka[] = [];
   filterDankaList: Danka[] = [];
   searchKeyword: string = '';
   dankaDisplay: number = 0;
   selectedFilter = 'all';
   selectedKanaRow: KanaRowValue = 'all';
+
   kanaRows: { label: string; value: KanaRowValue }[] = [
     { label: '全件', value: 'all' },
     { label: 'あ行', value: 'a' },
@@ -48,27 +49,33 @@ export class DankaList {
   ];
 
   private readonly kanaRowMap: Record<Exclude<KanaRowValue, 'all'>, string[]> = {
-    a: ['あ', 'い', 'う', 'え', 'お', 'ア', 'イ', 'ウ', 'エ', 'オ'],
-    ka: ['か', 'き', 'く', 'け', 'こ', 'が', 'ぎ', 'ぐ', 'げ', 'ご', 'カ', 'キ', 'ク', 'ケ', 'コ', 'ガ', 'ギ', 'グ', 'ゲ', 'ゴ'],
-    sa: ['さ', 'し', 'す', 'せ', 'そ', 'ざ', 'じ', 'ず', 'ぜ', 'ぞ', 'サ', 'シ', 'ス', 'セ', 'ソ', 'ザ', 'ジ', 'ズ', 'ゼ', 'ゾ'],
-    ta: ['た', 'ち', 'つ', 'て', 'と', 'だ', 'ぢ', 'づ', 'で', 'ど', 'タ', 'チ', 'ツ', 'テ', 'ト', 'ダ', 'ヂ', 'ヅ', 'デ', 'ド'],
-    na: ['な', 'に', 'ぬ', 'ね', 'の', 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ'],
-    ha: ['は', 'ひ', 'ふ', 'へ', 'ほ', 'ば', 'び', 'ぶ', 'べ', 'ぼ', 'ぱ', 'ぴ', 'ぷ', 'ぺ', 'ぽ', 'ハ', 'ヒ', 'フ', 'ヘ', 'ホ', 'バ', 'ビ', 'ブ', 'ベ', 'ボ', 'パ', 'ピ', 'プ', 'ペ', 'ポ'],
-    ma: ['ま', 'み', 'む', 'め', 'も', 'マ', 'ミ', 'ム', 'メ', 'モ'],
-    ya: ['や', 'ゆ', 'よ', 'ヤ', 'ユ', 'ヨ'],
-    ra: ['ら', 'り', 'る', 'れ', 'ろ', 'ラ', 'リ', 'ル', 'レ', 'ロ'],
-    wa: ['わ', 'を', 'ん', 'ワ', 'ヲ', 'ン'],
+    a: ['あ','い','う','え','お','ア','イ','ウ','エ','オ'],
+    ka: ['か','き','く','け','こ','が','ぎ','ぐ','げ','ご','カ','キ','ク','ケ','コ','ガ','ギ','グ','ゲ','ゴ'],
+    sa: ['さ','し','す','せ','そ','ざ','じ','ず','ぜ','ぞ','サ','シ','ス','セ','ソ','ザ','ジ','ズ','ゼ','ゾ'],
+    ta: ['た','ち','つ','て','と','だ','ぢ','づ','で','ど','タ','チ','ツ','テ','ト','ダ','ヂ','ヅ','デ','ド'],
+    na: ['な','に','ぬ','ね','の','ナ','ニ','ヌ','ネ','ノ'],
+    ha: ['は','ひ','ふ','へ','ほ','ば','び','ぶ','べ','ぼ','ぱ','ぴ','ぷ','ぺ','ぽ','ハ','ヒ','フ','ヘ','ホ','バ','ビ','ブ','ベ','ボ','パ','ピ','プ','ペ','ポ'],
+    ma: ['ま','み','む','め','も','マ','ミ','ム','メ','モ'],
+    ya: ['や','ゆ','よ','ヤ','ユ','ヨ'],
+    ra: ['ら','り','る','れ','ろ','ラ','リ','ル','レ','ロ'],
+    wa: ['わ','を','ん','ワ','ヲ','ン'],
   };
 
   constructor(
     private dankaService: DankaService,
     private familyService: FamilyService,
-  ) {
-    this.dankaList = this.dankaService.getDankaList();
+  ) {}
+
+  // 非同期初期化
+  ngOnInit(): void {
+    this.init();
+  }
+
+  async init(): Promise<void> {
+    this.dankaList = await this.dankaService.getDankaList();
     this.showAllDanka();
   }
 
-  //全件タグで絞り込み
   showAllDanka() {
     this.selectedFilter = 'all';
     this.selectedKanaRow = 'all';
@@ -77,44 +84,39 @@ export class DankaList {
     this.dankaDisplay = this.filterDankaList.length;
   }
 
-  //電話番号タグで絞り込み
   filterPhoneAvailable() {
     this.selectedFilter = 'phone';
     this.selectedKanaRow = 'all';
-    //電話番号タブに該当する檀家を表示
-    this.filterDankaList = this.dankaList.filter((danka) => {
-      return danka.phones.some((phone) => phone.tel.trim() !== '');
-    });
+
+    this.filterDankaList = this.dankaList.filter((danka) =>
+      danka.phones.some((phone) => phone.tel.trim() !== '')
+    );
+
     this.dankaDisplay = this.filterDankaList.length;
   }
 
-  //検索処理
   searchDanka() {
     this.selectedFilter = 'search';
     this.selectedKanaRow = 'all';
-    //検索欄に入力された値から余白を削除
+
     const keyword = this.searchKeyword.trim();
-    //検索欄が空の場合は檀家の一覧を表示
+
     if (keyword === '') {
-      this.filterDankaList = this.dankaList;
-      this.dankaDisplay = this.filterDankaList.length;
+      this.showAllDanka();
       return;
     }
 
-    //検索欄に値がある場合は値に該当する内容を表示
-    this.filterDankaList = this.dankaList.filter((danka) => {
-      return (
-        danka.householdName.includes(keyword) ||
-        danka.householdFurigana.includes(keyword) ||
-        danka.householder.includes(keyword) ||
-        danka.householderFurigana.includes(keyword) ||
-        danka.postalCode.includes(keyword) ||
-        danka.address.includes(keyword) ||
-        danka.phones.some((phone) => phone.tel.includes(keyword) || phone.note.includes(keyword))
-      );
-    });
+    this.filterDankaList = this.dankaList.filter((danka) =>
+      danka.householdName.includes(keyword) ||
+      danka.householdFurigana.includes(keyword) ||
+      danka.householder.includes(keyword) ||
+      danka.householderFurigana.includes(keyword) ||
+      danka.postalCode.includes(keyword) ||
+      danka.address.includes(keyword) ||
+      danka.phones.some((p) => p.tel.includes(keyword) || p.note.includes(keyword))
+    );
+
     this.dankaDisplay = this.filterDankaList.length;
-    console.log(this.dankaDisplay);
   }
 
   filterByKanaRow(row: KanaRowValue): void {
@@ -123,15 +125,15 @@ export class DankaList {
     this.searchKeyword = '';
 
     if (row === 'all') {
-      this.filterDankaList = this.dankaList;
-      this.dankaDisplay = this.filterDankaList.length;
+      this.showAllDanka();
       return;
     }
 
-    this.filterDankaList = this.dankaList.filter((danka) => {
-      const firstKana = this.getDankaSortText(danka).charAt(0);
+    this.filterDankaList = this.dankaList.filter(async (danka) => {
+      const firstKana = (await this.getDankaSortText(danka)).charAt(0);
       return this.kanaRowMap[row].includes(firstKana);
     });
+
     this.dankaDisplay = this.filterDankaList.length;
   }
 
@@ -143,11 +145,12 @@ export class DankaList {
     this.dankaDisplay = 0;
   }
 
-  private getDankaSortText(danka: Danka): string {
+  private async getDankaSortText(danka: Danka): Promise<string> {
     const householderName = this.normalizeName(danka.householder);
-    const householderFamily = this.familyService
-      .getFamiliesByDankaId(danka.id)
-      .find((family) => this.normalizeName(family.name) === householderName);
+
+    const householderFamily = (await this.familyService
+      .getFamiliesByDankaId(danka.id))
+      .find((f) => this.normalizeName(f.name) === householderName);
 
     return (householderFamily?.furigana || danka.householder).trim();
   }
@@ -155,4 +158,4 @@ export class DankaList {
   private normalizeName(name: string): string {
     return name.replace(/\s/g, '');
   }
-}
+}

src/app/pages/dashboard/dashboard.ts

@@ -49,19 +49,23 @@ export class Dashboard {
     this.setUpcomingMemorials();
   }
 
-  private setRecentDankaList(): void {
-    this.recentDankaList = this.dankaService.getRecentDankaList(5).map((danka) => ({
-      danka,
-      nextMemorialLabel: this.getNextMemorialLabel(danka.id),
-      updatedAtLabel: this.formatUpdatedAt(danka.updatedAt),
-    }));
+  private async setRecentDankaList(): Promise<void> {
+    const dankaList = await this.dankaService.getRecentDankaList(5);
+
+    this.recentDankaList = await Promise.all(
+      dankaList.map(async (danka) => ({
+        danka,
+        nextMemorialLabel: await this.getNextMemorialLabel(danka.id),
+        updatedAtLabel: this.formatUpdatedAt(danka.updatedAt),
+      }))
+    );
   }
 
-  private setWeeklyMemorialSummary(): void {
+  private async setWeeklyMemorialSummary(): Promise<void> {
     const today = this.toDateOnly(new Date());
     const weekEnd = this.addDays(this.getWeekStart(today), 6);
 
-    const weeklyMemorials = this.kakochoService.getKakochoList().filter((kakocho) => {
+    const weeklyMemorials = (await this.kakochoService.getKakochoList()).filter((kakocho) => {
       const deathDate = this.parseDate(kakocho.deathDate);
       if (!deathDate) {
         return false;
@@ -83,10 +87,10 @@ export class Dashboard {
     this.upcomingWeeklyMemorialCount = this.weeklyMemorialCount - this.todayMemorialCount;
   }
 
-  private setMonthlyMemorialSummary(): void {
+  private async setMonthlyMemorialSummary(): Promise<void> {
     const today = this.toDateOnly(new Date());
 
-    this.monthlyMemorialCount = this.kakochoService.getKakochoList().filter((kakocho) => {
+    this.monthlyMemorialCount = (await this.kakochoService.getKakochoList()).filter((kakocho) => {
       const deathDate = this.parseDate(kakocho.deathDate);
       if (!deathDate || !this.isMemorialTarget(deathDate)) {
         return false;
@@ -96,12 +100,12 @@ export class Dashboard {
     }).length;
   }
 
-  private setUpcomingMemorials(): void {
+  private async setUpcomingMemorials(): Promise<void> {
     const today = this.toDateOnly(new Date());
     const endDate = this.addDays(today, 30);
 
-    this.upcomingMemorials = this.kakochoService
-      .getKakochoList()
+    this.upcomingMemorials = (await this.kakochoService
+      .getKakochoList())
       .map((kakocho): UpcomingMemorial | null => {
         const deathDate = this.parseDate(kakocho.deathDate);
         if (!deathDate) {
@@ -167,10 +171,10 @@ export class Dashboard {
     return `${date.getMonth() + 1}月${date.getDate()}日`;
   }
 
-  private getNextMemorialLabel(dankaId: string): string {
+  private async getNextMemorialLabel(dankaId: string): Promise<string> {
     const today = this.toDateOnly(new Date());
-    const nextMemorial = this.kakochoService
-      .getKakochoByDankaId(dankaId)
+    const nextMemorial = (await this.kakochoService
+      .getKakochoByDankaId(dankaId))
       .map((kakocho) => {
         const deathDate = this.parseDate(kakocho.deathDate);
         if (!deathDate) {

src/app/services/dankaService.ts

@@ -60,33 +60,69 @@ export class DankaService {
     await deleteDoc(ref);
   }
 
+  // -----------------------------
+  // 最近開いた檀家
+  // -----------------------------
+
   private getRecentDankaIds(): string[] {
-    if (!this.canUseLocalStorage()) {
-      return [];
-    }
+    if (!this.canUseLocalStorage()) return [];
 
     const value = localStorage.getItem(this.recentDankaStorageKey);
-    if (!value) {
-      return [];
-    }
+    if (!value) return [];
 
     try {
       const parsed = JSON.parse(value);
-      return Array.isArray(parsed) ? parsed.filter((id): id is string => typeof id === 'string') : [];
+      return Array.isArray(parsed)
+        ? parsed.filter((id): id is string => typeof id === 'string')
+        : [];
     } catch {
       return [];
     }
   }
 
   private saveRecentDankaIds(ids: string[]): void {
-    if (!this.canUseLocalStorage()) {
-      return;
-    }
-
+    if (!this.canUseLocalStorage()) return;
     localStorage.setItem(this.recentDankaStorageKey, JSON.stringify(ids));
   }
 
   private canUseLocalStorage(): boolean {
     return typeof localStorage !== 'undefined';
   }
-}
+
+  // ★ここが重要：async化
+  async recordDankaOpened(id: string): Promise<void> {
+    const danka = await this.getDankaById(id);
+    if (!danka) return;
+
+    const recentIds = [
+      id,
+      ...this.getRecentDankaIds().filter(rid => rid !== id),
+    ].slice(0, 5);
+
+    this.saveRecentDankaIds(recentIds);
+  }
+
+  // ★ここも async 必須
+  async getRecentDankaList(limit = 5): Promise<Danka[]> {
+    const ids = this.getRecentDankaIds().slice(0, limit);
+
+    const list = await Promise.all(
+      ids.map(id => this.getDankaById(id))
+    );
+
+    const filtered = list.filter((d): d is Danka => d !== undefined);
+
+    if (filtered.length > 0) {
+      return filtered;
+    }
+
+    // fallback（updatedAtがある前提なら）
+    const all = await this.getDankaList();
+
+    return [...all]
+      .sort((a: any, b: any) =>
+        (b.updatedAt ?? '').localeCompare(a.updatedAt ?? '')
+      )
+      .slice(0, limit);
+  }
+}