diff --git a/apps/graduate/src/admin/entities/graduation-users/api/fetchGraduationUsers.ts b/apps/graduate/src/admin/entities/graduation-users/api/fetchGraduationUsers.ts index 9c4a01b2..4a01f3a6 100644 --- a/apps/graduate/src/admin/entities/graduation-users/api/fetchGraduationUsers.ts +++ b/apps/graduate/src/admin/entities/graduation-users/api/fetchGraduationUsers.ts @@ -10,6 +10,7 @@ export type GraduationUserSummary = { name: string; graduationDate: string; graduationType: GraduationLabelType; + advisorProfessor: string; status?: SubmissionStatus; }; diff --git a/apps/graduate/src/admin/pages/thesis/types/row.ts b/apps/graduate/src/admin/pages/thesis/types/row.ts index d3fbf37f..30728f9b 100644 --- a/apps/graduate/src/admin/pages/thesis/types/row.ts +++ b/apps/graduate/src/admin/pages/thesis/types/row.ts @@ -7,5 +7,5 @@ export type ThesisRow = { gradTerm: string; status: string; submissionStatus: '제출' | '미제출'; - approved: '승인' | '미승인' | '승인 대기'; + approved: '승인' | '미승인'; }; diff --git a/apps/graduate/src/admin/widgets/Table/ui/Table.tsx b/apps/graduate/src/admin/widgets/Table/ui/Table.tsx index c01da7fa..a6f73d36 100644 --- a/apps/graduate/src/admin/widgets/Table/ui/Table.tsx +++ b/apps/graduate/src/admin/widgets/Table/ui/Table.tsx @@ -38,22 +38,19 @@ export default function Table({ graduationType === 'THESIS' && data ? data.contents.map((user: GraduationUserSummary, idx: number) => { const thesis = user.status?.type === 'THESIS' ? user.status : null; + const isFinalStage = Boolean(thesis?.midThesis.submitted); + const isSubmitted = isFinalStage + ? thesis?.finalThesis.submitted + : thesis?.midThesis.submitted; return { id: user.id, no: (page - 1) * pageSize + idx + 1, studentId: user.studentId, name: user.name, - advisor: '-', + advisor: user.advisorProfessor, gradTerm: user.graduationDate, - status: thesis?.finalThesis.approval - ? '승인' - : thesis?.finalThesis.submitted - ? '검토중' - : '미제출', - submissionStatus: - thesis?.midThesis.submitted && thesis?.finalThesis.submitted - ? '제출' - : '미제출', + status: isFinalStage ? '최종보고서' : '중간보고서', + submissionStatus: isSubmitted ? '제출' : '미제출', approved: thesis?.finalThesis.approval ? '승인' : '미승인', }; })