Skip to content

[Fix] date 받아오기 admin attendance #203

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] date 받아오기 admin attendance #203

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
20 changes: 10 additions & 10 deletions frontend/src/components/AdminDailyAttendanceCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {
"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",
},
]
: [];
const rawSlots = rawData
.filter((d) => d.date === date) // 해당 날짜의 출석만 필터
.sort((a, b) => a.order - b.order) // order 순으로 정렬
.map((d) => ({
date: d.date,
id: d.attendanceId, // 출석 ID
order: d.order, // 회차 표시용
status: d.status ? "SUCCESS" : "FAILURE", // 드롭다운에 맞게 변환
}));

setSlots(rawSlots);
setModified(Array(rawSlots.length).fill(false));

} catch (err) {
console.error("슬롯 정보 불러오기 실패:", err);
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/admin/AdminStudentAttendance.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ const AdminStudentAttendance = () => {

weekSlotMap.set(week, [...existing, ...statuses]);
dateMap.set(week, [...existingDates, date]);
console.log("✅ week", week, "=>", newDates);
});

return Array.from({ length: 5 }, (_, i) => {
const week = i + 1;
const all = weekSlotMap.get(week) || [];
//const dates = dateMap.get(week) || [];
const dates = sortedByOrder.map((r) => r.date);
const dates = dateMap.get(week) || [];
const classes = [0, 1, 2].map((classIdx) => {
const slice = all.slice(classIdx * 3, classIdx * 3 + 3);
const trueCount = slice.filter((s) => s === "SUCCESS").length;
Expand Down