[add]

・檀家詳細の過去帳タグの編集ボタンを追加
・キャンセルボタンをクリックした際に該当檀家の過去帳タブに遷移

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

@@ -305,6 +305,7 @@
                     <div>続柄</div>
                     <div>回忌</div>
                     <div>備考</div>
+                    <div>操作</div>
                   </div>
 
                   @for (kakocho of kakocholist; track kakocho.id) {
@@ -332,6 +333,15 @@
                       <div>
                         {{ kakocho.note || '' }}
                       </div>
+
+                      <div class="family-table-action">
+                        <a
+                          class="family-edit-link"
+                          [routerLink]="['/danka', danka.id, 'kakocho', kakocho.id, 'edit']"
+                        >
+                          編集
+                        </a>
+                      </div>
                     </div>
                   }
                 </div>

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

@@ -10,9 +10,9 @@
       <div class="page-title-area">
         <h1>
           @if (kakocho) {
-            故人を編集
+            故人編集
           } @else {
-            故人を追加
+            故人追加
           }
         </h1>
       </div>
@@ -130,8 +130,7 @@
           <button
             type="button"
             class="cancel-button"
-            [routerLink]="['/kakocho-list']"
-          >
+            (click)="cancelKakochoEdit()">
             キャンセル
           </button>
 
@@ -150,4 +149,4 @@
 
     </section>
   </main>
-</div>
+</div>

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

@@ -105,9 +105,9 @@
   font-weight: 800;
 }
 
-.form-row input {
+.form-row input,
+.form-row textarea {
   width: 100%;
-  height: 54px;
   padding: 0 14px;
   border: 2px solid #d8caba;
   border-radius: 8px;
@@ -119,7 +119,18 @@
   outline: none;
 }
 
-.form-row input:focus {
+.form-row input {
+  height: 54px;
+}
+
+.form-row textarea {
+  min-height: 108px;
+  padding-top: 14px;
+  resize: vertical;
+}
+
+.form-row input:focus,
+.form-row textarea:focus {
   border-color: #8a6543;
   box-shadow: 0 0 0 3px rgba(138, 101, 67, 0.15);
 }

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

@@ -9,7 +9,6 @@ import {
 import {
   ActivatedRoute,
   Router,
-  RouterLink,
 } from '@angular/router';
 
 import { AppHeader } from '../../share/header/app-header';
@@ -27,17 +26,15 @@ import { Kakocho } from '../../models/kakocho';
     AppHeader,
     AppSideMenu,
     ReactiveFormsModule,
-    RouterLink,
   ],
   templateUrl: './kakocho-edit.html',
   styleUrl: './kakocho-edit.scss',
 })
 export class KakochoEdit {
-
   danka?: Danka;
   kakocho?: Kakocho;
-
   kakochoForm: FormGroup;
+  dankaId: string;
 
   constructor(
     private fb: FormBuilder,
@@ -60,6 +57,7 @@ export class KakochoEdit {
 
     // 檀家ID
     const dankaId = this.route.snapshot.params['dankaId'];
+    this.dankaId = this.route.snapshot.params['dankaId'];
 
     if (dankaId) {
       this.danka =
@@ -137,22 +135,19 @@ export class KakochoEdit {
     this.router.navigate([
       '/danka-detail',
       this.danka?.id,
-    ]);
+    ], { queryParams: { tab: 'kakocho' } });
   }
 
   deleteKakocho(): void {
-
     if (!this.kakocho) {
       return;
     }
 
-    this.kakochoService.deleteKakocho(
-      this.kakocho.id
-    );
+    this.kakochoService.deleteKakocho(this.kakocho.id);
 
-    this.router.navigate([
-      '/danka-detail',
-      this.danka?.id,
-    ]);
+    this.router.navigate(['/danka-detail', this.danka?.id], { queryParams: { tab: 'kakocho' } });
   }
-}
+
+  cancelKakochoEdit() {
+    this.router.navigate(['/danka-detail', this.danka?.id], { queryParams: { tab: 'kakocho' } });  }
+}