diff --git a/client/src/apis/timetable.api.js b/client/src/apis/timetable.api.js
index c81a145cb21116731d48c2160647bbf18dfdf06a..0d72f56e654f4ff75bb066c977d096e9453f1201 100644
--- a/client/src/apis/timetable.api.js
+++ b/client/src/apis/timetable.api.js
@@ -11,8 +11,8 @@ const submit = async (sendData) => {
return data
}
-const remove = async () => {
- const { data } = await axios.delete(`${baseUrl}/api/timetable/`)
+const remove = async (timeId) => {
+ const { data } = await axios.delete(`${baseUrl}/api/timetable/${timeId}`)
return data
}
diff --git a/client/src/components/Admin/TimeTable.js b/client/src/components/Admin/TimeTable.js
index e8e5ab030b2e26cefb55c5a291d83e0e0c4f36a6..b33b5647536f36f3f8a892af99ef00c6e99c505e 100644
--- a/client/src/components/Admin/TimeTable.js
+++ b/client/src/components/Admin/TimeTable.js
@@ -1,8 +1,9 @@
import { useState, useEffect } from "react";
import moment from 'moment';
-import Calender from "../Calender/Calender.js";
+import HorizontalCalender from "../Calender/HorizontalCalender.js";
import timetableApi from "../../apis/timetable.api.js";
import catchErrors from "../../utils/catchErrors.js";
+import styles from "./admin.module.scss";
const TimeTable = () => {
const [selectDate, setSelectDate] = useState(moment().format('YYYY-MM-DD'))
@@ -23,10 +24,10 @@ const TimeTable = () => {
}
}
- async function deleteTime() {
+ async function deleteTime(timeId) {
try {
setError("")
- await timetableApi.remove()
+ await timetableApi.remove(timeId)
alert('해당 상영시간표 정보를 성공적으로 삭제하였습니다.')
getTimeTable(selectDate)
} catch (error) {
@@ -35,24 +36,22 @@ const TimeTable = () => {
}
return (
-
- {console.log("list==", timeList)}
-
+
+
{timeList.length !== 0 ?
- timeList.map(el => <>
-
{el.theaterName} 관
- {/* {arr = el.timetable.map(time =>
-
{moment(time.start_time, 'hh:mm')} ~ {moment(time.end_time, 'hh:mm')}
-
- )
- } */}
- {/* {el.timetable.map(time => {
- if (el.id === time.id) return
-
{moment(time.start_time, 'hh:mm')} ~ {moment(time.end_time, 'hh:mm')}
-
- })} */}
- >)
- : <>>}
+ timeList.map(el =>
+
{el.theaterName} 관 /
{el.theatertype.theaterTypeName}
+ {el.timetable.map(time =>
+
+
+
+
+
{moment(time.start_time).format('HH:mm')} ~ {moment(time.end_time).format('HH:mm')}
+
{time.title}
+
+
)}
+
)
+ :
서버에 저장되어 있는 상영시간표가 존재하지 않습니다.
아래의 양식을 작성해 새로운 상영시간표를 등록해주세요.
}
)
}
diff --git a/client/src/components/Admin/TimeTableEditForm.js b/client/src/components/Admin/TimeTableEditForm.js
index ca9161183b1ed2b496bcbc3bae3b3d31ca233c81..7a6bb88fab52b0abf0cb64bcf2a9c823753df3a8 100644
--- a/client/src/components/Admin/TimeTableEditForm.js
+++ b/client/src/components/Admin/TimeTableEditForm.js
@@ -75,7 +75,7 @@ const TimeTableEditForm = () => {
const { list } = showTimes
const isSelect = Object.values(selectInfo).every((el) => Boolean(el))
if (isSelect) {
- const isTime = list.find(el => el.theaterTypeId === selectInfo.theater && (getDate(el.start) <= getDate(selectInfo.start) && getDate(selectInfo.start) <= getDate(el.end)) || (getDate(el.start) > getDate(selectInfo.start) && getDate(el.start) <= getDate(selectInfo.end)))
+ const isTime = list.find(el => (el.theaterTypeId === selectInfo.theater) && ((getDate(el.start) <= getDate(selectInfo.start) && getDate(selectInfo.start) <= getDate(el.end)) || (getDate(el.start) > getDate(selectInfo.start) && getDate(el.start) <= getDate(selectInfo.end))))
if (isTime) alert('이미 추가한 상영시간대입니다. 다른 시간대를 골라주시기 바랍니다.')
else {
const theater = theaterList.find(theater => theater.theatertypeId === selectInfo.theater)
@@ -146,7 +146,8 @@ const TimeTableEditForm = () => {
}
return (
-