[update]

ダッシュボードを修正

src/app/pages/dashboard/dashboard.html

@@ -9,11 +9,11 @@
         <div>
           <h1>ホーム</h1>
         </div>
-        <div class="date-pill">2026年5月28日 木曜日</div>
+        <div class="date-pill">{{ todayLabel }}</div>
       </div>
 
       <section class="overview" aria-label="概要">
-        <a class="card primary" href="#">
+        <a class="card" href="#">
           <div class="card-label">今週の法要</div>
           <div class="metric"><strong>{{ weeklyMemorialCount }}</strong><span>件</span></div>
           <p class="card-text">
@@ -34,10 +34,12 @@
           <input
             class="search-input"
             type="search"
+            [(ngModel)]="searchKeyword"
             placeholder="氏名、ふりがな、住所、戒名で検索"
             aria-label="まとめて検索"
+            (keydown.enter)="searchAll()"
           />
-          <button class="search-button" type="button">検索</button>
+          <button class="search-button" type="button" (click)="searchAll()">検索</button>
         </div>
       </section>
 

src/app/pages/dashboard/dashboard.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { RouterLink } from '@angular/router';
+import { Router, RouterLink } from '@angular/router';
+import { FormsModule } from '@angular/forms';
 import { KakochoService } from '../../services/kakocho-service';
 import { DankaService } from '../../services/dankaService';
 import { Danka } from '../../models/danka';
@@ -25,11 +26,13 @@ interface RecentDanka {
 
 @Component({
   selector: 'app-dashboard',
-  imports: [AppHeader, AppSideMenu, RouterLink],
+  imports: [AppHeader, AppSideMenu, RouterLink, FormsModule],
   templateUrl: './dashboard.html',
   styleUrl: './dashboard.scss',
 })
 export class Dashboard {
+  searchKeyword = '';
+  todayLabel = this.formatTodayLabel(new Date());
   weeklyMemorialCount = 0;
   todayMemorialCount = 0;
   upcomingWeeklyMemorialCount = 0;
@@ -42,6 +45,7 @@ export class Dashboard {
   constructor(
     private kakochoService: KakochoService,
     private dankaService: DankaService,
+    private router: Router,
   ) {
     this.setWeeklyMemorialSummary();
     this.setMonthlyMemorialSummary();
@@ -49,6 +53,14 @@ export class Dashboard {
     this.setUpcomingMemorials();
   }
 
+  searchAll(): void {
+    const keyword = this.searchKeyword.trim();
+
+    this.router.navigate(['/search'], {
+      queryParams: keyword ? { keyword } : undefined,
+    });
+  }
+
   private async setRecentDankaList(): Promise<void> {
     const dankaList = await this.dankaService.getRecentDankaList(5);
 
@@ -104,9 +116,10 @@ export class Dashboard {
     const today = this.toDateOnly(new Date());
     const endDate = this.addDays(today, 30);
 
-    this.upcomingMemorials = (await this.kakochoService
-      .getKakochoList())
-      .map((kakocho): UpcomingMemorial | null => {
+    const upcomingMemorials = await Promise.all(
+      (await this.kakochoService
+        .getKakochoList())
+        .map(async (kakocho): Promise<UpcomingMemorial | null> => {
         const deathDate = this.parseDate(kakocho.deathDate);
         if (!deathDate) {
           return null;
@@ -118,7 +131,7 @@ export class Dashboard {
         }
 
         const memorialType = this.getMemorialType(deathDate);
-        const danka = this.dankaService.getDankaById(kakocho.dankaId);
+        const danka = await this.dankaService.getDankaById(kakocho.dankaId);
         const type = memorialType ? '年忌法要' : '命日';
         const status = memorialType ? '準備確認' : '要確認';
 
@@ -132,7 +145,10 @@ export class Dashboard {
           type,
           status,
         };
-      })
+      }),
+    );
+
+    this.upcomingMemorials = upcomingMemorials
       .filter((memorial): memorial is UpcomingMemorial => memorial !== null)
       .sort((a, b) => a.date.getTime() - b.date.getTime() || a.title.localeCompare(b.title, 'ja'))
       .slice(0, 3);
@@ -219,6 +235,11 @@ export class Dashboard {
     return `${updatedDate.getMonth() + 1}月${updatedDate.getDate()}日`;
   }
 
+  private formatTodayLabel(date: Date): string {
+    const weekdays = ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'];
+    return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${weekdays[date.getDay()]}`;
+  }
+
   private getWeekStart(date: Date): Date {
     const day = date.getDay();
     const diff = day === 0 ? -6 : 1 - day;

src/app/pages/search/search.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormsModule } from '@angular/forms';
-import { Router, RouterLink } from '@angular/router';
+import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { Danka } from '../../models/danka';
 import { Family } from '../../models/family';
 import { Kakocho } from '../../models/kakocho';
@@ -34,9 +34,16 @@ export class Search implements OnInit{
     private dankaService: DankaService,
     private familyService: FamilyService,
     private kakochoService: KakochoService,
+    private route: ActivatedRoute,
   ) { }
 
   ngOnInit(): void {
+    const keyword = this.route.snapshot.queryParamMap.get('keyword');
+
+    if (keyword) {
+      this.searchKeyword = keyword;
+      this.searchAll();
+    }
   }
 
   //　フィルタータブの選択処理