Skip to content

주간 시간표 금요일에 이번주는 저번주가, 다음주는 이번주 시간표가 보이는 이슈 #203

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

Merged
baekteun merged 2 commits into from
Nov 26, 2025
Merged

주간 시간표 금요일에 이번주는 저번주가, 다음주는 이번주 시간표가 보이는 이슈 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be45e68
주간 시간표 금요일에 이번주는 저번주가, 다음주는 이번주 시간표가 보이는 이슈
baekteun Nov 21, 2025
13271c7
11.3
baekteun Nov 21, 2025
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
4 changes: 2 additions & 2 deletions Projects/App/iOS/Support/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>11.2</string>
<string>11.3</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>83</string>
<string>84</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down
10 changes: 4 additions & 6 deletions Projects/Feature/TimeTableFeature/Sources/Weekly/WeeklyTimeTableCore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,10 @@ public struct WeeklyTimeTableCore: Reducer {

let calendar = Calendar.autoupdatingCurrent
let baseDate = state.displayDate
let normalizedBaseDate = calendar.startOfDay(for: baseDate)
let weekday = calendar.component(.weekday, from: normalizedBaseDate)
let daysFromMonday = (weekday + 5) % 7
let mondayDate =
calendar.date(byAdding: .day, value: -daysFromMonday, to: normalizedBaseDate)
?? normalizedBaseDate
let components = calendar.dateComponents([.yearForWeekOfYear, .weekOfYear], from: baseDate)
var adjustedComponents = components
adjustedComponents.weekday = 2
let mondayDate = calendar.date(from: adjustedComponents) ?? baseDate

return .concatenate(
.cancel(id: CancellableID.fetch),
Expand Down
Loading