Commit @a2bfcca52dda07cad7717f9d2aeb3ce210f64401

최정우 2023-04-04

Merge branch 'front-end' of http://210.180.118.83/yjryu/senior_care_system into front-end

@a2bfcca52dda07cad7717f9d2aeb3ce210f64401

08c54be

a2bfcca

client/resources/css/common.css

--- client/resources/css/common.css

+++ client/resources/css/common.css


 
 /* layout 공통 */
-textarea{border: 1px solid #d8d3c7; border-radius: 5px;}
+textarea{border: 1px solid #d8d3c7; border-radius: 5px; padding: 0.5rem;}
 em{font-style: normal;}
 main img{margin-right: 1rem; 
   width: unset;}

 input[type='radio'],
 input[type='radio']:checked {
   width: 0.9rem;
-  height: 0.9rem;
+  height: 1.5rem;
   border-radius: 100%;
   margin-right: 1rem;
 }

08c54be

a2bfcca

client/resources/css/main.css

--- client/resources/css/main.css

+++ client/resources/css/main.css


   font-size: 1.5rem;
   color: #cbc9c9;
 }
-
+.statistics-grid > div{height: 35rem;}
 .statistics-grid .statistics-guardian {
   height: 41vh;
 }

08c54be

a2bfcca

client/views/component/Table.jsx

--- client/views/component/Table.jsx

+++ client/views/component/Table.jsx


                           else if (view == "qna") {
                             navigate(`/QuestionConfirm/${i.qna_idx}`);
                           }
+                          else if (view == "mySeniorMedicine") {
+                            navigate("/MedicineCareSelectOne");
+                          }
+                          else if (view == "mySeniorTemperature") {
+                            navigate("/TemperatureManagementSelectOne");
+                          }
+                          else if (view == "mySeniorVisit") {
+                            navigate("/VisitSelectOne");
+                          }
                           else {
                             return;
                           }

08c54be

a2bfcca

client/views/pages/healthcare/Healthcare.jsx

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

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


 import DetailSearch from "../../component/DetailSearch.jsx";
 import DetailTitle from "../../component/DetailTitle.jsx";
 
-export default function UserAuthoriySelect() {
+export default function Healthcare() {
     const navigate = useNavigate();
     const [tapName, setTapName] = useState("복약관리")
     const thead = [
         "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률",
     ];
     const key = [
-        "No", "name", "number", "birth", "phone", "address", "average"
+        "No", "name", "number", "birth", "phone", "address", "average",
     ];
     const content = [
         {

             agency: "A복지관",
             protect: "홍길동",
             average: "0%",
+            // detail: (
+            //     <Button
+            //         className={"btn-small gray-btn"}
+            //         btnName={"보기"}
+            //         onClick={() => {
+            //             navigate("/MedicineCareSelectOne");
+            //         }}
+            //     />
+            // ),
         },
 
     ];

     const thead1 = [
         "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도", "최근 최고 온도",
     ];
-    const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high"
+    const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high",
     ];
     const content1 = [
         {

             protect: "홍길동",
             high: "18°C",
             low: "18°C",
+            // detail: (
+            //     <Button
+            //         className={"btn-small gray-btn"}
+            //         btnName={"보기"}
+            //         onClick={() => {
+            //             navigate("/TemperatureManagementSelectOne");
+            //         }}
+            //     />
+            // ),
         }
     ];
     const thead2 = [
         "No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유",
     ];
     const key2 = [
-        "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail"
+        "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail",
     ];
     const content2 = [
         {

             visit: "2023.02.08",
             reason: "정기방문",
             reason_detail: "정기방문일",
+            // detail: (
+            //     <Button
+            //         className={"btn-small gray-btn"}
+            //         btnName={"보기"}
+            //         onClick={() => {
+            //             navigate("/VisitSelectOne");
+            //         }}
+            //     />
+            // ),
         },
     ];
     const data = [

                     head={thead}
                     contents={content}
                     contentKey={key}
+                    view={"mySeniorMedicine"}
                     onClick={() => {
                         navigate("/MedicineCareSelectOne");
                     }}

                     head={thead1}
                     contents={content1}
                     contentKey={key1}
+                    view={"mySeniorTemperature"}
                     onClick={() => {
                         navigate("/TemperatureManagementSelectOne");
                     }}

                     head={thead2}
                     contents={content2}
                     contentKey={key2}
+                    view={"mySeniorVisit"}
                     onClick={() => {
                         navigate("/VisitSelectOne");
                     }}

08c54be

a2bfcca

client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx

--- client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx

+++ client/views/pages/healthcare/medicinecare/MedicineCareSelectOne.jsx


               </td>
             </tr>
           </table>
-          <div>
-            <Button className={"btn-100 green-btn"} btnName={"등록"} />
+          <div className="flex-center">
+            <Button className={"btn-small red-btn"} btnName={"등록"} />
           </div>
         </div>
       </Modal>

                 <td>
                   <div className="btn-wrap flex-center">
                     <Button
-                      className={"btn-small green-btn"}
+                      className={"btn-small lightgray-btn"}
                       btnName={"수정"}
                       onClick={openModal}
                     />
-                    <Button className={"btn-small gray-btn"} btnName={"삭제"} />
+                    <Button className={"btn-small gray-btn"} btnName={"삭제"} onClick={function() {alert('정말 삭제하시겠습니까?')}}/>
                   </div>
                 </td>
               </tr>

                 <td>
                   <div className="btn-wrap flex-center">
                     <Button
-                      className={"btn-small green-btn"}
+                      className={"btn-small lightgray-btn"}
                       btnName={"수정"}
                       onClick={openModal}
                     />
-                    <Button className={"btn-small gray-btn"} btnName={"삭제"} />
+                    <Button className={"btn-small gray-btn"} btnName={"삭제"} onClick={function() {alert('정말 삭제하시겠습니까?')}}/>
                   </div>
                 </td>
               </tr>

               className={"btn-large gray-btn"}
               btnName={"이전"}
               onClick={() => {
-                navigate("/MedicineCareSelect");
+                navigate("/Healthcare");
               }}
             />
           </div>

08c54be

a2bfcca

client/views/pages/visit/visit/VisitSelectOne.jsx

--- client/views/pages/visit/visit/VisitSelectOne.jsx

+++ client/views/pages/visit/visit/VisitSelectOne.jsx


               className={"btn-large gray-btn"}
               btnName={"이전"}
               onClick={() => {
-                navigate("/VisitSelect");
+                navigate("/Healthcare");
               }}
             />
           </div>

Add a comment

Open 0
Closed 0

List

...	...	@@ -1,6 +1,6 @@
1	1
2	2	/* layout 공통 */
3		-textarea{border: 1px solid #d8d3c7; border-radius: 5px;}
	3	+textarea{border: 1px solid #d8d3c7; border-radius: 5px; padding: 0.5rem;}
4	4	em{font-style: normal;}
5	5	main img{margin-right: 1rem;
6	6	width: unset;}
...	...	@@ -366,7 +366,7 @@
366	366	input[type='radio'],
367	367	input[type='radio']:checked {
368	368	width: 0.9rem;
369		- height: 0.9rem;
	369	+ height: 1.5rem;
370	370	border-radius: 100%;
371	371	margin-right: 1rem;
372	372	}

...	...	@@ -408,7 +408,7 @@
408	408	font-size: 1.5rem;
409	409	color: #cbc9c9;
410	410	}
411		-
	411	+.statistics-grid > div{height: 35rem;}
412	412	.statistics-grid .statistics-guardian {
413	413	height: 41vh;
414	414	}

...	...	@@ -132,6 +132,15 @@
132	132	else if (view == "qna") {
133	133	navigate(`/QuestionConfirm/${i.qna_idx}`);
134	134	}
	135	+ else if (view == "mySeniorMedicine") {
	136	+ navigate("/MedicineCareSelectOne");
	137	+ }
	138	+ else if (view == "mySeniorTemperature") {
	139	+ navigate("/TemperatureManagementSelectOne");
	140	+ }
	141	+ else if (view == "mySeniorVisit") {
	142	+ navigate("/VisitSelectOne");
	143	+ }
135	144	else {
136	145	return;
137	146	}

...	...	@@ -9,14 +9,14 @@
9	9	import DetailSearch from "../../component/DetailSearch.jsx";
10	10	import DetailTitle from "../../component/DetailTitle.jsx";
11	11
12		-export default function UserAuthoriySelect() {
	12	+export default function Healthcare() {
13	13	const navigate = useNavigate();
14	14	const [tapName, setTapName] = useState("복약관리")
15	15	const thead = [
16	16	"No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 복약률",
17	17	];
18	18	const key = [
19		- "No", "name", "number", "birth", "phone", "address", "average"
	19	+ "No", "name", "number", "birth", "phone", "address", "average",
20	20	];
21	21	const content = [
22	22	{
...	...	@@ -29,6 +29,15 @@
29	29	agency: "A복지관",
30	30	protect: "홍길동",
31	31	average: "0%",
	32	+ // detail: (
	33	+ // <Button
	34	+ // className={"btn-small gray-btn"}
	35	+ // btnName={"보기"}
	36	+ // onClick={() => {
	37	+ // navigate("/MedicineCareSelectOne");
	38	+ // }}
	39	+ // />
	40	+ // ),
32	41	},
33	42
34	43	];
...	...	@@ -36,7 +45,7 @@
36	45	const thead1 = [
37	46	"No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", "최근 최저 온도", "최근 최고 온도",
38	47	];
39		- const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high"
	48	+ const key1 = ["No", "name", "number", "birth", "phone", "address", "low", "high",
40	49	];
41	50	const content1 = [
42	51	{
...	...	@@ -50,13 +59,22 @@
50	59	protect: "홍길동",
51	60	high: "18°C",
52	61	low: "18°C",
	62	+ // detail: (
	63	+ // <Button
	64	+ // className={"btn-small gray-btn"}
	65	+ // btnName={"보기"}
	66	+ // onClick={() => {
	67	+ // navigate("/TemperatureManagementSelectOne");
	68	+ // }}
	69	+ // />
	70	+ // ),
53	71	}
54	72	];
55	73	const thead2 = [
56	74	"No", "이름", "대상자등록번호", "생년월일", "연락처", "주소", , "최근 방문일", "방문목적", "상세사유",
57	75	];
58	76	const key2 = [
59		- "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail"
	77	+ "No", "name", "number", "birth", "phone", "address", "visit", "reason", "reason_detail",
60	78	];
61	79	const content2 = [
62	80	{
...	...	@@ -69,6 +87,15 @@
69	87	visit: "2023.02.08",
70	88	reason: "정기방문",
71	89	reason_detail: "정기방문일",
	90	+ // detail: (
	91	+ // <Button
	92	+ // className={"btn-small gray-btn"}
	93	+ // btnName={"보기"}
	94	+ // onClick={() => {
	95	+ // navigate("/VisitSelectOne");
	96	+ // }}
	97	+ // />
	98	+ // ),
72	99	},
73	100	];
74	101	const data = [
...	...	@@ -81,6 +108,7 @@
81	108	head={thead}
82	109	contents={content}
83	110	contentKey={key}
	111	+ view={"mySeniorMedicine"}
84	112	onClick={() => {
85	113	navigate("/MedicineCareSelectOne");
86	114	}}
...	...	@@ -96,6 +124,7 @@
96	124	head={thead1}
97	125	contents={content1}
98	126	contentKey={key1}
	127	+ view={"mySeniorTemperature"}
99	128	onClick={() => {
100	129	navigate("/TemperatureManagementSelectOne");
101	130	}}
...	...	@@ -111,6 +140,7 @@
111	140	head={thead2}
112	141	contents={content2}
113	142	contentKey={key2}
	143	+ view={"mySeniorVisit"}
114	144	onClick={() => {
115	145	navigate("/VisitSelectOne");
116	146	}}

...	...	@@ -99,8 +99,8 @@
99	99	</td>
100	100	</tr>
101	101	</table>
102		- <div>
103		- <Button className={"btn-100 green-btn"} btnName={"등록"} />
	102	+ <div className="flex-center">
	103	+ <Button className={"btn-small red-btn"} btnName={"등록"} />
104	104	</div>
105	105	</div>
106	106	</Modal>
...	...	@@ -211,11 +211,11 @@
211	211	<td>
212	212	<div className="btn-wrap flex-center">
213	213	<Button
214		- className={"btn-small green-btn"}
	214	+ className={"btn-small lightgray-btn"}
215	215	btnName={"수정"}
216	216	onClick={openModal}
217	217	/>
218		- <Button className={"btn-small gray-btn"} btnName={"삭제"} />
	218	+ <Button className={"btn-small gray-btn"} btnName={"삭제"} onClick={function() {alert('정말 삭제하시겠습니까?')}}/>
219	219	</div>
220	220	</td>
221	221	</tr>
...	...	@@ -233,11 +233,11 @@
233	233	<td>
234	234	<div className="btn-wrap flex-center">
235	235	<Button
236		- className={"btn-small green-btn"}
	236	+ className={"btn-small lightgray-btn"}
237	237	btnName={"수정"}
238	238	onClick={openModal}
239	239	/>
240		- <Button className={"btn-small gray-btn"} btnName={"삭제"} />
	240	+ <Button className={"btn-small gray-btn"} btnName={"삭제"} onClick={function() {alert('정말 삭제하시겠습니까?')}}/>
241	241	</div>
242	242	</td>
243	243	</tr>
...	...	@@ -248,7 +248,7 @@
248	248	className={"btn-large gray-btn"}
249	249	btnName={"이전"}
250	250	onClick={() => {
251		- navigate("/MedicineCareSelect");
	251	+ navigate("/Healthcare");
252	252	}}
253	253	/>
254	254	</div>

...	...	@@ -116,7 +116,7 @@
116	116	className={"btn-large gray-btn"}
117	117	btnName={"이전"}
118	118	onClick={() => {
119		- navigate("/VisitSelect");
	119	+ navigate("/Healthcare");
120	120	}}
121	121	/>
122	122	</div>

Delete comment