Skip to content

[Fix] 공휴일 처리 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JungDohyeon wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[Fix] 공휴일 처리 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ final class CalendarDayCell: UICollectionViewCell {

// 인디케이터 높이 결정
// 월급/휴가 레이블이 있으면 18pt, 근무 점이면 14pt, 없으면 0
let hasLabel = schedule.events.contains(.payday) || schedule.contentType == .vacation
let hasLabel = schedule.events.contains(.payday) || schedule.events.contains(.publicHoliday) || schedule.contentType == .vacation
let hasDot = schedule.contentType == .work && schedule.status != .none
if hasLabel {
setIndicatorHeight(18)
Expand Down
17 changes: 12 additions & 5 deletions Moa/Moa/Features/Home/History/Calendar/Components/Calendar/CalendarDayIndicatorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,23 @@ final class CalendarDayIndicatorView: UIView {
reset()
guard let schedule else { return }

let hasPayday = schedule.events.contains(.payday)
let isVacation = schedule.contentType == .vacation
let isWork = schedule.contentType == .work
let hasPayday = schedule.events.contains(.payday)
let hasHoliday = schedule.events.contains(.publicHoliday)
let isVacation = schedule.contentType == .vacation
let isWork = schedule.contentType == .work

if hasPayday && isVacation {
showDualLabel(primary: "월급", secondary: "휴가")
showDualLabel(primary: "월급", secondary: "연차")
} else if hasPayday && hasHoliday {
showDualLabel(primary: "월급", secondary: "공휴일")
} else if hasPayday {
showSingleLabel("월급", color: AppColor.IconAndText.green)
} else if hasHoliday && isVacation {
showSingleLabel("공휴일", color: AppColor.IconAndText.mediumEmphasis)
} else if isVacation {
showSingleLabel("휴가", color: AppColor.IconAndText.mediumEmphasis)
showSingleLabel("연차", color: AppColor.IconAndText.mediumEmphasis)
} else if hasHoliday {
showSingleLabel("공휴일", color: AppColor.IconAndText.mediumEmphasis)
} else if isWork {
switch schedule.status {
case .completed:
Expand Down