Skip to content

Commit

Permalink
fix: resolve conflict error
Browse files Browse the repository at this point in the history
  • Loading branch information
WONYOUNG-HC committed Dec 26, 2024
1 parent e7b18c4 commit 5437b97
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/pages/Attendance/List/AttendanceList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import { Swiper, SwiperSlide } from 'swiper/react';
import useSWR from 'swr';
import fetcherWithParams from '@utils/fetcherWithParams';
import {
CotatoAttendanceRecordResponseResultEnum,
CotatoAttendanceResponseOpenStatusEnum,
CotatoMemberAttendanceRecordsResponse,
CotatoMemberAttendResponse,
CotatoMemberAttendResponseOpenStatusEnum,
Expand Down Expand Up @@ -57,16 +55,16 @@ const AttendanceList = () => {
*/
const handleCardClick = (attendance: CotatoMemberAttendResponse) => {
const allowedAttendanceStatus = [
CotatoMemberAttendResponseIsOpenedEnum.Open,
CotatoMemberAttendResponseIsOpenedEnum.Late,
CotatoMemberAttendResponseIsOpenedEnum.Absent,
] as CotatoMemberAttendResponseIsOpenedEnum[];
CotatoMemberAttendResponseOpenStatusEnum.Open,
CotatoMemberAttendResponseOpenStatusEnum.Late,
CotatoMemberAttendResponseOpenStatusEnum.Absent,
] as CotatoMemberAttendResponseOpenStatusEnum[];

attendance.isOpened = CotatoMemberAttendResponseIsOpenedEnum.Open;
attendance.openStatus = CotatoMemberAttendResponseOpenStatusEnum.Open;

if (
allowedAttendanceStatus.includes(
attendance.isOpened as CotatoMemberAttendResponseIsOpenedEnum,
attendance.openStatus as CotatoMemberAttendResponseOpenStatusEnum,
)
) {
navigate(`/attendance/attend/generation/${generationId}/session/${attendance.sessionId}`);
Expand Down

0 comments on commit 5437b97

Please sign in to comment.