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
23 changes: 11 additions & 12 deletions frontend/src/components/TaskModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,21 @@ const TaskModal = ({ weekInfo, onClose, onSubmit }) => {
const handleAddTask = () => {
setTaskList([...taskList, ""]);
};

const handleSave = async () => {
const weekNumber = parseInt(weekInfo.week.replace("주차", ""));
const filteredTasks = taskList.filter((t) => t.trim() !== "");

const requests = filteredTasks.map((task, index) => {
const existingTask = weekInfo.tasks[index];
const payload = {
title: topic,
subtitle: topic,
assignmentName: task,
week: weekNumber,
day: day,
orderNumber: index + 1,
};
const newTasks = filteredTasks.map((task, index) => ({
title: topic,
subtitle: topic,
assignmentName: task,
week: weekNumber,
day: day,
orderNumber: index + 1,
}));

const requests = newTasks.map((payload, index) => {
const existingTask = weekInfo.tasks[index];
return existingTask?.id
? putAssignment(existingTask.id, payload)
: postAssignment(payload);
Expand All @@ -49,7 +48,7 @@ const TaskModal = ({ weekInfo, onClose, onSubmit }) => {
try {
await Promise.all(requests);
alert("과제가 저장되었습니다.");
onSubmit && onSubmit();
onSubmit && onSubmit(newTasks);
onClose();
} catch (error) {
console.error("저장 오류:", error);
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/pages/admin/ManageTask.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ const ManageTask = () => {
]);
};

const handleAddTaskToWeek = (weekIndex, newTask) => {
const handleAddTaskToWeek = (weekIndex, newTasks) => {
const updated = [...assignmentsByWeek];
updated[weekIndex].tasks.push(newTask);
updated[weekIndex].title = newTask.title;
updated[weekIndex].tasks = newTasks;
updated[weekIndex].title = newTasks[0]?.title || "Comming soon~";
setAssignmentsByWeek(updated);
};

Expand Down Expand Up @@ -96,8 +96,8 @@ const ManageTask = () => {
<TaskModal
weekInfo={assignmentsByWeek[selectedWeekIndex]}
onClose={closeModal}
onSubmit={(newTask) => {
handleAddTaskToWeek(selectedWeekIndex, newTask);
onSubmit={(newTasks) => {
handleAddTaskToWeek(selectedWeekIndex, newTasks);
closeModal();
}}
/>
Expand Down