6 Commits

Autor SHA1 Mensagem Data
  poohr 4b23f24d7c Merge remote-tracking branch 'origin/master' 3 semanas atrás
  poohr 55930d3ed2 [update] 3 semanas atrás
  poohr 2f6e9bb4fb Merge remote-tracking branch 'origin/master' 3 semanas atrás
  poohr e2e0368eef [update] 3 semanas atrás
  poohr f82987694b [add] 3 semanas atrás
  poohr 0a44ef1385 [add] 3 semanas atrás

+ 1
- 0
src/app/models/memorial.ts Ver arquivo

@@ -3,6 +3,7 @@ export interface Memorial {
3 3
   id: string;
4 4
   dankaId: string;
5 5
   name: string;
6
+  furigana: string;
6 7
   kaimyo: string;
7 8
   relationship: string;
8 9
   householdName: string;

+ 2
- 2
src/app/pages/kakocho-edit/kakocho-edit.html Ver arquivo

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

+ 3
- 3
src/app/pages/memorial-list/memorial-list.html Ver arquivo

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

+ 2
- 0
src/app/pages/memorial-list/memorial-list.ts Ver arquivo

@@ -81,6 +81,7 @@ export class MemorialList implements OnInit{
81 81
         id: kakocho.id,
82 82
         dankaId: kakocho.dankaId,
83 83
         name: kakocho.name,
84
+        furigana: kakocho.furigana,
84 85
         kaimyo: kakocho.kaimyo,
85 86
         relationship: kakocho.relationship,
86 87
         householdName: danka?.householdName ?? '不明',
@@ -119,6 +120,7 @@ export class MemorialList implements OnInit{
119 120
       [
120 121
         memorial.kaimyo,
121 122
         memorial.name,
123
+        memorial.furigana,
122 124
         memorial.deathDate,
123 125
         memorial.relationship,
124 126
         memorial.householdName,

+ 0
- 3
src/app/pages/search/search.html Ver arquivo

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

+ 11
- 15
src/app/pages/search/search.scss Ver arquivo

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

+ 1
- 1
src/app/share/side-menu/app-side-menu.html Ver arquivo

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

Carregando…
Cancelar
Salvar