Skip to content

Commit ae1dc52

Browse files
authored
Merge pull request #265 from pirogramming/develop
메인 머지
2 parents 210386e + 24506a0 commit ae1dc52

4 files changed

Lines changed: 23 additions & 0 deletions

File tree

backend/src/main/java/com/example/Piroin/project/domain/assignment/enums/AssignmentStatus.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ public enum AssignmentStatus {
44

55
SUCCESS, // 정상 제출 (0원)
66

7+
INSUFFICIENT_5000,
8+
79
INSUFFICIENT_MINOR, // 경미한 불충분 (-10000)
810

911
INSUFFICIENT_15000,

backend/src/main/java/com/example/Piroin/project/domain/user/service/AdminUserService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ private int calculateAssignmentPenalty(AssignmentStatus status) {
165165

166166
case SUCCESS, PENDING -> 0;
167167

168+
case INSUFFICIENT_5000 -> 5_000;
169+
168170
case INSUFFICIENT_MINOR -> 10_000;
169171

170172
case INSUFFICIENT_15000 -> 15_000;
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
ALTER TABLE assignment_item
2+
DROP CONSTRAINT chk_assignment_item_submitted;
3+
4+
ALTER TABLE assignment_item
5+
ADD CONSTRAINT chk_assignment_item_submitted
6+
CHECK (
7+
submitted IN (
8+
'SUCCESS',
9+
'INSUFFICIENT_5000',
10+
'INSUFFICIENT_MINOR',
11+
'INSUFFICIENT_15000',
12+
'INSUFFICIENT_MAJOR',
13+
'INSUFFICIENT_25000',
14+
'FAILURE',
15+
'PENDING'
16+
)
17+
);

frontend/src/pages/pirocheck/students/StudentDetail.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const dayLabel = { TUESDAY: 'TUE', THURSDAY: 'THU', SATURDAY: 'SAT' };
1313
const statusOptions = [
1414
'PENDING',
1515
'SUCCESS',
16+
'INSUFFICIENT_5000',
1617
'INSUFFICIENT_MINOR',
1718
'INSUFFICIENT_15000',
1819
'INSUFFICIENT_MAJOR',
@@ -22,6 +23,7 @@ const statusOptions = [
2223
const statusLabel = {
2324
PENDING: '채점 중',
2425
SUCCESS: '성공',
26+
INSUFFICIENT_5000: '미달 (-0.5)',
2527
INSUFFICIENT_MINOR: '미달 (-1)',
2628
INSUFFICIENT_15000: '미달 (-1.5)',
2729
INSUFFICIENT_MAJOR: '미달 (-2)',

0 commit comments

Comments
 (0)