Merge branch 'develop'

DSM-PICK · Aug 23, 2024 · 8219cc1 · 8219cc1
2 parents 590cbc4 + 555c6e9
commit 8219cc1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/api/type.ts b/src/api/type.ts
@@ -54,6 +54,7 @@ export interface ChangeStatus {
 
 export interface FloorClass {
   user_id: string;
+  id: string;
   class_num: number;
   classroom_name: string;
   end_period: number;

diff --git a/src/app/classChange/page.tsx b/src/app/classChange/page.tsx
@@ -143,7 +143,7 @@ const ClassChange = () => {
           <ChangeClass
             type="accept"
             key={index}
-            onClick={() => handleAcceptListClick(item.user_id, item.username)}
+            onClick={() => handleAcceptListClick(item.id, item.username)}
             prevClass={item.move}
             nextClass={`${item.classroom_name}`}
             student={getStudentString(item)}

diff --git a/src/app/outAccept/page.tsx b/src/app/outAccept/page.tsx
@@ -227,14 +227,12 @@ const OutAccept = () => {
             ))
           : applicationData?.map((item, index) => (
               <NonReturn
-                id={item.user_id}
+                id={item.id}
                 type="accept"
                 key={index}
                 returnTime={`${item.start_time}~`}
                 name={getStudentString(item)}
-                onClick={() =>
-                  handleAcceptListClick(item.user_id, item.username)
-                }
+                onClick={() => handleAcceptListClick(item.id, item.username)}
                 reason={item.reason}
               />
             ))}