Merge pull request #103 from IT-Cotato/fix/misc

[Fix] 통계 관련 자잘한 오류 수정
IT-Cotato · Feb 21, 2025 · 929fd85 · 929fd85
2 parents 67d6ea8 + 91764d1
commit 929fd85
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/src/components/Statistics/Empty.tsx b/src/components/Statistics/Empty.tsx
@@ -1,13 +1,12 @@
-import { useState } from 'react';
 import Frame from '../../assets/images/Frame.svg?react';
-import Button from '../Button';
 import StatisticsButton from '../StatisticsButton';
-import Modal from '../Modal/Modal';
-import CreateModal from '../Modal/CreateModal';
 
-const Empty = () => {
+interface EmptyProps {
+  setModalOpen: (value: boolean) => void;
+}
+
+const Empty = ({ setModalOpen }: EmptyProps) => {
   const userRole = localStorage.getItem('roleInfo');
-  const [modalOpen, setModalOpen] = useState(false);
 
   return (
     <div className="p-4 flex flex-col justify-center gap-6 items-center">
@@ -17,11 +16,13 @@ const Empty = () => {
         <p>시험 종류를 추가하고</p>
         <p>성적 통계를 한번에 보세요!</p>
       </div>
-      {userRole == 'TEACHER' ? <StatisticsButton type="시험" onClick={() => setModalOpen(true)} /> : ''}
-      {modalOpen && (
-        <Modal onClose={() => setModalOpen(false)}>
-          <CreateModal type="시험" setModalOpen={setModalOpen} />
-        </Modal>
+      {userRole == 'TEACHER' && (
+        <StatisticsButton
+          type="시험"
+          onClick={() => {
+            setModalOpen(true);
+          }}
+        />
       )}
     </div>
   );

diff --git a/src/pages/Statistics/Statistics.tsx b/src/pages/Statistics/Statistics.tsx
@@ -44,11 +44,12 @@ const Statistics = () => {
           data.data.examBox.map((subject: Subject, index: number) => ({
             id: subject.id,
             title: subject.name,
-            isClicked: index == 0 ? true : false,
+            isClicked: index === 0,
           })),
         );
         getExamGrade(data.data.examBox[0].id);
         setSelectedTag(data.data.examBox[0].id);
+        setName(data.data.examBox[0].name);
       }
     });
   }, [modalOpen]);
@@ -59,7 +60,6 @@ const Statistics = () => {
       if (data.data.exams.length == 0) {
         setData([]);
       } else {
-        setName(data.data.examBoxName);
         setData(data.data.exams);
       }
     });
@@ -69,7 +69,12 @@ const Statistics = () => {
   if (tags?.length == 0 || !tags) {
     return (
       <div className="flex flex-col h-full justify-center items-center">
-        <Empty />
+        <Empty setModalOpen={setModalOpen} />
+        {modalOpen && (
+          <Modal onClose={() => setModalOpen(false)}>
+            <CreateModal type="시험" setModalOpen={setModalOpen} />
+          </Modal>
+        )}
       </div>
     );
   }
@@ -79,6 +84,7 @@ const Statistics = () => {
 
     getExamGrade(id);
     setSelectedTag(id);
+    setName(title);
   };
 
   if (!data) {
@@ -96,7 +102,7 @@ const Statistics = () => {
       </div>
       {/* 그래프 */}
       <div className="flex flex-col pt-4 pb-6 rounded-lg bg-gray-50 w-full justify-center items-center px-4 gap-6">
-        <h1 className="text-body2 font-semibold leading-8 tracking-[-0.18px]">시험 종류명</h1>
+        <h1 className="text-body2 font-semibold leading-8 tracking-[-0.18px]">{name}</h1>
         <div className="w-full h-full">
           <Chart data={data} />
         </div>