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
43 changes: 31 additions & 12 deletions frontend/src/pages/pirocheck/assignment/Assignment.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,23 @@ const IS_MOCK = false;

// 제출 상태 아이콘 (부원용)
function StatusIcon({ status }) {
if (status === 'SUBMITTED') return <img src={StatusO} className={styles.statusIcon} alt="제출" />;
if (status === 'LATE') return <img src={StatusT} className={styles.statusIcon} alt="지각제출" />;
return <img src={StatusX} className={styles.statusIcon} alt="미제출" />;
if (status === 'PENDING') {
return <span className={styles.pendingText}>채점 중</span>;
}

if (status === 'SUCCESS') {
return <img src={StatusO} className={styles.statusIcon} alt="성공" />;
}

if (status === 'INSUFFICIENT_MINOR' || status === 'INSUFFICIENT_MAJOR') {
return <img src={StatusT} className={styles.statusIcon} alt="불충분" />;
}

if (status === 'FAILURE') {
return <img src={StatusX} className={styles.statusIcon} alt="실패" />;
}

return <span className={styles.pendingText}>채점 중</span>;
}

// 세션별 과제 묶기
Expand Down Expand Up @@ -147,15 +161,20 @@ function Assignment() {
const [modalItem, setModalItem] = useState(undefined); // undefined=닫힘, null=생성, object=수정

const fetchAll = async () => {
const results = await Promise.all(
['1', '2', '3', '4', '5'].map(w =>
authFetch(`/api/assignments/me/${w}`)
.then(r => r.json())
.catch(() => ({ week: w, assignments: [] }))
)
);
setWeeks(results);
};
const results = await Promise.all(
['1', '2', '3', '4', '5'].map(w =>
authFetch(`/api/assignments/me/${w}`)
.then(r => r.json())
.then(json => {
console.log('week', w, json);
return json;
})
.catch(() => ({ week: w, assignments: [] }))
)
);

setWeeks(results);
};

// 수정 시 로컬 state만 업데이트 (순서 유지)
const handleEditSave = (updatedItem) => {
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/pages/pirocheck/assignment/Assignment.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@
flex-shrink: 0;
}

.pendingText {
color: var(--main);
font-size: 0.9rem;
font-weight: 600;
white-space: nowrap;
}

.divider {
border: none;
border-top: 1px solid #555;
Expand Down
10 changes: 8 additions & 2 deletions frontend/src/pages/pirocheck/students/StudentDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@ 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', 'FAILURE'];
const statusLabel = { PENDING: '채점 중', SUCCESS: '성공', INSUFFICIENT: '미달', FAILURE: '실패' };
const statusOptions = ['PENDING', 'SUCCESS', 'INSUFFICIENT_MINOR', 'INSUFFICIENT_MAJOR', 'FAILURE'];
const statusLabel = {
PENDING: '채점 중',
SUCCESS: '성공',
INSUFFICIENT_MINOR: '경미한 미달',
INSUFFICIENT_MAJOR: '심각한 미달',
FAILURE: '실패',
};

function WeekBlock({ weekData, onChange }) {
const [isOpen, setIsOpen] = useState(false);
Expand Down
Loading