Commit @90ace5930a0bd27ed97372ea2d9328259b66e010

최정임 2023-02-16

230216 최정임 게시판 수정

@90ace5930a0bd27ed97372ea2d9328259b66e010

28dde5b

90ace59

client/views/pages/App.jsx

--- client/views/pages/App.jsx

+++ client/views/pages/App.jsx


   };
 
 
-  const menuItems = AllApp.menuItems;  //AdminApp, GovernmentApp, AllApp 
-  const AppRoute = AllApp.AppRoute;
+  const menuItems = AdminApp.menuItems;  //AdminApp, GovernmentApp, AllApp, AgencyApp, GuardianApp 
+  const AppRoute = AdminApp.AppRoute;
 
 
   const { title } = menuItems.find(

28dde5b

90ace59

client/views/pages/AppRoute.jsx

--- client/views/pages/AppRoute.jsx

+++ client/views/pages/AppRoute.jsx


 import CallIcon from '@mui/icons-material/Call';
 import ConstructionIcon from '@mui/icons-material/Construction';
 import EqualizerIcon from '@mui/icons-material/Equalizer';
+import ApartmentIcon from '@mui/icons-material/Apartment';
 
 import Test from "./Test/Test.jsx";
 import Main_government from "./main/Main_government.jsx";

 import EquipmentManagementSelect from "./equipment/EquipmentManagementSelect.jsx";
 import EquipmentManagementSelectOne from "./equipment/EquipmentManagementSelectOne.jsx";
 import UserAuthoriySelect from "./user_management/UserAuthoriySelect.jsx";
-import UserAuthoriySelect_admin from "./user_management/UserAuthoriySelect_admin.jsx";
+import UserAuthoriySelect_agency from "./user_management/UserAuthoriySelect_agency.jsx";
 import MyInfoUpdate from "./authority/MyInfoUpdate.jsx";
-import CallInsert from "./callcenter/CallInsert.jsx";
-import CallSelect from "./callcenter/CallSelect.jsx";
-import CallSelectOne from "./setting/RiskSet.jsx";
-import CallUpdate from "./callcenter/CallUpdate.jsx";
-import EquipmentInquiry from "./equipment/EquipmentInquiry.jsx";
+import QandASelect from "./callcenter/QandASelect.jsx";
+import QandAConfirm from "./callcenter/QandAConfirm.jsx";
+import EquipmentManagementInsert from "./equipment/EquipmentManagementInsert.jsx";
 import EquipmentManagementSelectAdd from "./equipment/EquipmentManagementSelectAdd.jsx";
 import RiskSet from "./setting/RiskSet.jsx";
-import QandA from "./callcenter/QandA.jsx";
+import QandAInsert from "./callcenter/QandAInsert.jsx";
+import QandA_agency from "./callcenter/QandA_agency.jsx";
 import UserSelectOk from "./user_management/UserSelectOk.jsx";
 import AuthorityManagement from "./setting/AuthorityManagement.jsx";
 import AgencyInsert from "./user_management/AgencyInsert.jsx";

       },
       {
         title: "장비 문의 관리",
-        path: "/EquipmentManagementSelect",
+        path: "/QandASelect",
         icon: (
           <SettingsIcon
             sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}

       },
       {
         title: "시니어 관리",
-        path: "/UserAuthoriySelect_admin",
+        path: "/UserAuthoriySelect_agency",
         icon: (
           <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
         ),

       },
       {
         title: "Q&A 관리",
-        path: "/QandA",
+        path: "/QandASelect",
         icon: (
           <SpeakerPhoneIcon
             sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}

       },
       {
         title: "장비 대여 관리x",
-        // path: "/EquipmentInquiry",
+        path: "/EquipmentInquiry",
         icon: (
           <SettingsIcon
             sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}

         icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
       },
       {
-        title: "Q&A",
-        path: "/QandA",
-        icon: (
-          <SpeakerPhoneIcon
-            sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
-          />
-        ),
-      },
+        title: "그래프로 보기",
+        path: "/GuardianStatistics",
+        icon: <EqualizerIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+      }, 
     ],
   },
-  {
-    title: "그래프로 보기",
-    path: "/GuardianStatistics",
-    icon: <EqualizerIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
-  }, 
+ 
 ];
 
 function AllAppRoute() {

           element={<UserAuthoriySelect />}
         ></Route>
         <Route path="/MyInfoUpdate" element={<MyInfoUpdate />}></Route>
-        <Route path="/CallInsert" element={<CallInsert />}></Route>
-        <Route path="/CallUpdate" element={<CallUpdate />}></Route>
-        <Route path="/CallSelect" element={<CallSelect />}></Route>
+        <Route path="/QandAInsert" element={<QandAInsert />}></Route>
         <Route path="/CallSelectOne" element={<CallSelectOne />}></Route>
-        <Route path="/EquipmentInquiry" element={<EquipmentInquiry />}></Route>
+        <Route path="/QandAInquiry" element={<QandAInquiry />}></Route>
         <Route path="/EquipmentManagementSelectAdd" element={<EquipmentManagementSelectAdd />}></Route>
         <Route path="/RiskSet" element={<RiskSet />}></Route>
         <Route path="/AuthorityManagement" element={<AuthorityManagement />}></Route>
-        <Route path="/UserAuthoriySelect_admin" element={<UserAuthoriySelect_admin />}></Route>
-        <Route path="/QandA" element={<QandA />}></Route>
+        <Route path="/UserAuthoriySelect_agency" element={<UserAuthoriySelect_agency />}></Route>
+        <Route path="/QandA_agency" element={<QandA_agency />}></Route>
+        <Route path="/QandASelect" element={<QandASelect />}></Route>
         <Route path="/UserSelectOk" element={<UserSelectOk />}></Route>
         <Route path="/AuthorityManagement" element={<AuthorityManagement />}></Route>
         <Route path="/AgencyInsert" element={<AgencyInsert />}></Route>

         <Route path="/Questionnaire_government" element={<Questionnaire_government />}></Route>
         <Route path="/VisitSelect_government" element={<VisitSelect_government />}></Route>
         <Route path="/QandA_government" element={<QandA_government />}></Route>
+        <Route path="/QandAConfirm" element={<QandAConfirm />}></Route>
       </Routes>
   );
 }

 
 const AdminAppMenuItems = [
   {
-    title: "Home",
+    title: "Home(올잇메디)",
     path: "/Main",
     icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
   },

       <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
     ),
   },
