Merge pull request #4473 from haghighi/saturday-1st-day-of-the-week

SuperQ · web-flow · commit d4845714b835 · 2025-10-19T07:39:15.000+01:00
add Saturday to the First day of the week options
diff --git a/asset/assets_vfsdata.go b/asset/assets_vfsdata.go
diff --git a/ui/app/src/Main.elm b/ui/app/src/Main.elm
@@ -97,6 +97,9 @@ init flags url key =
                             "Sunday" ->
                                 Sunday
 
+                            "Saturday" ->
+                                Saturday
+
                             _ ->
                                 Monday
                    )
diff --git a/ui/app/src/Utils/DateTimePicker/Utils.elm b/ui/app/src/Utils/DateTimePicker/Utils.elm
@@ -25,6 +25,7 @@ import Time.Extra as Time exposing (Interval(..))
 type FirstDayOfWeek
     = Monday
     | Sunday
+    | Saturday
 
 
 listDaysOfMonth : Posix -> FirstDayOfWeek -> List Posix
@@ -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)
@@ -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
diff --git a/ui/app/src/Utils/DateTimePicker/Views.elm b/ui/app/src/Utils/DateTimePicker/Views.elm
@@ -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"
diff --git a/ui/app/src/Views/Settings/Updates.elm b/ui/app/src/Views/Settings/Updates.elm
@@ -20,6 +20,9 @@ update msg model =
                         "Sunday" ->
                             Sunday
 
+                        "Saturday" ->
+                            Saturday
+
                         _ ->
                             Monday
 
@@ -30,6 +33,9 @@ update msg model =
 
                         Sunday ->
                             "Sunday"
+
+                        Saturday ->
+                            "Saturday"
             in
             ( { model | firstDayOfWeek = firstDayOfWeek }
             , Cmd.batch
diff --git a/ui/app/src/Views/Settings/Views.elm b/ui/app/src/Views/Settings/Views.elm
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,9 @@ init flags url key =`
`97`	`97`	`"Sunday" ->`
`98`	`98`	`Sunday`
`99`	`99`
	`100`	`+ "Saturday" ->`
	`101`	`+ Saturday`
	`102`	`+`
`100`	`103`	`_ ->`
`101`	`104`	`Monday`
`102`	`105`	`)`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ viewMonth dateTimePicker justViewTime =`
`94`	`94`
`95`	`95`	`Monday ->`
`96`	`96`	`List.map viewWeekHeader [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]`
	`97`	`+`
	`98`	`+ Saturday ->`
	`99`	`+ List.map viewWeekHeader [ "Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri" ]`
`97`	`100`	`)`
`98`	`101`	`, div`
`99`	`102`	`[ class "date-container"`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ view model =`
`17`	`17`	`, fieldset [ id "fieldset" ]`
`18`	`18`	`[ radio "Monday" (model.firstDayOfWeek == Monday) UpdateFirstDayOfWeek`
`19`	`19`	`, radio "Sunday" (model.firstDayOfWeek == Sunday) UpdateFirstDayOfWeek`
	`20`	`+ , radio "Saturday" (model.firstDayOfWeek == Saturday) UpdateFirstDayOfWeek`
`20`	`21`	`]`
`21`	`22`	`, small [ class "form-text text-muted" ]`
`22`	`23`	`[ text "Note: This setting is saved in local storage of your browser"`