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

Filter empty custom field values in webui

Browse Source
This commit is contained in:
Eike Kettner 2020-11-23 10:47:45 +01:00
parent 7712e02d2d
commit 473985c80e
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import DatePicker exposing (DatePicker)
import Html exposing (..) import Html exposing (..)
import Html.Attributes exposing (..) import Html.Attributes exposing (..)
import Html.Events exposing (onCheck, onClick, onInput) import Html.Events exposing (onCheck, onClick, onInput)
import Util.Maybe
type alias Model = type alias Model =
@ -60,17 +61,6 @@ fieldType field =
errorMsg : Model -> Maybe String errorMsg : Model -> Maybe String
errorMsg model = errorMsg model =
let let
floatModel =
case model.fieldModel of
NumberField fm ->
Just fm
MoneyField fm ->
Just fm
_ ->
Nothing
getMsg res = getMsg res =
case res of case res of
Ok _ -> Ok _ ->
@ -79,7 +69,22 @@ errorMsg model =
Err m -> Err m ->
Just m Just m
in in
Maybe.andThen getMsg (Maybe.map .result floatModel) case model.fieldModel of
NumberField fm ->
getMsg fm.result
MoneyField fm ->
getMsg fm.result
TextField mt ->
if mt == Nothing then
Just "Please fill in some value"
else
Nothing
_ ->
Nothing
init : CustomField -> ( Model, Cmd Msg ) init : CustomField -> ( Model, Cmd Msg )
@ -215,10 +220,13 @@ update msg model =
case ( msg, model.fieldModel ) of case ( msg, model.fieldModel ) of
( SetText str, TextField _ ) -> ( SetText str, TextField _ ) ->
let let
newValue =
Util.Maybe.fromString str
model_ = model_ =
{ model | fieldModel = TextField (Just str) } { model | fieldModel = TextField newValue }
in in
UpdateResult model_ Cmd.none (Value str) UpdateResult model_ Cmd.none (Maybe.map Value newValue |> Maybe.withDefault NoResult)
( NumberMsg str, NumberField _ ) -> ( NumberMsg str, NumberField _ ) ->
let let