From 5b2b2eceb3fb9567ca2124d1bb2b04d3f0338f58 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sun, 7 Jun 2020 15:43:46 +0200 Subject: [PATCH] Show tags in item list view Also set default page size down to 60. --- modules/webapp/src/main/elm/Api.elm | 2 +- .../webapp/src/main/elm/Comp/ItemCardList.elm | 30 +++++++++++++++++-- .../webapp/src/main/elm/Data/UiSettings.elm | 2 +- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/modules/webapp/src/main/elm/Api.elm b/modules/webapp/src/main/elm/Api.elm index f5fbd474..f0d51946 100644 --- a/modules/webapp/src/main/elm/Api.elm +++ b/modules/webapp/src/main/elm/Api.elm @@ -1029,7 +1029,7 @@ moveAttachmentBefore flags itemId data receive = itemSearch : Flags -> ItemSearch -> (Result Http.Error ItemLightList -> msg) -> Cmd msg itemSearch flags search receive = Http2.authPost - { url = flags.config.baseUrl ++ "/api/v1/sec/item/search" + { url = flags.config.baseUrl ++ "/api/v1/sec/item/searchWithTags" , account = getAccount flags , body = Http.jsonBody (Api.Model.ItemSearch.encode search) , expect = Http.expectJson receive Api.Model.ItemLightList.decoder diff --git a/modules/webapp/src/main/elm/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Comp/ItemCardList.elm index fbbbece4..b708861e 100644 --- a/modules/webapp/src/main/elm/Comp/ItemCardList.elm +++ b/modules/webapp/src/main/elm/Comp/ItemCardList.elm @@ -162,7 +162,7 @@ viewItem item = , Util.String.underscoreToSpace item.name |> text ] - , span [ class "meta" ] + , div [ class "meta" ] [ div [ classList [ ( "ui ribbon label", True ) @@ -173,9 +173,33 @@ viewItem item = [ i [ class "exclamation icon" ] [] , text " New" ] + , span + [ classList + [ ( "right floated", not isConfirmed ) + ] + ] + [ Util.Time.formatDate item.date |> text + ] ] - , span [ class "right floated meta" ] - [ Util.Time.formatDate item.date |> text + , div [ class "meta description" ] + [ div + [ classList + [ ( "ui right floated tiny labels", True ) + , ( "invisible hidden", item.tags == [] ) + ] + ] + (List.map + (\tag -> + div + [ classList + [ ( "ui basic label", True ) + , ( "blue", tag.category /= Nothing ) + ] + ] + [ text tag.name ] + ) + item.tags + ) ] ] , div [ class "content" ] diff --git a/modules/webapp/src/main/elm/Data/UiSettings.elm b/modules/webapp/src/main/elm/Data/UiSettings.elm index 7498f088..3da2dbfc 100644 --- a/modules/webapp/src/main/elm/Data/UiSettings.elm +++ b/modules/webapp/src/main/elm/Data/UiSettings.elm @@ -36,7 +36,7 @@ type alias UiSettings = defaults : UiSettings defaults = - { itemSearchPageSize = 90 + { itemSearchPageSize = 60 }