Преглед изворни кода

[add]

・檀家詳細の過去帳タグの編集ボタンを追加
・キャンセルボタンをクリックした際に該当檀家の過去帳タブに遷移
poohr пре 3 недеља
родитељ
комит
0e3beba196

+ 10
- 0
src/app/pages/danka-detail/danka-detail.html Прегледај датотеку

305
                     <div>続柄</div>
305
                     <div>続柄</div>
306
                     <div>回忌</div>
306
                     <div>回忌</div>
307
                     <div>備考</div>
307
                     <div>備考</div>
308
+                    <div>操作</div>
308
                   </div>
309
                   </div>
309
 
310
 
310
                   @for (kakocho of kakocholist; track kakocho.id) {
311
                   @for (kakocho of kakocholist; track kakocho.id) {
332
                       <div>
333
                       <div>
333
                         {{ kakocho.note || '' }}
334
                         {{ kakocho.note || '' }}
334
                       </div>
335
                       </div>
336
+
337
+                      <div class="family-table-action">
338
+                        <a
339
+                          class="family-edit-link"
340
+                          [routerLink]="['/danka', danka.id, 'kakocho', kakocho.id, 'edit']"
341
+                        >
342
+                          編集
343
+                        </a>
344
+                      </div>
335
                     </div>
345
                     </div>
336
                   }
346
                   }
337
                 </div>
347
                 </div>

+ 4
- 5
src/app/pages/kakocho-edit/kakocho-edit.html Прегледај датотеку

10
       <div class="page-title-area">
10
       <div class="page-title-area">
11
         <h1>
11
         <h1>
12
           @if (kakocho) {
12
           @if (kakocho) {
13
-            故人編集
13
+            故人編集
14
           } @else {
14
           } @else {
15
-            故人追加
15
+            故人追加
16
           }
16
           }
17
         </h1>
17
         </h1>
18
       </div>
18
       </div>
130
           <button
130
           <button
131
             type="button"
131
             type="button"
132
             class="cancel-button"
132
             class="cancel-button"
133
-            [routerLink]="['/kakocho-list']"
134
-          >
133
+            (click)="cancelKakochoEdit()">
135
             キャンセル
134
             キャンセル
136
           </button>
135
           </button>
137
 
136
 
150
 
149
 
151
     </section>
150
     </section>
152
   </main>
151
   </main>
153
-</div>
152
+</div>

+ 14
- 3
src/app/pages/kakocho-edit/kakocho-edit.scss Прегледај датотеку

105
   font-weight: 800;
105
   font-weight: 800;
106
 }
106
 }
107
 
107
 
108
-.form-row input {
108
+.form-row input,
109
+.form-row textarea {
109
   width: 100%;
110
   width: 100%;
110
-  height: 54px;
111
   padding: 0 14px;
111
   padding: 0 14px;
112
   border: 2px solid #d8caba;
112
   border: 2px solid #d8caba;
113
   border-radius: 8px;
113
   border-radius: 8px;
119
   outline: none;
119
   outline: none;
120
 }
120
 }
121
 
121
 
122
-.form-row input:focus {
122
+.form-row input {
123
+  height: 54px;
124
+}
125
+
126
+.form-row textarea {
127
+  min-height: 108px;
128
+  padding-top: 14px;
129
+  resize: vertical;
130
+}
131
+
132
+.form-row input:focus,
133
+.form-row textarea:focus {
123
   border-color: #8a6543;
134
   border-color: #8a6543;
124
   box-shadow: 0 0 0 3px rgba(138, 101, 67, 0.15);
135
   box-shadow: 0 0 0 3px rgba(138, 101, 67, 0.15);
125
 }
136
 }

+ 9
- 14
src/app/pages/kakocho-edit/kakocho-edit.ts Прегледај датотеку

9
 import {
9
 import {
10
   ActivatedRoute,
10
   ActivatedRoute,
11
   Router,
11
   Router,
12
-  RouterLink,
13
 } from '@angular/router';
12
 } from '@angular/router';
14
 
13
 
15
 import { AppHeader } from '../../share/header/app-header';
14
 import { AppHeader } from '../../share/header/app-header';
27
     AppHeader,
26
     AppHeader,
28
     AppSideMenu,
27
     AppSideMenu,
29
     ReactiveFormsModule,
28
     ReactiveFormsModule,
30
-    RouterLink,
31
   ],
29
   ],
32
   templateUrl: './kakocho-edit.html',
30
   templateUrl: './kakocho-edit.html',
33
   styleUrl: './kakocho-edit.scss',
31
   styleUrl: './kakocho-edit.scss',
34
 })
32
 })
35
 export class KakochoEdit {
33
 export class KakochoEdit {
36
-
37
   danka?: Danka;
34
   danka?: Danka;
38
   kakocho?: Kakocho;
35
   kakocho?: Kakocho;
39
-
40
   kakochoForm: FormGroup;
36
   kakochoForm: FormGroup;
37
+  dankaId: string;
41
 
38
 
42
   constructor(
39
   constructor(
43
     private fb: FormBuilder,
40
     private fb: FormBuilder,
60
 
57
 
61
     // 檀家ID
58
     // 檀家ID
62
     const dankaId = this.route.snapshot.params['dankaId'];
59
     const dankaId = this.route.snapshot.params['dankaId'];
60
+    this.dankaId = this.route.snapshot.params['dankaId'];
63
 
61
 
64
     if (dankaId) {
62
     if (dankaId) {
65
       this.danka =
63
       this.danka =
137
     this.router.navigate([
135
     this.router.navigate([
138
       '/danka-detail',
136
       '/danka-detail',
139
       this.danka?.id,
137
       this.danka?.id,
140
-    ]);
138
+    ], { queryParams: { tab: 'kakocho' } });
141
   }
139
   }
142
 
140
 
143
   deleteKakocho(): void {
141
   deleteKakocho(): void {
144
-
145
     if (!this.kakocho) {
142
     if (!this.kakocho) {
146
       return;
143
       return;
147
     }
144
     }
148
 
145
 
149
-    this.kakochoService.deleteKakocho(
150
-      this.kakocho.id
151
-    );
146
+    this.kakochoService.deleteKakocho(this.kakocho.id);
152
 
147
 
153
-    this.router.navigate([
154
-      '/danka-detail',
155
-      this.danka?.id,
156
-    ]);
148
+    this.router.navigate(['/danka-detail', this.danka?.id], { queryParams: { tab: 'kakocho' } });
157
   }
149
   }
158
-}
150
+
151
+  cancelKakochoEdit() {
152
+    this.router.navigate(['/danka-detail', this.danka?.id], { queryParams: { tab: 'kakocho' } });  }
153
+}

Loading…
Откажи
Сачувај