-  // {
-  //   title: "시니어 관리",
-  //   path: "/UserAuthoriySelect_admin",
-  //   icon: (
-  //     <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
-  //   ),
-  // },
-  // {
-  //   title: "사용자 계정 승인",
-  //   path: "/UserSelectOk",
-  //   icon: (
-  //     <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
-  //   ),
-  // },
-  // {
-  //   title: "건강 관리",
-  //   prefix: "/Medicine",
-  //   icon: (
-  //     <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
-  //   ),
-  //   childrens: [
-  //     {
-  //       title: "복약 관리",
-  //       path: "/MedicineCareSelect",
-  //     },
-  //     {
-  //       title: "댁내 온도 관리",
-  //       path: "/TemperatureManagementSelect",
-  //     },
-  //     {
-  //       title: "문진표 작성",
-  //       path: "/TemperatureManagementSelect",
-  //     },
-  //   ],
-  // },
-
-  // {
-  //   title: "방문 관리",
-  //   prefix: "/Visit",
-  //   icon: (
-  //     <DoorFrontIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
-  //   ),
-  //   childrens: [
-  //     {
-  //       title: "방문 관리",
-  //       path: "/VisitSelect",
-  //     },
-  //   ],
-  // },
-  // {
-  //   title: "장비 관리",    
-  //   icon: (
-  //     <SettingsIcon
-  //       sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
-  //     />
-  //   ),
-  //   childrens: [
-  //     {
-  //       title: "장비 조회",
-  //       path: "/EquipmentManagementSelect",
-  //     },
-  //     {
-  //       title: "장비 문의 요청",
-  //       path: "/EquipmentInquiry",
-  //     },
-  //     // {
-  //     //   title: "장비 추가 요청",
-  //     //   path: "/EquipmentManagementSelectAdd",
-  //     // },
-  //   ],
-  // },    
-  {
-    title: "문의게시판",
-    path: "/QandA",
+   {
+    title: "시니어 건강 관리",
+    path: "/UserAuthoriySelect_agency",
     icon: (
-      <SpeakerPhoneIcon
-        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
-      />
-    ),
-  },
-  // {
-  //   title: "설정",    
-  //   icon: (
-  //     <SettingsIcon
-  //       sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
-  //     />
-  //   ),
-  //   childrens: [
-  //     {
-  //       title: "위험 기준 관리",
-  //       path: "/RiskSet",
-  //     },
-  //     {
-  //       title: "사용자 권한 관리",
-  //       path: "/AuthorityManagement",
-  //     },
-  //     // {
-  //     //   title: "장비 추가 요청",
-  //     //   path: "/EquipmentManagementSelectAdd",
-  //     // },
-  //   ],
-  // },    
+       <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+     ),
+     childrens: [
+           {
+            title: "복약 관리",
+        path: "/MedicineCareSelect",
+          },
+          {
+            title: "댁내 온도 관리",
+        path: "/TemperatureManagementSelect",
+          },
+          {
+            title: "진료 관리",
+        path: "/Questionnaire",
+          },
+          {
+            title: "방문 관리",
+        path: "/VisitSelect",
+          },
+        ],
+   },
+   {
+      title: "장비 관리",    
+      icon: (
+        <ConstructionIcon
+          sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+        />
+      ),
+      childrens: [
+        {
+          title: "장비 조회",
+          path: "/EquipmentManagementSelect",
+        },
+        {
+          title: "장비 문의 관리",
+        path: "/QandASelect",
+        },
+      ],
+    },  
+ 
 ];
 function AdminAppRoute() {
   return (
     <Routes>
       <Route path="/Test" element={<Test />}></Route>
         <Route path="/Main" element={<Main />}></Route>
-        <Route path="/Main_government" element={<Main_government />}></Route>
-        <Route path="/Main_guardian" element={<Main_guardian />}></Route>
-        <Route path="/Main_agency" element={<Main_agency />}></Route>
         <Route
           path="/EquipmentRentalInsert"
           element={<EquipmentRentalInsert />}
         ></Route>
         <Route
+          path="/EquipmentManagementInsert"
+          element={<EquipmentManagementInsert />}
+        ></Route>
+        <Route
           path="/EquipmentManagementSelect"
           element={<EquipmentManagementSelect />}
         ></Route>
+          <Route
+            path="/EquipmentManagementSelectOne"
+            element={<EquipmentManagementSelectOne />}
+          ></Route>        
         <Route
-          path="/EquipmentManagementSelectOne"
-          element={<EquipmentManagementSelectOne />}
-        ></Route>        
-        <Route path="/MyInfoUpdate" element={<MyInfoUpdate />}></Route>
-        <Route path="/CallInsert" element={<CallInsert />}></Route>
-        <Route path="/CallUpdate" element={<CallUpdate />}></Route>
-        <Route path="/CallSelect" element={<CallSelect />}></Route>
-        <Route path="/CallSelectOne" element={<CallSelectOne />}></Route>
-        <Route path="/EquipmentInquiry" element={<EquipmentInquiry />}></Route>
+          path="/MedicineCareSelect"
+          element={<MedicineCareSelect />}
+        ></Route>
+        <Route
+          path="/MedicineCareSelectOne"
+          element={<MedicineCareSelectOne />}
+        ></Route>
+        <Route
+          path="/TemperatureManagementSelectOne"
+          element={<TemperatureManagementSelectOne />}
+        ></Route>
+        <Route
+          path="/TemperatureManagementSelect"
+          element={<TemperatureManagementSelect />}
+        ></Route>
+        <Route
+          path="/VisitSelect"
+          element={<VisitSelect />}
+        ></Route>
+        <Route
+          path="/VisitSelectOne"
+          element={<VisitSelectOne />}
+        ></Route>
+        <Route
+          path="/Questionnaire"
+          element={<Questionnaire />}
+        ></Route>
+        <Route path="/QandAInsert" element={<QandAInsert />}></Route>
+        <Route path="/QandASelect" element={<QandASelect />}></Route>
         <Route path="/EquipmentManagementSelectAdd" element={<EquipmentManagementSelectAdd />}></Route>
-        <Route path="/RiskSet" element={<RiskSet />}></Route>
-        <Route path="/AuthorityManagement" element={<AuthorityManagement />}></Route>
-        <Route path="/UserAuthoriySelect_admin" element={<UserAuthoriySelect_admin />}></Route>
-        <Route path="/QandA" element={<QandA />}></Route>
-        <Route path="/UserSelectOk" element={<UserSelectOk />}></Route>
-        <Route path="/AuthorityManagement" element={<AuthorityManagement />}></Route>
+        <Route path="/UserAuthoriySelect" element={<UserAuthoriySelect />}></Route>
+        <Route path="/QandAConfirm" element={<QandAConfirm />}></Route>
     </Routes>
   );
 }

 const GovernmentAppMenuItems = [
    {
     title: "Home",
-    path: "/Main",
+    path: "/Main_government",
     icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
   },
   {
-    title: "사용자 관리",
-    path: "/UserAuthoriySelect",
+    title: "기관 관리",
     icon: (
-      <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+      <ApartmentIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
     ),
+    childrens: [
+      {
+        title: "기관 조회",
+        path: "/AgencySelect",        
+      },
+      {
+        title: "사용자 계정 승인",
+        path: "/UserSelectOk",
+      },
+    ],
   },
   {
-    title: "시니어 관리",
-    path: "/UserAuthoriySelect_admin",
-    icon: (
-      <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
-    ),
-  },
-  {
-    title: "사용자 계정 승인",
-    path: "/UserSelectOk",    
-  },
-  {
-    title: "건강 관리",
-    prefix: "/Medicine",
+    title: "시니어 건강 관리",
     icon: (
       <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
     ),
-    childrens: [
+    childrens:[
       {
         title: "복약 관리",
-        path: "/MedicineCareSelect",
+        path: "/MedicineCareSelect",      
       },
       {
         title: "댁내 온도 관리",
-        path: "/TemperatureManagementSelect",
+        path: "/TemperatureManagementSelect",      
       },
       {
-        title: "문진표 작성",
-        path: "/TemperatureManagementSelect",
+        title: "진료 관리",
+        path: "/Questionnaire",      
       },
-    ],
-  },
-
-  {
-    title: "방문 관리",
-    prefix: "/Visit",
-    icon: (
-      <DoorFrontIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
-    ),
-    childrens: [
       {
         title: "방문 관리",
-        path: "/VisitSelect",
+        path: "/VisitSelect",     
       },
-    ],
+    ]
   },
   {
-    title: "장비 관리",    
-    icon: (
-      <SettingsIcon
-        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
-      />
-    ),
-    childrens: [
-      {
-        title: "장비 조회",
-        path: "/EquipmentManagementSelect",
-      },
-      {
-        title: "장비 문의 요청",
-        path: "/EquipmentInquiry",
-      },
-      // {
-      //   title: "장비 추가 요청",
-      //   path: "/EquipmentManagementSelectAdd",
-      // },
-    ],
-  },    
-  {
-    title: "문의게시판",
+    title: "문의 현황 관리",
     path: "/QandA",
     icon: (
       <SpeakerPhoneIcon

     ),
   },
   {
-    title: "설정",    
+    title: "설정 관리",
+    prefix: "/Visit",
     icon: (
-      <SettingsIcon
-        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
-      />
+      <SettingsIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
     ),
     childrens: [
       {

         title: "사용자 권한 관리",
         path: "/AuthorityManagement",
       },
-      // {
-      //   title: "장비 추가 요청",
-      //   path: "/EquipmentManagementSelectAdd",
-      // },
     ],
-  },  
+  },
 ];
 function GovernmentAppRoute() {
   return (
     <Routes>
       <Route path="/Test" element={<Test />}></Route>
-      <Route path="/Main" element={<Main2 />}></Route>
-      <Route path="/SeniorSelect" element={<SeniorSelect />}></Route>
-      <Route path="/SeniorInsert" element={<SeniorInsert />}></Route>
-      <Route path="/SeniorSelectOne" element={<SeniorSelectOne />}></Route>
+      <Route path="/Main_government" element={<Main_government />}></Route>
+      <Route path="/AgencySelect" element={<AgencySelect />}></Route>
+      <Route path="/UserSelectOk" element={<UserSelectOk />}></Route>
       <Route
         path="/MedicineCareSelect"
         element={<MedicineCareSelect />}

       ></Route>
       <Route path="/VisitInsert" element={<VisitInsert />}></Route>
       <Route path="/VisitSelect" element={<VisitSelect />}></Route>
+      <Route path="/VisitSelectOne" element={<VisitSelectOne />}></Route>      
+      <Route
+        path="/UserAuthoriySelect"
+        element={<UserAuthoriySelect />}
+      ></Route>
+      <Route path="/RiskSet" element={<RiskSet />}></Route>
+      <Route path="/AuthorityManagement" element={<AuthorityManagement />}></Route>
+    </Routes>
+  );
+}
+const AgencyAppMenuItems = [
+   {
+    title: "Home",
+    path: "/Main_agency",
+    icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+  },
+  {
+    title: "시니어 관리",
+    path: "/UserAuthoriySelect_agency",
+    icon: (
+      <PersonIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+    ),
+  },
+  {
+    title: "시니어 건강 관리",
+    icon: (
+      <Diversity1Icon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />
+    ),
+    childrens:[
+      {
+        title: "복약 관리",
+        path: "/MedicineCareSelect",      
+      },
+      {
+        title: "댁내 온도 관리",
+        path: "/TemperatureManagementSelect",      
+      },
+      {
+        title: "진료 관리",
+        path: "/Questionnaire",      
+      },
+      {
+        title: "방문 관리",
+        path: "/VisitSelect",     
+      },
+    ]
+  },
+  {
+    title: "장비 대여 관리",
+    path: "/EquipmentInquiry",
+    icon: (
+      <ConstructionIcon
+        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+      />
+    ),
+  },
+  {
+    title: "문의게시판",
+    path: "/EquipmentInquiry",
+    icon: (
+      <SpeakerPhoneIcon
+        sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }}
+      />
+    ),
+  },
+];
+function AgencyAppRoute() {
+  return (
+    <Routes>
+      <Route path="/Test" element={<Test />}></Route>
+      <Route path="/Main_agency" element={<Main_agency />}></Route>
+      <Route path="/UserAuthoriySelect_agency" element={<UserAuthoriySelect_agency />}></Route>
+      <Route path="/SeniorInsert" element={<SeniorInsert />}></Route>
+      <Route path="/SeniorSelectOne" element={<SeniorSelectOne />}></Route>
+      <Route
+        path="/MedicineCareSelect"
+        element={<MedicineCareSelect />}
+      ></Route>
+      <Route
+        path="/MedicineCareSelectOne"
+        element={<MedicineCareSelectOne />}
+      ></Route>
+      <Route
+        path="/TemperatureManagementSelect"
+        element={<TemperatureManagementSelect />}
+      ></Route>
+      <Route
+        path="/TemperatureManagementSelectOne"
+        element={<TemperatureManagementSelectOne />}
+      ></Route>
+      <Route path="/VisitInsert" element={<VisitInsert />}></Route>
+      <Route path="/VisitSelect" element={<VisitSelect />}></Route>
       <Route path="/VisitSelectOne" element={<VisitSelectOne />}></Route>
+      <Route path="/Questionnaire" element={<Questionnaire />}></Route>
       <Route
         path="/EquipmentRentalInsert"
         element={<EquipmentRentalInsert />}

         element={<EquipmentManagementSelectOne />}
       ></Route>
       <Route
-        path="/UserAuthoriySelect"
-        element={<UserAuthoriySelect />}
-      ></Route>
-      <Route path="/MyInfoUpdate" element={<MyInfoUpdate />}></Route>
-      <Route path="/CallInsert" element={<CallInsert />}></Route>
-      <Route path="/CallUpdate" element={<CallUpdate />}></Route>
-      <Route path="/CallSelect" element={<CallSelect />}></Route>
-      <Route path="/CallSelectOne" element={<CallSelectOne />}></Route>
-      <Route path="/EquipmentInquiry" element={<EquipmentInquiry />}></Route>
-      <Route path="/EquipmentManagementSelectAdd" element={<EquipmentManagementSelectAdd />}></Route>
-      <Route path="/RiskInsert" element={<RiskInsert />}></Route>
-      <Route path="/AuthorityManagement" element={<AuthorityManagement />}></Route>
-      <Route path="/QandA" element={<QandA />}></Route>
+        path="/EquipmentInquiry"
+        element={<EquipmentInquiry />}
+      ></Route>      
+    </Routes>
+  );
+}
+const GuardianAppMenuItems = [
+   {
+    title: "Home",
+    path: "/Main_guardian",
+    icon: <HouseIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+  },
+  {
+    title: "그래프로 보기",
+    path: "/GuardianStatistics",
+    icon: <EqualizerIcon sx={{ fontSize: 20, color: "#ffffff", marginRight: 1 }} />,
+  }, 
+];
+function GuardianAppRoute() {
+  return (
+    <Routes>
+      <Route path= "/GuardianStatistics" element={GuardianStatistics}></Route>
+      <Route path= "/Main_guardian" element={Main_guardian}></Route>
     </Routes>
   );
 }

 const AllApp = {'menuItems': AllAppMenuItems, 'AppRoute': AllAppRoute};
 const AdminApp = {'menuItems': AdminAppMenuItems, 'AppRoute': AdminAppRoute};
 const GovernmentApp = {'menuItems': GovernmentAppMenuItems, 'AppRoute': GovernmentAppRoute};
