add : 출석체크시 이동교실 표시

DSM-PICK · May 10, 2024 · 9e02604 · 9e02604
2 parents dc5682d + fbc01fc
commit 9e02604
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/api/classChange/index.ts b/src/api/classChange/index.ts
@@ -5,7 +5,7 @@ import apiError from "@/hook/errorHandling";
 
 export const AcceptClassChange = (floor: number) => {
   return useQuery<FloorClass[]>({
-    queryKey: ["AcceptClassChange", floor], // floor를 queryKey에 추가
+    queryKey: ["AcceptClassChange", floor],
     queryFn: async () => {
       const response = await instance.get(
         `/class-room/floor?floor=${floor}&status=QUIET`

diff --git a/src/api/type.ts b/src/api/type.ts
@@ -37,6 +37,7 @@ export interface ClubList {
   grade: number;
   class_num: number;
   num: number;
+  classroom_name: string;
   status6: string;
   status7: string;
   status8: string;

diff --git a/src/app/attendanceCheck/page.tsx b/src/app/attendanceCheck/page.tsx
@@ -132,6 +132,7 @@ const attendanceCheck = () => {
             state4={item.status9}
             state5={item.status10}
             after
+            class_name={item.classroom_name}
           />
         ))}
       </div>

diff --git a/src/components/list/afterManage/index.tsx b/src/components/list/afterManage/index.tsx
@@ -13,6 +13,7 @@ interface NonReturnProp {
   after?: boolean;
   name: string;
   time?: number;
+  class_name?: string;
 }
 
 export const AfterList = ({
@@ -25,6 +26,7 @@ export const AfterList = ({
   id,
   onClick,
   name,
+  class_name,
 }: NonReturnProp) => {
   const Change = (item: string) => {
     switch (item) {
@@ -106,7 +108,16 @@ export const AfterList = ({
         className={`min-w-fit gap-2 flex justify-between w-full bg-white px-4 py-3 rounded-lg flex-col`}
       >
         <div className=" whitespace-nowrap min-w-fit gap-2 items-center flex justify-between w-full rounded-lg">
-          <div className=" text-sub-title4-M">{name}</div>
+          <div className=" flex whitespace-nowrap gap-2 items-center justify-between">
+            <div className=" text-sub-title4-M">{name}</div>
+            {class_name === "" ? (
+              ""
+            ) : (
+              <div className=" border border-primary-400 px-2 py-1 rounded-2xl bg-primary-400 text-body3 text-white">
+                {class_name}
+              </div>
+            )}
+          </div>
           <StatusDrop onChange={ClassCheck} state={Change(changeProp())} />
         </div>
       </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,6 +132,7 @@ const attendanceCheck = () => { @@
                 state4={item.status9}
                 state5={item.status10}
                 after
+                class_name={item.classroom_name}
               />
             ))}
           </div>
@@ Expand Down @@