Update shift week_start when translating to UTC #2124
Merged
Conversation
This file contains 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
matiasb
added
pr:no changelog
pr:no public docs
matiasb
commented
Jun 7, 2023
There was a problem hiding this comment.
In the same way that we render the shift start / end datetimes (returned as UTC by the backend) in the selected TZ, I think we should map by_day selected days accordingly, as mentioned here.
maskin25
pushed a commit
that referenced
this pull request
Jun 8, 2023
joeyorlando
approved these changes
Jun 12, 2023
Comment on lines
+55
to
+74
| export const getUTCWeekStart = (dayOptions: SelectOption[], moment: dayjs.Dayjs) => { | ||
| let week_start_index = 0; | ||
| let byDayOptions = []; | ||
| dayOptions.forEach(({ value }) => byDayOptions.push(value)); | ||
| if (moment.day() !== moment.utc().day()) { | ||
| // when converting to UTC, shift starts on a different day, | ||
| // so we may need to change when week starts based on the UTC start time | ||
| // depending on the UTC side, move one day before or after | ||
| let offset = moment.utcOffset(); | ||
| if (offset < 0) { | ||
| // move one day after | ||
| week_start_index = (week_start_index + 1) % 7; | ||
| } else { | ||
| // move one day before | ||
| week_start_index = (((week_start_index - 1) % 7) + 7) % 7; | ||
| } | ||
| } | ||
| return byDayOptions[week_start_index]; | ||
| }; | ||
|
|
There was a problem hiding this comment.
nit consider adding a unit test here
matiasb
force-pushed
the
matiasb/by-day-week-start-tz
branch
from
1bc8ae5 to
8658b6e
Compare
brojd
pushed a commit
that referenced
this pull request
Sep 18, 2024
This fixes scenario described [here](#2118 (comment)). When a rotation is setup in UTC+1, and the shift starts at 00:00 with Monday as active day and a weekly frequency, the values are translated to UTC when submitting to the backend, so the shift data becomes something like: shift starting at 23:00 on Sunday, but since week_start is on Monday, the "first event" in the week belongs to the "previous week". This can be addressed by moving the week_start, so a weekly shift that was starting on a Monday but in UTC tz starts on Sunday, "translates" to a UTC week_start on Sunday:  (this is with the proposed changes; otherwise you get the same issue linked above where the first event in the week is assigned to the other user group). About selected week days changed when editing a rotation, see inline comment (related to [this](#1322 (comment)))
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.
This fixes scenario described here.
When a rotation is setup in UTC+1, and the shift starts at 00:00 with Monday as active day and a weekly frequency, the values are translated to UTC when submitting to the backend, so the shift data becomes something like: shift starting at 23:00 on Sunday, but since week_start is on Monday, the "first event" in the week belongs to the "previous week". This can be addressed by moving the week_start, so a weekly shift that was starting on a Monday but in UTC tz starts on Sunday, "translates" to a UTC week_start on Sunday:
(this is with the proposed changes; otherwise you get the same issue linked above where the first event in the week is assigned to the other user group).
About selected week days changed when editing a rotation, see inline comment (related to this)