diff --git a/frontend/src/components/AdminDailyAttendanceCard.jsx b/frontend/src/components/AdminDailyAttendanceCard.jsx
index 73b0b07..f4f0f25 100644
--- a/frontend/src/components/AdminDailyAttendanceCard.jsx
+++ b/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>
diff --git a/frontend/src/components/AdminStudentHeader.jsx b/frontend/src/components/AdminStudentHeader.jsx
index 22368ed..0c4de14 100644
--- a/frontend/src/components/AdminStudentHeader.jsx
+++ b/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>
diff --git a/frontend/src/components/AdminWeeklyAttendanceList.jsx b/frontend/src/components/AdminWeeklyAttendanceList.jsx
index 6072f3c..c8edeae 100644
--- a/frontend/src/components/AdminWeeklyAttendanceList.jsx
+++ b/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>
diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx
index b5ddb99..180c8d5 100644
--- a/frontend/src/pages/admin/AdminStudentAssignment.jsx
+++ b/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);
diff --git a/frontend/src/pages/admin/AdminStudentAttendance.jsx b/frontend/src/pages/admin/AdminStudentAttendance.jsx
index b7039ae..9a70692 100644
--- a/frontend/src/pages/admin/AdminStudentAttendance.jsx
+++ b/frontend/src/pages/admin/AdminStudentAttendance.jsx
@@ -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";
@@ -12,7 +12,26 @@ const AdminStudentAttendance = () => {
   const [studentInfo, setStudentInfo] = useState(null);
   const [attendanceData, setAttendanceData] = useState([]);
   const [selectedDate, setSelectedDate] = useState(null);
-
+  const fetchData = async () => {
+    try {
+      const studentRes = await getStudentBasicInfo(studentId);
+      setStudentInfo(studentRes);
+
+      const attendanceRes = await getStudentAttendance(studentId);
+      /*
+          "attendanceId": 1,
+          "userId": 1,
+          "username": "홍길동",
+          "date": "2023-10-20",
+          "order": 1,
+          "status": true
+      */
+      const processed = processWeeklyAttendance(attendanceRes);
+      setAttendanceData(processed);
+    } catch (err) {
+      console.error("데이터 불러오기 실패:", err);
+    }
+  };
   useEffect(() => {
     const id = Number(studentId);
     
@@ -21,19 +40,6 @@ const AdminStudentAttendance = () => {
       return;
     }
     
-    const fetchData = async () => {
-      try {
-        const studentRes = await getStudentBasicInfo(studentId);
-        setStudentInfo(studentRes);
-
-        const attendanceRes = await getStudentAttendance(studentId);
-        const processed = processWeeklyAttendance(attendanceRes);
-        setAttendanceData(processed);
-      } catch (err) {
-        console.error("데이터 불러오기 실패:", err);
-      }
-    };
-
     fetchData();
   }, [studentId]);
   
@@ -56,64 +62,72 @@ 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, slots }) => {
-      const week = getWeekFromDate(date);
-      const statuses = slots.map((s) =>
-        s.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");
+  const offsetDays = [0, 2, 4];
 
-    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,
-        };
-      });
-
-
-      return { week, classes };
-    });
+
+  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 getDateForClass = (week, classIdx) => {
+    const base = new Date(startDate);
+    base.setDate(base.getDate() + (week - 1) * 7 + offsetDays[classIdx]);
+    return base.toISOString().split("T")[0]; // 'YYYY-MM-DD' 형식
   };
 
+  // 주차별 출석 정보 묶기
+  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 order = classIdx + 1;
+      const slice = entries.slice(classIdx * 3, classIdx * 3 + 3);
+      const entry = entries.find((e) => e.order === order);
+      const fallbackDate = getDateForClass(week, classIdx);
+      
+
+      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 {
+        order,
+        status: entry?.status ?? "EMPTY",
+        date: entry?.date ?? fallbackDate,
+      };
+    });
+
+    return { week, classes };
+  });
+};
+
   return (
     <div className={styles.attendance_page}>
       {/*헤더 */}
@@ -126,16 +140,26 @@ const AdminStudentAttendance = () => {
       {/* 주차별 출석 */}
       <AdminWeeklyAttendanceList
         attendanceData={attendanceData}
-        onSelectDate={(date) => setSelectedDate(date)}
+        onSelectDate={(selected) => setSelectedDate(selected)}
+        //onSelectDate={(date) => setSelectedDate(date)}
       />
 
-      {/* 선택된 날짜의 상세 수정 카드 */}
+      {/* 선택된 날짜의 상세 수정 카드 
       {selectedDate && (
-        <DailyAttendanceCard
+        <AdminDailyAttendanceCard 
           date={selectedDate}
           studentId={studentId}
           onClose={() => setSelectedDate(null)}
         />
+      )}*/}
+      {selectedDate && (
+        <AdminDailyAttendanceCard
+          studentId={studentId}
+          date={selectedDate.date} 
+          order={selectedDate.order}
+          onClose={() => setSelectedDate(null)}
+          onRefresh={fetchData}
+        />
       )}
     </div>
   );
diff --git a/frontend/src/pages/admin/DetailManageStudent.jsx b/frontend/src/pages/admin/DetailManageStudent.jsx
index 36cfbb1..9fbefcb 100644
--- a/frontend/src/pages/admin/DetailManageStudent.jsx
+++ b/frontend/src/pages/admin/DetailManageStudent.jsx
@@ -73,7 +73,7 @@ const DetailManageStudent = () => {
               <button
                 key={index}
                 className={style.assignment_button}
-                onClick={() => navigate(`/admin/assignment/${student.id}/${index + 1}`)}
+                onClick={() => navigate(`/admin/assignment/${student.id}/${week.week}`)}
               >
                 {week.week} {week.title && `  ${week.title}`}
               </button>
diff --git a/frontend/src/pages/generation/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx
index 095d5fc..3f5edc2 100644
--- a/frontend/src/pages/generation/Assignment.jsx
+++ b/frontend/src/pages/generation/Assignment.jsx
@@ -19,10 +19,12 @@ const Assignment = () => {
     fetchAssignmentsByUser(userId)
       .then((weekData) => {
         const formatted = weekData.map((weekItem) => ({
-          label: `${weekItem.week}주차 ${weekItem.subject}`,
+          label: `${weekItem.week}주차 ${weekItem.subtitle}`,
+          //label: `${weekItem.week}주차 ${weekItem.subject}`,
           details: weekItem.days.map((dayItem) => ({
             day: dayItem.day,
-            subject: weekItem.subject,
+            subject: dayItem.subject,
+            //subject: weekItem.subject,
             tasks: dayItem.details.map((task) => ({
               label: task.assignmentName,
               status: mapStatus(task.status),