Skip to content

Frontend admin sj #205

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 2 commits into from
May 24, 2025
Merged

Frontend admin sj #205

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e16052
[Fix] processWeeklyAttendance 리팩토링..
Imggaggu May 24, 2025
5f3f18c
Merge branch 'frontend_admin_sj' of https://github.com/pirogramming/P…
Imggaggu May 24, 2025
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
100 changes: 47 additions & 53 deletions frontend/src/pages/admin/AdminStudentAttendance.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,64 +64,58 @@ const AdminStudentAttendance = () => {
}, []);
*/
// 날짜 기반 주차-회차 구조로 변환
const processWeeklyAttendance = (rawData) => {
const startDate = new Date("2025-06-24");
const getWeekFromDate = (dateStr) => {
const d = new Date(dateStr);
const diffDays = Math.floor((d - startDate) / (1000 * 60 * 60 * 24));
return Math.floor(diffDays / 7) + 1;
};

const weekSlotMap = new Map();
const dateMap = new Map(); // 추가: 날짜 저장

rawData.forEach(({ date, order, status }) => {
const week = getWeekFromDate(date);
const statuses = [status ? "SUCCESS" : "FAILURE"];
const existing = weekSlotMap.get(week) || [];
const existingDates = dateMap.get(week) || [];

weekSlotMap.set(week, [...existing, ...statuses]);
dateMap.set(week, [...existingDates, date]);
const processWeeklyAttendance = (rawData) => {
const startDate = new Date("2025-06-24");

});

return Array.from({ length: 5 }, (_, i) => {
const week = i + 1;
const all = weekSlotMap.get(week) || [];
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;

let status;
switch (trueCount) {
case 3:
status = "SUCCESS";
break;
case 2:
status = "INSUFFICIENT";
break;
case 1:
status = "FAILURE";
break;
default:
status = "EMPTY";
}

return {
status,
date: dates[classIdx] || null,
};
});
const getWeekFromDate = (dateStr) => {
const d = new Date(dateStr);
const diffDays = Math.floor((d - startDate) / (1000 * 60 * 60 * 24));
return Math.floor(diffDays / 7) + 1;
};

// 주차별 출석 정보 묶기
const weekMap = new Map();

rawData.forEach(({ date, order, status }) => {
const week = getWeekFromDate(date);
const entry = { date, order, status: status ? "SUCCESS" : "FAILURE" };

if (!weekMap.has(week)) weekMap.set(week, []);
weekMap.get(week).push(entry);
});

return Array.from({ length: 5 }, (_, i) => {
const week = i + 1;
const entries = (weekMap.get(week) || []).sort((a, b) => a.order - b.order);

const classes = [0, 1, 2].map((classIdx) => {
const slice = entries.slice(classIdx * 3, classIdx * 3 + 3);
const trueCount = slice.filter((e) => e.status === "SUCCESS").length;

let status;
switch (trueCount) {
case 3:
status = "SUCCESS";
break;
case 2:
status = "INSUFFICIENT";
break;
case 1:
status = "FAILURE";
break;
default:
status = "EMPTY";
}

return {
week,
classes
};
status,
date: entries[classIdx]?.date || null,
};
});
};

return { week, classes };
});
};

return (
<div className={styles.attendance_page}>
Expand Down