Sfoglia il codice sorgente

[add]

<檀家一覧>
ページ遷移した時に全件が表示されるように修正 〇
檀家一覧のタイトルと入力フォームの余白※
リスト表示に家族数、過去帳の人数(要相談)
タブについて全件は残して、あいうえお検索タブに変更 〇
檀家登録のボタンをクリアに変更 〇

<檀家一覧(基本情報)>
タイトル 檀家詳細-〇〇家に変更 〇
茶色のバーの中身の情報を世帯名と情報の更新日を追加 〇
 →回忌ボタンを削除 〇
編集ボタンの色をタブと同じ色に変更(檀家の家族タブの編集ボタンに修正)
右側の「家族を見る」「過去帳を見る」を削除 〇

<檀家一覧(家族)>
世帯主を一番上に 〇
氏名・ふりがな・生年月日・年齢・関係・備考 〇
操作に削除機能について<要相談>

<檀家編集(家族)>
世帯主設定

<檀家一覧(過去等)>
年次法要を見るを削除 〇
編集ボタンを削除 〇
編集ページへの遷移について
故人を登録の位置を修正

<檀家一覧(家系図)>
ツリー修正
右の人物に没年月日情報を追加
表について生年月日表示はなくして

<年次法要>
リストをクリックしたら、対象の檀家の基本情報へ遷移
リストの表示内容の順番を修正

<まとめて検索>
一覧へもどる削除 〇
戻る・フォームを削除 〇

<サイドメニュー>
選択済みはわかるように色付け 〇
檀家一覧の下に檀家登録を追加 〇
poohr 3 settimane fa
parent
commit
79ef9279d8

+ 5
- 8
src/app/pages/danka-detail/danka-detail.html Vedi File

1
 <app-header></app-header>
1
 <app-header></app-header>
2
 
2
 
3
-<div class="breadcrumb">
4
-  ホーム &gt; 檀家(世帯) &gt; {{ danka?.householdName }}
5
-</div>
6
 
3
 
7
 <div class="danka-detail-page">
4
 <div class="danka-detail-page">
8
   <app-side-menu></app-side-menu>
5
   <app-side-menu></app-side-menu>
212
                     <div>ふりがな</div>
209
                     <div>ふりがな</div>
213
                     <div>生年月日</div>
210
                     <div>生年月日</div>
214
                     <div>年齢</div>
211
                     <div>年齢</div>
215
-                    <div>関係</div>
212
+                    <div>続柄</div>
216
                     <div>備考</div>
213
                     <div>備考</div>
217
                     <div>操作</div>
214
                     <div>操作</div>
218
                   </div>
215
                   </div>
275
                     <div>戒名</div>
272
                     <div>戒名</div>
276
                     <div>俗名</div>
273
                     <div>俗名</div>
277
                     <div>没年月日</div>
274
                     <div>没年月日</div>
278
-                    <div>関係</div>
275
+                    <div>続柄</div>
279
                     <div>回忌</div>
276
                     <div>回忌</div>
280
                     <div>備考</div>
277
                     <div>備考</div>
281
                   </div>
278
                   </div>
291
                       </div>
288
                       </div>
292
 
289
 
293
                       <div>
290
                       <div>
294
-                        {{ kakocho.deathDate }}
291
+                        {{ formatDeathDateWithYear(kakocho.deathDate) }}
295
                       </div>
292
                       </div>
296
 
293
 
297
                       <div>
294
                       <div>
383
                             {{ selectedFamily.name }}
380
                             {{ selectedFamily.name }}
384
                           </span>
381
                           </span>
385
                           <span class="tree-card-relationship">
382
                           <span class="tree-card-relationship">
386
-                            {{ selectedFamily.relationship || '関係未登録' }}
383
+                            {{ selectedFamily.relationship || '続柄未登録' }}
387
                           </span>
384
                           </span>
388
                           <span class="tree-card-birth">
385
                           <span class="tree-card-birth">
389
                             {{ selectedFamily.birthDate || '生年月日未登録' }}
386
                             {{ selectedFamily.birthDate || '生年月日未登録' }}
467
 
464
 
468
                     <div class="selected-info-list">
465
                     <div class="selected-info-list">
