From c23637f43650c8182f6d186546dd6e6c7a1ff24f Mon Sep 17 00:00:00 2001
From: jivebreaddev <89639413+jivebreaddev@users.noreply.github.com>
Date: Tue, 5 Oct 2021 13:50:08 +0000
Subject: [PATCH] Users, Access users tables integrated

---
 WEB/web-admin/src/AccessUser.js | 12 +++++-----
 WEB/web-admin/src/App.js        |  4 ++--
 WEB/web-admin/src/users.js      | 40 ++++++++++++++++++++-------------
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/WEB/web-admin/src/AccessUser.js b/WEB/web-admin/src/AccessUser.js
index 8943a7b..bc35d00 100644
--- a/WEB/web-admin/src/AccessUser.js
+++ b/WEB/web-admin/src/AccessUser.js
@@ -24,13 +24,13 @@ export const AccessUserList = props => (
             <List filters={postFilters} {...props} >
                 <Datagrid>
                     <TextField label="순번" source="id" />
-                    <ImageField label="사진" />
-                    <TextField label="출입시간"/>
-                    <TextField label="장소"/>
-                    <TextField label="계급" />
+                    <ImageField label="사진"source="photourl" />
+                    <TextField label="출입시간"source="place"/>
+                    <TextField label="장소"source="time"/>
+                    <TextField label="계급" source="rank"/>
                     <TextField label="이름" source="name" />
-                    <TextField label="군번" />
-                    <TextField label="소속" />
+                    <TextField label="군번" source="altid"/>
+                    <TextField label="소속" source="company"/>
                 </Datagrid>
             </List>
         </div>
diff --git a/WEB/web-admin/src/App.js b/WEB/web-admin/src/App.js
index 8c72b68..9c8c2a9 100644
--- a/WEB/web-admin/src/App.js
+++ b/WEB/web-admin/src/App.js
@@ -25,11 +25,11 @@ const App = () => (
     
     <Resource
       name="users"
-      list={UserList}
+      list={UserList} create={UserCreate} edit={UserEdit} show={UserShow} icon={UserIcon}
       options={{ label: "사용자" }}
     />
     <Resource
-      name="access"
+      name="accessusers"
       list={AccessUserList}
       icon={AccessUserIcon}
       options={{ label: "출입한 사용자" }}
diff --git a/WEB/web-admin/src/users.js b/WEB/web-admin/src/users.js
index 6959f0e..c2054d3 100644
--- a/WEB/web-admin/src/users.js
+++ b/WEB/web-admin/src/users.js
@@ -11,14 +11,22 @@ import {
   SelectInput,
   TextInput,
   Show,
-  SimpleShowLayout,
+  SimpleShowLayout
 } from "react-admin";
-
+const userFilters = [
+  <TextInput label="Search" source="q" alwaysOn />
+];
 
 export const UserList = (props) => (
-  <List {...props}>
-    <Datagrid>
+  <List filters={userFilters} {...props}>
+    <Datagrid rowClick="show">
       <TextField label="순번" source="id" />
+      <ImageField  label="사진" source="photourl" />
+      <TextField label="계급" source="rank" />
+      <TextField label="이름" source="name" />
+      <TextField label="군번" source="altid" />
+      <TextField label="소속" source="company" />
+      <EditButton />
     </Datagrid>
   </List>
 );
@@ -27,11 +35,11 @@ export const UserEdit = (props) => (
   <Edit {...props}>
     <SimpleForm>
       <TextInput label="순번" source="id" />
-      <ImageField label="사진" source="address.suite" />
-      <TextInput label="계급" source="address.street" />
+      <ImageField label="사진" source="photourl" />
+      <TextInput label="계급" source="rank" />
       <TextInput label="이름" source="name" />
-      <TextInput label="군번" source="phone" />
-      <TextInput label="소속" source="company.name" />
+      <TextInput label="군번" source="altid" />
+      <TextInput label="소속" source="company" />
     </SimpleForm>
   </Edit>
 );
@@ -40,11 +48,11 @@ export const UserCreate = (props) => (
   <Create {...props}>
     <SimpleForm>
       <TextInput label="순번" source="id" />
-      <ImageField label="사진" source="address.suite" />
-      <TextInput label="계급" source="address.street" />
+      <ImageField  label="사진" source="photourl" />
+      <TextInput label="계급" source="rank" />
       <TextInput label="이름" source="name" />
-      <TextInput label="군번" source="phone" />
-      <TextInput label="소속" source="company.name" />
+      <TextInput label="군번" source="altid" />
+      <TextInput label="소속" source="company" />
     </SimpleForm>
   </Create>
 );
@@ -53,11 +61,11 @@ export const UserShow = (props) => (
   <Show {...props}>
     <SimpleShowLayout>
       <TextField label="순번" source="id" />
-      <ImageField label="사진" source="address.suite" />
-      <TextField label="계급" source="address.street" />
+      <ImageField  label="사진" source="photourl" />
+      <TextField label="계급" source="rank" />
       <TextField label="이름" source="name" />
-      <TextField label="군번" source="phone" />
-      <TextField label="소속" source="company.name" />
+      <TextField label="군번" source="altid" />
+      <TextField label="소속" source="company" />
     </SimpleShowLayout>
   </Show>
 );