6 Commits

Author SHA1 Message Date
  poohr 4b23f24d7c Merge remote-tracking branch 'origin/master' 3 weeks ago
  poohr 55930d3ed2 [update] 3 weeks ago
  poohr 2f6e9bb4fb Merge remote-tracking branch 'origin/master' 3 weeks ago
  poohr e2e0368eef [update] 3 weeks ago
  poohr f82987694b [add] 3 weeks ago
  poohr 0a44ef1385 [add] 3 weeks ago

+ 1
- 0
src/app/models/memorial.ts View File

3
   id: string;
3
   id: string;
4
   dankaId: string;
4
   dankaId: string;
5
   name: string;
5
   name: string;
6
+  furigana: string;
6
   kaimyo: string;
7
   kaimyo: string;
7
   relationship: string;
8
   relationship: string;
8
   householdName: string;
9
   householdName: string;

+ 2
- 2
src/app/pages/kakocho-edit/kakocho-edit.html View File

89
                 />
89
                 />
90
               </div>
90
               </div>
91
 
91
 
92
-              <!--年 -->
92
+              <!--年 -->
93
               <div class="form-row">
93
               <div class="form-row">
94
-                <label for="ageAtDeath">年</label>
94
+                <label for="ageAtDeath">年</label>
95
 
95
 
96
                 <input
96
                 <input
97
                   id="ageAtDeath"
97
                   id="ageAtDeath"

+ 3
- 3
src/app/pages/memorial-list/memorial-list.html View File

12
 
12
 
13
           <div class="filter-row">
13
           <div class="filter-row">
14
             <div class="filter-field">
14
             <div class="filter-field">
15
-              <label for="targetYear">対象年</label>
15
+              <label for="targetYear">年</label>
16
               <select
16
               <select
17
                 id="targetYear"
17
                 id="targetYear"
18
                 [(ngModel)]="targetYear"
18
                 [(ngModel)]="targetYear"
60
         <div class="memorial-table">
60
         <div class="memorial-table">
61
           <div class="memorial-table-header">
61
           <div class="memorial-table-header">
62
             <div>戒名</div>
62
             <div>戒名</div>
63
-            <div>俗名</div>
63
+            <div>俗名・ふりがな</div>
64
             <div>没年月日</div>
64
             <div>没年月日</div>
65
             <div>関係</div>
65
             <div>関係</div>
66
             <div>檀家(世帯)</div>
66
             <div>檀家(世帯)</div>
77
                 </div>
77
                 </div>
78
                 <div>
78
                 <div>
79
                   <p class="person-name">{{ memorial.name }}</p>
79
                   <p class="person-name">{{ memorial.name }}</p>
80
-                  <p class="person-sub">俗名</p>
80
+                  <p class="person-sub">{{ memorial.furigana || 'ふりがな未登録' }}</p>
81
                 </div>
81
                 </div>
82
                 <div>
82
                 <div>
83
                   {{ formatDeathDate(memorial.deathDate) }}
83
                   {{ formatDeathDate(memorial.deathDate) }}

+ 2
- 0
src/app/pages/memorial-list/memorial-list.ts View File

81
         id: kakocho.id,
81
         id: kakocho.id,
82
         dankaId: kakocho.dankaId,
82
         dankaId: kakocho.dankaId,
83
         name: kakocho.name,
83
         name: kakocho.name,
84
+        furigana: kakocho.furigana,
84
         kaimyo: kakocho.kaimyo,
85
         kaimyo: kakocho.kaimyo,
85
         relationship: kakocho.relationship,
86
         relationship: kakocho.relationship,
86
         householdName: danka?.householdName ?? '不明',
87
         householdName: danka?.householdName ?? '不明',
119
       [
120
       [
120
         memorial.kaimyo,
121
         memorial.kaimyo,
121
         memorial.name,
122
         memorial.name,
123
+        memorial.furigana,
122
         memorial.deathDate,
124
         memorial.deathDate,
123
         memorial.relationship,
125
         memorial.relationship,
124
         memorial.householdName,
126
         memorial.householdName,

+ 0
- 3
src/app/pages/search/search.html View File

58
                   <div>
58
                   <div>
59
                     住所: {{ danka.address }}
59
                     住所: {{ danka.address }}
60
                   </div>
60
                   </div>
61
-                  <div class="result-link-text">
62
-                    開く
63
-                  </div>
64
                 </a>
61
                 </a>
65
               }
62
               }
