TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-07 07:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort custom fields in views

Browse Source
This commit is contained in:
Eike Kettner 2021-01-02 10:09:05 +01:00
parent 70983f115c
commit ae57881f2d
4 changed files with 101 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,7 +400,8 @@ mainTagsAndFields settings item =
[] []
else else
List.map showField item.customfields List.sortBy Util.CustomField.nameOrLabel item.customfields
|> List.map showField
renderTags = renderTags =
if hideTags then if hideTags then

90
modules/webapp/src/main/elm/Comp/SearchStatsView.elm Normal file
View File

@ -0,0 +1,90 @@
module Comp.SearchStatsView exposing
( nameOrLabel
, sortFields
, view
)
import Api.Model.FieldStats exposing (FieldStats)
import Api.Model.SearchStats exposing (SearchStats)
import Data.Icons as Icons
import Data.Money
import Html exposing (..)
import Html.Attributes exposing (..)
nameOrLabel : FieldStats -> String
nameOrLabel f =
Maybe.withDefault f.name f.label
view : SearchStats -> List (Html msg)
view stats =
let
isNumField f =
f.sum > 0
statValues f =
tr [ class "center aligned" ]
[ td [ class "left aligned" ]
[ div [ class "ui basic label" ]
[ Icons.customFieldTypeIconString "" f.ftype
, text (nameOrLabel f)
]
]
, td []
[ f.count |> String.fromInt |> text
]
, td []
[ f.sum |> Data.Money.format |> text
]
, td []
[ f.avg |> Data.Money.format |> text
]
, td []
[ f.min |> Data.Money.format |> text
]
, td []
[ f.max |> Data.Money.format |> text
]
]
fields =
List.filter isNumField stats.fieldStats
|> sortFields
in
[ div [ class "ui container" ]
[ div [ class "ui middle aligned stackable grid" ]
[ div [ class "three wide center aligned column" ]
[ div [ class "ui small statistic" ]
[ div [ class "value" ]
[ String.fromInt stats.count |> text
]
, div [ class "label" ]
[ text "Items"
]
]
]
, div [ class "thirteen wide column" ]
[ table [ class "ui very basic tiny six column table" ]
[ thead []
[ tr [ class "center aligned" ]
[ th [] []
, th [] [ text "Count" ]
, th [] [ text "Sum" ]
, th [] [ text "Avg" ]
, th [] [ text "Min" ]
, th [] [ text "Max" ]
]
]
, tbody []
(List.map statValues fields)
]
]
]
]
]
sortFields : List FieldStats -> List FieldStats
sortFields fields =
List.sortBy nameOrLabel fields

70
modules/webapp/src/main/elm/Page/Home/View.elm
View File

@ -5,11 +5,10 @@ import Comp.FixedDropdown
import Comp.ItemCardList import Comp.ItemCardList
import Comp.ItemDetail.EditMenu import Comp.ItemDetail.EditMenu
import Comp.SearchMenu import Comp.SearchMenu
import Comp.SearchStatsView
import Comp.YesNoDimmer import Comp.YesNoDimmer
import Data.Flags exposing (Flags) import Data.Flags exposing (Flags)
import Data.Icons as Icons
import Data.ItemSelection import Data.ItemSelection
import Data.Money
import Data.UiSettings exposing (UiSettings) import Data.UiSettings exposing (UiSettings)
import Html exposing (..) import Html exposing (..)
import Html.Attributes exposing (..) import Html.Attributes exposing (..)
@ -166,72 +165,7 @@ view flags settings model =
viewStats : Flags -> Model -> List (Html Msg) viewStats : Flags -> Model -> List (Html Msg)
viewStats _ model = viewStats _ model =
let Comp.SearchStatsView.view model.searchStats
stats =
model.searchStats
isNumField f =
f.sum > 0
statValues f =
tr [ class "center aligned" ]
[ td [ class "left aligned" ]
[ div [ class "ui basic label" ]
[ Icons.customFieldTypeIconString "" f.ftype
, text (Maybe.withDefault f.name f.label)
]
]
, td []
[ f.count |> String.fromInt |> text
]
, td []
[ f.sum |> Data.Money.format |> text
]
, td []
[ f.avg |> Data.Money.format |> text
]
, td []
[ f.min |> Data.Money.format |> text
]
, td []
[ f.max |> Data.Money.format |> text
]
]
fields =
List.filter isNumField stats.fieldStats
in
[ div [ class "ui container" ]
[ div [ class "ui middle aligned stackable grid" ]
[ div [ class "three wide center aligned column" ]
[ div [ class "ui small statistic" ]
[ div [ class "value" ]
[ String.fromInt stats.count |> text
]
, div [ class "label" ]
[ text "Results"
]
]
]
, div [ class "thirteen wide column" ]
[ table [ class "ui very basic tiny six column table" ]
[ thead []
[ tr [ class "center aligned" ]
[ th [] []
, th [] [ text "Count" ]
, th [] [ text "Sum" ]
, th [] [ text "Avg" ]
, th [] [ text "Min" ]
, th [] [ text "Max" ]
]
]
, tbody []
(List.map statValues fields)
]
]
]
]
]
viewLeftMenu : Flags -> UiSettings -> Model -> List (Html Msg) viewLeftMenu : Flags -> UiSettings -> Model -> List (Html Msg)

9
modules/webapp/src/main/elm/Util/CustomField.elm
View File

@ -1,4 +1,4 @@
module Util.CustomField exposing (renderValue) module Util.CustomField exposing (nameOrLabel, renderValue)
import Api.Model.ItemFieldValue exposing (ItemFieldValue) import Api.Model.ItemFieldValue exposing (ItemFieldValue)
import Data.CustomFieldType import Data.CustomFieldType
@ -7,6 +7,11 @@ import Html exposing (..)
import Html.Attributes exposing (..) import Html.Attributes exposing (..)
nameOrLabel : ItemFieldValue -> String
nameOrLabel fv =
Maybe.withDefault fv.name fv.label
renderValue : String -> ItemFieldValue -> Html msg renderValue : String -> ItemFieldValue -> Html msg
renderValue classes cv = renderValue classes cv =
let let
@ -19,7 +24,7 @@ renderValue classes cv =
in in
div [ class classes ] div [ class classes ]
[ Icons.customFieldTypeIconString "" cv.ftype [ Icons.customFieldTypeIconString "" cv.ftype
, Maybe.withDefault cv.name cv.label |> text , nameOrLabel cv |> text
, div [ class "detail" ] , div [ class "detail" ]
[ if Data.CustomFieldType.fromString cv.ftype == Just Data.CustomFieldType.Boolean then [ if Data.CustomFieldType.fromString cv.ftype == Just Data.CustomFieldType.Boolean then
renderBool renderBool