- handleAcceptListClick(dataItem.id, dataItem.username)
+ handleAcceptListClick(dataItem.id, dataItem.user_name)
}
key={index}
time={`${dataItem.start} ~`}
diff --git a/src/app/outAccept/previous/page.tsx b/src/app/outAccept/previous/page.tsx
index c10123b..a5696aa 100644
--- a/src/app/outAccept/previous/page.tsx
+++ b/src/app/outAccept/previous/page.tsx
@@ -11,7 +11,7 @@ import { useEffect, useState } from "react";
interface StudentData {
id: string;
- name: string;
+ user_name: string;
grade: number;
class_num: number;
num: number;
@@ -87,7 +87,7 @@ const Previous = () => {
key={index}
APPLICATION={item.application_cnt}
EARLY_RETURN={item.early_return_cnt}
- userName={`${setStudentNum(item)} ${item.name}`}
+ user_name={`${setStudentNum(item)} ${item.user_name}`}
/>
))}
diff --git a/src/app/outList/page.tsx b/src/app/outList/page.tsx
index 44714cf..c501493 100644
--- a/src/app/outList/page.tsx
+++ b/src/app/outList/page.tsx
@@ -19,7 +19,7 @@ import useAcceptListSelection from "@/hook/hook";
interface applicationOK {
id: string;
- username: string;
+ user_name: string;
start: string;
end: string;
grade: number;
@@ -100,7 +100,7 @@ const OutList = () => {
{applicationList?.map((data, index) => (
handleAcceptListClick(data.id, data.username)}
+ onClick={() => handleAcceptListClick(data.id, data.user_name)}
id={data.id}
key={index}
returnTime={data.end}
diff --git a/src/app/outList/reason/page.tsx b/src/app/outList/reason/page.tsx
index bdcc934..b5451c7 100644
--- a/src/app/outList/reason/page.tsx
+++ b/src/app/outList/reason/page.tsx
@@ -11,7 +11,7 @@ import { BackGround } from "@/app/components/common/background";
interface OutListData {
id: string;
user_id: string;
- username: string;
+ user_name: string;
start: string;
end: string;
grade: number;
@@ -23,7 +23,7 @@ interface OutListData {
interface HomeData {
id: string;
user_id: string;
- username: string;
+ user_name: string;
start: string;
grade: number;
class_num: number;
diff --git a/src/app/selfStudyCheck/page.tsx b/src/app/selfStudyCheck/page.tsx
index 81d85fd..5989852 100644
--- a/src/app/selfStudyCheck/page.tsx
+++ b/src/app/selfStudyCheck/page.tsx
@@ -10,19 +10,6 @@ import CheckList from "../components/common/list/after/check/page";
import Modal from "../components/common/modal/page";
import useAttendanceStore from "@/stores/useChangeStatus";
-interface ClassCheck {
- id: string;
- username: string;
- grade: number;
- class_num: number;
- num: number;
- status6: string;
- status7: string;
- status8: string;
- status9: string;
- status10: string;
-}
-
interface ChangeStatus {
user_id: string;
status_list: string[];
@@ -186,7 +173,7 @@ const SelfStudyCheck = () => {
state4={item.status9}
state5={item.status10}
onClick={() =>
- handleAcceptListClick(item.id, item.username)
+ handleAcceptListClick(item.id, item.user_name)
}
type="NO"
/>
diff --git a/src/utils/until.ts b/src/utils/until.ts
index ee543ed..dbaf049 100644
--- a/src/utils/until.ts
+++ b/src/utils/until.ts
@@ -10,7 +10,7 @@ interface Student {
grade: number;
class_num: number;
num: number;
- username: string;
+ user_name: string;
}
interface studentNum {
@@ -23,10 +23,10 @@ export const getStudentString = ({
grade,
class_num,
num,
- username,
+ user_name,
}: Student) => {
const change = num.toString().length === 1 ? `0${num}` : `${num}`;
- return `${grade}${class_num}${change} ${username}`;
+ return `${grade}${class_num}${change} ${user_name}`;
};
export const setStudentNum = ({ grade, class_num, num }: studentNum) => {