From 652370e11918b15af4c8cf5abf8997d9250f0957 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 26 May 2025 02:00:44 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Fix]=20=EC=88=98=EC=A0=95=EB=90=9C=20?= =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EA=B4=80=EB=A6=AC=20api=20=EB=A7=9E=EC=B6=94?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 180c8d5..16faf42 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -33,7 +33,7 @@ const AdminStudentAssignment = () => { fetchStudentAssignments(studentId).then((res) => { - const formatted = res.data.data.map((weekItem) => ({ + const formatted = res.data.map((weekItem) => ({ week: weekItem.week, label: `${weekItem.week}주차 ${weekItem.subject}`, days: weekItem.days.map((dayItem) => ({ From 3c8df21cb27cf01eee8640029a0cef0e1a62cb95 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 26 May 2025 02:01:21 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Fix]=20=EC=88=98=EC=A0=95=EB=90=9C=20?= =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EA=B4=80=EB=A6=AC=20api=20=EB=A7=9E=EC=B6=94?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- frontend/src/pages/admin/DetailManageStudent.jsx | 2 +- frontend/src/pages/generation/Assignment.jsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 16faf42..17a44a1 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -35,7 +35,7 @@ const AdminStudentAssignment = () => { fetchStudentAssignments(studentId).then((res) => { const formatted = res.data.map((weekItem) => ({ week: weekItem.week, - label: `${weekItem.week}주차 ${weekItem.subject}`, + label: `${weekItem.week}주차 ${weekItem.title}`, days: weekItem.days.map((dayItem) => ({ day: dayItem.day, tasks: dayItem.details.map((task) => ({ diff --git a/frontend/src/pages/admin/DetailManageStudent.jsx b/frontend/src/pages/admin/DetailManageStudent.jsx index 9fbefcb..36cfbb1 100644 --- a/frontend/src/pages/admin/DetailManageStudent.jsx +++ b/frontend/src/pages/admin/DetailManageStudent.jsx @@ -73,7 +73,7 @@ const DetailManageStudent = () => { diff --git a/frontend/src/pages/generation/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx index 3f5edc2..b253839 100644 --- a/frontend/src/pages/generation/Assignment.jsx +++ b/frontend/src/pages/generation/Assignment.jsx @@ -19,11 +19,11 @@ const Assignment = () => { fetchAssignmentsByUser(userId) .then((weekData) => { const formatted = weekData.map((weekItem) => ({ - label: `${weekItem.week}주차 ${weekItem.subtitle}`, + label: `${weekItem.week}주차 ${weekItem.title}`, //label: `${weekItem.week}주차 ${weekItem.subject}`, details: weekItem.days.map((dayItem) => ({ day: dayItem.day, - subject: dayItem.subject, + subject: dayItem.subtitle, //subject: weekItem.subject, tasks: dayItem.details.map((task) => ({ label: task.assignmentName, From 6d0b5db62d9edf9fad30cc2b7140475faa4673ea Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 26 May 2025 02:04:47 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Fix]=20=EC=A0=9C=EB=AA=A9=20=EB=B6=80?= =?UTF-8?q?=EC=A0=9C=EB=AA=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 17a44a1..8c718c7 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -122,7 +122,7 @@ const AdminStudentAssignment = () => { {weekItem.days.map((dayItem, dayIdx) => (

- {dayItem.day}   {dayItem.subject} + {dayItem.day}   {dayItem.subtitle}

{dayItem.tasks.map((task, taskIdx) => (