Skip to content

Commit 1bdf6ed

Browse files
authored
Merge pull request #212 from pirogramming/frontend_admin_sj
과제관리페이지 수정 시작 ( 출석 관리 끝)
2 parents 3139b3c + 1c89020 commit 1bdf6ed

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

frontend/src/components/AdminStudentHeader.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const AdminStudentHeader = ({ studentName = "default", subtitle = "default", onB
2424

2525
<button
2626
className="icon-button"
27-
onClick={() => navigate(`/admin/managestudent`)}
27+
onClick={() => navigate(`/managestudent`)}
2828
>
2929
👥
3030
</button>

frontend/src/pages/admin/AdminStudentAssignment.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,28 @@ const AdminStudentAssignment = () => {
3838
label: `${weekItem.week}주차 ${weekItem.subject}`,
3939
days: weekItem.days.map((dayItem) => ({
4040
day: dayItem.day,
41-
subject: weekItem.subject,
4241
tasks: dayItem.details.map((task) => ({
4342
id: task.id,
4443
label: task.assignmentName,
4544
status: task.status,
46-
modified: false,
45+
//modified: false,
4746
})),
4847
})),
4948
}));
5049

5150
setWeeks(formatted);
5251

53-
const matched = formatted.find((w) => String(w.week) === String(week));
52+
const matched = formatted.find((w) => Number(w.week) === Number(week));
5453
if (matched) {
5554
setSelectedWeekLabel(matched.label);
55+
/*
5656
if (matched.days.length > 0) {
5757
setHighlightCard({
5858
weekLabel: matched.label,
5959
day: matched.days[0].day,
6060
tasks: matched.days[0].tasks,
6161
});
62-
}
62+
}*/
6363
}
6464
});
6565
}, [studentId, week]);
@@ -79,9 +79,11 @@ const AdminStudentAssignment = () => {
7979
});
8080
};
8181
*/
82+
83+
8284
const handleSave = async (taskId, status) => {
8385
const userId = parseInt(studentId); // 문자열일 수 있으니 숫자로 변환
84-
86+
8587
try {
8688
// PUT 요청 시도 (기존 과제 수정)
8789
await updateAssignmentStatus(userId, taskId, status);

frontend/src/pages/admin/DetailManageStudent.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const DetailManageStudent = () => {
7373
<button
7474
key={index}
7575
className={style.assignment_button}
76-
onClick={() => navigate(`/admin/assignment/${student.id}/${index + 1}`)}
76+
onClick={() => navigate(`/admin/assignment/${student.id}/${week.week}`)}
7777
>
7878
{week.week} {week.title && ` ${week.title}`}
7979
</button>

frontend/src/pages/generation/Assignment.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ const Assignment = () => {
1919
fetchAssignmentsByUser(userId)
2020
.then((weekData) => {
2121
const formatted = weekData.map((weekItem) => ({
22-
label: `${weekItem.week}주차 ${weekItem.subject}`,
22+
label: `${weekItem.week}주차 ${weekItem.subtitle}`,
23+
//label: `${weekItem.week}주차 ${weekItem.subject}`,
2324
details: weekItem.days.map((dayItem) => ({
2425
day: dayItem.day,
25-
subject: weekItem.subject,
26+
subject: dayItem.subject,
27+
//subject: weekItem.subject,
2628
tasks: dayItem.details.map((task) => ({
2729
label: task.assignmentName,
2830
status: mapStatus(task.status),

0 commit comments

Comments
 (0)