Skip to content

과제관리페이지 수정 시작 ( 출석 관리 끝) #212

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
Imggaggu merged 2 commits into from
May 25, 2025
Merged

과제관리페이지 수정 시작 ( 출석 관리 끝) #212

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
608865a
[Fix] attendance 수강생 페이지 일별 제목
Imggaggu May 25, 2025
1c89020
[Fix] 과제 관리 페이지 시작
Imggaggu May 25, 2025
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
2 changes: 1 addition & 1 deletion frontend/src/components/AdminStudentHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const AdminStudentHeader = ({ studentName = "default", subtitle = "default", onB

<button
className="icon-button"
onClick={() => navigate(`/admin/managestudent`)}
onClick={() => navigate(`/managestudent`)}
>
👥
</button>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/pages/admin/AdminStudentAssignment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,28 @@ const AdminStudentAssignment = () => {
label: `${weekItem.week}주차 ${weekItem.subject}`,
days: weekItem.days.map((dayItem) => ({
day: dayItem.day,
subject: weekItem.subject,
tasks: dayItem.details.map((task) => ({
id: task.id,
label: task.assignmentName,
status: task.status,
modified: false,
//modified: false,
})),
})),
}));

setWeeks(formatted);

const matched = formatted.find((w) => String(w.week) === String(week));
const matched = formatted.find((w) => Number(w.week) === Number(week));
if (matched) {
setSelectedWeekLabel(matched.label);
/*
if (matched.days.length > 0) {
setHighlightCard({
weekLabel: matched.label,
day: matched.days[0].day,
tasks: matched.days[0].tasks,
});
}
}*/
}
});
}, [studentId, week]);
Expand All @@ -79,9 +79,11 @@ const AdminStudentAssignment = () => {
});
};
*/


const handleSave = async (taskId, status) => {
const userId = parseInt(studentId); // 문자열일 수 있으니 숫자로 변환

try {
// PUT 요청 시도 (기존 과제 수정)
await updateAssignmentStatus(userId, taskId, status);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/admin/DetailManageStudent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const DetailManageStudent = () => {
<button
key={index}
className={style.assignment_button}
onClick={() => navigate(`/admin/assignment/${student.id}/${index + 1}`)}
onClick={() => navigate(`/admin/assignment/${student.id}/${week.week}`)}
>
{week.week} {week.title && ` ${week.title}`}
</button>
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/pages/generation/Assignment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ const Assignment = () => {
fetchAssignmentsByUser(userId)
.then((weekData) => {
const formatted = weekData.map((weekItem) => ({
label: `${weekItem.week}주차 ${weekItem.subject}`,
label: `${weekItem.week}주차 ${weekItem.subtitle}`,
//label: `${weekItem.week}주차 ${weekItem.subject}`,
details: weekItem.days.map((dayItem) => ({
day: dayItem.day,
subject: weekItem.subject,
subject: dayItem.subject,
//subject: weekItem.subject,
tasks: dayItem.details.map((task) => ({
label: task.assignmentName,
status: mapStatus(task.status),
Expand Down