transfer picker validation to dateInput

mercurymedia · Dec 29, 2024 · 3eb3134 · 3eb3134
1 parent 0599586
commit 3eb3134
Show file tree

Hide file tree

Showing 8 changed files with 240 additions and 118 deletions.
diff --git a/examples/src/DurationDatePickerExample.elm b/examples/src/DurationDatePickerExample.elm
@@ -8,7 +8,7 @@ import Html.Events exposing (onClick)
 import Task
 import Time exposing (Month(..), Posix, Zone)
 import Time.Extra as TimeExtra exposing (Interval(..))
-import Utilities exposing (posixToDateString, posixToTimeString, isDateBeforeToday, adjustAllowedTimesOfDayToClientZone)
+import Utilities exposing (adjustAllowedTimesOfDayToClientZone, isDateBeforeToday, posixToDateString, posixToTimeString)
 
 
 type Msg

diff --git a/examples/src/ModalPickerExample.elm b/examples/src/ModalPickerExample.elm
@@ -10,7 +10,7 @@ import SingleDatePicker
 import Task
 import Time exposing (Month(..), Posix, Zone)
 import Time.Extra as TimeExtra exposing (Interval(..))
-import Utilities exposing (posixToDateString, posixToTimeString, isDateBeforeToday, adjustAllowedTimesOfDayToClientZone)
+import Utilities exposing (adjustAllowedTimesOfDayToClientZone, isDateBeforeToday, posixToDateString, posixToTimeString)
 
 
 type Msg

diff --git a/examples/src/SingleDatePickerExample.elm b/examples/src/SingleDatePickerExample.elm
@@ -1,6 +1,7 @@
 module SingleDatePickerExample exposing (Model, Msg, init, subscriptions, update, view)
 
 import Css
+import DatePicker.DateInput as DateInput
 import DatePicker.Settings
     exposing
         ( Settings
@@ -15,7 +16,7 @@ import SingleDatePicker
 import Task
 import Time exposing (Month(..), Posix, Zone)
 import Time.Extra as TimeExtra exposing (Interval(..))
-import Utilities exposing (posixToDateString, posixToTimeString, isDateBeforeToday, adjustAllowedTimesOfDayToClientZone)
+import Utilities exposing (adjustAllowedTimesOfDayToClientZone, isDateBeforeToday, posixToDateString, posixToTimeString)
 
 
 type Msg
@@ -58,6 +59,18 @@ userDefinedDatePickerSettings zone today =
     let
         defaults =
             defaultSettings zone
+
+        allowedTimesOfDay =
+            \clientZone datetime -> adjustAllowedTimesOfDayToClientZone Time.utc clientZone today datetime
+
+        dateFormat =
+            DateInput.defaultDateFormat
+
+        timeFormat =
+            DateInput.defaultTimeFormat
+
+        dateInputSettings =
+            { format = DateInput.DateTime dateFormat { timeFormat | allowedTimesOfDay = allowedTimesOfDay }, getErrorMessage = getErrorMessage }
     in
     { defaults
         | isDayDisabled = \clientZone datetime -> isDateBeforeToday (TimeExtra.floor Day clientZone today) datetime
@@ -71,9 +84,20 @@ userDefinedDatePickerSettings zone today =
                 }
         , showCalendarWeekNumbers = True
         , presets = []
+        , dateInputSettings = dateInputSettings
     }
 
 
+getErrorMessage : DateInput.InputError -> String
+getErrorMessage error =
+    case error of
+        DateInput.ValueInvalid ->
+            "Invalid value. Make sure to use the correct format."
+
+        DateInput.ValueNotAllowed ->
+            "Date not allowed."
+
+
 view : Model -> Html Msg
 view model =
     div
@@ -93,8 +117,8 @@ view model =
                     Nothing ->
                         text "No date selected yet!"
                 , div []
-                    [ SingleDatePicker.viewDateInput [ onClick OpenPicker ] 
-                        (userDefinedDatePickerSettings model.zone model.currentTime) 
+                    [ SingleDatePicker.viewDateInput [ onClick OpenPicker ]
+                        (userDefinedDatePickerSettings model.zone model.currentTime)
                         model.picker
                     ]
                 ]

diff --git a/examples/src/Utilities.elm b/examples/src/Utilities.elm
@@ -1,9 +1,9 @@
-
-module Utilities exposing (posixToDateString, posixToTimeString, isDateBeforeToday, adjustAllowedTimesOfDayToClientZone)
+module Utilities exposing (adjustAllowedTimesOfDayToClientZone, isDateBeforeToday, posixToDateString, posixToTimeString)
 
 import Time exposing (Month(..), Posix, Zone)
 import Time.Extra as TimeExtra exposing (Interval(..))
 
+
 addLeadingZero : Int -> String
 addLeadingZero value =
     let
@@ -16,6 +16,7 @@ addLeadingZero value =
     else
         string
 
+
 monthToNmbString : Month -> String
 monthToNmbString month =
     case month of
@@ -55,10 +56,12 @@ monthToNmbString month =
         Dec ->
             "12"
 
+
 isDateBeforeToday : Posix -> Posix -> Bool
 isDateBeforeToday today datetime =
     Time.posixToMillis today > Time.posixToMillis datetime
 
+
 posixToDateString : Zone -> Posix -> String
 posixToDateString zone date =
     addLeadingZero (Time.toDay zone date)
@@ -127,4 +130,4 @@ adjustAllowedTimesOfDayToClientZone baseZone clientZone today datetimeBeingProce
             bounds
 
     else
-        bounds
+        bounds