TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 19:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1984 from eikek/numeric-field-comma

Browse Source 
Map comma to dot for numeric custom fields
This commit is contained in:
mergify[bot] 2023-03-04 22:51:34 +00:00 committed by GitHub
commit d36ec1419f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/webapp/src/main/elm/Comp/CustomFieldInput.elm
View File

@ -133,6 +133,15 @@ errorMsg texts model =
Nothing Nothing
textInputNumberConfig : Comp.SimpleTextInput.Config
textInputNumberConfig =
let
cfg =
Comp.SimpleTextInput.defaultConfig
in
{ cfg | valueTransform = normalizeStringToNumber }
init : CustomField -> ( Model, Cmd Msg ) init : CustomField -> ( Model, Cmd Msg )
init = init =
init1 Comp.SimpleTextInput.defaultConfig init1 Comp.SimpleTextInput.defaultConfig
@ -151,7 +160,7 @@ init1 cfg field =
TextField (Comp.SimpleTextInput.init cfg Nothing) TextField (Comp.SimpleTextInput.init cfg Nothing)
Data.CustomFieldType.Numeric -> Data.CustomFieldType.Numeric ->
NumberField (FloatModel (Comp.SimpleTextInput.init cfg Nothing) (Err NoValue)) NumberField (FloatModel (Comp.SimpleTextInput.init textInputNumberConfig Nothing) (Err NoValue))
Data.CustomFieldType.Money -> Data.CustomFieldType.Money ->
MoneyField (MoneyModel "" (Err NoValue)) MoneyField (MoneyModel "" (Err NoValue))
@ -193,7 +202,7 @@ initWith1 cfg value =
Data.CustomFieldType.Numeric -> Data.CustomFieldType.Numeric ->
let let
fm = fm =
Comp.SimpleTextInput.init cfg <| Just value.value Comp.SimpleTextInput.init textInputNumberConfig <| Just value.value
res = res =
string2Float value.value string2Float value.value
@ -414,7 +423,7 @@ updateFloatModel forSearch model lm fm parse =
( { input = result.model ( { input = result.model
, result = Ok n , result = Ok n
} }
, Value value , Value (normalizeStringToNumber value)
) )
Err err -> Err err ->
@ -569,9 +578,14 @@ mkLabel model =
Maybe.withDefault model.field.name model.field.label Maybe.withDefault model.field.name model.field.label
normalizeStringToNumber : String -> String
normalizeStringToNumber =
String.replace "," "."
string2Float : String -> Result FieldError Float string2Float : String -> Result FieldError Float
string2Float str = string2Float str =
case String.toFloat str of case (normalizeStringToNumber >> String.toFloat) str of
Just n -> Just n ->
Ok n Ok n

1
modules/webapp/src/main/elm/Comp/ItemSearchInput.elm
View File

@ -83,6 +83,7 @@ init cfg =
, setOnTyping = True , setOnTyping = True
, setOnEnter = True , setOnEnter = True
, setOnBlur = False , setOnBlur = False
, valueTransform = identity
} }
in in
{ searchModel = Comp.SimpleTextInput.init textCfg Nothing { searchModel = Comp.SimpleTextInput.init textCfg Nothing

3
modules/webapp/src/main/elm/Comp/SimpleTextInput.elm
View File

@ -40,6 +40,7 @@ type alias Config =
, setOnTyping : Bool , setOnTyping : Bool
, setOnEnter : Bool , setOnEnter : Bool
, setOnBlur : Bool , setOnBlur : Bool
, valueTransform : String -> String
} }
@ -49,6 +50,7 @@ defaultConfig =
, setOnTyping = True , setOnTyping = True
, setOnEnter = True , setOnEnter = True
, setOnBlur = True , setOnBlur = True
, valueTransform = identity
} }
@ -130,6 +132,7 @@ update msg (Model model) =
let let
maybeStr = maybeStr =
Util.Maybe.fromString str Util.Maybe.fromString str
|> Maybe.map model.cfg.valueTransform
cmd_ = cmd_ =
Task.succeed () |> Task.perform (\_ -> DelayedSet) Task.succeed () |> Task.perform (\_ -> DelayedSet)