66
             </section>
63
             </section>

+ 11
- 15
src/app/pages/search/search.scss View File

71
 }
71
 }
72
 
72
 
73
 .search-condition-area {
73
 .search-condition-area {
74
-  margin-top: 0;
74
+  margin: 0 0 16px;
75
 }
75
 }
76
 
76
 
77
 .search-input-row {
77
 .search-input-row {
85
   height: 46px;
85
   height: 46px;
86
   border: 2px solid #d8caba;
86
   border: 2px solid #d8caba;
87
   border-radius: 6px;
87
   border-radius: 6px;
88
-  background: #fffdf9;
88
+  background: #ffffff;
89
   display: flex;
89
   display: flex;
90
   align-items: center;
90
   align-items: center;
91
   padding: 0 16px;
91
   padding: 0 16px;
128
 
128
 
129
 .search-button {
129
 .search-button {
130
   border: 2px solid #8a6543;
130
   border: 2px solid #8a6543;
131
-  background: #8a6543;
132
-  color: #ffffff;
131
+  background: #ffffff;
132
+  color: #8a6543;
133
 }
133
 }
134
 
134
 
135
 .search-button:hover {
135
 .search-button:hover {
136
-  background: #765639;
136
+  background: #f6efe6;
137
 }
137
 }
138
 
138
 
139
 .filter-button-main,
139
 .filter-button-main,
140
 .back-list-button {
140
 .back-list-button {
141
-  border: 2px solid #d8caba;
141
+  border: 2px solid #8a6543;
142
   background: #ffffff;
142
   background: #ffffff;
143
-  color: #2f2720;
143
+  color: #8a6543;
144
   text-decoration: none;
144
   text-decoration: none;
145
   display: flex;
145
   display: flex;
146
   align-items: center;
146
   align-items: center;
156
   display: flex;
156
   display: flex;
157
   flex-wrap: wrap;
157
   flex-wrap: wrap;
158
   gap: 8px;
158
   gap: 8px;
159
-  margin-top: 12px;
159
+  margin: 12px 0 16px;
160
 }
160
 }
161
 
161
 
162
 .search-filter-button {
162
 .search-filter-button {
184
 }
184
 }
185
 
185
 
186
 .search-result-panel {
186
 .search-result-panel {
187
-  margin-top: 16px;
187
+  margin-top: 0;
188
   padding: 0;
188
   padding: 0;
189
   border: 2px solid #d8caba;
189
   border: 2px solid #d8caba;
190
   border-radius: 8px;
190
   border-radius: 8px;
231
   align-items: center;
231
   align-items: center;
232
   column-gap: 18px;
232
   column-gap: 18px;
233
   box-sizing: border-box;
233
   box-sizing: border-box;
234
+  cursor: pointer;
234
 }
235
 }
235
 
236
 
236
 .result-row:hover {
237
 .result-row:hover {
238
 }
239
 }
239
 
240
 
240
 .danka-result-row {
241
 .danka-result-row {
241
-  grid-template-columns: 1.1fr 1.4fr 1.8fr 80px;
242
+  grid-template-columns: 1.1fr 1.4fr 1.8fr;
242
 }
243
 }
243
 
244
 
244
 .family-result-row {
245
 .family-result-row {
253
   font-weight: 800;
254
   font-weight: 800;
254
 }
255
 }
255
 
256
 
256
-.result-link-text {
257
-  color: #3f6f45;
258
-  font-weight: 800;
259
-}
260
-
261
 .empty-result {
257
 .empty-result {
262
   min-height: 72px;
258
   min-height: 72px;
263
   padding: 22px;
259
   padding: 22px;

+ 1
- 1
src/app/share/side-menu/app-side-menu.html View File

8
       </a>
8
       </a>
9
 
9
 
10
       <a routerLink="/danka-list" routerLinkActive="active" class="menu-button">
10
       <a routerLink="/danka-list" routerLinkActive="active" class="menu-button">
11
-        檀家一覧
11
+        檀家
12
       </a>
12
       </a>
13
 
13
 
14
       <a routerLink="/danka-new" routerLinkActive="active" class="menu-button">
14
       <a routerLink="/danka-new" routerLinkActive="active" class="menu-button">

Loading…
Cancel
Save