+const AgencyApp = {'menuItems': AgencyAppMenuItems, 'AppRoute': AgencyAppRoute};
+const GuardianApp = {'menuItems': GuardianAppMenuItems, 'AppRoute': GuardianAppRoute};
 
 export default AllApp;
-export {AdminApp, GovernmentApp};
+export {AdminApp, GovernmentApp, GuardianApp, AgencyApp};

28dde5b

client/views/pages/callcenter/CallSelect.jsx (deleted)

--- client/views/pages/callcenter/CallSelect.jsx

...	...	@@ -1,103 +0,0 @@
	1	-import React from "react";
	2	-import Button from "../../component/Button.jsx";
	3	-import ContentTitle from "../../component/ContentTitle.jsx";
	4	-import { useNavigate } from "react-router";
	5	-
	6	-export default function CallInsert() {
	7	- const navigate = useNavigate();
	8	- return (
	9	- <main>
	10	- <div className="content-wrap row">
	11	- <ContentTitle contentTitle={"장비문의"} />
	12	- <p>작성자 정보</p>
	13	- <table className="margin-bottom2 senior-insert">
	14	- <tr>
	15	- <th>작성자</th>
	16	- <td>
	17	- <input type="text" placeholder="자동입력부분" />
	18	- </td>
	19	- </tr>
	20	-
	21	- <tr>
	22	- <th>소속 기관</th>
	23	- <td colSpan={3}>
	24	- <input type="text" placeholder="자동입력부분" />
	25	- </td>
	26	- </tr>
	27	- <tr>
	28	- <th>연락처</th>
	29	- <td colSpan={3}>
	30	- <input type="text" placeholder="자동입력부분" />
	31	- </td>
	32	- </tr>
	33	- <tr>
	34	- <th>구분</th>
	35	- <td colSpan={3} className="flex">
	36	- <select name="year" id="year">
	37	- <option value="">반납</option>
	38	- <option value="">교환</option>
	39	- <option value="">추가</option>
	40	- <option value="">기타</option>
	41	- </select>
	42	- </td>
	43	- </tr>
	44	- <tr>
	45	- <th>내용</th>
	46	- <td colSpan={3}>
	47	- <textarea className="medicine" cols="30" rows="2"></textarea>
	48	- </td>
	49	- </tr>
	50	- </table>
	51	- <p>시니어 정보</p>
	52	- <table className="margin-bottom2 senior-insert">
	53	- <tr>
	54	- <th>시니어 선택</th>
	55	- <td colSpan={3} className="flex width">
	56	- <select>
	57	- <option value="">시니어1</option>
	58	- <option value="">시니어2</option>
	59	- </select>
	60	- </td>
	61	- </tr>
	62	- <tr>
	63	- <th>시니어 이름</th>
	64	- <td>
	65	- <input type="text" placeholder="자동입력부분" />
	66	- </td>
	67	- <th>시니어등록번호</th>
	68	- <td>
	69	- <input type="text" placeholder="자동입력부분" />
	70	- </td>
	71	- </tr>
	72	- <tr>
	73	- <th>시니어 연락처</th>
	74	- <td>
	75	- <input type="text" placeholder="자동입력부분" />
	76	- </td>
	77	- <th>시니어 주소</th>
	78	- <td>
	79	- <input type="text" placeholder="자동입력부분" />
	80	- </td>
	81	- </tr>
	82	-
	83	- </table>
	84	- <div className="btn-wrap flex-center">
	85	- <Button
	86	- className={"btn-large gray-btn"}
	87	- btnName={"이전"}
	88	- onClick={() => {
	89	- navigate("/EquipmentManagementSelectReturn");
	90	- }}
	91	- />
	92	- <Button
	93	- className={"btn-large green-btn"}
	94	- btnName={"등록"}
	95	- onClick={() => {
	96	- navigate("/EquipmentManagementSelectReturn");
	97	- }}
	98	- />
	99	- </div>
	100	- </div>
	101	- </main>
	102	- );
	103	-}

