Fix : 마일리지 등록 테이블 수정(#29)

HGU-WALAB · Sep 6, 2023 · e0b42a4 · e0b42a4
2 parents 187fd05 + da232d6
commit e0b42a4
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 22 deletions.
diff --git a/src/components/common/Filter/CategoryAutoComplete.tsx b/src/components/common/Filter/CategoryAutoComplete.tsx
@@ -3,16 +3,17 @@ import { styled } from '@mui/system';
 import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setCategory } from 'src/redux/slices/filter';
+import { removeDuplicates } from './Filtering';
 
 const StyledAutocomplete = styled(Autocomplete)({
   minWidth: '200px',
 });
 
 export default function CategoryAutoComplete() {
-  const top100Films = [
+  const top100Films = removeDuplicates([
     '전체',
     ...useSelector((state) => state.filterList.categoryList.map((category) => category.name)),
-  ];
+  ]);
 
   const value = useSelector((state) => state.filter.category);
   const dispatch = useDispatch();

diff --git a/src/components/common/Filter/Filtering.tsx b/src/components/common/Filter/Filtering.tsx
@@ -16,6 +16,10 @@ const ResponsiveFilterBox = styled(Box)({
   gap: '10px',
 });
 
+export function removeDuplicates(arr) {
+  return [...new Set(arr)];
+}
+
 export default function Filtering() {
   const tableNum = useSelector((state) => state.component.componentNum);
 

diff --git a/src/components/common/Filter/ItemAutoComplete.tsx b/src/components/common/Filter/ItemAutoComplete.tsx
@@ -2,16 +2,17 @@ import { Autocomplete, TextField, styled } from '@mui/material';
 import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { setCategory, setItem } from 'src/redux/slices/filter';
+import { removeDuplicates } from './Filtering';
 
 const StyledAutocomplete = styled(Autocomplete)({
   minWidth: '230px',
 });
 
 export default function ItemAutoComplete() {
-  const top100Films = [
+  const top100Films = removeDuplicates([
     '전체',
     ...useSelector((state) => state.filterList.itemList).map((item) => item.name),
-  ];
+  ]);
   const item = useSelector((state) => state.filter.item);
   const dispatch = useDispatch();
 

diff --git a/src/components/common/modal/SWModal.tsx b/src/components/common/modal/SWModal.tsx
@@ -194,7 +194,7 @@ export const engToKor = (eng) => {
     case SEMESTERITEMID:
       return '학기별 세부 항목 ID';
     case STUDENT_ID:
-      return '학번';
+      return '학생 고유 ID';
     case COUNTS:
       return '등록횟수';
     case POINTS:

diff --git a/src/components/modalForm/CategoryForm.tsx b/src/components/modalForm/CategoryForm.tsx
@@ -53,6 +53,7 @@ export default function CategoryForm() {
 
       case EDITCATEGORY:
         axiosInstance
+          .patch(`/api/mileage/categories/${beforeData[ID]}`, newData)
           .patch(`/api/mileage/categories/${beforeData[ID]}`, newData)
           .then((res) => {
             alert('카테고리가 수정되었습니다.');

diff --git a/src/components/modalForm/GlobalItemForm.tsx b/src/components/modalForm/GlobalItemForm.tsx
@@ -92,6 +92,7 @@ export default function GlobalItemForm() {
         return 'C';
       }
     };
+
     const newData = {
       categoryId: 106,
       itemName: values[ITEM],

diff --git a/src/components/modalForm/StudentForm.tsx b/src/components/modalForm/StudentForm.tsx
@@ -60,7 +60,6 @@ const StyleFieldBox = styled(Box)({
   flexDirection: 'column',
   alignItems: ' center',
   margin: '30px 0px',
-
   padding: '0px 20px',
   width: '100%',
   gap: '15px',
@@ -75,7 +74,6 @@ const StyleFieldForm = styled(Form)({
   flexDirection: 'column',
   alignItems: 'center',
   margin: '30px 0px',
-
   padding: '0px 20px',
   width: '100%',
   gap: '20px',
@@ -160,6 +158,7 @@ export default function StudentForm() {
         <StyleFieldForm>
           <Box sx={{ display: 'flex', width: '100%', gap: '30px' }}>
             <StyleFieldBox>
+              {[NAME, SID, DEPARTMENT, MAJOR1, MAJOR2, YEAR, SEMESTERCOUNT].map(
               {[NAME, SID, DEPARTMENT, MAJOR1, MAJOR2, YEAR, SEMESTERCOUNT].map(
                 (field: string, index: number) => (
                   <Box key={index}>

diff --git a/src/pages/manage/student/index.tsx b/src/pages/manage/student/index.tsx
@@ -28,6 +28,7 @@ import SWModal from 'src/components/common/modal/SWModal';
 import { EDITCATEGORY, EDITSTUDENT } from 'src/assets/data/modal/modals';
 import { random } from 'lodash';
 import { ReactNode } from 'react';
+import { ID } from 'src/assets/data/fields';
 
 /**
  * @component [학생 관리] 게시판
@@ -43,7 +44,7 @@ export enum StudentManageBoard {
   'NAME' = NAME,
   'SID' = SID,
   'GRADE' = GRADE,
-  'MOBILE' = MOBILE,
+
   'DEPARTMENT' = DEPARTMENT,
   'MAJOR' = MAJOR,
   'LASTLOGINDATE' = LASTLOGINDATE,
@@ -166,11 +167,11 @@ const rows = [
     '오인혁',
     '21800446',
     '4(8)',
-    '010-6536-6217',
+
     '전산전자공학부',
     'AI 컴퓨터공학심화',
     '2022-08-21',
-    '2022-08-20',
+
     <CheckBoxIcon />,
     <ManageAccountsIcon />
   ),
@@ -179,11 +180,11 @@ const rows = [
     '한시온',
     '21800447',
     '4(8)',
-    '010-6536-6217',
+
     '전산전자공학부',
     'AI 컴퓨터공학심화',
     '2022-08-21',
-    '2022-08-20',
+
     <CheckBoxIcon />,
     <ManageAccountsIcon />
   ),
@@ -192,11 +193,11 @@ const rows = [
     '김민수',
     '21800448',
     '4(8)',
-    '010-6536-6217',
+
     '전산전자공학부',
     'AI 컴퓨터공학심화',
     '2022-08-21',
-    '2022-08-20',
+
     <CheckBoxIcon />,
     <ManageAccountsIcon />
   ),
@@ -205,11 +206,11 @@ const rows = [
     '장유진',
     '21800449',
     '4(8)',
-    '010-6536-6217',
+
     '전산전자공학부',
     'AI 컴퓨터공학심화',
     '2022-08-21',
-    '2022-08-20',
+
     <CheckBoxIcon />,
     <ManageAccountsIcon />
   ),
@@ -264,6 +265,7 @@ export default function StudentManage({
       [ISCHECKED]: student[ISCHECKED],
     };
     return createData(
+      student[ID],
       student[ID],
       student[NAME],
       student[SID],

diff --git a/src/pages/mileage/category/index.tsx b/src/pages/mileage/category/index.tsx
@@ -21,10 +21,12 @@ import { setMileageCategoryList } from 'src/redux/slices/data';
  */
 
 export enum MileageCategoryBoard {
-  'NUM' = NUM,
+  'ID' = ID,
   'CATEGORY' = CATEGORY,
   'DESCRIPTION1' = DESCRIPTION1,
   'DESCRIPTION2' = DESCRIPTION2,
+  'DESCRIPTION1' = DESCRIPTION1,
+  'DESCRIPTION2' = DESCRIPTION2,
   'MANAGE' = MANAGE,
 }
 
@@ -34,10 +36,12 @@ export enum MileageCategoryBoard {
  */
 
 interface Data {
-  [MileageCategoryBoard.NUM]: number;
+  [MileageCategoryBoard.ID]: number;
   [MileageCategoryBoard.CATEGORY]: string;
   [MileageCategoryBoard.DESCRIPTION1]: string;
   [MileageCategoryBoard.DESCRIPTION2]: string;
+  [MileageCategoryBoard.DESCRIPTION1]: string;
+  [MileageCategoryBoard.DESCRIPTION2]: string;
   [MileageCategoryBoard.MANAGE]: ReactNode;
 }
 
@@ -69,7 +73,7 @@ function createData(
  */
 const headCells = [
   {
-    id: [MileageCategoryBoard.NUM],
+    id: [MileageCategoryBoard.ID],
     numeric: false,
     disablePadding: true,
     label: '번호',
@@ -80,6 +84,13 @@ const headCells = [
     disablePadding: false,
     label: '카테고리명',
   },
+
+  {
+    id: [MileageCategoryBoard.DESCRIPTION1],
+    numeric: true,
+    disablePadding: false,
+    label: '설명 1',
+  },
   {
     id: [MileageCategoryBoard.DESCRIPTION1],
     numeric: true,

diff --git a/src/pages/mileage/item/semester/index.tsx b/src/pages/mileage/item/semester/index.tsx
@@ -273,15 +273,15 @@ export default function MileageCategory({
 
   const convertedFetchList = fetchData.list?.map((semesterItem) => {
     const beforeData = {
-      [NUM]: semesterItem.item.id,
+      [NUM]: semesterItem.id,
       [CATEGORY]: semesterItem.category.name,
       [SEMESTER]: semesterItem.semesterName,
       [ITEM]: semesterItem.item.name,
       [MILEAGE]: semesterItem.points,
       [MAX_MAILEAGE]: semesterItem.itemMaxPoints,
     };
     return createData(
-      semesterItem.item.id,
+      semesterItem.id,
       semesterItem.category.name,
       semesterItem.semesterName,
       semesterItem.item.name,

diff --git a/src/pages/mileage/register/index.tsx b/src/pages/mileage/register/index.tsx
@@ -197,5 +197,8 @@ export default function MileageRegister({
 
   console.log(convertedFetchList);
 
-  return <CollapsibleTable rows={convertedFetchList} type="마일리지 등록" />;
+  return (
+    <EnhancedTable originalRows={convertedFetchList} headCells={headCells} type="마일리지 등록" />
+  );
+  // <CollapsibleTable rows={convertedFetchList} type="마일리지 등록" />;
 }