diff --git a/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/DailyLogTime.tsx b/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/DailyLogTime.tsx index 35c8da3b..3434f88e 100644 --- a/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/DailyLogTime.tsx +++ b/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/DailyLogTime.tsx @@ -3,12 +3,12 @@ import { Text } from '@shared/ui-kit'; import { TimelineItem } from '../TimelineItem'; type DailyLogtimeProps = { - timeRecord: number; + dailyLogtime: number; color: string; }; -export const DailyLogTime = ({ timeRecord, color }: DailyLogtimeProps) => { - const [hour, minute] = [Math.floor(timeRecord / 60), timeRecord % 60]; +export const DailyLogTime = ({ dailyLogtime, color }: DailyLogtimeProps) => { + const [hour, minute] = [Math.floor(dailyLogtime / 60), dailyLogtime % 60]; return ( { hasVerticalLine={false} > - {hour}시간 {minute}분 접속 + {dailyLogtime === 0 ? '접속 기록 없음' : `${hour}시간 ${minute}분 접속`} ); diff --git a/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/index.tsx b/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/index.tsx index d5b66466..a3a44888 100644 --- a/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/index.tsx +++ b/app/src/Profile/dashboard-contents/General/DailyActivityDetail/DailyActivityTimeline/index.tsx @@ -59,7 +59,7 @@ export const DailyActivityTimeline = ({ const color = coalition?.color ?? theme.colors.mono.black; const { login } = useContext(UserProfileContext); const { records } = useAtomValue(selectedDailyActivityAtom); - const { dailyRecords, timeRecord } = parseDailyActivity(records); + const { dailyRecords, dailyLogtime } = parseDailyActivity(records); const { loading, error, data } = useQuery(GET_DAILY_ACTIVITY_DETAIL_RECORDS, { variables: { @@ -82,7 +82,7 @@ export const DailyActivityTimeline = ({ return ( - + {data?.getPersonalGeneral.dailyActivityDetailRecords.map( (item, index) => { if ('teamId' in item) { diff --git a/app/src/Profile/dashboard-contents/General/DailyActivityDetail/utils/parseDailyActivity.tsx b/app/src/Profile/dashboard-contents/General/DailyActivityDetail/utils/parseDailyActivity.tsx index cb616fd8..a6eb63d3 100644 --- a/app/src/Profile/dashboard-contents/General/DailyActivityDetail/utils/parseDailyActivity.tsx +++ b/app/src/Profile/dashboard-contents/General/DailyActivityDetail/utils/parseDailyActivity.tsx @@ -5,23 +5,18 @@ import { DailyLogtimeRecord, } from '@shared/__generated__/graphql'; -export const parseDailyActivity = ( - records: DailyActivity['records'], -): { - dailyRecords: DailyActivityDetailRecordIdWithType[]; - timeRecord: number; -} => { +export const parseDailyActivity = (records: DailyActivity['records']) => { return records.reduce( ( result: { dailyRecords: DailyActivityDetailRecordIdWithType[]; - timeRecord: number; + dailyLogtime: number; }, record: DailyDefaultRecord | DailyLogtimeRecord, ) => { if ('value' in record) { //DailyLogtimeRecord - result.timeRecord += record.value; + result.dailyLogtime += record.value; } else { //DailyDefaultRecord result.dailyRecords.push({ @@ -33,7 +28,7 @@ export const parseDailyActivity = ( }, { dailyRecords: [], - timeRecord: 0, + dailyLogtime: 0, }, ); };