TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-03 05:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #479 from eikek/person-dropdown

Browse Source 
Show concerning/correspond person exclusively in dropdowns
This commit is contained in:
mergify[bot] 2020-11-27 22:59:56 +00:00 committed by GitHub
commit 6c7f0cc4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/webapp/src/main/elm/Comp/ItemDetail/EditMenu.elm
View File

@ -15,6 +15,7 @@ import Api.Model.FolderItem exposing (FolderItem)
import Api.Model.FolderList exposing (FolderList) import Api.Model.FolderList exposing (FolderList)
import Api.Model.IdName exposing (IdName) import Api.Model.IdName exposing (IdName)
import Api.Model.ItemProposals exposing (ItemProposals) import Api.Model.ItemProposals exposing (ItemProposals)
import Api.Model.PersonList exposing (PersonList)
import Api.Model.ReferenceList exposing (ReferenceList) import Api.Model.ReferenceList exposing (ReferenceList)
import Api.Model.Tag exposing (Tag) import Api.Model.Tag exposing (Tag)
import Api.Model.TagList exposing (TagList) import Api.Model.TagList exposing (TagList)
@ -102,7 +103,7 @@ type Msg
| ConcEquipMsg (Comp.Dropdown.Msg IdName) | ConcEquipMsg (Comp.Dropdown.Msg IdName)
| GetTagsResp (Result Http.Error TagList) | GetTagsResp (Result Http.Error TagList)
| GetOrgResp (Result Http.Error ReferenceList) | GetOrgResp (Result Http.Error ReferenceList)
| GetPersonResp (Result Http.Error ReferenceList) | GetPersonResp (Result Http.Error PersonList)
| GetEquipResp (Result Http.Error EquipmentList) | GetEquipResp (Result Http.Error EquipmentList)
| GetFolderResp (Result Http.Error FolderList) | GetFolderResp (Result Http.Error FolderList)
| CustomFieldMsg Comp.CustomFieldMultiInput.Msg | CustomFieldMsg Comp.CustomFieldMultiInput.Msg
@ -172,7 +173,7 @@ loadModel flags =
Cmd.batch Cmd.batch
[ Api.getTags flags "" GetTagsResp [ Api.getTags flags "" GetTagsResp
, Api.getOrgLight flags GetOrgResp , Api.getOrgLight flags GetOrgResp
, Api.getPersonsLight flags GetPersonResp , Api.getPersons flags "" GetPersonResp
, Api.getEquipments flags "" GetEquipResp , Api.getEquipments flags "" GetEquipResp
, Api.getFolders flags "" False GetFolderResp , Api.getFolders flags "" False GetFolderResp
, Cmd.map CustomFieldMsg (Comp.CustomFieldMultiInput.initCmd flags) , Cmd.map CustomFieldMsg (Comp.CustomFieldMultiInput.initCmd flags)
@ -422,14 +423,20 @@ update flags msg model =
GetPersonResp (Ok ps) -> GetPersonResp (Ok ps) ->
let let
opts = ( conc, corr ) =
Comp.Dropdown.SetOptions ps.items List.partition .concerning ps.items
concRefs =
List.map (\e -> IdName e.id e.name) conc
corrRefs =
List.map (\e -> IdName e.id e.name) corr
res1 = res1 =
update flags (CorrPersonMsg opts) model update flags (CorrPersonMsg (Comp.Dropdown.SetOptions corrRefs)) model
res2 = res2 =
update flags (ConcPersonMsg opts) res1.model update flags (ConcPersonMsg (Comp.Dropdown.SetOptions concRefs)) res1.model
in in
res2 res2

3
modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm
View File

@ -20,6 +20,7 @@ import Api.Model.FolderList exposing (FolderList)
import Api.Model.IdName exposing (IdName) import Api.Model.IdName exposing (IdName)
import Api.Model.ItemDetail exposing (ItemDetail) import Api.Model.ItemDetail exposing (ItemDetail)
import Api.Model.ItemProposals exposing (ItemProposals) import Api.Model.ItemProposals exposing (ItemProposals)
import Api.Model.PersonList exposing (PersonList)
import Api.Model.ReferenceList exposing (ReferenceList) import Api.Model.ReferenceList exposing (ReferenceList)
import Api.Model.SentMails exposing (SentMails) import Api.Model.SentMails exposing (SentMails)
import Api.Model.Tag exposing (Tag) import Api.Model.Tag exposing (Tag)
@ -221,7 +222,7 @@ type Msg
| ConcEquipMsg (Comp.Dropdown.Msg IdName) | ConcEquipMsg (Comp.Dropdown.Msg IdName)
| GetTagsResp (Result Http.Error TagList) | GetTagsResp (Result Http.Error TagList)
| GetOrgResp (Result Http.Error ReferenceList) | GetOrgResp (Result Http.Error ReferenceList)
| GetPersonResp (Result Http.Error ReferenceList) | GetPersonResp (Result Http.Error PersonList)
| GetEquipResp (Result Http.Error EquipmentList) | GetEquipResp (Result Http.Error EquipmentList)
| SetName String | SetName String
| SetNotes String | SetNotes String

26
modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm
View File

@ -606,14 +606,30 @@ update key flags inav settings msg model =
GetPersonResp (Ok ps) -> GetPersonResp (Ok ps) ->
let let
opts = ( conc, corr ) =
Comp.Dropdown.SetOptions ps.items List.partition .concerning ps.items
concRefs =
List.map (\e -> IdName e.id e.name) conc
corrRefs =
List.map (\e -> IdName e.id e.name) corr
res1 = res1 =
update key flags inav settings (CorrPersonMsg opts) model update key
flags
inav
settings
(CorrPersonMsg (Comp.Dropdown.SetOptions corrRefs))
model
res2 = res2 =
update key flags inav settings (ConcPersonMsg opts) res1.model update key
flags
inav
settings
(ConcPersonMsg (Comp.Dropdown.SetOptions concRefs))
res1.model
in in
{ model = res2.model { model = res2.model
, cmd = Cmd.batch [ res1.cmd, res2.cmd ] , cmd = Cmd.batch [ res1.cmd, res2.cmd ]
@ -1410,7 +1426,7 @@ getOptions flags =
Cmd.batch Cmd.batch
[ Api.getTags flags "" GetTagsResp [ Api.getTags flags "" GetTagsResp
, Api.getOrgLight flags GetOrgResp , Api.getOrgLight flags GetOrgResp
, Api.getPersonsLight flags GetPersonResp , Api.getPersons flags "" GetPersonResp
, Api.getEquipments flags "" GetEquipResp , Api.getEquipments flags "" GetEquipResp
, Api.getFolders flags "" False GetFolderResp , Api.getFolders flags "" False GetFolderResp
] ]

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

@ -17,6 +17,7 @@ import Api.Model.FolderItem exposing (FolderItem)
import Api.Model.FolderList exposing (FolderList) import Api.Model.FolderList exposing (FolderList)
import Api.Model.IdName exposing (IdName) import Api.Model.IdName exposing (IdName)
import Api.Model.ItemSearch exposing (ItemSearch) import Api.Model.ItemSearch exposing (ItemSearch)
import Api.Model.PersonList exposing (PersonList)
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.CustomFieldMultiInput
@ -256,7 +257,7 @@ type Msg
| GetTagsResp (Result Http.Error TagCloud) | GetTagsResp (Result Http.Error TagCloud)
| GetOrgResp (Result Http.Error ReferenceList) | GetOrgResp (Result Http.Error ReferenceList)
| GetEquipResp (Result Http.Error EquipmentList) | GetEquipResp (Result Http.Error EquipmentList)
| GetPersonResp (Result Http.Error ReferenceList) | GetPersonResp (Result Http.Error PersonList)
| SetName String | SetName String
| SetAllName String | SetAllName String
| SetFulltext String | SetFulltext String
@ -341,7 +342,7 @@ updateDrop ddm flags settings msg model =
[ Api.getTagCloud flags GetTagsResp [ Api.getTagCloud flags GetTagsResp
, Api.getOrgLight flags GetOrgResp , Api.getOrgLight flags GetOrgResp
, Api.getEquipments flags "" GetEquipResp , Api.getEquipments flags "" GetEquipResp
, Api.getPersonsLight flags GetPersonResp , Api.getPersons flags "" GetPersonResp
, Api.getFolders flags "" False GetFolderResp , Api.getFolders flags "" False GetFolderResp
, Cmd.map CustomFieldMsg (Comp.CustomFieldMultiInput.initCmd flags) , Cmd.map CustomFieldMsg (Comp.CustomFieldMultiInput.initCmd flags)
, cdp , cdp
@ -441,14 +442,28 @@ updateDrop ddm flags settings msg model =
GetPersonResp (Ok ps) -> GetPersonResp (Ok ps) ->
let let
opts = ( conc, corr ) =
Comp.Dropdown.SetOptions ps.items List.partition .concerning ps.items
concRefs =
List.map (\e -> IdName e.id e.name) conc
corrRefs =
List.map (\e -> IdName e.id e.name) corr
next1 = next1 =
updateDrop ddm flags settings (CorrPersonMsg opts) model updateDrop ddm
flags
settings
(CorrPersonMsg (Comp.Dropdown.SetOptions corrRefs))
model
next2 = next2 =
updateDrop next1.dragDrop.model flags settings (ConcPersonMsg opts) next1.model updateDrop next1.dragDrop.model
flags
settings
(ConcPersonMsg (Comp.Dropdown.SetOptions concRefs))
next1.model
in in
next2 next2