Merge branch 'develop'

DSM-PICK · Aug 20, 2024 · bf8a8e0 · bf8a8e0
2 parents afb40f3 + 6b222dc
commit bf8a8e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/api/type.ts b/src/api/type.ts
@@ -1,7 +1,8 @@
 export interface applicationOK {
-  id: string;
+  user_id: string;
   username: string;
   start_time: string;
+  id: string;
   end_time: string;
   grade: number;
   class_num: number;
@@ -52,7 +53,7 @@ export interface ChangeStatus {
 }
 
 export interface FloorClass {
-  id: string;
+  user_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.id, item.username)}
+            onClick={() => handleAcceptListClick(item.user_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
@@ -216,23 +216,27 @@ const OutAccept = () => {
         {selectedTab
           ? applicationData?.map((item, index) => (
               <NonReturn
-                id={item.id}
+                id={item.user_id}
                 type="accept"
                 key={index}
                 returnTime={`${item.start_time}~${item.end_time}`}
                 name={getStudentString(item)}
-                onClick={() => handleAcceptListClick(item.id, item.username)}
+                onClick={() =>
+                  handleAcceptListClick(item.user_id, item.username)
+                }
                 reason={item.reason}
               />
             ))
           : applicationData?.map((item, index) => (
               <NonReturn
-                id={item.id}
+                id={item.user_id}
                 type="accept"
                 key={index}
                 returnTime={`${item.start_time}~`}
                 name={getStudentString(item)}
-                onClick={() => handleAcceptListClick(item.id, item.username)}
+                onClick={() =>
+                  handleAcceptListClick(item.user_id, item.username)
+                }
                 reason={item.reason}
               />
             ))}