Skip to content

[Feat/257] 과제 상태 추가 #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lilyyang0077 merged 2 commits into from
Jun 27, 2026
+20 −1
Merged

[Feat/257] 과제 상태 추가 #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c970e30
feat: 백 과제 상태 추가
Jun 27, 2026
7d53c5a
feat: 과제 상태 프론트 추가
Jun 27, 2026
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
4 changes: 4 additions & 0 deletions ...nd/src/main/java/com/example/Piroin/project/domain/assignment/enums/AssignmentStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ public enum AssignmentStatus {

INSUFFICIENT_MINOR, // 경미한 불충분 (-10000)

INSUFFICIENT_15000,

INSUFFICIENT_MAJOR, // 심각한 불충분 (-20000)

INSUFFICIENT_25000,

FAILURE, // 미제출 (-20000)

PENDING // 아직 채점 안 됨
Expand Down
4 changes: 4 additions & 0 deletions backend/src/main/java/com/example/Piroin/project/domain/user/service/AdminUserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
Expand Down
12 changes: 11 additions & 1 deletion frontend/src/pages/pirocheck/students/StudentDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: '실패',
};

Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/qna/QnAListPage.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@
width: 70px;
height: 36px;
color: var(--dark);
padding: 0 8px;
}

.oxCount {
Expand Down
Loading