Merge pull request #111 from PLADI-ALM/refactor/PDW-65-user-manage-list

[PDW-65/fix] 빈 직원 목록 처리
PLADI-ALM · Oct 27, 2023 · 0a63d18 · 0a63d18
2 parents 446af00 + 0a5c3bb
commit 0a63d18
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/pages/booking/bookedList/BookedList.js b/src/pages/booking/bookedList/BookedList.js
@@ -54,6 +54,13 @@ export const BookedLineTr = styled.tr`
     border-bottom: #E1E0E2 solid 1px;
 `
 
+export const NoLineTr = styled.tr`
+  color: #4c4c4c;
+  text-align: center;
+  height: 60px;
+  border-bottom: #E1E0E2 solid 1px;
+`
+
 const optionList = BookingCategoryList.map((category) => (<option>{category}</option>))
 
 function BookedList(props) {

diff --git a/src/pages/manager/resourceManage/ResourceManage.js b/src/pages/manager/resourceManage/ResourceManage.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { useState, useEffect } from "react";
 import { RightContainer, TitleText, WhiteContainer } from "components/rightContainer/RightContainer";
-import { Bar, BookedTable, BookedThead, TableContainer } from "../../booking/bookedList/BookedList";
+import {Bar, BookedTable, BookedThead, NoLineTr, TableContainer} from "../../booking/bookedList/BookedList";
 import ResourceManageTableCell from "./ResourceManageTableCell";
 import ManageSearchBar from "components/searchBar/ManageSearchBar";
 import { getToken } from "utils/IsLoginUtil";
@@ -57,9 +57,9 @@ function ResourceManage(props) {
                         </BookedThead>
                         <tbody>
                             { resources.length === 0 ?
-                            <ResourceManageTableCell>
+                            <NoLineTr>
                                 <td colSpan={5}>장비 내역이 없습니다.</td>
-                            </ResourceManageTableCell>
+                            </NoLineTr>
                             : resources.map((resource) =>
                                 <ResourceManageTableCell
                                     key={resource.resourceId}

diff --git a/src/pages/manager/userManage/UserManage.js b/src/pages/manager/userManage/UserManage.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { useState, useEffect } from "react";
 import { RightContainer, TitleText, WhiteContainer } from "components/rightContainer/RightContainer";
-import { Bar, BookedTable, BookedThead, TableContainer } from "../../booking/bookedList/BookedList";
+import {Bar, BookedTable, BookedThead, NoLineTr, TableContainer} from "../../booking/bookedList/BookedList";
 import UserManageLine from "pages/manager/userManage/UserManageLine"
 import ManageSearchBar from "components/searchBar/ManageSearchBar";
 import { AdminUsersAxios } from "api/AxiosApi";
@@ -45,7 +45,7 @@ function UserManage(props) {
                 <UserModal id={props.id} handler={openModalHandler} />
                 : null
             }
-            <TitleText>{props.title}</TitleText>
+            <TitleText>직원 관리</TitleText>
             <ManageSearchBar btnClick={openModalHandler} onEnter={searchUsers} buttonTitle="신규 직원 등록" />
 
             <WhiteContainer>
@@ -54,7 +54,7 @@ function UserManage(props) {
                     <BookedTable>
                         <BookedThead>
                             <tr>
-                                <th width="5%">성명</th>
+                                <th width="10%">성명</th>
                                 <th width="15%">이메일</th>
                                 <th width="15%">연락처</th>
                                 <th width="10%">부서</th>
@@ -64,11 +64,12 @@ function UserManage(props) {
                         </BookedThead>
                         <tbody>
                             {users.length === 0 ?
-                                <UserManageLine>
+                                <NoLineTr>
                                     <td colSpan={6}>직원이 없습니다.</td>
-                                </UserManageLine>
-                                : users.map((user, index) =>
-                                    <UserManageLine key={index}
+                                </NoLineTr>
+                                : users.map((user) =>
+                                    <UserManageLine
+                                        key={user.id}
                                         id={user.userId}
                                         name={user.name}
                                         email={user.email}