Skip to content

fix: day straddle detection not always working #366

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
alyxbb wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix: day straddle detection not always working #366

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
10 changes: 9 additions & 1 deletion models/schedule_tabulate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ func straddlesDay(s *ScheduleItem) bool {
return straddle
}

func listStraddlesDay(s *ScheduleItem) bool {
dayBoundary := 0
adjustedStart := s.Start.Add(time.Hour * time.Duration(-dayBoundary))
adjustedEnd := s.Finish.Add(time.Hour * time.Duration(-dayBoundary))
Comment on lines +58 to +60
Copy link
Member

@markspolakovs markspolakovs Sep 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bit confused by this - why is there a variable that's always 0, and why are we adding zero hours to the start/finish time?

Copy link
Contributor Author

@alyxbb alyxbb Sep 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied the function from above and modified it badly. I can fix it if needed. Tbh I might rewrite the schedule, the code for it is a mess

straddle := adjustedEnd.Day() != adjustedStart.Day() && s.Finish.Sub(s.Start) > time.Hour
return straddle
}

// calcScheduleBoundaries gets the offsets of the earliest and latest visible schedule hours.
// It returns these as top and bot respectively.
func calcScheduleBoundaries(items []*ScheduleItem, scheduleStart time.Time) (top, bot utils.StartOffset, err error) {
Expand Down Expand Up @@ -350,7 +358,7 @@ func buildList(schedule []*ScheduleItem, dates []time.Time) []WeekScheduleList {
}
for _, item := range schedule {
dayIndex := (item.Start.Weekday() + 6) % 7
if straddlesDay(item) {
if listStraddlesDay(item) {
item.ShowWeekDay = true
EnddayIndex := (item.Finish.Weekday() + 6) % 7
for i := dayIndex; i<=EnddayIndex; i++ {
Expand Down