feat: rule-based on-call scheduling with Schedule tab (#21)#23
Merged
Conversation
…uto-expand - Add weekStartsOnMonday to OnCallSettings with orderedWeekdays helper - Fix DayCell not tappable: add .contentShape(Rectangle()) for clear-bg cells - Remove ScrollView from ScheduleTab so panel auto-expands via ContentView geometry - Propagate weekStartsOnMonday to OnCallCalendarGrid, RuleEditSheet, ScheduleRowEditor
…ltiplier fields - Rate history: pencil button → inline edit row (DatePicker + TextField + Save/cancel) - Non-billable section: hide AddNonBillableRuleRow behind + toggle button - Replace Stepper multiplier rows with MultiplierField (TextField + FocusState commit) - AddNonBillableRuleRow uses orderedWeekdays from settings
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
RecurrenceRule+ScheduleExceptionmodels toTimeTrackerCore— supports day-of-week patterns and interval+duration cycles (e.g. every 3 days, 1 week on / 1 week off)OnCallBilling) now evaluates rules and exceptions alongside existing rotation blocks; existing callers compile unchanged (new params default to[])OnCallStorepersists rules and exceptions with backward-compatible JSON decodingRecurrenceRuleTests, 6RecurrenceBillingTests, 21 existingOnCallBillingTestsFollow-up fixes and improvements (post-initial review)
.contentShape(Rectangle())added toDayCellto make clear-background cells hit-testableDayDetailPanelwas clipped below fold — removedScrollView/scrollDisabledfromScheduleTabsoContentView'sGeometryReaderreports natural height and the window auto-expandsweekStartsOnMondayonOnCallSettings); all day-of-week UIs (calendar grid, rule editor, rotation editor, non-billable add row) respect it+toggle button; shown on demandTextField(commit on blur/return, validated 0–200%,@FocusStatefor blur detection)New files
Sources/TimeTrackerCore/RecurrenceModels.swiftSources/TimeTracker/RuleEditSheet.swiftSources/TimeTracker/OnCallCalendarGrid.swiftSources/TimeTracker/ScheduleTab.swiftTests/TimeTrackerTests/RecurrenceRuleTests.swiftTests/TimeTrackerTests/RecurrenceBillingTests.swiftdocs/adr/0001-schedule-tab-for-rule-based-on-call.mdTest plan
swift test— all 37 tests passswift buildclean+button → Add Rule sheet (day-of-week and interval modes, day toggles, time pickers, anchor/end date)+next to "Non-billable window" shows/hides add form