박정하 박정하 2023-07-05
230705 박정하 일부 명칭 수정
@481f7274fd13bf6c3eddef9bbdea1916af128805
Global.js
--- Global.js
+++ Global.js
@@ -5,10 +5,10 @@
 const SERVICE_STATUS = process.env.NODE_ENV;//development, production
 const PORT = 80;
 const API_SERVER_HOST = 'localhost:8080';
-const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
-const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
-// const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
-// const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
+//const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
+//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
+const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
+const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
 
 module.exports = {
     PROJECT_NAME,
client/resources/css/main.css
--- client/resources/css/main.css
+++ client/resources/css/main.css
@@ -845,7 +845,7 @@
   margin-bottom: 0;
 }
 
-/* 보호사 정보 */
+/* 생활보호사 정보 */
 .caregiver-info p {
   font-size: 1.6rem;
   margin-bottom: 1rem;
client/views/component/Modal_Guardian.jsx
--- client/views/component/Modal_Guardian.jsx
+++ client/views/component/Modal_Guardian.jsx
@@ -305,7 +305,7 @@
           </div>
           <div className="modal-main">
             <SubTitle explanation={"최초 ID는 연락처, PW는 qwer1234!입니다."} className="margin-bottom" />
-            {CommonUtil.isEmpty(guardian['user_phonenumber']) ?
+            {CommonUtil.isEmpty(guardian['guardian_id']) ?
               <div className="flex-end margin-bottom">
                 <div className="flex searchselect" style={{ width: 'auto' }}>
                   <input type="radio" id="new_guardian" name="guardian" checked={isNewGuardian}
@@ -319,7 +319,7 @@
               </div> : null
             }
 
-            {CommonUtil.isEmpty(guardian['user_phonenumber']) && !isNewGuardian ? (
+            {CommonUtil.isEmpty(guardian['guardian_id']) && !isNewGuardian ? (
               <table className="margin-bottom2 senior-insert">
                 <tr>
                   <th><span style={{ color: "red" }}>*</span>연락처 검색</th>
client/views/component/Modal_Matching.jsx
--- client/views/component/Modal_Matching.jsx
+++ client/views/component/Modal_Matching.jsx
@@ -24,9 +24,9 @@
 
   const thead = [
     "No",
-    "보호사 명",
-    "보호사 ID",
-    "보호사 연락처",
+    "생활보호사 명",
+    "생활보호사 ID",
+    "생활보호사 연락처",
     "매칭 일자",
     "삭제"
   ];
client/views/layout/Menu.jsx
--- client/views/layout/Menu.jsx
+++ client/views/layout/Menu.jsx
@@ -7,13 +7,13 @@
 import MenuIcon from "@mui/icons-material/Menu";
 import CloseIcon from '@mui/icons-material/Close';
 
-export default function Sidebar({items}) {
+export default function Sidebar({ items }) {
   //전역 변수 저장 객체
-  const state = useSelector((state) => {return state});
+  const state = useSelector((state) => { return state });
 
   const [menuToggle, setMenuToggle] = React.useState(false);
 
-  const onClickshow=()=>{
+  const onClickshow = () => {
     setMenuToggle(!menuToggle)
   }
   const navigate = useNavigate();
@@ -37,15 +37,15 @@
     });
   };
   const [iconIndex, setIconIndex] = React.useState(0);
-  const icons = [<MenuIcon sx={{ fontSize: 40, }}/>, <CloseIcon sx={{ fontSize: 40, }}/>];
+  const icons = [<MenuIcon sx={{ fontSize: 40, }} />, <CloseIcon sx={{ fontSize: 40, }} />];
   const handleClick = () => {
-    setIconIndex((iconIndex + 1) % icons.length);   
+    setIconIndex((iconIndex + 1) % icons.length);
   };
   return (
- <>
-      <nav className={menuToggle? "nav on" : "nav"}>
-        <div className="menuicon"  onClick={() => {onClickshow(); handleClick();}}>
-          {icons[iconIndex]} 
+    <>
+      <nav className={menuToggle ? "nav on" : "nav"}>
+        <div className="menuicon" onClick={() => { onClickshow(); handleClick(); }}>
+          {icons[iconIndex]}
         </div>
         <h1 className="logo"><img src={logo} alt="" /></h1>
         <div className="flex-align-column" style={{ marginTop: `3rem` }}>
@@ -59,21 +59,22 @@
             }
           </ul>
         </div>
-        <div className="bottom-section flex-center" style={{width: '100%'}}>
-            {state.loginUser['authority'] == 'ROLE_ADMIN'
-              || state.loginUser['authority'] == 'ROLE_GOVERNMENT'
-              || state.loginUser['authority'] == 'ROLE_AGENCYADMIN'
-              || state.loginUser['authority'] == 'ROLE_AGENCY' ? 
-              <div className="info-id" >
-                <span onClick={() => {
-                  navigate("/Join");
-                }}>계정추가</span>
-              </div>
+        <div className="bottom-section flex-center" style={{ width: '100%' }}>
+          {state.loginUser['authority'] == 'ROLE_ADMIN'
+            || state.loginUser['authority'] == 'ROLE_GOVERNMENT'
+            || state.loginUser['authority'] == 'ROLE_AGENCYADMIN'
+            // || state.loginUser['authority'] == 'ROLE_AGENCY' 
+            ?
+            <div className="info-id" >
+              <span onClick={() => {
+                navigate("/Join");
+              }}>관리자추가</span>
+            </div>
             : null}
-            <div className="logout" onClick={logout}><span>로그아웃</span></div>
-          </div>
+          <div className="logout" onClick={logout}><span>로그아웃</span></div>
+        </div>
       </nav>
-        
- </>
+
+    </>
   );
 }
client/views/pages/AppRoute.jsx
--- client/views/pages/AppRoute.jsx
+++ client/views/pages/AppRoute.jsx
@@ -291,6 +291,15 @@
     icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />,
   },
   {
+    title: "사용자 관리",
+    path: "/UserSelect",
+    icon: (
+      <PersonIcon
+        sx={{ fontSize: 20, marginRight: 1 }}
+      />
+    ),
+  },
+  {
     title: "대상자 관리",
     path: "/AgencyAdminSeniorSelect",
     icon: (
@@ -342,6 +351,7 @@
       <Route path="/SeniorEdit" element={<SeniorEdit />}></Route>
       <Route path="/SeniorSelectOne" element={<SeniorSelectOne />}></Route>
       <Route path="/UserEdit" element={<UserEdit />}></Route>
+      <Route path="/UserSelect" element={<UserSelect />}></Route>
       <Route path="/AgentSelectOne" element={<AgentSelectOne />}></Route>
       <Route
         path="/HealthcareSelectOne"
client/views/pages/authority/AuthorityManagement-ryu.jsx
--- client/views/pages/authority/AuthorityManagement-ryu.jsx
+++ client/views/pages/authority/AuthorityManagement-ryu.jsx
@@ -7,7 +7,7 @@
   const [checkArr, setCheckArr] = React.useState([]); //check 배열
   const [menuCheckArr, setMenuCheckArr] = React.useState([]); //menu check 배열
 
-  const authorityList = ["보호자", "보호사", "병원", "지자체", "관리자"];
+  const authorityList = ["보호자", "생활보호사", "병원", "지자체", "관리자"];
   const menuList = [
     {
       menu: {
client/views/pages/equipment/AgencyEquipmentSelect.jsx
--- client/views/pages/equipment/AgencyEquipmentSelect.jsx
+++ client/views/pages/equipment/AgencyEquipmentSelect.jsx
@@ -96,12 +96,13 @@
   const [rentalEquipmentSearch, setRentalEquipmentSearch] = React.useState({
     'government_id': defaultGovernmentId,
     'agency_id': defaultAgencyId,
-    'senior_id': 'IS_NOT_NULL',
+    // 'senior_id': 'IS_NOT_NULL',
     'currentPage': 1,
     'perPage': 10,
   });
   //입고 및 미대여 목록
   const [rentalEquipment, setRentalEquipment] = React.useState({ equipmentList: [], equipmentListCount: 0 });
+  console.log("rentalEquipmentSearch:", rentalEquipmentSearch)
   //입고 및 미대여 목록 조회
   const rentalEquipmentSelectList = (currentPage) => {
     rentalEquipmentSearch.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
@@ -185,12 +186,13 @@
                 <td data-label="장비상태">{equipmentStates[item['equipment_state']]}</td>
                 <td>{item['agency_name']}</td>
                 <td data-label="대여시행자">
-                  {item['rental_detail_insert_user_name']}
-                  ({item['rental_detail_insert_user_id']})
+                  {CommonUtil.isEmpty(item['rental_detail_insert_user_name']) == false ?
+                    item['rental_detail_insert_user_name'] + '(' + item['rental_detail_insert_user_id'] + ')'
+                    : '-'}
                 </td>
-                <td data-label="대여일">{item['rental_start_date']}</td>
+                <td data-label="대여일">{CommonUtil.isEmpty(item['rental_start_date']) == false ? item['rental_start_date'] : '-'}</td>
                 <td data-label="대여여부">{CommonUtil.isEmpty(item['user_name']) == false ? '대여중' : '미대여'}</td>
-                <td data-label="장비사용대상자">{item['user_name']}</td>
+                <td data-label="장비사용대상자">{CommonUtil.isEmpty(item['user_name']) == false ? item['user_name'] : '-'}</td>
               </tr>
             )
           })}
client/views/pages/equipment/GovernmentEquipmentSelect.jsx
--- client/views/pages/equipment/GovernmentEquipmentSelect.jsx
+++ client/views/pages/equipment/GovernmentEquipmentSelect.jsx
@@ -431,12 +431,13 @@
   const [selectEquipment, setSelectEquipment] = React.useState()
 
   //장비 대여 등록
-  const equipmentRentalInsert = (seniorId) => {
+  const equipmentRentalInsert = (senior) => {
     if (confirm('해당 장비를 추가하시겠습니까?') == false) {
       return;
     }
 
-    selectEquipment['senior_id'] = seniorId;
+    selectEquipment['agency_id'] = senior['agency_id']; // 장비에 시행기관이 '없음'일 경우 배포한 시니어의 시행기관을 등록 
+    selectEquipment['senior_id'] = senior['senior_id'];
     selectEquipment['rental_start_date'] = new Date();
 
     fetch("/equipment/equipmentRentalInsert.json", {
@@ -850,7 +851,7 @@
                     <td data-label="생년월일">{item['user_birth']}</td>
                     <td data-label="성별">{item['user_gender']}</td>
                     <td data-label="배포">
-                      <button className="btn-small gray-btn" onClick={() => { equipmentRentalInsert(item['senior_id']) }}>배포하기</button>
+                      <button className="btn-small gray-btn" onClick={() => { equipmentRentalInsert(item) }}>배포하기</button>
                     </td>
                   </tr>
                 )
client/views/pages/healthcare/Healthcare.jsx
--- client/views/pages/healthcare/Healthcare.jsx
+++ client/views/pages/healthcare/Healthcare.jsx
@@ -43,7 +43,7 @@
   React.useEffect(() => {
     searching();
   }, [isMySenior])
-  //보호사(간호사)의 돌봄 대상자(시니어)
+  //생활보호사(간호사)의 돌봄 대상자(시니어)
   const [senior, setSenior] = React.useState({
     seniorList: [], seniorListCount: 0, search: {
       'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'],
@@ -54,7 +54,7 @@
       'perPage': 10,
     }
   });
-  //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
+  //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
   const seniorSelectList = (currentPage) => {
     senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
 
client/views/pages/healthcare/HealthcareAdmin.jsx
--- client/views/pages/healthcare/HealthcareAdmin.jsx
+++ client/views/pages/healthcare/HealthcareAdmin.jsx
@@ -43,7 +43,7 @@
   React.useEffect(() => {
     searching();
   }, [isMySenior])
-  //보호사(간호사)의 돌봄 대상자(시니어)
+  //생활보호사(간호사)의 돌봄 대상자(시니어)
   const [senior, setSenior] = React.useState({
     seniorList: [], seniorListCount: 0, search: {
       'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'],
@@ -54,7 +54,7 @@
       'perPage': 10,
     }
   });
-  //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
+  //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
   const seniorSelectList = (currentPage) => {
     senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
 
client/views/pages/healthcare/Medicalcare.jsx
--- client/views/pages/healthcare/Medicalcare.jsx
+++ client/views/pages/healthcare/Medicalcare.jsx
@@ -46,7 +46,7 @@
     React.useEffect(() => {
         searching();
     }, [isMySenior])
-    //보호사(간호사)의 돌봄 대상자(시니어)
+    //생활보호사(간호사)의 돌봄 대상자(시니어)
 	const [senior, setSenior] = React.useState({seniorList: [], seniorListCount: 0, search: {
         'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'],
         'agency_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['agency_id'],
@@ -55,7 +55,7 @@
 		'currentPage': 1,
 		'perPage': 10,
 	}});
-	//보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
+	//생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
 	const seniorSelectList = (currentPage) => {
 		senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
 
client/views/pages/healthcare/MedicalcareAdmin.jsx
--- client/views/pages/healthcare/MedicalcareAdmin.jsx
+++ client/views/pages/healthcare/MedicalcareAdmin.jsx
@@ -46,7 +46,7 @@
   React.useEffect(() => {
     searching();
   }, [isMySenior])
-  //보호사(간호사)의 돌봄 대상자(시니어)
+  //생활보호사(간호사)의 돌봄 대상자(시니어)
   const [senior, setSenior] = React.useState({
     seniorList: [], seniorListCount: 0, search: {
       'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'],
@@ -57,7 +57,7 @@
       'perPage': 10,
     }
   });
-  //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
+  //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
   const seniorSelectList = (currentPage) => {
     senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
 
client/views/pages/healthcare/statistics/GuardianStatistics.jsx
--- client/views/pages/healthcare/statistics/GuardianStatistics.jsx
+++ client/views/pages/healthcare/statistics/GuardianStatistics.jsx
@@ -27,7 +27,7 @@
             <li className="flex-start">
               <p><img className="guardian-img" src={calendarBig} alt="" /></p>
               <p>방문 그래프</p>
-              <p>이번달 보호사님이 방문한 횟수는 총 4회 입니다.</p>
+              <p>이번달 생활보호사님이 방문한 횟수는 총 4회 입니다.</p>
             </li>
             <li className="chart-guardian">
               <Chart />
client/views/pages/join/Join.jsx
--- client/views/pages/join/Join.jsx
+++ client/views/pages/join/Join.jsx
@@ -118,8 +118,8 @@
   const userAuthorityChange = (value) => {
     let newUser = JSON.parse(JSON.stringify(user));
     newUser['authority'] = value;
-    newUser['government_id'] = null;
-    newUser['agency_id'] = null;
+    // newUser['government_id'] = null;
+    // newUser['agency_id'] = null;
     setUser(newUser);
   }
   //등록할 사용자의 관리기관 변경
@@ -253,7 +253,7 @@
     });
   }
 
-  //보호사 등록
+  //생활보호사 등록
   const agentInsert = () => {
     if (userInsertValidation() == false) {
       return;
@@ -266,7 +266,7 @@
       },
       body: JSON.stringify(user),
     }).then((response) => response.json()).then((data) => {
-      console.log("보호사 등록 결과(건수) : ", data);
+      console.log("생활보호사 등록 결과(건수) : ", data);
       if (data > 0) {
         alert("계정생성완료");
         navigate(-1);
@@ -310,7 +310,7 @@
                     {CommonUtil.isEmpty(state.loginUser) == false && (state.loginUser['authority'] == 'ROLE_ADMIN' || state.loginUser['authority'] == 'ROLE_GOVERNMENT' || state.loginUser['authority'] == 'ROLE_AGENCYADMIN') ?
                       <option value="ROLE_AGENCYADMIN" selected={user['authority'] == "ROLE_AGENCYADMIN"}>센터 관리자</option>
                     : null}
-                    <option value="ROLE_AGENCY" selected={user['authority'] == "ROLE_AGENCY"}>보호사</option>
+                    <option value="ROLE_AGENCY" selected={user['authority'] == "ROLE_AGENCY"}>생활보호사</option>
                 </select>
               </div>
             </div>
client/views/pages/main/Main_agency.jsx
--- client/views/pages/main/Main_agency.jsx
+++ client/views/pages/main/Main_agency.jsx
@@ -87,7 +87,7 @@
       }
 
       seniorGenderArr.map((item, idx) => {
-        for (let i = 4; i < 14; i++) {
+        for (let i = 0; i < 18; i++) {
           if (item['age'] > i * 5 && item['age'] < ((i + 1) * 5) - 1) {
             if (item['gender'] == "남") {
               genderData[i]['male'] = genderData[i]['male'] + 1
client/views/pages/main/Main_agencyAdmin.jsx
--- client/views/pages/main/Main_agencyAdmin.jsx
+++ client/views/pages/main/Main_agencyAdmin.jsx
@@ -132,7 +132,7 @@
     });
   }
 
-  //보호사별 대상자(시니어) 등록 현황
+  //생활보호사별 대상자(시니어) 등록 현황
   const [seniorEnroll, setSeniorEnroll] = React.useState([]);
   const seniorByAgent = () => {
     fetch("/stats/seniorByAgent.json", {
@@ -149,7 +149,7 @@
           item['agent_name'] = "미배정";
         }
       })
-      console.log("보호사별 시니어 등록 현황 : ", data);
+      console.log("생활보호사별 시니어 등록 현황 : ", data);
       setSeniorEnroll(data);
     }).catch((error) => {
       console.log('seniorByAgent() /stats/seniorByAgent.json error : ', error);
@@ -334,7 +334,7 @@
         </div>
         <div className="content-box combine-right-government">
           <div className="flex">
-            <Title title={`보호사별 대상자 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} />
+            <Title title={`생활보호사별 대상자 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} />
           </div>
           <Chart5_agencyadmin data={seniorEnroll} />
         </div>
client/views/pages/org/OrgSelect.jsx
--- client/views/pages/org/OrgSelect.jsx
+++ client/views/pages/org/OrgSelect.jsx
@@ -587,7 +587,7 @@
                                     <th>기관명</th>
                                     <th>관리장비개수</th>
                                     <th>관리자(명)</th>
-                                    <th>보호사(명)</th>
+                                    <th>생활보호사(명)</th>
                                     <th>돌봄 대상자(명)</th>
                                     <th>주소</th>
                                     <th>대표연락처</th>
@@ -608,7 +608,7 @@
                                             <td data-label="기관명">{item['government_name']}</td>
                                             <td data-label="관리 장비 개수">{item['equipment_count']}</td>
                                             <td data-label="관리자(명)">{item['government_user_count']}</td>
-                                            <td data-label="보호사(명)">{item['agent_user_count']}</td>
+                                            <td data-label="생활보호사(명)">{item['agent_user_count']}</td>
                                             <td data-label="돌봄 대상자(명)">{item['senior_user_count']}</td>
                                             <td data-label="주소">{item['government_address']}</td>
                                             <td data-label="대표 연락처">{item['government_phonenumber']}</td>
@@ -696,7 +696,7 @@
                                     <th>구분</th>
                                     <th>관리기관명</th>
                                     <th>기관명</th>
-                                    <th>보호사(명)</th>
+                                    <th>생활보호사(명)</th>
                                     <th>돌봄 대상자(명)</th>
                                     <th>주소</th>
                                     <th>대표연락처</th>
@@ -713,7 +713,7 @@
                                             <td data-label="구분">{orgTypes[item['agency_type']]}</td>
                                             <td data-label="관리기관명">{item['government_name']}</td>
                                             <td data-label="기관명">{item['agency_name']}</td>
-                                            <td data-label="보호사(명)">{item['agent_user_count']}</td>
+                                            <td data-label="생활보호사(명)">{item['agent_user_count']}</td>
                                             <td data-label="돌봄 대상자(명)">{item['senior_user_count']}</td>
                                             <td data-label="주소">{item['agency_address']}</td>
                                             <td data-label="대표 연락처">{item['agency_phonenumber']}</td>
client/views/pages/senior_management/SeniorSelectOne.jsx
--- client/views/pages/senior_management/SeniorSelectOne.jsx
+++ client/views/pages/senior_management/SeniorSelectOne.jsx
@@ -308,9 +308,9 @@
     modalGuardianOpen();
   }
 
-  //대상자의 보호사 목록
+  //대상자의 생활보호사 목록
   const [agent, setAgent] = React.useState({ agentListBySenior: [], agentListCountBySenior: 0 });
-  //대상자의 보호사 목록 조회
+  //대상자의 생활보호사 목록 조회
   const agentSelectListBySenior = () => {
     fetch("/user/agentSelectListBySenior.json", {
       method: "POST",
@@ -392,7 +392,7 @@
   const seniorDelete = (senior) => {
     let insertBtn = confirm("삭제하시겠습니까?");
     if (insertBtn) {
-      // 보호사 매칭 종료
+      // 생활보호사 매칭 종료
       let agent_id = "";
       let agent_match_idx = "";
       agent.agentListBySenior.map((item, idx) => {
@@ -683,7 +683,7 @@
         </div>
 
 
-        <SubTitle explanation={"대상자의 보호사"} className="margin-bottom" />
+        <SubTitle explanation={"대상자의 생활보호사"} className="margin-bottom" />
         <div className="margin-bottom5">
           <table className={"senior-user protector-user"}>
             <thead>
@@ -711,7 +711,7 @@
                     <td data-label="이름">{item['user_name']}</td>
                     <td data-label="연락처">{item['user_phonenumber']}</td>
                     <td data-label="이메일">{item['user_email']}</td>
-                    <td data-label="상태">{item['agent_match_state'] ? <span className="green">현재 보호사</span> : <span className="grey">이전 보호사</span>}</td>
+                    <td data-label="상태">{item['agent_match_state'] ? <span className="green">현재 생활보호사</span> : <span className="grey">이전 생활보호사</span>}</td>
                     <td data-label="배정시작일">{item['agent_match_start_date']}</td>
                     <td data-label="배정종료일">{item['agent_match_end_date']}</td>
                     <td data-label="관리">
client/views/pages/setting/AuthorityManagement.jsx
--- client/views/pages/setting/AuthorityManagement.jsx
+++ client/views/pages/setting/AuthorityManagement.jsx
@@ -7,7 +7,7 @@
   const [checkArr, setCheckArr] = React.useState([]); //check 배열
   const [menuCheckArr, setMenuCheckArr] = React.useState([]); //menu check 배열
 
-  const authorityList = ["보호자", "보호사", "병원", "지자체", "관리자"];
+  const authorityList = ["보호자", "생활보호사", "병원", "지자체", "관리자"];
   const menuList = [
     {
       menu: {
@@ -140,7 +140,7 @@
                 <td><input type="checkbox" checked="checked"/></td>
               </tr>
               <tr>
-                <td>보호사(간호사, 복지사 등)</td>
+                <td>생활보호사(간호사, 복지사 등)</td>
                 <td><input type="checkbox" checked="checked"/></td>
                 <td><input type="checkbox" checked="checked"/></td>
                 <td><input type="checkbox" checked="checked"/></td>
client/views/pages/user_management/AgencyAdminSeniorSelect.jsx
--- client/views/pages/user_management/AgencyAdminSeniorSelect.jsx
+++ client/views/pages/user_management/AgencyAdminSeniorSelect.jsx
@@ -123,20 +123,20 @@
       console.log('agencySeniorSelectList() /user/seniorSelectList.json error : ', error);
     });
   }
-  //보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회
+  //생활보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회
   const agentChange = (userId) => {
     agencySenior.search['agent_id'] = userId;
     setAgencySenior({ ...agencySenior });
     agencySeniorSelectList(1);
   }
-  //선택한 보호사의 이름
+  //선택한 생활보호사의 이름
   const getSearchAgentName = () => {
     for (let i = 0; i < agent.userList.length; i++) {
       if (agent.userList[i]['user_id'] == agencySenior.search['agent_id']) {
         return agent.userList[i]['user_name'];
       }
     }
-    return '보호사';
+    return '생활보호사';
   }
 
   const [CheckList, setCheckList] = React.useState([]);
@@ -167,8 +167,8 @@
   const [workerId, setWorkerId] = React.useState("");
   // 시니어 - 담당자 매칭 
   const MatchSeniorAgency = () => {
-    if (workerId == '') {
-      alert("보호사를 선택해 주세요.");
+    if (CommonUtil.isEmpty(workerId) == true) {
+      alert("생활보호사를 선택해 주세요.");
       return;
     }
     var insertBtn = confirm("등록하시겠습니까?");
@@ -181,7 +181,7 @@
     }
   };
 
-  // 보호사 배정
+  // 생활보호사 배정
   const agentSeniorInsert = (seniorId) => {
     fetch("/user/agentSeniorInsert.json", {
       method: "POST",
@@ -241,7 +241,7 @@
       <div>
         <div className="flex-align-start userauthoriylist gap5">
           <div className="left">
-            <SubTitle explanation={"우리기관 보호사"} />
+            <SubTitle explanation={"우리기관 생활보호사"} />
             <div style={{ fontSize: '16px', marginTop: '0px' }} className="category">
               <a className="active" onClick={() => { agentChange(null) }}>
                 {state.loginUser['government_name']}
@@ -291,7 +291,7 @@
               } />
               <div className="btn-wrap flex-end margin-bottom ">
                 <button className={"btn-small gray-btn"} onClick={modalSeniorInsertOpen}>신규등록</button>
-                <button className={"btn-small gray-btn"} onClick={() => { openModal() }}>보호사 배정하기</button>
+                <button className={"btn-small gray-btn"} onClick={() => { openModal() }}>생활보호사 배정하기</button>
               </div>
             </div>
             <table className={"protector-user"}>
@@ -307,7 +307,7 @@
                   <th>성별</th>
                   <th>연락처</th>
                   <th>보호자</th>
-                  <th>보호사</th>
+                  <th>생활보호사</th>
                   <th>대상자관리</th>
                 </tr>
               </thead>
@@ -331,7 +331,7 @@
                           : item['guardian_user_names']
                         }
                       </td>
-                      <td data-label="보호사">
+                      <td data-label="생활보호사">
                         {item['agent_user_names']}
                       </td>
                       <td data-label="대상자관리">
@@ -485,18 +485,18 @@
           </ul>
         </div>
       </div>
-      <Modal open={modalOpen} close={closeModal} header="보호사 배정하기">
+      <Modal open={modalOpen} close={closeModal} header="생활보호사 배정하기">
         <div className="modal-visit board-wrap">
           <table className="margin-bottom">
             <tbody>
               <tr>
-                <th>담당 보호사</th>
+                <th>담당 생활보호사</th>
                 <td>
                   <select onChange={(e) => {
                     console.log('e.target.value : ', e.target.value);
                     setWorkerId(e.target.value);
                   }}>
-                    <option value="">담당 보호사를 선택해주세요.</option>
+                    <option value="">담당 생활보호사를 선택해주세요.</option>
                     {agent.userList.map((user, idx) => {
                       return (
                         <option key={idx} value={user['user_id']}>{user['user_name']}</option>
client/views/pages/user_management/AgencySeniorSelect.jsx
--- client/views/pages/user_management/AgencySeniorSelect.jsx
+++ client/views/pages/user_management/AgencySeniorSelect.jsx
@@ -89,9 +89,9 @@
   }
 
 
-  //보호사(간호사)의 돌봄 대상자(시니어)
+  //생활보호사(간호사)의 돌봄 대상자(시니어)
   const [mySenior, setMySenior] = React.useState({ seniorList: [], seniorListCount: 0, search: JSON.parse(JSON.stringify(search)) });
-  //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
+  //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회
   const mySeniorSelectList = (currentPage) => {
     mySenior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage;
 
@@ -103,7 +103,7 @@
       body: JSON.stringify(mySenior.search),
     }).then((response) => response.json()).then((data) => {
       data.search = mySenior.search;
-      console.log("보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 : ", data);
+      console.log("생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 : ", data);
       setMySenior(data);
     }).catch((error) => {
       console.log('seniorSelectList() /user/seniorSelectList.json error : ', error);
@@ -132,25 +132,25 @@
       console.log('agencySeniorSelectList() /user/seniorSelectList.json error : ', error);
     });
   }
-  //보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회
+  //생활보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회
   const agentChange = (userId) => {
     agencySenior.search['agent_id'] = userId;
     setAgencySenior({ ...agencySenior });
     agencySeniorSelectList(1);
   }
-  //선택한 보호사의 이름
+  //선택한 생활보호사의 이름
   const getSearchAgentName = () => {
     for (let i = 0; i < agent.userList.length; i++) {
       if (agent.userList[i]['user_id'] == agencySenior.search['agent_id']) {
         return agent.userList[i]['user_name'];
       }
     }
-    return '보호사';
+    return '생활보호사';
   }
 
 
 
-  //보호사의 대상자 등록
+  //생활보호사의 대상자 등록
   const agentSeniorInsert = (senior, agentId) => {
     if (confirm(`${senior['user_name']}님을 돌봄 대상자로 추가하시겠습니까?`) == false) {
       return;
@@ -193,7 +193,7 @@
     content: (
       <div>
         <div className="flex equip-tab">
-          <SubTitle explanation={"접속하신 보호사(간호사)분의 돌봄 대상자 목록입니다."} />
+          <SubTitle explanation={"접속하신 생활보호사(간호사)분의 돌봄 대상자 목록입니다."} />
           <div className="btn-wrap flex-end margin-bottom ">
             <button className={"btn-small gray-btn"} onClick={modalSeniorInsertOpen}>신규등록</button>
           </div>
@@ -264,7 +264,7 @@
     // 		<div>
     // 			<div className="flex-align-start userauthoriylist gap5">
     // 				<div className="left">
-    // 					<SubTitle explanation={"우리기관 보호사"}/>
+    // 					<SubTitle explanation={"우리기관 생활보호사"}/>
     // 					<div style={{fontSize: '16px', marginTop: '0px'}} className="category">
     // 						<a className="active" onClick={() => {agentChange(null)}}>
     // 							{state.loginUser['government_name']}
@@ -324,7 +324,7 @@
     // 								<th>성별</th>
     // 								<th>연락처</th>
     // 								<th>보호자</th>
-    // 								<th>보호사</th>
+    // 								<th>생활보호사</th>
     // 								<th>대상자관리</th>
     // 							</tr>
     // 						</thead>
@@ -343,7 +343,7 @@
     // 										: item['guardian_user_names']
     // 									}
     // 								</td>
-    // 								<td data-label="보호사">
+    // 								<td data-label="생활보호사">
     // 									{CommonUtil.isEmpty(item['agent_user_names']) 
     // 										? <button className="btn-small gray-btn" onClick={() => agentSeniorInsert(item)}>내 돌봄 대상자로 추가</button>
     // 										: item['agent_user_names']
client/views/pages/user_management/AgentAdminSelectOne.jsx
--- client/views/pages/user_management/AgentAdminSelectOne.jsx
+++ client/views/pages/user_management/AgentAdminSelectOne.jsx
@@ -56,11 +56,11 @@
     });
   };
 
-  //보호사의 대상자 목록
+  //생활보호사의 대상자 목록
   const [seniorByAgent, setSeniorByAgent] = React.useState({seniorListByAgent: [], seniorListCountByAgent: 0});
-  //보호사의 선택한 대상자 정보
+  //생활보호사의 선택한 대상자 정보
   const [senior, setSenior] = React.useState({});
-  //보호사의 대상자 목록 조회
+  //생활보호사의 대상자 목록 조회
   const seniorSelectListByAgent = () => {
     fetch("/user/seniorSelectListByAgent.json", {
       method: "POST",
@@ -205,7 +205,7 @@
           </div>
         </div>
 
-        <SubTitle explanation={"보호사의 보호대상자"} className="margin-bottom display-inline-block" />
+        <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" />
         <button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button>
         <div className="margin-bottom5">
           <table className={"agent-user"}>
client/views/pages/user_management/AgentSelectOne.jsx
--- client/views/pages/user_management/AgentSelectOne.jsx
+++ client/views/pages/user_management/AgentSelectOne.jsx
@@ -56,11 +56,11 @@
     });
   };
 
-  //보호사의 대상자 목록
+  //생활보호사의 대상자 목록
   const [seniorByAgent, setSeniorByAgent] = React.useState({seniorListByAgent: [], seniorListCountByAgent: 0});
-  //보호사의 선택한 대상자 정보
+  //생활보호사의 선택한 대상자 정보
   const [senior, setSenior] = React.useState({});
-  //보호사의 대상자 목록 조회
+  //생활보호사의 대상자 목록 조회
   const seniorSelectListByAgent = () => {
     fetch("/user/seniorSelectListByAgent.json", {
       method: "POST",
@@ -205,7 +205,7 @@
           </div>
         </div>
 
-        <SubTitle explanation={"보호사의 보호대상자"} className="margin-bottom display-inline-block" />
+        <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" />
         <button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button>
         <div className="margin-bottom5">
           <table className={"agent-user"}>
client/views/pages/user_management/UserSelect.jsx
--- client/views/pages/user_management/UserSelect.jsx
+++ client/views/pages/user_management/UserSelect.jsx
@@ -439,7 +439,7 @@
                 {/* 탭 제목 */}
                 <ul className="tab-menu flex-end" >
                   {/* <li onClick={() => setTabActiveByRoleType('ROLE_SENIOR')} className={tabActiveByRoleType == 'ROLE_SENIOR' ? "active" : null}>대상자(어르신) ({senior.userListCount})</li> */}
-                  <li onClick={() => setTabActiveByRoleType('ROLE_AGENCY')} className={tabActiveByRoleType == 'ROLE_AGENCY' ? "active" : null}>보호사 ({agent.userListCount})</li>
+                  <li onClick={() => setTabActiveByRoleType('ROLE_AGENCY')} className={tabActiveByRoleType == 'ROLE_AGENCY' ? "active" : null}>생활보호사 ({agent.userListCount})</li>
                   {state.loginUser['authority'] == 'ROLE_ADMIN' || state.loginUser['authority'] == 'ROLE_AGENCYADMIN' || state.loginUser['authority'] == 'ROLE_GOVERNMENT'  ?
                     <li onClick={() => setTabActiveByRoleType('ROLE_AGENCYADMIN')} className={tabActiveByRoleType == 'ROLE_AGENCYADMIN' ? "active" : null}>센터 관리자 ({agentAdmin.userListCount})</li>
                   : null}
server/modules/web/Server.js
--- server/modules/web/Server.js
+++ server/modules/web/Server.js
@@ -17,12 +17,12 @@
 
 http.createServer(webServer).listen(PORT);
 https.createServer({
-    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
+    /* 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`),
-    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`),
+    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`),
-    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`), */
+    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`),
     /* requestCert: false,
     rejectUnauthorized: false */
 }, webServer).listen(443);
Add a comment
List