Merge branch 'develop'

DSM-PICK · Aug 9, 2024 · 13096f6 · 13096f6
2 parents 4173fed + 8e7fe4d
commit 13096f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/api/type.ts b/src/api/type.ts
@@ -105,6 +105,7 @@ export interface changeClass {
   grade: number;
   id: string;
   num: number;
+  move: string;
   user_id: string;
   username: string;
 }
diff --git a/src/app/classChange/page.tsx b/src/app/classChange/page.tsx
@@ -144,7 +144,7 @@ const ClassChange = () => {
             type="accept"
             key={index}
             onClick={() => handleAcceptListClick(item.id, item.username)}
-            prevClass={`${item.grade}-${item.class_num}`}
+            prevClass={item.move}
             nextClass={`${item.classroom_name}`}
             student={getStudentString(item)}
           />

diff --git a/src/app/classChange/status/page.tsx b/src/app/classChange/status/page.tsx
@@ -53,7 +53,7 @@ const ClassChangeOk = () => {
       {floorData?.map((item, index) => (
         <ChangeClass
           key={index}
-          prevClass={`${item.grade}-${item.class_num}`}
+          prevClass={item.move}
           nextClass={item.classroom_name}
           student={getStudentString(item)}
         />