28dde5b

client/views/pages/callcenter/CallUpdate.jsx (deleted)

--- client/views/pages/callcenter/CallUpdate.jsx

...	...	@@ -1,7 +0,0 @@
	1	-import React from 'react'
	2	-
	3	-export default function CallUpdate() {
	4	- return (
	5	- <div>CallUpdate</div>
	6	- )
	7	-}

90ace59

client/views/pages/callcenter/QandAConfirm.jsx (added)

+++ client/views/pages/callcenter/QandAConfirm.jsx

...	...	@@ -0,0 +1,96 @@
	1	+import React from "react";
	2	+import Button from "../../component/Button.jsx";
	3	+import ContentTitle from "../../component/ContentTitle.jsx";
	4	+import SubTitle from "../../component/SubTitle.jsx";
	5	+import { useNavigate } from "react-router";
	6	+
	7	+export default function CallInsert() {
	8	+ const navigate = useNavigate();
	9	+ return (
	10	+ <main>
	11	+ <div className="content-wrap row">
	12	+ <ContentTitle contentTitle={"문의글 작성"} />
	13	+ <SubTitle explanation={"작성자 정보"} />
	14	+ <table className="margin-bottom2 senior-insert">
	15	+ <tr>
	16	+ <th>작성자</th>
	17	+ <td>
	18	+ 홍길동
	19	+ </td>
	20	+ </tr>
	21	+
	22	+ <tr>
	23	+ <th>소속 기관</th>
	24	+ <td colSpan={3}>
	25	+ A복지관
	26	+ </td>
	27	+ </tr>
	28	+ <tr>
	29	+ <th>연락처</th>
	30	+ <td colSpan={3}>
	31	+ 010-1234-1234
	32	+ </td>
	33	+ </tr>
	34	+ <tr>
	35	+ <th>구분</th>
	36	+ <td colSpan={3}>추가
	37	+ </td>
	38	+ </tr>
	39	+ <tr>
	40	+ <th>내용</th>
	41	+ <td colSpan={3}>
	42	+ 시니어 인원 증가로 인한 장비 추가 요청
	43	+ </td>
	44	+ </tr>
	45	+ </table>
	46	+ <SubTitle explanation={"시니어 정보"} />
	47	+ <table className="margin-bottom2 senior-insert">
	48	+
	49	+ <tr>
	50	+ <th>시니어 이름</th>
	51	+ <td>
	52	+ 김복남
	53	+ </td>
	54	+ <th>시니어등록번호</th>
	55	+ <td>
	56	+ 00000001
	57	+ </td>
	58	+ </tr>
	59	+ <tr>
	60	+ <th>시니어 연락처</th>
	61	+ <td>
	62	+ 010-2345-2345
	63	+ </td>
	64	+ <th>시니어 주소</th>
	65	+ <td>
	66	+ 경상북도 군위군 군위읍
	67	+ </td>
	68	+ </tr>
	69	+
	70	+ </table>
	71	+ <SubTitle explanation={"장비 정보"} />
	72	+ <table className="margin-bottom2 senior-insert">
	73	+ <tr>
	74	+ <th>장비명</th>
	75	+ <td>
	76	+ 스마트약상자
	77	+ </td>
	78	+ <th>장비시리얼넘버</th>
	79	+ <td>
	80	+ ABCD-1
	81	+ </td>
	82	+ </tr>
	83	+ </table>
	84	+ <div className="btn-wrap flex-center">
	85	+ <Button
	86	+ className={"btn-large gray-btn"}
	87	+ btnName={"이전"}
	88	+ onClick={() => {
	89	+ navigate("/QandA_admin");
	90	+ }}
	91	+ />
	92	+ </div>
	93	+ </div>
	94	+ </main>
	95	+ );
	96	+}

28dde5b

90ace59

client/views/pages/callcenter/QandAInsert.jsx (Renamed from client/views/pages/callcenter/CallInsert.jsx)

--- client/views/pages/callcenter/CallInsert.jsx

+++ client/views/pages/callcenter/QandAInsert.jsx


 import React from "react";
 import Button from "../../component/Button.jsx";
 import ContentTitle from "../../component/ContentTitle.jsx";
