TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-10-31 09:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Amend search form for custom fields

Browse Source
This commit is contained in:
Eike Kettner
2020-11-22 21:09:09 +01:00
parent 23b343649c
commit a2e0c23644
1 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
modules/webapp/src/main/elm/Comp/SearchMenu.elm
View File

@@ -19,10 +19,12 @@ import Api.Model.IdName exposing (IdName)
import Api.Model.ItemSearch exposing (ItemSearch) import Api.Model.ItemSearch exposing (ItemSearch)
import Api.Model.ReferenceList exposing (ReferenceList) import Api.Model.ReferenceList exposing (ReferenceList)
import Api.Model.TagCloud exposing (TagCloud) import Api.Model.TagCloud exposing (TagCloud)
import Comp.CustomFieldMultiInput
import Comp.DatePicker import Comp.DatePicker
import Comp.Dropdown exposing (isDropdownChangeMsg) import Comp.Dropdown exposing (isDropdownChangeMsg)
import Comp.FolderSelect import Comp.FolderSelect
import Comp.TagSelect import Comp.TagSelect
import Data.CustomFieldChange exposing (CustomFieldValueCollect)
import Data.Direction exposing (Direction) import Data.Direction exposing (Direction)
import Data.Fields import Data.Fields
import Data.Flags exposing (Flags) import Data.Flags exposing (Flags)
@@ -67,6 +69,8 @@ type alias Model =
, fulltextModel : Maybe String , fulltextModel : Maybe String
, datePickerInitialized : Bool , datePickerInitialized : Bool
, showNameHelp : Bool , showNameHelp : Bool
, customFieldModel : Comp.CustomFieldMultiInput.Model
, customValues : CustomFieldValueCollect
} }
@@ -128,6 +132,8 @@ init =
, fulltextModel = Nothing , fulltextModel = Nothing
, datePickerInitialized = False , datePickerInitialized = False
, showNameHelp = False , showNameHelp = False
, customFieldModel = Comp.CustomFieldMultiInput.initWith []
, customValues = Data.CustomFieldChange.emptyCollect
} }
@@ -188,6 +194,7 @@ getItemSearch model =
, fullText = model.fulltextModel , fullText = model.fulltextModel
, tagCategoriesInclude = model.tagSelection.includeCats |> List.map .name , tagCategoriesInclude = model.tagSelection.includeCats |> List.map .name
, tagCategoriesExclude = model.tagSelection.excludeCats |> List.map .name , tagCategoriesExclude = model.tagSelection.excludeCats |> List.map .name
, customValues = Data.CustomFieldChange.toFieldValues model.customValues
} }
@@ -222,6 +229,10 @@ resetModel model =
, nameModel = Nothing , nameModel = Nothing
, allNameModel = Nothing , allNameModel = Nothing
, fulltextModel = Nothing , fulltextModel = Nothing
, customFieldModel =
Comp.CustomFieldMultiInput.reset
model.customFieldModel
, customValues = Data.CustomFieldChange.emptyCollect
} }
@@ -260,6 +271,7 @@ type Msg
| SetConcEquip IdName | SetConcEquip IdName
| SetFolder IdName | SetFolder IdName
| SetTag String | SetTag String
| CustomFieldMsg Comp.CustomFieldMultiInput.Msg
type alias NextState = type alias NextState =
@@ -331,6 +343,7 @@ updateDrop ddm flags settings msg model =
, Api.getEquipments flags "" GetEquipResp , Api.getEquipments flags "" GetEquipResp
, Api.getPersonsLight flags GetPersonResp , Api.getPersonsLight flags GetPersonResp
, Api.getFolders flags "" False GetFolderResp , Api.getFolders flags "" False GetFolderResp
, Cmd.map CustomFieldMsg (Comp.CustomFieldMultiInput.initCmd flags)
, cdp , cdp
] ]
, stateChange = False , stateChange = False
@@ -694,6 +707,22 @@ updateDrop ddm flags settings msg model =
, dragDrop = ddd , dragDrop = ddd
} }
CustomFieldMsg lm ->
let
res =
Comp.CustomFieldMultiInput.update lm model.customFieldModel
in
{ model =
{ model
| customFieldModel = res.model
, customValues = Data.CustomFieldChange.collectValues res.result model.customValues
}
, cmd = Cmd.map CustomFieldMsg res.cmd
, stateChange =
Data.CustomFieldChange.isValueChange res.result
, dragDrop = DD.DragDropData ddm Nothing
}
-- View -- View
@@ -813,6 +842,22 @@ viewDrop ddd flags settings model =
, Html.map ConcEquipmentMsg (Comp.Dropdown.view settings model.concEquipmentModel) , Html.map ConcEquipmentMsg (Comp.Dropdown.view settings model.concEquipmentModel)
] ]
] ]
, div
[ classList
[ ( segmentClass, True )
, ( "hidden invisible"
, fieldHidden Data.Fields.CustomFields
|| Comp.CustomFieldMultiInput.isEmpty model.customFieldModel
)
]
]
[ formHeader (Icons.customFieldIcon "") "Custom Fields"
, Html.map CustomFieldMsg
(Comp.CustomFieldMultiInput.view
(Comp.CustomFieldMultiInput.ViewSettings False "field")
model.customFieldModel
)
]
, div [ class segmentClass ] , div [ class segmentClass ]
[ formHeader (Icons.searchIcon "") "Text Search" [ formHeader (Icons.searchIcon "") "Text Search"
, div , div