Remove hidden fields from item details

This commit is contained in:
Eike Kettner 2020-09-21 13:47:35 +02:00
parent 910516b72b
commit 57ab050cf7

View File

@ -553,7 +553,7 @@ renderItemInfo : UiSettings -> Model -> Html Msg
renderItemInfo settings model = renderItemInfo settings model =
let let
date = date =
div ( div
[ class "item" [ class "item"
, title "Item Date" , title "Item Date"
] ]
@ -561,9 +561,11 @@ renderItemInfo settings model =
|> Util.Time.formatDate |> Util.Time.formatDate
|> text |> text
] ]
, Data.UiSettings.fieldVisible settings Data.Fields.Date
)
duedate = duedate =
div ( div
[ class "item" [ class "item"
, title "Due Date" , title "Due Date"
] ]
@ -572,9 +574,12 @@ renderItemInfo settings model =
|> Maybe.withDefault "" |> Maybe.withDefault ""
|> text |> text
] ]
, Data.UiSettings.fieldVisible settings Data.Fields.DueDate
&& Util.Maybe.nonEmpty model.item.dueDate
)
corr = corr =
div ( div
[ class "item" [ class "item"
, title "Correspondent" , title "Correspondent"
] ]
@ -585,9 +590,12 @@ renderItemInfo settings model =
|> Util.String.withDefault "(None)" |> Util.String.withDefault "(None)"
|> text |> text
] ]
, Data.UiSettings.fieldVisible settings Data.Fields.CorrOrg
|| Data.UiSettings.fieldVisible settings Data.Fields.CorrPerson
)
conc = conc =
div ( div
[ class "item" [ class "item"
, title "Concerning" , title "Concerning"
] ]
@ -598,9 +606,12 @@ renderItemInfo settings model =
|> Util.String.withDefault "(None)" |> Util.String.withDefault "(None)"
|> text |> text
] ]
, Data.UiSettings.fieldVisible settings Data.Fields.ConcEquip
|| Data.UiSettings.fieldVisible settings Data.Fields.ConcPerson
)
itemfolder = itemfolder =
div ( div
[ class "item" [ class "item"
, title "Folder" , title "Folder"
] ]
@ -609,21 +620,28 @@ renderItemInfo settings model =
|> Maybe.withDefault "-" |> Maybe.withDefault "-"
|> text |> text
] ]
, Data.UiSettings.fieldVisible settings Data.Fields.Folder
)
src = src =
div ( div
[ class "item" [ class "item"
, title "Source" , title "Source"
] ]
[ text model.item.source [ text model.item.source
] ]
, True
)
in in
div [ class "ui fluid container" ] div [ class "ui fluid container" ]
(h2 (h2
[ class "ui header" [ class "ui header"
] ]
[ i [ i
[ class (Data.Direction.iconFromString model.item.direction) [ classList
[ ( Data.Direction.iconFromString model.item.direction, True )
, ( "hidden invisible", Data.UiSettings.fieldHidden settings Data.Fields.Direction )
]
, title model.item.direction , title model.item.direction
] ]
[] []
@ -638,20 +656,17 @@ renderItemInfo settings model =
[ text "New!" [ text "New!"
] ]
, div [ class "sub header" ] , div [ class "sub header" ]
[ div [ class "ui horizontal bulleted list" ] <| [ div [ class "ui horizontal bulleted list" ]
List.append (List.filter Tuple.second
[ date [ date
, corr , corr
, conc , conc
, itemfolder , itemfolder
, src , src
, duedate
] ]
(if Util.Maybe.isEmpty model.item.dueDate then |> List.map Tuple.first
[] )
else
[ duedate ]
)
] ]
] ]
] ]
@ -661,25 +676,29 @@ renderItemInfo settings model =
renderTags : UiSettings -> Model -> List (Html Msg) renderTags : UiSettings -> Model -> List (Html Msg)
renderTags settings model = renderTags settings model =
case model.item.tags of if Data.UiSettings.fieldHidden settings Data.Fields.Tag then
[] -> []
[]
_ -> else
[ div [ class "ui right aligned fluid container" ] <| case model.item.tags of
List.map [] ->
(\t -> []
div
[ classList _ ->
[ ( "ui tag label", True ) [ div [ class "ui right aligned fluid container" ] <|
, ( Data.UiSettings.tagColorString t settings, True ) List.map
(\t ->
div
[ classList
[ ( "ui tag label", True )
, ( Data.UiSettings.tagColorString t settings, True )
]
] ]
] [ text t.name
[ text t.name ]
] )
) model.item.tags
model.item.tags ]
]
renderEditMenu : UiSettings -> Model -> List (Html Msg) renderEditMenu : UiSettings -> Model -> List (Html Msg)
@ -759,9 +778,6 @@ renderEditForm settings model =
fieldVisible field = fieldVisible field =
Data.UiSettings.fieldVisible settings field Data.UiSettings.fieldVisible settings field
fieldHidden field =
Data.UiSettings.fieldHidden settings field
optional fields html = optional fields html =
if if
List.map fieldVisible fields List.map fieldVisible fields