+import SubTitle from "../../component/SubTitle.jsx";
 import { useNavigate } from "react-router";
 
 export default function CallInsert() {

     <main>
       <div className="content-wrap row">
         <ContentTitle contentTitle={"문의글 작성"} />
-        <p>작성자 정보</p>
+        <SubTitle explanation={"작성자 정보"} />
         <table className="margin-bottom2 senior-insert">
           <tr>
             <th>작성자</th>

             <th>구분</th>
             <td colSpan={3} className="flex">
               <select name="year" id="year">
-                <option value="">반납</option>
-                <option value="">교환</option>
                 <option value="">추가</option>
+                <option value="">교환</option>
+                <option value="">반납</option>
                 <option value="">기타</option>
               </select>
             </td>

               </td>
             </tr>
         </table>
-        <p>시니어 정보</p>
+        <SubTitle explanation={"시니어 정보"} />
         <table className="margin-bottom2 senior-insert">
           <tr>
             <th>시니어 선택</th>

           </tr>
 
         </table>
+        <SubTitle explanation={"장비 정보(시니어가 사용중인 장비가 자동으로 입력됩니다.)"} />
+        <table className="margin-bottom2 senior-insert">          
+          <tr>
+            <th>장비명</th>
+            <td>
+              <input type="text" placeholder="자동입력부분" />
+            </td>
+            <th>장비시리얼넘버</th>
+            <td>
+              <input type="text" placeholder="자동입력부분" />
+            </td>
+          </tr>
+        </table>
         <div className="btn-wrap flex-center">
           <Button
             className={"btn-large gray-btn"}

28dde5b

90ace59

client/views/pages/callcenter/QandASelect.jsx (Renamed from client/views/pages/equipment/EquipmentInquiry.jsx)

--- client/views/pages/equipment/EquipmentInquiry.jsx

+++ client/views/pages/callcenter/QandASelect.jsx


 import { useNavigate } from "react-router";
 import ContentTitle from "../../component/ContentTitle.jsx";
 
-export default function EquipmentInquiry() {
+export default function QandAInquiry() {
   const navigate = useNavigate();
   //게시판
   const thead = [
     "No",
     "장비명",
     "시리얼 넘버",
+    "작성자",
     "기관명",
     "요청일자",
     "구분",
+    "내용상세보기",
     "처리여부",
   ];
   const key = [
     "No",
     "equipment_name",
     "serialNumber",
+    "writer",
     "name",
     "date",
     "category",
+    "show",
     "finish"
   ];
   const content = [

       No: 1,
       equipment_name: "스마트약상자",
       serialNumber: "ABCD-1",
+      writer: "홍길동",
       name: "A복지관",
       date: "2023-01-27",
       category: "교환",
+      show:  (
+        <Button
+          className={"btn-small gray-btn"}
+          btnName={"상세보기"}
+          onClick={() => {
+            navigate("/QandAConfirm");
+          }}
+        />
+      ),
       finish: (
         <select>
           <option value="">처리중</option>

               className={"btn-small green-btn"}
               btnName={"등록"}
               onClick={() => {
-                navigate("/CallInsert");
+                navigate("/QandAInsert");
               }}
             />
             <Button className={"btn-small green-btn "} btnName={"삭제"} />
           </div>
-          <Table className="equipment-detail" head={thead} contents={content} contentKey={key} onClick={() => {
-                navigate("/CallSelect");
-              }}/>
+          <Table className="equipment-detail" head={thead} contents={content} contentKey={key} />
         </div>
       </div>
     </main>

28dde5b

90ace59

client/views/pages/callcenter/QandA_agency.jsx (Renamed from client/views/pages/callcenter/QandA.jsx)

--- client/views/pages/callcenter/QandA.jsx

+++ client/views/pages/callcenter/QandA_agency.jsx


 import { useNavigate } from "react-router";
 import ContentTitle from "../../component/ContentTitle.jsx";
 
-export default function QandA() {
+export default function QandA_agency() {
   const navigate = useNavigate();
   //게시판
   const thead = [

   return (
     <main>
       <div className="content-wrap">
-      <ContentTitle contentTitle={"QnA게시판"} />
+      <ContentTitle contentTitle={"문의게시판"} />
         <div className="board-wrap">
         <div className="btn-wrap flex-end">
               <Button
                 className={"btn-small green-btn"}
                 btnName={"등록"}
                 onClick={() => {
-                  navigate("/CallInsert");
+                  navigate("/QandAInsert");
                 }}
               />
               <Button className={"btn-small green-btn"} btnName={"삭제"} />

90ace59

client/views/pages/equipment/EquipmentManagementInsert.jsx (added)

+++ client/views/pages/equipment/EquipmentManagementInsert.jsx

...	...	@@ -0,0 +1,108 @@
	1	+import React from "react";
	2	+import Button from "../../component/Button.jsx";
	3	+
	4	+export default function EquipmentManagementInsert() {
	5	+ return (
	6	+ <main>
	7	+ <div className="content-wrap">
	8	+ <div className="page-title margin-bottom">장비 등록</div>
	9	+ <div className="flex-align-start margin-bottom2 insert">
	10	+ <table className="flex70 margin-bottom">
	11	+ <tbody className="equipment-insert">
	12	+ <tr>
	13	+ <th>장비넘버</th>
	14	+ <td colSpan={5}>
	15	+ <input type="text" name="" id="" />
	16	+ </td>
	17	+ </tr>
	18	+ <tr>
	19	+ <th>기기종류</th>
	20	+ <td colSpan={5}>
	21	+ <div className="flex-start">
	22	+ <input type="checkbox" />
	23	+ <label htmlFor="">
	24	+
	25	+ 스마트 약상자
	26	+ </label>
	27	+ <input type="checkbox" />
	28	+ <label htmlFor="">
	29	+
	30	+ 심전도
	31	+ </label>
	32	+ </div>
	33	+ </td>
	34	+ </tr>
	35	+ <tr>
	36	+ <th>사용자</th>
	37	+ <td colSpan={5}>
	38	+ <div className="flex">
	39	+ <input type="text" disabled />
	40	+ </div>
	41	+ </td>
	42	+ </tr>
	43	+ <tr>
	44	+ <th>주소</th>
	45	+ <td colSpan={5}>
	46	+ <div className="flex">
	47	+ <input type="text" disabled />
	48	+ </div>
	49	+ </td>
	50	+ </tr>
	51	+ <tr>
	52	+ <th>대여일</th>
	53	+ <td>
	54	+ <input type="date"/>
	55	+ </td>
	56	+ <th>반납일</th>
	57	+ <td>
	58	+ <input type="date" />
	59	+ </td>
	60	+ <th>작동여부</th>
	61	+ <td>
	62	+ <select name="" id="" className="select100">
	63	+ <option value="">작동</option>
	64	+ <option value="">수리중</option>
	65	+ <option value="">고장</option>
	66	+ </select>
	67	+ </td>
	68	+ </tr>
	69	+ <tr>
	70	+ <th>아침</th>
	71	+ <td>
	72	+ <select name="" id="" className="select100">
	73	+ <option value="">미사용</option>
	74	+ <option value="">사용</option>
	75	+ </select>
	76	+ </td>
	77	+ <th>점심</th>
	78	+ <td>
	79	+ <select name="" id="" className="select100">
	80	+ <option value="">미사용</option>
	81	+ <option value="">사용</option>
	82	+ </select>
	83	+ </td>
	84	+ <th>저녁</th>
	85	+ <td>
	86	+ <select name="" id="" className="select100">
	87	+ <option value="">미사용</option>
	88	+ <option value="">사용</option>
	89	+ </select>
	90	+ </td>
	91	+ </tr>
	92	+ <tr>
	93	+ <th>비고</th>
	94	+ <td colSpan={5}>
	95	+ <textarea name="" id="" cols="30" rows="10" style={{height:"167px"}}></textarea>
	96	+ </td>
	97	+ </tr>
	98	+ </tbody>
	99	+ </table>
	100	+ </div>
	101	+ <div className="btn-wrap flex-center">
	102	+ <Button className={"btn-large gray-btn"} btnName={"취소"} />
	103	+ <Button className={"btn-large green-btn"} btnName={"등록"} />
	104	+ </div>
	105	+ </div>
	106	+ </main>
	107	+ );
	108	+}

28dde5b

90ace59

client/views/pages/equipment/EquipmentManagementSelect.jsx

--- client/views/pages/equipment/EquipmentManagementSelect.jsx

+++ client/views/pages/equipment/EquipmentManagementSelect.jsx


 
 
 export default function EquipmentManagementSelect() {
-  
+
   const [modalOpen, setModalOpen] = React.useState(false);
   const openModal = () => {
     setModalOpen(true);

     "입고일자",
     "납품 기관",
   ];
-  const key3= [
+  const key3 = [
     "No",
     "equipment_name",
     "serialNumber",

       serialNumber: "ABCD-1",
       name: "2022.12.02",
       management: (<Button
-      className={"btn-small gray-btn"}
-      btnName={"선택"}
-      onClick={openModal}
-    />)
+        className={"btn-small gray-btn"}
+        btnName={"선택"}
+        onClick={openModal}
+      />)
     },
   ];
   const thead2 = [

       title: "장비 전체(205)",
       description: (
         <div>
-        <div className="btn-wrap flex-end margin-bottom ">
-          <Button
-            className={"btn-small green-btn"}
-            btnName={"등록"}
+          <div className="flex">
+            <SubTitle explanation={"장비 클릭 시 지난 매칭이력을 확인할 수 있습니다."} />
+            <div className="btn-wrap flex-end margin-bottom ">
+              <Button
+                className={"btn-small green-btn"}
+                btnName={"등록"}
+                onClick={() => {
+                  navigate("/EquipmentManagementInsert");
+                }}
+              />
+              <Button className={"btn-small green-btn"} btnName={"삭제"} />
+            </div>
+          </div>
+          <Table
+            className={"caregiver-user"}
+            head={thead1}
+            contents={content1}
+            contentKey={key1}
             onClick={() => {
-              navigate("/EquipmentManagementInsert");
+              navigate("/EquipmentManagementSelectOne");
             }}
           />
-          <Button className={"btn-small green-btn"} btnName={"삭제"} />
         </div>
-        <Table
-          className={"caregiver-user"}
-          head={thead1}
-          contents={content1}
-          contentKey={key1}
-        />
-      </div>  
       ),
     },
     {

             contents={content3}
             contentKey={key3}
           />
-        </div>      
+        </div>
       ),
     },
     {

               onClick={() => navigate("")}
             />
           </div>
+
           <ul className="tab-content">
             {data
               .filter((item) => index === item.id)

28dde5b

90ace59

client/views/pages/equipment/EquipmentManagementSelectOne.jsx

--- client/views/pages/equipment/EquipmentManagementSelectOne.jsx

+++ client/views/pages/equipment/EquipmentManagementSelectOne.jsx


 import Modal from "../../component/Modal.jsx";
 import { useNavigate } from "react-router";
 import ContentTitle from "../../component/ContentTitle.jsx";
+import SubTitle from "../../component/SubTitle.jsx";
 
 export default function EquipmentManagementSelectOne() {
   const navigate = useNavigate();
   //게시판
   const thead = [
     "No",
-    "장비명",
-    "시리얼 넘버",
     "사용자명",
-    "사용자관리번호",
-    "위치",
+    "시니어등록번호",
+    "관리기관",
     "대여기간",
   ];
   const key = [
     "No",
-    "equipment_name",
-    "serialNumber",
     "name",
     "management_number",
     "address",

   const content = [
     {
       No: 1,
-      equipment_name: "스마트약상자",
-      serialNumber: "ABCD-1",
       name: "김복남",
       management_number: 2022080101,
-      address: "경상북도 군위군 삼국유사면",
+      address: "A복지관",
       period_of_use: "2022.12.01 ~ 2023.11.30",
     },
     {
       No: 2,
-      equipment_name: "스마트약상자",
-      serialNumber: "ABCD-1",
       name: "홍길동",
       management_number: 2022080102,
-      address: "경상북도 군위군 군위읍",
+      address: "B복지관",
       period_of_use: "2020.05.01 ~ 2022.04.23",
     },
   ];

       <div className="content-wrap">
       <ContentTitle contentTitle={"장비 상세 목록"} />
         <div className="board-wrap">
+        <SubTitle explanation={"스마트약상자(ABCD-1)"} />
           <Table className="equipment-detail" head={thead} contents={content} contentKey={key} />
         </div>
       </div>

28dde5b

90ace59

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

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

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

...	...	@@ -9,8 +9,8 @@
9	9	const navigate = useNavigate();
10	10
11	11	//게시판
12		- const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "최근 복약률",];
13		- const key = ["No", "name","number", "birth", "phone", "address", "average"];
	12	+ const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소","관리기관","보호사", "최근 복약률",];
	13	+ const key = ["No", "name","number", "birth", "phone", "address", "agency", "protect","average"];
14	14	const content = [
15	15	{
16	16	No: 1,
...	...	@@ -19,6 +19,8 @@
19	19	birth: "1948.11.15",
20	20	phone: "010-1234-5678",
21	21	address: "경상북도 군위군 삼국유사면",
	22	+ agency: "A복지관",
	23	+ protect: "홍길동",
22	24	average: "0%",
23	25	},
24	26	{
...	...	@@ -28,6 +30,8 @@
28	30	birth: "1948.08.02",
29	31	phone: "010-1234-3333",
30	32	address: "경상북도 군위군 군위읍",
	33	+ agency: "A복지관",
	34	+ protect: "홍길동",
31	35	average: "80%",
32	36	},
33	37	];

28dde5b

90ace59

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

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

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


 import ContentTitle from "../../../component/ContentTitle.jsx";
 import SubTitle from "../../../component/SubTitle.jsx";
 
-export default function MedicineCareSelect_government() {
+export default function MedicineCareSelect() {
   const navigate = useNavigate();
 
   //게시판
-  const thead = ["No", "이름", "생년월일", "연락처", "주소", "관리기관","보호사","최근 3일 복약률",];
-  const key = ["No", "name", "birth", "phone", "address","agency","protect", "average"];
+  const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소","보호사", "관리기관", "일 복약 횟수",];
+  const key = ["No", "name","number", "birth", "phone", "address","protector","agency", "average"];
   const content = [
     {
       No: 1,
       name: "김복남",
+      number: "00000001",
       birth: "1948.11.15",
       phone: "010-1234-5678",
       address: "경상북도 군위군 삼국유사면",
+      protector: "홍길동",
       agency: "A복지관",
-      protect: "홍길동",
-      average: "0%",
-    },
-    {
-      No: 2,
-      name: "홍길동",
-      birth: "1948.08.02",
-      phone: "010-1234-3333",
-      address: "경상북도 군위군 군위읍",
-      agency: "B복지관",
-      protect: "박길동",
-      average: "80%",
+      average: "3회",
     },
   ];
 
   return (
     <main>
       <div className="content-wrap">
-        <ContentTitle contentTitle={"복약 조회"} />
+      <ContentTitle contentTitle={"복약 조회"} />
         <div>
           <DetailSearch />
           <div className="board-wrap">
-            <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
+          <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom"/>
             <Table
-              className={"medicine-table"}
+            className={"medicine-table"}
               head={thead}
               contents={content}
               contentKey={key}

28dde5b

90ace59

client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx

--- client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx

+++ client/views/pages/healthcare/temperature/TemperatureManagementSelect.jsx

...	...	@@ -5,11 +5,11 @@
5	5	import SubTitle from "../../../component/SubTitle.jsx";
6	6	import { useNavigate } from 'react-router';
7	7
8		-export default function TemperatureManagementSelect() {
	8	+export default function TemperatureManagementSelect_government() {
9	9	const navigate = useNavigate();
10	10	//게시판
11		- const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소", "최근 최저 온도","최근 최고 온도",];
12		- const key = ["No", "name", "number","birth", "phone", "address", "low", "high"];
	11	+ const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소","관리기관","보호사", "최근 최고 온도", "최근 최저 온도"];
	12	+ const key = ["No", "name","number", "birth", "phone", "address","agency", "protect","high","low"];
13	13	const content = [
14	14	{
15	15	No: 1,
...	...	@@ -18,18 +18,10 @@
18	18	birth: "1948.11.15",
19	19	phone: "010-1234-5678",
20	20	address: "경상북도 군위군 삼국유사면",
21		- low: "18°C",
	21	+ agency: "A복지관",
	22	+ protect: "홍길동",
22	23	high: "18°C",
23		- },
24		- {
25		- No: 2,
26		- name: "홍길동",
27		- number: "00000001",
28		- birth: "1945.05.08",
29		- phone: "010-1234-5678",
30		- address: "경상북도 군위군 군위읍",
31		- low: "10°C",
32		- high: "10°C",
	24	+ low: "18°C",
33	25	},
34	26	];
35	27	return (

28dde5b

90ace59

client/views/pages/user_management/UserAuthoriySelect_agency.jsx (Renamed from client/views/pages/user_management/UserAuthoriySelect_admin.jsx)

--- client/views/pages/user_management/UserAuthoriySelect_admin.jsx

+++ client/views/pages/user_management/UserAuthoriySelect_agency.jsx


 import Modal from "../../component/Modal.jsx";
 import { useNavigate } from "react-router";
 
-export default function UserAuthoriySelect_admin() {
+export default function UserAuthoriySelect_agency() {
   const navigate = useNavigate();
   const [modalOpen, setModalOpen] = React.useState(false);
   const openModal = () => {

Add a comment

Open 0
Closed 0

List

...	...	@@ -26,8 +26,8 @@
26	26	};
27	27
28	28
29		- const menuItems = AllApp.menuItems; //AdminApp, GovernmentApp, AllApp
30		- const AppRoute = AllApp.AppRoute;
	29	+ const menuItems = AdminApp.menuItems; //AdminApp, GovernmentApp, AllApp, AgencyApp, GuardianApp
	30	+ const AppRoute = AdminApp.AppRoute;
31	31
32	32
33	33	const { title } = menuItems.find(

...	...	@@ -1,6 +1,7 @@
1	1	import React from "react";
2	2	import Button from "../../component/Button.jsx";
3	3	import ContentTitle from "../../component/ContentTitle.jsx";
	4	+import SubTitle from "../../component/SubTitle.jsx";
4	5	import { useNavigate } from "react-router";
5	6
6	7	export default function CallInsert() {
...	...	@@ -9,7 +10,7 @@
9	10	<main>
10	11	<div className="content-wrap row">
11	12	<ContentTitle contentTitle={"문의글 작성"} />
12		- <p>작성자 정보</p>
	13	+ <SubTitle explanation={"작성자 정보"} />
13	14	<table className="margin-bottom2 senior-insert">
14	15	<tr>
15	16	<th>작성자</th>
...	...	@@ -34,9 +35,9 @@
34	35	<th>구분</th>
35	36	<td colSpan={3} className="flex">
36	37	<select name="year" id="year">
37		- <option value="">반납</option>
38		- <option value="">교환</option>
39	38	<option value="">추가</option>
	39	+ <option value="">교환</option>
	40	+ <option value="">반납</option>
40	41	<option value="">기타</option>
41	42	</select>
42	43	</td>
...	...	@@ -48,7 +49,7 @@
48	49	</td>
49	50	</tr>
50	51	</table>
51		- <p>시니어 정보</p>
	52	+ <SubTitle explanation={"시니어 정보"} />
52	53	<table className="margin-bottom2 senior-insert">
53	54	<tr>
54	55	<th>시니어 선택</th>
...	...	@@ -81,6 +82,19 @@
81	82	</tr>
82	83
83	84	</table>
	85	+ <SubTitle explanation={"장비 정보(시니어가 사용중인 장비가 자동으로 입력됩니다.)"} />
	86	+ <table className="margin-bottom2 senior-insert">
	87	+ <tr>
	88	+ <th>장비명</th>
	89	+ <td>
	90	+ <input type="text" placeholder="자동입력부분" />
	91	+ </td>
	92	+ <th>장비시리얼넘버</th>
	93	+ <td>
	94	+ <input type="text" placeholder="자동입력부분" />
	95	+ </td>
	96	+ </tr>
	97	+ </table>
84	98	<div className="btn-wrap flex-center">
85	99	<Button
86	100	className={"btn-large gray-btn"}

...	...	@@ -5,25 +5,29 @@
5	5	import { useNavigate } from "react-router";
6	6	import ContentTitle from "../../component/ContentTitle.jsx";
7	7
8		-export default function EquipmentInquiry() {
	8	+export default function QandAInquiry() {
9	9	const navigate = useNavigate();
10	10	//게시판
11	11	const thead = [
12	12	"No",
13	13	"장비명",
14	14	"시리얼 넘버",
	15	+ "작성자",
15	16	"기관명",
16	17	"요청일자",
17	18	"구분",
	19	+ "내용상세보기",
18	20	"처리여부",
19	21	];
20	22	const key = [
21	23	"No",
22	24	"equipment_name",
23	25	"serialNumber",
	26	+ "writer",
24	27	"name",
25	28	"date",
26	29	"category",
	30	+ "show",
27	31	"finish"
28	32	];
29	33	const content = [
...	...	@@ -31,9 +35,19 @@
31	35	No: 1,
32	36	equipment_name: "스마트약상자",
33	37	serialNumber: "ABCD-1",
	38	+ writer: "홍길동",
34	39	name: "A복지관",
35	40	date: "2023-01-27",
36	41	category: "교환",
	42	+ show: (
	43	+ <Button
	44	+ className={"btn-small gray-btn"}
	45	+ btnName={"상세보기"}
	46	+ onClick={() => {
	47	+ navigate("/QandAConfirm");
	48	+ }}
	49	+ />
	50	+ ),
37	51	finish: (
38	52	<select>
39	53	<option value="">처리중</option>
...	...	@@ -53,14 +67,12 @@
53	67	className={"btn-small green-btn"}
54	68	btnName={"등록"}
55	69	onClick={() => {
56		- navigate("/CallInsert");
	70	+ navigate("/QandAInsert");
57	71	}}
58	72	/>
59	73	<Button className={"btn-small green-btn "} btnName={"삭제"} />
60	74	</div>
61		- <Table className="equipment-detail" head={thead} contents={content} contentKey={key} onClick={() => {
62		- navigate("/CallSelect");
63		- }}/>
	75	+ <Table className="equipment-detail" head={thead} contents={content} contentKey={key} />
64	76	</div>
65	77	</div>
66	78	</main>

...	...	@@ -5,7 +5,7 @@
5	5	import { useNavigate } from "react-router";
6	6	import ContentTitle from "../../component/ContentTitle.jsx";
7	7
8		-export default function QandA() {
	8	+export default function QandA_agency() {
9	9	const navigate = useNavigate();
10	10	//게시판
11	11	const thead = [
...	...	@@ -31,14 +31,14 @@
31	31	return (
32	32	<main>
33	33	<div className="content-wrap">
34		- <ContentTitle contentTitle={"QnA게시판"} />
	34	+ <ContentTitle contentTitle={"문의게시판"} />
35	35	<div className="board-wrap">
36	36	<div className="btn-wrap flex-end">
37	37	<Button
38	38	className={"btn-small green-btn"}
39	39	btnName={"등록"}
40	40	onClick={() => {
41		- navigate("/CallInsert");
	41	+ navigate("/QandAInsert");
42	42	}}
43	43	/>
44	44	<Button className={"btn-small green-btn"} btnName={"삭제"} />

...	...	@@ -8,7 +8,7 @@
8	8
9	9
10	10	export default function EquipmentManagementSelect() {
11		-
	11	+
12	12	const [modalOpen, setModalOpen] = React.useState(false);
13	13	const openModal = () => {
14	14	setModalOpen(true);
...	...	@@ -57,7 +57,7 @@
57	57	"입고일자",
58	58	"납품 기관",
59	59	];
60		- const key3= [
	60	+ const key3 = [
61	61	"No",
62	62	"equipment_name",
63	63	"serialNumber",
...	...	@@ -83,10 +83,10 @@
83	83	serialNumber: "ABCD-1",
84	84	name: "2022.12.02",
85	85	management: (<Button
86		- className={"btn-small gray-btn"}
87		- btnName={"선택"}
88		- onClick={openModal}
89		- />)
	86	+ className={"btn-small gray-btn"}
	87	+ btnName={"선택"}
	88	+ onClick={openModal}
	89	+ />)
90	90	},
91	91	];
92	92	const thead2 = [
...	...	@@ -151,23 +151,29 @@
151	151	title: "장비 전체(205)",
152	152	description: (
153	153	<div>
154		- <div className="btn-wrap flex-end margin-bottom ">
155		- <Button
156		- className={"btn-small green-btn"}
157		- btnName={"등록"}
	154	+ <div className="flex">
	155	+ <SubTitle explanation={"장비 클릭 시 지난 매칭이력을 확인할 수 있습니다."} />
	156	+ <div className="btn-wrap flex-end margin-bottom ">
	157	+ <Button
	158	+ className={"btn-small green-btn"}
	159	+ btnName={"등록"}
	160	+ onClick={() => {
	161	+ navigate("/EquipmentManagementInsert");
	162	+ }}
	163	+ />
	164	+ <Button className={"btn-small green-btn"} btnName={"삭제"} />
	165	+ </div>
	166	+ </div>
	167	+ <Table
	168	+ className={"caregiver-user"}
	169	+ head={thead1}
	170	+ contents={content1}
	171	+ contentKey={key1}
158	172	onClick={() => {
159		- navigate("/EquipmentManagementInsert");
	173	+ navigate("/EquipmentManagementSelectOne");
160	174	}}
161	175	/>
162		- <Button className={"btn-small green-btn"} btnName={"삭제"} />
163	176	</div>
164		- <Table
165		- className={"caregiver-user"}
166		- head={thead1}
167		- contents={content1}
168		- contentKey={key1}
169		- />
170		- </div>
171	177	),
172	178	},
173	179	{
...	...	@@ -181,7 +187,7 @@
181	187	contents={content3}
182	188	contentKey={key3}
183	189	/>
184		- </div>
	190	+ </div>
185	191	),
186	192	},
187	193	{
...	...	@@ -250,6 +256,7 @@
250	256	onClick={() => navigate("")}
251	257	/>
252	258	</div>
	259	+
253	260	<ul className="tab-content">
254	261	{data
255	262	.filter((item) => index === item.id)

...	...	@@ -4,23 +4,20 @@
4	4	import Modal from "../../component/Modal.jsx";
5	5	import { useNavigate } from "react-router";
6	6	import ContentTitle from "../../component/ContentTitle.jsx";
	7	+import SubTitle from "../../component/SubTitle.jsx";
7	8
8	9	export default function EquipmentManagementSelectOne() {
9	10	const navigate = useNavigate();
10	11	//게시판
11	12	const thead = [
12	13	"No",
13		- "장비명",
14		- "시리얼 넘버",
15	14	"사용자명",
16		- "사용자관리번호",
17		- "위치",
	15	+ "시니어등록번호",
	16	+ "관리기관",
18	17	"대여기간",
19	18	];
20	19	const key = [
21	20	"No",
22		- "equipment_name",
23		- "serialNumber",
24	21	"name",
25	22	"management_number",
26	23	"address",
...	...	@@ -29,20 +26,16 @@
29	26	const content = [
30	27	{
31	28	No: 1,
32		- equipment_name: "스마트약상자",
33		- serialNumber: "ABCD-1",
34	29	name: "김복남",
35	30	management_number: 2022080101,
36		- address: "경상북도 군위군 삼국유사면",
	31	+ address: "A복지관",
37	32	period_of_use: "2022.12.01 ~ 2023.11.30",
38	33	},
39	34	{
40	35	No: 2,
41		- equipment_name: "스마트약상자",
42		- serialNumber: "ABCD-1",
43	36	name: "홍길동",
44	37	management_number: 2022080102,
45		- address: "경상북도 군위군 군위읍",
	38	+ address: "B복지관",
46	39	period_of_use: "2020.05.01 ~ 2022.04.23",
47	40	},
48	41	];
...	...	@@ -51,6 +44,7 @@
51	44	<div className="content-wrap">
52	45	<ContentTitle contentTitle={"장비 상세 목록"} />
53	46	<div className="board-wrap">
	47	+ <SubTitle explanation={"스마트약상자(ABCD-1)"} />
54	48	<Table className="equipment-detail" head={thead} contents={content} contentKey={key} />
55	49	</div>
56	50	</div>

...	...	@@ -5,45 +5,36 @@
5	5	import ContentTitle from "../../../component/ContentTitle.jsx";
6	6	import SubTitle from "../../../component/SubTitle.jsx";
7	7
8		-export default function MedicineCareSelect_government() {
	8	+export default function MedicineCareSelect() {
9	9	const navigate = useNavigate();
10	10
11	11	//게시판
12		- const thead = ["No", "이름", "생년월일", "연락처", "주소", "관리기관","보호사","최근 3일 복약률",];
13		- const key = ["No", "name", "birth", "phone", "address","agency","protect", "average"];
	12	+ const thead = ["No", "이름","시니어등록번호", "생년월일", "연락처", "주소","보호사", "관리기관", "일 복약 횟수",];
	13	+ const key = ["No", "name","number", "birth", "phone", "address","protector","agency", "average"];
14	14	const content = [
15	15	{
16	16	No: 1,
17	17	name: "김복남",
	18	+ number: "00000001",
18	19	birth: "1948.11.15",
19	20	phone: "010-1234-5678",
20	21	address: "경상북도 군위군 삼국유사면",
	22	+ protector: "홍길동",
21	23	agency: "A복지관",
22		- protect: "홍길동",
23		- average: "0%",
24		- },
25		- {
26		- No: 2,
27		- name: "홍길동",
28		- birth: "1948.08.02",
29		- phone: "010-1234-3333",
30		- address: "경상북도 군위군 군위읍",
31		- agency: "B복지관",
32		- protect: "박길동",
33		- average: "80%",
	24	+ average: "3회",
34	25	},
35	26	];
36	27
37	28	return (
38	29	<main>
39	30	<div className="content-wrap">
40		- <ContentTitle contentTitle={"복약 조회"} />
	31	+ <ContentTitle contentTitle={"복약 조회"} />
41	32	<div>
42	33	<DetailSearch />
43	34	<div className="board-wrap">
44		- <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom" />
	35	+ <SubTitle explanation={"대상자 클릭 시 상세페이지로 이동합니다."} className="margin-bottom"/>
45	36	<Table
46		- className={"medicine-table"}
	37	+ className={"medicine-table"}
47	38	head={thead}
48	39	contents={content}
49	40	contentKey={key}

Delete comment