diff --git a/backend/src/main/java/com/example/Piroin/project/domain/assignment/enums/AssignmentStatus.java b/backend/src/main/java/com/example/Piroin/project/domain/assignment/enums/AssignmentStatus.java index e3902db..8e09924 100644 --- a/backend/src/main/java/com/example/Piroin/project/domain/assignment/enums/AssignmentStatus.java +++ b/backend/src/main/java/com/example/Piroin/project/domain/assignment/enums/AssignmentStatus.java @@ -6,8 +6,12 @@ public enum AssignmentStatus { INSUFFICIENT_MINOR, // 경미한 불충분 (-10000) + INSUFFICIENT_15000, + INSUFFICIENT_MAJOR, // 심각한 불충분 (-20000) + INSUFFICIENT_25000, + FAILURE, // 미제출 (-20000) PENDING // 아직 채점 안 됨 diff --git a/backend/src/main/java/com/example/Piroin/project/domain/user/service/AdminUserService.java b/backend/src/main/java/com/example/Piroin/project/domain/user/service/AdminUserService.java index dfd4873..6619728 100644 --- a/backend/src/main/java/com/example/Piroin/project/domain/user/service/AdminUserService.java +++ b/backend/src/main/java/com/example/Piroin/project/domain/user/service/AdminUserService.java @@ -167,8 +167,12 @@ private int calculateAssignmentPenalty(AssignmentStatus status) { case INSUFFICIENT_MINOR -> 10_000; + case INSUFFICIENT_15000 -> 15_000; + case INSUFFICIENT_MAJOR -> 20_000; + case INSUFFICIENT_25000 -> 25_000; + case FAILURE -> 30_000; }; } diff --git a/frontend/src/pages/pirocheck/students/StudentDetail.js b/frontend/src/pages/pirocheck/students/StudentDetail.js index 91e8949..26c49d2 100644 --- a/frontend/src/pages/pirocheck/students/StudentDetail.js +++ b/frontend/src/pages/pirocheck/students/StudentDetail.js @@ -10,12 +10,22 @@ import Toggle2 from '../../../assets/images/icon_togle2.svg'; const IS_MOCK = false; const dayLabel = { TUESDAY: 'TUE', THURSDAY: 'THU', SATURDAY: 'SAT' }; -const statusOptions = ['PENDING', 'SUCCESS', 'INSUFFICIENT_MINOR', 'INSUFFICIENT_MAJOR', 'FAILURE']; +const statusOptions = [ + 'PENDING', + 'SUCCESS', + 'INSUFFICIENT_MINOR', + 'INSUFFICIENT_15000', + 'INSUFFICIENT_MAJOR', + 'INSUFFICIENT_25000', + 'FAILURE', +]; const statusLabel = { PENDING: '채점 중', SUCCESS: '성공', INSUFFICIENT_MINOR: '미달 (-1)', + INSUFFICIENT_15000: '미달 (-1.5)', INSUFFICIENT_MAJOR: '미달 (-2)', + INSUFFICIENT_25000: '미달 (-2.5)', FAILURE: '실패', }; diff --git a/frontend/src/pages/qna/QnAListPage.module.css b/frontend/src/pages/qna/QnAListPage.module.css index 430f1d0..f4b28bc 100644 --- a/frontend/src/pages/qna/QnAListPage.module.css +++ b/frontend/src/pages/qna/QnAListPage.module.css @@ -207,6 +207,7 @@ width: 70px; height: 36px; color: var(--dark); + padding: 0 8px; } .oxCount {