Merge branch 'develop'

DSM-PICK · Aug 23, 2024 · 590cbc4 · 590cbc4
2 parents 5fbbedc + 2024e80
commit 590cbc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/app/afterManage/page.tsx b/src/app/afterManage/page.tsx
@@ -138,9 +138,6 @@ const AfterManage = () => {
                           id={item.id}
                           state={item.status}
                           name={`${setStudentNum(item)} ${item.name}`}
-                          onClick={() =>
-                            handleAcceptListClick(item.id, item.name)
-                          }
                           class_name={item.classroom_name}
                         />
                       );

diff --git a/src/components/dropdown/status.tsx b/src/components/dropdown/status.tsx
@@ -44,6 +44,7 @@ const AfterCheck: React.FC<AfterCheckProp> = ({ state, onChange, type }) => {
         return "border border-tertiary-300 text-tertiary-300";
       case "취업":
       case "현체":
+      case "귀가":
         return "border border-neutral-500 text-neutral-500";
       default:
         return "";
@@ -67,6 +68,8 @@ const AfterCheck: React.FC<AfterCheckProp> = ({ state, onChange, type }) => {
         return "MOVEMENT";
       case "출석":
         return "ATTENDANCE";
+      case "귀가":
+        return "GO_HOME";
       default:
         return "";
     }
@@ -78,7 +81,7 @@ const AfterCheck: React.FC<AfterCheckProp> = ({ state, onChange, type }) => {
     setIsDropdownVisible(false);
   };
 
-  return state === "현체" || state === "취업" ? (
+  return state === "현체" || state === "취업" || state === "귀가" ? (
     <div
       className={`box-border group px-4 py-1 bg-white rounded-lg text-Button-ES fle x justify-between items-center ${style()}`}
     >
@@ -112,6 +115,12 @@ const AfterCheck: React.FC<AfterCheckProp> = ({ state, onChange, type }) => {
           >
             외출
           </div>
+          <div
+            className={`${commonStyle} text-neutral-50`}
+            onClick={() => handleOptionClick("귀가")}
+          >
+            귀가
+          </div>
           <div
             className={`${commonStyle} text-error-400`}
             onClick={() => handleOptionClick("무단")}