Skip to content

[Fix] Attendance 수정 로직 수정 #201

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 1 commit into from
May 24, 2025
Merged

[Fix] Attendance 수정 로직 수정 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 24 additions & 4 deletions frontend/src/components/AdminDailyAttendanceCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,24 @@ const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {
*/
try {
const rawData = await getStudentAttendance(studentId);
const dayData = rawData.data.find((d) => d.date === date);
const rawSlots = dayData?.slots || [];
/*
"attendanceId": 1,
"userId": 1,
"username": "홍길동",
"date": "2023-10-20",
"order": 1,
"status": true
*/
const dayData = rawData.find((d) => d.date === date);
const rawSlots = dayData
? [
{
id: dayData.attendanceId, // API 요청용 ID
order: dayData.order, // 회차 표시용
status: dayData.status ? "SUCCESS" : "FAILURE",
},
]
: [];

setSlots(rawSlots);
setModified(Array(rawSlots.length).fill(false));
Expand All @@ -49,8 +65,12 @@ const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {

const handleSave = async (idx) => {
try {
const slot = slots[idx];
await updateAttendanceStatus(studentId, slot.id, slot.status);

const slot = slots[idx];
const attendanceId = slot.id;
const status = slot.status === "SUCCESS";

await updateAttendanceStatus(studentId, attendanceId, status);

const newModified = [...modified];
newModified[idx] = false;
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/pages/admin/AdminStudentAttendance.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";
import { useParams } from "react-router-dom";
import AdminStudentHeader from "../../components/AdminStudentHeader";
import DailyAttendanceCard from "../../components/AdminDailyAttendanceCard";
import AdminDailyAttendanceCard from "../../components/AdminDailyAttendanceCard";
import api from "../../api/api";
import styles from "./AdminStudentAttendance.module.css";
import AdminWeeklyAttendanceList from "../../components/AdminWeeklyAttendanceList";
Expand Down Expand Up @@ -75,7 +75,7 @@ const AdminStudentAttendance = () => {
const weekSlotMap = new Map();
const dateMap = new Map(); // 추가: 날짜 저장

rawData.forEach(({ date, order,status }) => {
rawData.forEach(({ date, order, status }) => {
const week = getWeekFromDate(date);
const statuses = status.map((s) => (s ? "SUCCESS" : "FAILURE"));
const existing = weekSlotMap.get(week) || [];
Expand Down Expand Up @@ -137,7 +137,7 @@ const AdminStudentAttendance = () => {

{/* 선택된 날짜의 상세 수정 카드 */}
{selectedDate && (
<DailyAttendanceCard
<AdminDailyAttendanceCard
date={selectedDate}
studentId={studentId}
onClose={() => setSelectedDate(null)}
Expand Down