Merge pull request #1336 from 42organization/feat/파티어드민-패널티-시간변경-#1335

[Fix] 시간출력오류 변경
42organization · Mar 29, 2024 · 58eeb00 · 58eeb00
2 parents 96574dc + 4ad8fe4
commit 58eeb00
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 19 deletions.
diff --git a/components/admin/party/AdminCommentReport.tsx b/components/admin/party/AdminCommentReport.tsx
@@ -17,7 +17,7 @@ import {
   AdminTableHead,
 } from 'components/admin/common/AdminTable';
 import PageNation from 'components/Pagination';
-import styles from 'styles/admin/Party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
 
 const tableTitle: { [key: string]: string } = {
   id: '번호',

diff --git a/components/admin/party/AdminPartyNoShow.tsx b/components/admin/party/AdminPartyNoShow.tsx
@@ -17,7 +17,7 @@ import {
   AdminTableHead,
 } from 'components/admin/common/AdminTable';
 import PageNation from 'components/Pagination';
-import styles from 'styles/admin/Party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
 
 const tableTitle: { [key: string]: string } = {
   id: '번호',

diff --git a/components/admin/party/AdminPartyPenalty.tsx b/components/admin/party/AdminPartyPenalty.tsx
@@ -10,6 +10,7 @@ import {
 } from '@mui/material';
 import { PartyPenaltyAdmin, PartyPenaltyTable } from 'types/partyTypes';
 import { instanceInPartyManage } from 'utils/axios';
+import { dateToStringShort } from 'utils/handleTime';
 import { modalState } from 'utils/recoil/modal';
 import { toastState } from 'utils/recoil/toast';
 import { tableFormat } from 'constants/admin/table';
@@ -18,7 +19,7 @@ import {
   AdminTableHead,
 } from 'components/admin/common/AdminTable';
 import PageNation from 'components/Pagination';
-import styles from 'styles/admin/Party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
 
 const tableTitle: { [key: string]: string } = {
   id: '번호',
@@ -58,14 +59,14 @@ export default function AdminCommentReport() {
           clicked: true,
         });
       });
