Deploy

frontend/src/components/AdminDailyAttendanceCard.jsx

@@ -3,7 +3,7 @@ import "./componentsCss/AdminDailyAttendanceCard.css";
 import api from "../api/api";
 import { getStudentAttendance,updateAttendanceStatus } from "../api/adminattendance";
 
-const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {
+const AdminDailyAttendanceCard = ({ date,  order,studentId, onClose, onRefresh }) => {
   const [slots, setSlots] = useState([]);
   const [modified, setModified] = useState([]);
 
@@ -24,11 +24,40 @@ 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 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", // 드롭다운에 맞게 변환
+          }));
+
+        const filledSlots =
+          rawSlots.length > 0
+            ? rawSlots
+            : [1, 2, 3].map((order) => ({
+                date,
+                id: null, // 새 출석이므로 아직 id 없음
+                order,
+                status: "EMPTY",//기본값
+              }));
+
+        setSlots(filledSlots);
+        setModified(Array(filledSlots.length).fill(false));
+
+        //setSlots(rawSlots);
+        //setModified(Array(rawSlots.length).fill(false));
 
-        setSlots(rawSlots);
-        setModified(Array(rawSlots.length).fill(false));
       } catch (err) {
         console.error("슬롯 정보 불러오기 실패:", err);
       }
@@ -39,7 +68,7 @@ const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {
 
   const handleChange = (idx, newValue) => {
     const newSlots = [...slots];
-    newSlots[idx].status = newValue === "SUCCESS";
+    newSlots[idx].status = newValue;
     setSlots(newSlots);
 
     const newModified = [...modified];
@@ -49,15 +78,28 @@ 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;
       setModified(newModified);
+
+      console.log("📝 저장 요청", {
+        id: slot.id,
+        order: slot.order,
+        date: slot.date,
+        status: slot.status,
+      });
+
     } catch (err) {
       console.error("슬롯 저장 실패:", err);
       alert("저장 실패");
+
     }
   };
 
@@ -69,6 +111,8 @@ const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {
         }
       }
       alert("전체 저장 완료");
+      if (onRefresh) onRefresh(); // submit 이후 새로고침
+      onClose(); 
     } catch (err) {
       console.error("전체 저장 실패:", err);
     }
@@ -82,7 +126,7 @@ const AdminDailyAttendanceCard = ({ date, studentId, onClose }) => {
       </div>
       <div className="card-body">
         {slots.map((slot, idx) => (
-          <div key={slot.id} className="slot-row">
+          <div key={`${slot.date}-${slot.order}`} className="slot-row">
             <span>{idx + 1}차 출석</span>
             <select value={slot.status} onChange={(e) => handleChange(idx, e.target.value)}>
               <option value="SUCCESS">성공</option>

frontend/src/components/AdminStudentHeader.jsx

@@ -24,7 +24,7 @@ const AdminStudentHeader = ({ studentName = "default", subtitle = "default", onB
 
       <button
         className="icon-button"
-        onClick={() => navigate(`/admin/managestudent`)}
+        onClick={() => navigate(`/managestudent`)}
       >
         👥
       </button>

frontend/src/components/AdminWeeklyAttendanceList.jsx

@@ -19,7 +19,16 @@ const AdminWeeklyAttendanceList = ({ attendanceData, onSelectDate }) => {
               <img key={idx} 
               src={statusImageMap[cls.status]}  
               style={{ cursor: "pointer" }}
-              onClick={() => cls.date && onSelectDate(cls.date)}
+              /*
+              onClick={() => {
+                console.log("🧪 클릭됨!", cls.date);
+                cls.date && onSelectDate(cls.date);
+              }}
+              */
+              onClick={() => {
+                console.log("🧪 클릭됨!", cls.date, cls.order);
+                if (cls.date) onSelectDate({ date: cls.date, order: cls.order });
+              }}
               />
             ))}
           </div>

frontend/src/pages/admin/AdminStudentAssignment.jsx

@@ -27,7 +27,7 @@ const AdminStudentAssignment = () => {
     }
 
     fetchStudentInfo(id).then((res) => {
-      setStudentInfo(res.data);
+      setStudentInfo(res);
     });
 
 
@@ -38,28 +38,28 @@ const AdminStudentAssignment = () => {
         label: `${weekItem.week}주차 ${weekItem.subject}`,
         days: weekItem.days.map((dayItem) => ({
           day: dayItem.day,
-          subject: weekItem.subject,
           tasks: dayItem.details.map((task) => ({
             id: task.id,
             label: task.assignmentName,
             status: task.status,
-            modified: false,
+            //modified: false,
           })),
         })),
       }));
 
         setWeeks(formatted);
 
-        const matched = formatted.find((w) => String(w.week) === String(week));
+        const matched = formatted.find((w) => Number(w.week) === Number(week));
         if (matched) {
           setSelectedWeekLabel(matched.label);
+          /*
           if (matched.days.length > 0) {
             setHighlightCard({
               weekLabel: matched.label,
               day: matched.days[0].day,
               tasks: matched.days[0].tasks,
             });
-          }
+          }*/
         }
       });
   }, [studentId, week]);
@@ -79,9 +79,11 @@ const AdminStudentAssignment = () => {
     });
   };
 */
+
+
   const handleSave = async (taskId, status) => {
     const userId = parseInt(studentId); // 문자열일 수 있으니 숫자로 변환
-
+    
     try {
       // PUT 요청 시도 (기존 과제 수정)
       await updateAssignmentStatus(userId, taskId, status);