fix(admin): 확인 중 추가하며 접수 -> 확인 중

Bamdoliro · Oct 15, 2024 · c43e28b · c43e28b
1 parent ae81712
commit c43e28b
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 5 deletions.
diff --git a/apps/admin/src/app/form/page.tsx b/apps/admin/src/app/form/page.tsx
@@ -142,12 +142,12 @@ const FormPage = () => {
               <Dropdown
                 data={[
                   { value: 'RESET', label: '전체 보기' },
-                  { value: 'RECEIVED', label: '접수' },
+                  { value: 'APPROVED', label: '확인 중' },
                   { value: 'FIRST_FAILED', label: '1차 불합격' },
                   { value: 'FAILED', label: '불합격' },
                   { value: 'FINAL_SUBMITTED', label: '최종 제출' },
                   { value: 'SUBMITTED', label: '제출' },
-                  { value: 'APPROVED', label: '승인' },
+                  { value: 'RECEIVED', label: '승인' },
                   { value: 'NO_SHOW', label: '불참' },
                   { value: 'FIRST_PASSED', label: '1차 합격' },
                   { value: 'PASSED', label: '최종 합격' },

diff --git a/...min/src/components/form/FormDetailContent/ChangeFinalScoreModal/ChangeFinalScoreModal.tsx b/...min/src/components/form/FormDetailContent/ChangeFinalScoreModal/ChangeFinalScoreModal.tsx
@@ -78,6 +78,21 @@ const FinalScoreConfirm = ({ id, isOpen, onClose }: Props) => {
               hidden
             />
           </CardRadio>
+          <CardRadio approvalStatusType="확인 중" $checked={approvalStatus === '확인 중'}>
+            <Text
+              fontType="context"
+              color={approvalStatus === '확인 중' ? color.green : color.gray600}
+            >
+              확인 중
+            </Text>
+            <input
+              type="radio"
+              name="approvalStatus"
+              value="확인 중"
+              onChange={handleApprovalRadioChange}
+              hidden
+            />
+          </CardRadio>
         </Row>
         <Row gap={16} style={{ alignSelf: 'flex-end' }}>
           <Button size="SMALL" styleType="SECONDARY" onClick={onClose}>
@@ -141,5 +156,10 @@ const CardRadio = styled.label<{ approvalStatusType: ApprovalStatus; $checked: b
           border: 1px solid ${color.red};
           background: rgba(244, 67, 54, 0.1);
         `
+      : approvalStatusType === '확인 중'
+      ? css`
+          border: 1px solid ${color.green};
+          background: rgba(0, 191, 64, 0.1);
+        `
       : null)}
 `;
diff --git a/apps/admin/src/components/form/FormTable/FormTableItem/FormTableItem.tsx b/apps/admin/src/components/form/FormTable/FormTableItem/FormTableItem.tsx
@@ -42,6 +42,8 @@ const FormTableItem = ({
         return color.maruDefault;
       case 'REJECTED':
         return color.red;
+      case 'APPROVED':
+        return color.green;
       default:
         return color.gray900;
     }
@@ -65,6 +67,8 @@ const FormTableItem = ({
         return '승인';
       case 'REJECTED':
         return '반려';
+      case 'APPROVED':
+        return '확인 중';
       default:
         return '접수 중';
     }

diff --git a/apps/admin/src/constants/form/constants.ts b/apps/admin/src/constants/form/constants.ts
@@ -1,12 +1,12 @@
 import type { FormCategory, FormStatus, FormType } from '@/types/form/client';
 
 export const FORM_STATUS_CATEGORY: Record<FormStatus, string> = {
-  RECEIVED: '접수',
+  RECEIVED: '승인',
   FIRST_FAILED: '1차 불합격',
   FAILED: '불합격',
   FINAL_SUBMITTED: '최종 제출',
   SUBMITTED: '제출',
-  APPROVED: '승인',
+  APPROVED: '확인 중',
   NO_SHOW: '불참',
   FIRST_PASSED: '1차 합격',
   PASSED: '최종 합격',

diff --git a/apps/admin/src/services/form/api.ts b/apps/admin/src/services/form/api.ts
@@ -102,6 +102,10 @@ export const patchFinalScore = async (id: number, status: ApprovalStatus) => {
   if (status === '반려') {
     const { data } = await maru.patch(`/form/${id}/reject`, {}, authorization());
 
+    return data;
+  } else if (status === '확인 중') {
+    const { data } = await maru.patch(`/form/${id}/approve`, {}, authorization());
+
     return data;
   }
   const { data } = await maru.patch(`/form/${id}/receive`, {}, authorization());

diff --git a/apps/admin/src/types/form/client.ts b/apps/admin/src/types/form/client.ts
@@ -144,4 +144,4 @@ export interface Attendance {
   classAbsenceCount: number;
 }
 
-export type ApprovalStatus = '승인' | '반려' | '';
+export type ApprovalStatus = '승인' | '반려' | '확인 중' | '';
diff --git a/packages/design-token/src/color.ts b/packages/design-token/src/color.ts
@@ -3,6 +3,7 @@ const color = {
   white: '#FFFFFF',
   orange: '#FF763B',
   red: '#F44336',
+  green: '#00BF40',
 
   bamdoliro: '#1E2E3D',
   maruDefault: '#257CFF',