Check firstDayOfWeek with case statements

Signed-off-by: Martin Schimandl <martin.schimandl@gmail.com>
prometheus · Oct 16, 2022 · 5cb449a · 5cb449a
1 parent 3f48186
commit 5cb449a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/ui/app/src/Utils/DateTimePicker/Utils.elm b/ui/app/src/Utils/DateTimePicker/Utils.elm
@@ -39,33 +39,37 @@ listDaysOfMonth time firstDayOfWeek =
         padFront =
             weekToInt (Time.toWeekday utc firstOfMonth)
                 |> (\wd ->
-                        if firstDayOfWeek == Sunday then
-                            if wd == 7 then
-                                0
+                        case firstDayOfWeek of
+                            Sunday ->
+                                if wd == 7 then
+                                    0
 
-                            else
-                                wd
+                                else
+                                    wd
 
-                        else if wd == 1 then
-                            0
+                            Monday ->
+                                if wd == 1 then
+                                    0
 
-                        else
-                            wd - 1
+                                else
+                                    wd - 1
                    )
                 |> (\w -> Time.add Time.Day -w utc firstOfMonth)
                 |> (\d -> Time.range Time.Day 1 utc d firstOfMonth)
 
         padBack =
             weekToInt (Time.toWeekday utc firstOfNextMonth)
                 |> (\wd ->
-                        if firstDayOfWeek == Sunday then
-                            wd
+                        case firstDayOfWeek of
+                            Sunday ->
+                                wd
 
-                        else if wd == 1 then
-                            7
+                            Monday ->
+                                if wd == 1 then
+                                    7
 
-                        else
-                            wd - 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
@@ -88,11 +88,12 @@ viewMonth dateTimePicker justViewTime =
     in
     div [ class "row justify-content-center" ]
         [ div [ class "weekheader" ]
-            (if dateTimePicker.firstDayOfWeek == Sunday then
-                List.map viewWeekHeader [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ]
+            (case dateTimePicker.firstDayOfWeek of
+                Sunday ->
+                    List.map viewWeekHeader [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ]
 
-             else
-                List.map viewWeekHeader [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]
+                Monday ->
+                    List.map viewWeekHeader [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]
             )
         , div
             [ class "date-container"