Skip to content

add Saturday to the First day of the week options #4473

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
SuperQ merged 2 commits into from
Oct 19, 2025
Merged

add Saturday to the First day of the week options #4473

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
7cd8659
add Saturday to the First day of the week options
haghighi Jul 13, 2025
fd19cc6
add Saturday to the First day of the week options
haghighi Jul 15, 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 asset/assets_vfsdata.go
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions ui/app/src/Main.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ init flags url key =
"Sunday" ->
Sunday

"Saturday" ->
Saturday

_ ->
Monday
)
Expand Down
21 changes: 21 additions & 0 deletions ui/app/src/Utils/DateTimePicker/Utils.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import Time.Extra as Time exposing (Interval(..))
type FirstDayOfWeek
= Monday
| Sunday
| Saturday


listDaysOfMonth : Posix -> FirstDayOfWeek -> List Posix
Expand Down Expand Up @@ -53,6 +54,16 @@ listDaysOfMonth time firstDayOfWeek =

else
wd - 1

Saturday ->
if wd == 6 then
0

else if wd == 7 then
1

else
wd + 1
)
|> (\w -> Time.add Time.Day -w utc firstOfMonth)
|> (\d -> Time.range Time.Day 1 utc d firstOfMonth)
Expand All @@ -70,6 +81,16 @@ listDaysOfMonth time firstDayOfWeek =

else
wd - 1

Saturday ->
if wd == 6 then
7

else if wd == 7 then
1

else
wd + 1
)
|> (\w -> Time.add Time.Day (7 - w) utc firstOfNextMonth)
|> Time.range Time.Day 1 utc firstOfNextMonth
Expand Down
3 changes: 3 additions & 0 deletions ui/app/src/Utils/DateTimePicker/Views.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ viewMonth dateTimePicker justViewTime =

Monday ->
List.map viewWeekHeader [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]

Saturday ->
List.map viewWeekHeader [ "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri" ]
)
, div
[ class "date-container"
Expand Down
6 changes: 6 additions & 0 deletions ui/app/src/Views/Settings/Updates.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ update msg model =
"Sunday" ->
Sunday

"Saturday" ->
Saturday

_ ->
Monday

Expand All @@ -30,6 +33,9 @@ update msg model =

Sunday ->
"Sunday"

Saturday ->
"Saturday"
in
( { model | firstDayOfWeek = firstDayOfWeek }
, Cmd.batch
Expand Down
1 change: 1 addition & 0 deletions ui/app/src/Views/Settings/Views.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ view model =
, fieldset [ id "fieldset" ]
[ radio "Monday" (model.firstDayOfWeek == Monday) UpdateFirstDayOfWeek
, radio "Sunday" (model.firstDayOfWeek == Sunday) UpdateFirstDayOfWeek
, radio "Saturday" (model.firstDayOfWeek == Saturday) UpdateFirstDayOfWeek
]
, small [ class "form-text text-muted" ]
[ text "Note: This setting is saved in local storage of your browser"
Expand Down