469
                       <div class="selected-info-row">
466
                       <div class="selected-info-row">
470
-                        <span>関係</span>
467
+                        <span>続柄</span>
471
                         <strong>{{ selectedFamily.relationship || '未登録' }}</strong>
468
                         <strong>{{ selectedFamily.relationship || '未登録' }}</strong>
472
                       </div>
469
                       </div>
473
 
470
 

+ 0
- 10
src/app/pages/danka-detail/danka-detail.scss Vedi File

6
   color: #2f2720;
6
   color: #2f2720;
7
 }
7
 }
8
 
8
 
9
-.breadcrumb {
10
-  position: absolute;
11
-  top: 28px;
12
-  left: 50%;
13
-  transform: translateX(-50%);
14
-  color: #7b6b5c;
15
-  font-size: 14px;
16
-  z-index: 2;
17
-}
18
-
19
 .danka-detail-page {
9
 .danka-detail-page {
20
   display: flex;
10
   display: flex;
21
   align-items: flex-start;
11
   align-items: flex-start;

+ 9
- 0
src/app/pages/danka-detail/danka-detail.ts Vedi File

93
     return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`;
93
     return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`;
94
   }
94
   }
95
 
95
 
96
+  formatDeathDateWithYear(deathDate: string): string {
97
+    const date = this.parseDate(deathDate);
98
+    if (!date) {
99
+      return '未登録';
100
+    }
101
+
102
+    return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`;
103
+  }
104
+
96
   getMemorialType(deathDate: string): string {
105
   getMemorialType(deathDate: string): string {
97
     const deathYear = Number(deathDate.slice(0, 4));
106
     const deathYear = Number(deathDate.slice(0, 4));
98
     const yearDiff = this.currentYear - deathYear;
107
     const yearDiff = this.currentYear - deathYear;

+ 0
- 3
src/app/pages/danka-edit/danka-edit.html Vedi File

1
 <app-header></app-header>
1
 <app-header></app-header>
2
 
2
 
3
-<div class="breadcrumb">
4
-  ホーム &gt; 檀家(世帯) &gt; 編集
5
-</div>
6
 
3
 
7
 <div class="danka-edit-page">
4
 <div class="danka-edit-page">
8
   <app-side-menu></app-side-menu>
5
   <app-side-menu></app-side-menu>

+ 0
- 10
src/app/pages/danka-edit/danka-edit.scss Vedi File

6
   color: #2f2720;
6
   color: #2f2720;
7
 }
7
 }
8
 
8
 
9
-.breadcrumb {
10
-  position: absolute;
11
-  top: 28px;
12
-  left: 50%;
13
-  transform: translateX(-50%);
14
-  color: #7b6b5c;
15
-  font-size: 14px;
16
-  z-index: 2;
17
-}
18
-
19
 .danka-edit-page {
9
 .danka-edit-page {
20
   display: flex;
10
   display: flex;
21
   align-items: flex-start;
11
   align-items: flex-start;

+ 2
- 5
src/app/pages/family-edit/family-edit.html Vedi File

1
 <app-header></app-header>
1
 <app-header></app-header>
2
 
2
 
3
-<div class="breadcrumb">
4
-  ホーム &gt; 檀家(世帯) &gt; 家族 &gt; 編集
5
-</div>
6
 
3
 
7
 <div class="danka-edit-page">
4
 <div class="danka-edit-page">
8
   <app-side-menu></app-side-menu>
5
   <app-side-menu></app-side-menu>
42
               </div>
39
               </div>
43
 
40
 
44
               <div class="form-row">
41
               <div class="form-row">
45
-                <label for="relationship">世帯主との関係</label>
42
+                <label for="relationship">続柄</label>
46
                 <div class="form-field">
43
                 <div class="form-field">
47
                   <select id="relationship"
44
                   <select id="relationship"
48
                           formControlName="relationship">
45
                           formControlName="relationship">
58
                     <option value="その他">その他</option>
55
                     <option value="その他">その他</option>
59
                   </select>
56
                   </select>
60
                   @if (familyForm.get('relationship')?.invalid && familyForm.get('relationship')?.touched) {
57
                   @if (familyForm.get('relationship')?.invalid && familyForm.get('relationship')?.touched) {
61
-                    <p class="error-message">世帯主との関係を選択してください。</p>
58
+                    <p class="error-message">続柄を選択してください。</p>
62
                   }
59
                   }
63
                 </div>
60
                 </div>
64
               </div>
61
               </div>

+ 0
- 16
src/app/pages/family-edit/family-edit.scss Vedi File

6
   color: #2f2720;
6
   color: #2f2720;
7
 }
7
 }
8
 
8
 
9
-.breadcrumb {
10
-  position: absolute;
11
-  top: 28px;
12
-  left: 50%;
13
-  transform: translateX(-50%);
14
-  color: #7b6b5c;
15
-  font-size: 14px;
16
-  z-index: 2;
17
-}
18
-
19
 .danka-edit-page {
9
 .danka-edit-page {
20
   display: flex;
10
   display: flex;
21
   align-items: flex-start;
11
   align-items: flex-start;
296
 }
286
 }
297
 
287
 
298
 @media (max-width: 800px) {
288
 @media (max-width: 800px) {
299
-  .breadcrumb {
300
-    position: static;
301
-    transform: none;
302
-    padding: 16px 20px 0;
303
-  }
304
-
305
   .danka-edit-page {
289
   .danka-edit-page {
306
     flex-direction: column;
290
     flex-direction: column;
307
   }
291
   }

+ 0
- 3
src/app/pages/family-tree/family-tree.html Vedi File

1
 <app-header></app-header>
1
 <app-header></app-header>
2
 
2
 
3
-<div class="breadcrumb">
4
-  ホーム &gt; 家系図
5
-</div>
6
 
3
 
7
 <div class="search-page">
4
 <div class="search-page">
8
   <app-side-menu></app-side-menu>
5
   <app-side-menu></app-side-menu>

+ 0
- 7
src/app/pages/kakocho-edit/kakocho-edit.html Vedi File

1
 <app-header></app-header>
1
 <app-header></app-header>
2
 
2
 
3
-<div class="breadcrumb">
4
-  @if (kakocho) {
5
-    ホーム &gt; 檀家(世帯) &gt; 過去帳 &gt; 故人を編集
6
-  } @else {
7
-    ホーム &gt; 檀家(世帯) &gt; 過去帳 &gt; 故人を追加
8
-  }
9
-</div>
10
 
3
 
11
 <div class="danka-edit-page">
4
 <div class="danka-edit-page">
12
   <app-side-menu></app-side-menu>
5
   <app-side-menu></app-side-menu>

+ 0
- 10
src/app/pages/kakocho-edit/kakocho-edit.scss Vedi File

6
   color: #2f2720;
6
   color: #2f2720;
7
 }
7
 }
8
 
8
 
9
-.breadcrumb {
10
-  position: absolute;
11
-  top: 28px;
12
-  left: 50%;
13
-  transform: translateX(-50%);
14
-  color: #7b6b5c;
15
-  font-size: 14px;
16
-  z-index: 2;
17
-}
18
-
19
 .danka-edit-page {
9
 .danka-edit-page {
20
   display: flex;
10
   display: flex;
21
   align-items: flex-start;
11
   align-items: flex-start;

+ 6
- 9
src/app/pages/memorial-list/memorial-list.html Vedi File

1
 <app-header></app-header>
1
 <app-header></app-header>
2
 
2
 
3
-<div class="breadcrumb">
4
-  ホーム &gt; 年次法要
5
-</div>
6
 
3
 
7
 <div class="memorial-list-page">
4
 <div class="memorial-list-page">
8
   <app-side-menu></app-side-menu>
5
   <app-side-menu></app-side-menu>
49
       <section class="memorial-table-section">
46
       <section class="memorial-table-section">
50
         <div class="memorial-table">
47
         <div class="memorial-table">
51
           <div class="memorial-table-header">
48
           <div class="memorial-table-header">
52
-            <div>俗名</div>
53
             <div>戒名</div>
49
             <div>戒名</div>
50
+            <div>俗名</div>
51
+            <div>没年月日</div>
54
             <div>関係</div>
52
             <div>関係</div>
55
             <div>檀家(世帯)</div>
53
             <div>檀家(世帯)</div>
56
-            <div>没年月日</div>
57
             <div>回忌</div>
54
             <div>回忌</div>
58
             <div>詳細</div>
55
             <div>詳細</div>
59
           </div>
56
           </div>
62
             @for (memorial of memorialList; track memorial.id) {
59
             @for (memorial of memorialList; track memorial.id) {
63
               <div class="memorial-table-row">
60
               <div class="memorial-table-row">
64
                 <div class="person-name">
61
                 <div class="person-name">
62
+                  {{ memorial.kaimyo }}
63
+                </div>
64
+                <div>
65
                   {{ memorial.name }}
65
                   {{ memorial.name }}
66
                 </div>
66
                 </div>
67
                 <div>
67
                 <div>
68
-                  {{ memorial.kaimyo }}
68
+                  {{ formatDeathDate(memorial.deathDate) }}
69
                 </div>
69
                 </div>
70
                 <div>
70
                 <div>
71
                   {{ memorial.relationship }}
71
                   {{ memorial.relationship }}
73
                 <div>
73
                 <div>
74
                   {{ memorial.householdName }}
74
                   {{ memorial.householdName }}
75
                 </div>
75
                 </div>
76
-                <div>
77
-                  {{ memorial.deathDate }}
78
-                </div>
79
                 <div class="memorial-type">
76
                 <div class="memorial-type">
80
                   {{ memorial.memorialType }}
77
                   {{ memorial.memorialType }}
81
                 </div>
78
                 </div>

+ 1
- 17
src/app/pages/memorial-list/memorial-list.scss Vedi File

6
   color: #2f2720;
6
   color: #2f2720;
7
 }
7
 }
8
 
8
 
9
-.breadcrumb {
10
-  position: absolute;
11
-  top: 28px;
12
-  left: 50%;
13
-  transform: translateX(-50%);
14
-  color: #7b6b5c;
15
-  font-size: 14px;
16
-  z-index: 2;
17
-}
18
-
19
 .memorial-list-page {
9
 .memorial-list-page {
20
   display: flex;
10
   display: flex;
21
   align-items: flex-start;
11
   align-items: flex-start;
172
 .memorial-table-header,
162
 .memorial-table-header,
173
 .memorial-table-row {
163
 .memorial-table-row {
174
   display: grid;
164
   display: grid;
175
-  grid-template-columns: 1.2fr 1.4fr 0.8fr 1.2fr 1.1fr 0.8fr 0.7fr;
165
+  grid-template-columns: 1.4fr 1.2fr 0.9fr 0.8fr 1.2fr 0.8fr 0.7fr;
176
   align-items: center;
166
   align-items: center;
177
   column-gap: 12px;
167
   column-gap: 12px;
178
 }
168
 }
284
 }
274
 }
285
 
275
 
286
 @media (max-width: 800px) {
276
 @media (max-width: 800px) {
287
-  .breadcrumb {
288
-    position: static;
289
-    transform: none;
290
-    padding: 16px 20px 0;
291
-  }
292
-
293
   .memorial-list-page {
277
   .memorial-list-page {
294
     flex-direction: column;
278
     flex-direction: column;
295
   }
279
   }

+ 9
- 0
src/app/pages/memorial-list/memorial-list.ts Vedi File

75
     this.createMemorialList();
75
     this.createMemorialList();
76
   }
76
   }
77
 
77
 
78
+  formatDeathDate(deathDate: string): string {
79
+    const [, month, day] = deathDate.split('-').map(Number);
80
+    if (!month || !day) {
81
+      return '未登録';
82
+    }
83
+
84
+    return `${month}月${day}日`;
85
+  }
86
+
78
   getMemorialType(yearDiff: number) {
87
   getMemorialType(yearDiff: number) {
79
     switch (yearDiff) {
88
     switch (yearDiff) {
80
       case 1:
89
       case 1:

+ 1
- 5
src/app/pages/search/search.html Vedi File

1
 <app-header></app-header>
1
 <app-header></app-header>
2
 
2
 
3
-<div class="breadcrumb">
4
-  ホーム &gt; まとめて検索
5
-</div>
6
-
7
 <div class="search-page">
3
 <div class="search-page">
8
   <app-side-menu></app-side-menu>
4
   <app-side-menu></app-side-menu>
9
 
5
 
18
           <div class="search-input-box">
14
           <div class="search-input-box">
19
             <span class="search-icon">⌕</span>
15
             <span class="search-icon">⌕</span>
20
             <input type="text" [(ngModel)]="searchKeyword"
16
             <input type="text" [(ngModel)]="searchKeyword"
21
-                   placeholder="さとう / 佐藤 / 釈 / 2024 / 母 / 三回忌"
17
+                   placeholder="三回忌 / 〇〇歳 / 2024 /"
22
                    (keydown.enter)="searchAll()"/>
18
                    (keydown.enter)="searchAll()"/>
23
           </div>
19
           </div>
24
           <button type="button" class="search-button" (click)="searchAll()">
20
           <button type="button" class="search-button" (click)="searchAll()">

+ 0
- 16
src/app/pages/search/search.scss Vedi File

6
   color: #2f2720;
6
   color: #2f2720;
7
 }
7
 }
8
 
8
 
9
-.breadcrumb {
10
-  position: absolute;
11
-  top: 28px;
12
-  left: 50%;
13
-  transform: translateX(-50%);
14
-  color: #7b6b5c;
15
-  font-size: 14px;
16
-  z-index: 2;
17
-}
18
-
19
 .search-page {
9
 .search-page {
20
   display: flex;
10
   display: flex;
21
   align-items: flex-start;
11
   align-items: flex-start;
314
 }
304
 }
315
 
305
 
316
 @media (max-width: 800px) {
306
 @media (max-width: 800px) {
317
-  .breadcrumb {
318
-    position: static;
319
-    transform: none;
320
-    padding: 16px 20px 0;
321
-  }
322
-
323
   .search-page {
307
   .search-page {
324
     flex-direction: column;
308
     flex-direction: column;
325
   }
309
   }

+ 4
- 4
src/app/services/kakocho-service.ts Vedi File

13
       name: '鈴木 一郎',
13
       name: '鈴木 一郎',
14
       furigana: 'すずき いちろう',
14
       furigana: 'すずき いちろう',
15
       relationship: '父',
15
       relationship: '父',
16
-      kaimyo: '〇〇院〇〇居士',
16
+      kaimyo: '光譽明照信士',
17
       deathDate: '2024-01-08',
17
       deathDate: '2024-01-08',
18
       ageAtDeath: '88',
18
       ageAtDeath: '88',
19
       note: '三回忌対象',
19
       note: '三回忌対象',
25
       name: '鈴木 ハナ',
25
       name: '鈴木 ハナ',
26
       furigana: 'すずき はな',
26
       furigana: 'すずき はな',
27
       relationship: '母',
27
       relationship: '母',
28
-      kaimyo: '〇〇院〇〇大姉',
28
+      kaimyo: '清譽妙蓮大姉',
29
       deathDate: '2020-05-12',
29
       deathDate: '2020-05-12',
30
       ageAtDeath: '82',
30
       ageAtDeath: '82',
31
       note: '',
31
       note: '',
32
     },
32
     },
33
     {
33
     {
34
-      id: '2',
34
+      id: '3',
35
       dankaId: '2',
35
       dankaId: '2',
36
       familyId: '',
36
       familyId: '',
37
       name: '鈴木 太郎',
37
       name: '鈴木 太郎',
38
       furigana: 'すずき たろう',
38
       furigana: 'すずき たろう',
39
       relationship: '息子',
39
       relationship: '息子',
40
-      kaimyo: '〇〇院〇〇大姉',
40
+      kaimyo: '慈譽善道信士',
41
       deathDate: '2025-01-08',
41
       deathDate: '2025-01-08',
42
       ageAtDeath: '50',
42
       ageAtDeath: '50',
43
       note: '',
43
       note: '',

+ 1
- 1
src/index.html Vedi File

1
 <!doctype html>
1
 <!doctype html>
2
-<html lang="en">
2
+<html lang="ja">
3
 <head>
3
 <head>
4
   <meta charset="utf-8">
4
   <meta charset="utf-8">
5
   <title>戒名管理</title>
5
   <title>戒名管理</title>

Loading…
Annulla
Salva