-  }, [currentPage, penaltyInfo]);
+  }, [currentPage]);
 
   const handleAddpenalty = () => {
-    setModal({ modalName: 'ADMIN-PARTY_ADMIN_PENALTY' });
+    setModal({ modalName: 'ADMIN-PARTY_PENALTY' });
   };
 
   const handleEditpenalty = (partyPenalty?: PartyPenaltyAdmin) => {
-    setModal({ modalName: 'ADMIN-PARTY_ADMIN_PENALTY', partyPenalty });
+    setModal({ modalName: 'ADMIN-PARTY_PENALTY', partyPenalty });
   };
 
   return (
@@ -101,6 +102,10 @@ export default function AdminCommentReport() {
                               >
                                 수정
                               </button>
+                            ) : columnName === 'startTime' ? (
+                              <span>
+                                {dateToStringShort(new Date(penalty.startTime))}
+                              </span>
                             ) : (
                               penalty[
                                 columnName as keyof PartyPenaltyAdmin

diff --git a/components/admin/party/AdminPartyRoomReport.tsx b/components/admin/party/AdminPartyRoomReport.tsx
@@ -17,7 +17,7 @@ import {
   AdminTableHead,
 } from 'components/admin/common/AdminTable';
 import PageNation from 'components/Pagination';
-import styles from 'styles/admin/Party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
 
 const tableTitle: { [key: string]: string } = {
   id: '번호',
@@ -31,7 +31,7 @@ const tableTitle: { [key: string]: string } = {
 export default function AdminPartyRoomReport() {
   const [roomInfo, setRoomInfo] = useState<PartyRoomReportTable>({
     roomReportList: [],
-    totalPage: 0,
+    totalPages: 0,
     currentPage: 0,
   });
   const [currentPage, setCurrentPage] = useState<number>(1);
@@ -44,7 +44,7 @@ export default function AdminPartyRoomReport() {
       .then((res) => {
         setRoomInfo({
           roomReportList: res.data.roomReportList,
-          totalPage: res.data.totalPage,
+          totalPages: res.data.totalPage,
           currentPage: currentPage,
         });
       })
@@ -92,7 +92,7 @@ export default function AdminPartyRoomReport() {
       <div className={styles.pageNationContainer}>
         <PageNation
           curPage={roomInfo.currentPage}
-          totalPages={roomInfo.totalPage}
+          totalPages={roomInfo.totalPages}
           pageChangeHandler={(pageNumber: number) => {
             setCurrentPage(pageNumber);
           }}

diff --git a/components/admin/party/PartyTemplate.tsx b/components/admin/party/PartyTemplate.tsx
@@ -13,7 +13,7 @@ import { modalState } from 'utils/recoil/modal';
 import { tableFormat } from 'constants/admin/table';
 import { AdminTableHead } from 'components/admin/common/AdminTable';
 import { usePartyTemplate } from 'hooks/party/usePartyTemplate';
-import styles from 'styles/admin/Party/AdminPartyCommon.module.scss';
+import styles from 'styles/admin/party/AdminPartyCommon.module.scss';
 
 const tableTitle: { [key: string]: string } = {
   gameTemplateId: '템플릿번호',

diff --git a/components/modal/admin/AdminPartyPenaltyModal.tsx b/components/modal/admin/AdminPartyPenaltyModal.tsx
@@ -12,12 +12,19 @@ export default function PartyPenaltyModal({
   partyPenalty?: PartyPenaltyAdmin;
 }) {
   const [formData, setFormData] = useState<PartyPenaltyAdminSubmit>(
-    partyPenalty ?? {
-      penaltyType: '',
-      message: '',
-      penaltyTime: 0,
-      userIntraId: '',
-    }
+    partyPenalty
+      ? {
+          penaltyType: partyPenalty.penaltyType,
+          message: partyPenalty.message,
+          penaltyTime: partyPenalty.penaltyTime,
+          userIntraId: partyPenalty.userIntraId || '',
+        }
+      : {
+          penaltyType: '',
+          message: '',
+          penaltyTime: 0,
+          userIntraId: '',
+        }
   );
   const setModal = useSetRecoilState(modalState);
   const [isUpdateMode, setIsUpdateMode] = useState(partyPenalty ? true : false);
@@ -67,6 +74,7 @@ export default function PartyPenaltyModal({
             <input
               type='text'
               value={formData.penaltyType}
+              maxLength={20}
               onChange={(e) =>
                 setFormData({ ...formData, penaltyType: e.target.value })
               }
@@ -75,6 +83,7 @@ export default function PartyPenaltyModal({
             <input
               type='text'
               value={formData.message}
+              maxLength={100}
               onChange={(e) =>
                 setFormData({ ...formData, message: e.target.value })
               }

diff --git a/components/modal/modalType/AdminModal.tsx b/components/modal/modalType/AdminModal.tsx
@@ -97,7 +97,7 @@ export default function AdminModal() {
       <AdminTournamentParticipantEditModal tournamentId={tournamentId} />
     ) : null,
     'ADMIN-PARTY_TEMPLATE': <TemplateModal template={template} />,
-    'ADMIN-PARTY_ADMIN_PENALTY': (
+    'ADMIN-PARTY_PENALTY': (
       <AdminPartyPenaltyModal partyPenalty={partyPenalty} />
     ),
     'ADMIN-PARTY_EDIT': roomId ? <PartyRoomEditModal roomId={roomId} /> : null,

diff --git a/types/modalTypes.ts b/types/modalTypes.ts
@@ -57,7 +57,7 @@ type AdminModal =
   | 'TOURNAMENT_BRAKET_EDIT'
   | 'TOURNAMENT_PARTICIPANT_EDIT'
   | 'PARTY_TEMPLATE'
-  | 'PARTY_ADMIN_PENALTY'
+  | 'PARTY_PENALTY'
   | 'PARTY_EDIT';
 
 type ModalName =

diff --git a/types/partyTypes.ts b/types/partyTypes.ts
@@ -125,6 +125,38 @@ export type PartyPenaltyAdmin = {
   message: string;
   startTime: string;
   penaltyTime: number;
+  userIntraId?: string;
+};
+
+export type PartyPenaltyAdminSubmit = {
+  penaltyType: string;
+  message: string;
+  penaltyTime: number;
+  userIntraId: string;
+};
+
+export type PartyCommentReportTable = {
+  commentReportList: PartyCommentReport[];
+  totalPage: number;
+  currentPage: number;
+};
+
+export type PartyPenaltyTable = {
+  penaltyList: PartyPenaltyAdmin[];
+  totalPage: number;
+  currentPage: number;
+};
+
+export type PartyNoshowReportTable = {
+  noShowReportList: PartyNoshowReport[];
+  totalPages: number;
+  currentPage: number;
+};
+
+export type PartyRoomReportTable = {
+  roomReportList: PartyNoshowReport[];
+  totalPages: number;
+  currentPage: number;
 };
 
 export type PartyColors = 'PARTY-MAIN';