Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type GraduationUserSummary = {
name: string;
graduationDate: string;
graduationType: GraduationLabelType;
advisorProfessor: string;
status?: SubmissionStatus;
};

Expand Down
2 changes: 1 addition & 1 deletion apps/graduate/src/admin/pages/thesis/types/row.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ export type ThesisRow = {
gradTerm: string;
status: string;
submissionStatus: '제출' | '미제출';
approved: '승인' | '미승인' | '승인 대기';
approved: '승인' | '미승인';
};
17 changes: 7 additions & 10 deletions apps/graduate/src/admin/widgets/Table/ui/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 ? '승인' : '미승인',
};
})
Expand Down
Loading