Commit @d951aecd3a4120d410b9da16c4470f5a78fcff27

박정하 2024-12-02

241202 박정하 최종 코드 커밋

@d951aecd3a4120d410b9da16c4470f5a78fcff27

c7476f6

d951aec

client/views/pages/healthcare/HealthcareSelectOne.jsx

--- client/views/pages/healthcare/HealthcareSelectOne.jsx

+++ client/views/pages/healthcare/HealthcareSelectOne.jsx


           {'AFTERNOON' in clickDayMedication ? <th>점심</th> : null}
           {'NIGHT' in clickDayMedication ? <th>저녁</th> : null}
           {'MIDNIGHT' in clickDayMedication ? <th>취침</th> : null}
+
+          {'BEFOREMORNING' in clickDayMedication ? <th>아침식전</th> : null}
+          {'AFTERMORNING' in clickDayMedication ? <th>아침</th> : null}
+          {'BEFOREAFTERNOON' in clickDayMedication ? <th>점심식전</th> : null}
+          {'AFTERAFTERNOON' in clickDayMedication ? <th>점심</th> : null}
+          {'BEFORENIGHT' in clickDayMedication ? <th>저녁식전</th> : null}
+          {'AFTERNIGHT' in clickDayMedication ? <th>저녁</th> : null}
+          {'BEFORESLEEPING' in clickDayMedication ? <th>취침전</th> : null}
         </tr>
         <tr>
           {clcikDaymedicationCount > 0 ? (

               {'AFTERNOON' in clickDayMedication ? <td>{clickDayMedication['AFTERNOON']}</td> : null}
               {'NIGHT' in clickDayMedication ? <td>{clickDayMedication['NIGHT']}</td> : null}
               {'MIDNIGHT' in clickDayMedication ? <td>{clickDayMedication['MIDNIGHT']}</td> : null}
+
+              {'BEFOREMORNING' in clickDayMedication ? <td>{clickDayMedication['BEFOREMORNING']}</td> : null}
+              {'AFTERMORNING' in clickDayMedication ? <td>{clickDayMedication['AFTERMORNING']}</td> : null}
+              {'BEFOREAFTERNOON' in clickDayMedication ? <td>{clickDayMedication['BEFOREAFTERNOON']}</td> : null}
+              {'AFTERAFTERNOON' in clickDayMedication ? <td>{clickDayMedication['AFTERAFTERNOON']}</td> : null}
+              {'BEFORENIGHT' in clickDayMedication ? <td>{clickDayMedication['BEFORENIGHT']}</td> : null}
+              {'AFTERNIGHT' in clickDayMedication ? <td>{clickDayMedication['AFTERNIGHT']}</td> : null}
+              {'BEFORESLEEPING' in clickDayMedication ? <td>{clickDayMedication['BEFORESLEEPING']}</td> : null}
             </>
           ) : <td colSpan={seniorMedicationList.length}>정보가 없습니다.</td>}
         </tr>

         <div className="flex-start main-guardian"><img src={Senior} alt="" />
           <Title title={`${senior['user_name']} 어르신`} explanation={"방문, 복약, 온도, 배터리 현황을 확인하세요."} />
         </div>
- 
+
         <div className="btn-wrap flex-end margin-bottom">
           <button className="btn-small gray-btn" onClick={() => { setVisitRecordInit(); openModal(); }}>방문등록</button>
         </div>

c7476f6

d951aec

client/views/pages/main/Main_agency.jsx

--- client/views/pages/main/Main_agency.jsx

+++ client/views/pages/main/Main_agency.jsx


         'Content-Type': 'application/json; charset=UTF-8'
       },
       body: JSON.stringify({
+        agency_id: state.loginUser["agency_id"],
         agent_id: state.loginUser["user_id"],
       }),
     }).then((response) => response.json()).then((data) => {

         "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
+        agency_id: state.loginUser["agency_id"],
         agent_id: state.loginUser["user_id"],
       }),
     })

         "Content-Type": "application/json; charset=UTF-8",
       },
       body: JSON.stringify({
+        agency_id: state.loginUser["agency_id"],
         agent_id: state.loginUser["user_id"],
       }),
     })

c7476f6

d951aec

server/modules/web/Server.js

--- server/modules/web/Server.js

+++ server/modules/web/Server.js


 
 http.createServer(webServer).listen(PORT);
 https.createServer({
-    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
-    cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`),
+    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/www.u-dolbom.com_nopass.key`),
+    cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/www.u-dolbom.com.pem`),
     ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`),
     // key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
     // cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`),

Add a comment

Open 0
Closed 0

List

...	...	@@ -413,6 +413,14 @@
413	413	{'AFTERNOON' in clickDayMedication ? <th>점심</th> : null}
414	414	{'NIGHT' in clickDayMedication ? <th>저녁</th> : null}
415	415	{'MIDNIGHT' in clickDayMedication ? <th>취침</th> : null}
	416	+
	417	+ {'BEFOREMORNING' in clickDayMedication ? <th>아침식전</th> : null}
	418	+ {'AFTERMORNING' in clickDayMedication ? <th>아침</th> : null}
	419	+ {'BEFOREAFTERNOON' in clickDayMedication ? <th>점심식전</th> : null}
	420	+ {'AFTERAFTERNOON' in clickDayMedication ? <th>점심</th> : null}
	421	+ {'BEFORENIGHT' in clickDayMedication ? <th>저녁식전</th> : null}
	422	+ {'AFTERNIGHT' in clickDayMedication ? <th>저녁</th> : null}
	423	+ {'BEFORESLEEPING' in clickDayMedication ? <th>취침전</th> : null}
416	424	</tr>
417	425	<tr>
418	426	{clcikDaymedicationCount > 0 ? (
...	...	@@ -422,6 +430,14 @@
422	430	{'AFTERNOON' in clickDayMedication ? <td>{clickDayMedication['AFTERNOON']}</td> : null}
423	431	{'NIGHT' in clickDayMedication ? <td>{clickDayMedication['NIGHT']}</td> : null}
424	432	{'MIDNIGHT' in clickDayMedication ? <td>{clickDayMedication['MIDNIGHT']}</td> : null}
	433	+
	434	+ {'BEFOREMORNING' in clickDayMedication ? <td>{clickDayMedication['BEFOREMORNING']}</td> : null}
	435	+ {'AFTERMORNING' in clickDayMedication ? <td>{clickDayMedication['AFTERMORNING']}</td> : null}
	436	+ {'BEFOREAFTERNOON' in clickDayMedication ? <td>{clickDayMedication['BEFOREAFTERNOON']}</td> : null}
	437	+ {'AFTERAFTERNOON' in clickDayMedication ? <td>{clickDayMedication['AFTERAFTERNOON']}</td> : null}
	438	+ {'BEFORENIGHT' in clickDayMedication ? <td>{clickDayMedication['BEFORENIGHT']}</td> : null}
	439	+ {'AFTERNIGHT' in clickDayMedication ? <td>{clickDayMedication['AFTERNIGHT']}</td> : null}
	440	+ {'BEFORESLEEPING' in clickDayMedication ? <td>{clickDayMedication['BEFORESLEEPING']}</td> : null}
425	441	</>
426	442	) : <td colSpan={seniorMedicationList.length}>정보가 없습니다.</td>}
427	443	</tr>
...	...	@@ -510,7 +526,7 @@
510	526	<div className="flex-start main-guardian"><img src={Senior} alt="" />
511	527	<Title title={`${senior['user_name']} 어르신`} explanation={"방문, 복약, 온도, 배터리 현황을 확인하세요."} />
512	528	</div>
513		-
	529	+
514	530	<div className="btn-wrap flex-end margin-bottom">
515	531	<button className="btn-small gray-btn" onClick={() => { setVisitRecordInit(); openModal(); }}>방문등록</button>
516	532	</div>

...	...	@@ -144,6 +144,7 @@
144	144	'Content-Type': 'application/json; charset=UTF-8'
145	145	},
146	146	body: JSON.stringify({
	147	+ agency_id: state.loginUser["agency_id"],
147	148	agent_id: state.loginUser["user_id"],
148	149	}),
149	150	}).then((response) => response.json()).then((data) => {
...	...	@@ -163,6 +164,7 @@
163	164	"Content-Type": "application/json; charset=UTF-8",
164	165	},
165	166	body: JSON.stringify({
	167	+ agency_id: state.loginUser["agency_id"],
166	168	agent_id: state.loginUser["user_id"],
167	169	}),
168	170	})
...	...	@@ -188,6 +190,7 @@
188	190	"Content-Type": "application/json; charset=UTF-8",
189	191	},
190	192	body: JSON.stringify({
	193	+ agency_id: state.loginUser["agency_id"],
191	194	agent_id: state.loginUser["user_id"],
192	195	}),
193	196	})

...	...	@@ -17,8 +17,8 @@
17	17
18	18	http.createServer(webServer).listen(PORT);
19	19	https.createServer({
20		- key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
21		- cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`),
	20	+ key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/www.u-dolbom.com_nopass.key`),
	21	+ cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/www.u-dolbom.com.pem`),
22	22	ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`),
23	23	// key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
24	24	// cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`),

Delete comment