TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 18:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow person to be correspondent, concerning or both

Browse Source
This commit is contained in:
Eike Kettner
2021-02-16 22:37:56 +01:00
parent 567bfb3e69
commit 48eee00c0b
19 changed files with 321 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/webapp/src/main/elm/Comp/DateInput.elm Normal file
View File

@ -0,0 +1,4 @@
module Comp.DateInput exposing (..)
import Html exposing (..)
import Html.Attributes exposing (..)

9
modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
View File

@ -32,6 +32,7 @@ import Data.DropdownStyle
import Data.Fields
import Data.Flags exposing (Flags)
import Data.Icons as Icons
import Data.PersonUse
import Data.UiSettings exposing (UiSettings)
import DatePicker exposing (DatePicker)
import Html exposing (..)
@ -429,14 +430,14 @@ update flags msg model =
GetPersonResp (Ok ps) ->
let
( conc, corr ) =
List.partition .concerning ps.items
{ concerning, correspondent } =
Data.PersonUse.spanPersonList ps.items
concRefs =
List.map (\e -> IdName e.id e.name) conc
List.map (\e -> IdName e.id e.name) concerning
corrRefs =
List.map (\e -> IdName e.id e.name) corr
List.map (\e -> IdName e.id e.name) correspondent
res1 =
update flags (CorrPersonMsg (Comp.Dropdown.SetOptions corrRefs)) model

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

@ -49,6 +49,7 @@ import Data.Direction
import Data.Fields exposing (Field)
import Data.Flags exposing (Flags)
import Data.ItemNav exposing (ItemNav)
import Data.PersonUse
import Data.UiSettings exposing (UiSettings)
import DatePicker
import Dict
@ -612,8 +613,8 @@ update key flags inav settings msg model =
GetPersonResp (Ok ps) ->
let
( conc, corr ) =
List.partition .concerning ps.items
{ concerning, correspondent } =
Data.PersonUse.spanPersonList ps.items
personDict =
List.map (\p -> ( p.id, p )) ps.items
@ -632,10 +633,10 @@ update key flags inav settings msg model =
\_ -> True
concRefs =
List.map (\e -> IdName e.id e.name) conc
List.map (\e -> IdName e.id e.name) concerning
corrRefs =
List.filter personFilter corr
List.filter personFilter correspondent
|> List.map (\e -> IdName e.id e.name)
mkPersonOption idref =

80
modules/webapp/src/main/elm/Comp/PersonForm.elm
View File

@ -16,12 +16,14 @@ import Comp.AddressForm
import Comp.Basic as B
import Comp.ContactField
import Comp.Dropdown
import Comp.FixedDropdown
import Data.DropdownStyle as DS
import Data.Flags exposing (Flags)
import Data.PersonUse exposing (PersonUse)
import Data.UiSettings exposing (UiSettings)
import Html exposing (..)
import Html.Attributes exposing (..)
import Html.Events exposing (onCheck, onInput)
import Html.Events exposing (onInput)
import Styles as S
@ -31,7 +33,8 @@ type alias Model =
, addressModel : Comp.AddressForm.Model
, contactModel : Comp.ContactField.Model
, notes : Maybe String
, concerning : Bool
, use : PersonUse
, useModel : Comp.FixedDropdown.Model PersonUse
, orgModel : Comp.Dropdown.Model IdName
}
@ -43,7 +46,11 @@ emptyModel =
, addressModel = Comp.AddressForm.emptyModel
, contactModel = Comp.ContactField.emptyModel
, notes = Nothing
, concerning = False
, use = Data.PersonUse.Both
, useModel =
Comp.FixedDropdown.initMap
Data.PersonUse.label
Data.PersonUse.all
, orgModel = Comp.Dropdown.orgDropdown
}
@ -68,7 +75,7 @@ getPerson model =
, address = Comp.AddressForm.getAddress model.addressModel
, contacts = Comp.ContactField.getContacts model.contactModel
, notes = model.notes
, concerning = model.concerning
, use = Data.PersonUse.asString model.use
, organization = org
}
@ -79,9 +86,9 @@ type Msg
| AddressMsg Comp.AddressForm.Msg
| ContactMsg Comp.ContactField.Msg
| SetNotes String
| SetConcerning Bool
| SetOrgs (List IdName)
| OrgDropdownMsg (Comp.Dropdown.Msg IdName)
| UseDropdownMsg (Comp.FixedDropdown.Msg PersonUse)
update : Flags -> Msg -> Model -> ( Model, Cmd Msg )
@ -108,7 +115,9 @@ update flags msg model =
| person = t
, name = t.name
, notes = t.notes
, concerning = t.concerning
, use =
Data.PersonUse.fromString t.use
|> Maybe.withDefault Data.PersonUse.Both
}
, Cmd.batch [ c1, c2, c3 ]
)
@ -149,8 +158,15 @@ update flags msg model =
, Cmd.none
)
SetConcerning _ ->
( { model | concerning = not model.concerning }, Cmd.none )
UseDropdownMsg lm ->
let
( nm, mu ) =
Comp.FixedDropdown.update lm model.useModel
newUse =
Maybe.withDefault model.use mu
in
( { model | useModel = nm, use = newUse }, Cmd.none )
OrgDropdownMsg lm ->
let
@ -185,16 +201,10 @@ view1 settings compact model =
]
[]
]
, div [ class "inline field" ]
[ div [ class "ui checkbox" ]
[ input
[ type_ "checkbox"
, checked model.concerning
, onCheck SetConcerning
]
[]
, label [] [ text "Use for concerning person suggestion only" ]
]
, div [ class "field" ]
[ label [] [ text "Use" ]
, Html.map UseDropdownMsg (Comp.FixedDropdown.view (makeUseItem model) model.useModel)
, label [] [ text "Use for concerning person suggestion only" ]
]
, div [ class "field" ]
[ label [] [ text "Organization" ]
@ -221,6 +231,12 @@ view1 settings compact model =
]
makeUseItem : Model -> Maybe (Comp.FixedDropdown.Item PersonUse)
makeUseItem model =
Just <|
Comp.FixedDropdown.Item model.use (Data.PersonUse.label model.use)
--- View2
@ -253,21 +269,21 @@ view2 mobile settings model =
]
, div [ class "mb-4" ]
[ label
[ class "inline-flex items-center"
, for "concerning"
[ class S.inputLabel
]
[ input
[ type_ "checkbox"
, checked model.concerning
, onCheck SetConcerning
, class S.checkboxInput
, name "concerning"
, id "concerning"
]
[]
, span [ class "ml-2" ]
[ text "Use for concerning person suggestion only"
]
[ text "Use of this person" ]
, Html.map UseDropdownMsg
(Comp.FixedDropdown.view2 (makeUseItem model) model.useModel)
, span [ class "opacity-50 text-sm" ]
[ case model.use of
Data.PersonUse.Concerning ->
text "Use as concerning person only"
Data.PersonUse.Correspondent ->
text "Use as correspondent person only"
Data.PersonUse.Both ->
text "Use as both concerning or correspondent person"
]
]
, div [ class "mb-4" ]

25
modules/webapp/src/main/elm/Comp/PersonTable.elm
View File

@ -10,6 +10,7 @@ module Comp.PersonTable exposing
import Api.Model.Person exposing (Person)
import Comp.Basic as B
import Data.Flags exposing (Flags)
import Data.PersonUse
import Html exposing (..)
import Html.Attributes exposing (..)
import Html.Events exposing (onClick)
@ -57,7 +58,7 @@ view model =
[ thead []
[ tr []
[ th [ class "collapsing" ] []
, th [ class "collapsing center aligned" ] [ text "Concerning" ]
, th [ class "collapsing center aligned" ] [ text "Use" ]
, th [] [ text "Name" ]
, th [] [ text "Organization" ]
, th [] [ text "Address" ]
@ -85,11 +86,10 @@ renderPersonLine model person =
]
]
, td [ class "center aligned" ]
[ if person.concerning then
i [ class "check square outline icon" ] []
else
i [ class "minus square outline icon" ] []
[ Data.PersonUse.fromString person.use
|> Maybe.withDefault Data.PersonUse.Both
|> Data.PersonUse.label
|> text
]
, td []
[ text person.name
@ -118,8 +118,8 @@ view2 model =
[ thead []
[ tr []
[ th [ class "w-px whitespace-nowrap" ] []
, th [ class "w-px whitespace-nowrap text-center pr-1 md:px-2" ]
[ text "Concerning"
, th [ class "text-left pr-1 md:px-2" ]
[ text "Use"
]
, th [ class "text-left" ] [ text "Name" ]
, th [ class "text-left hidden sm:table-cell" ] [ text "Organization" ]
@ -138,8 +138,13 @@ renderPersonLine2 model person =
, class S.tableRow
]
[ B.editLinkTableCell (Select person)
, td [ class "w-px whitespace-nowrap text-center" ]
[ Util.Html.checkbox2 person.concerning
, td [ class "text-left pr-1 md:px-2" ]
[ div [ class "label inline-flex text-sm" ]
[ Data.PersonUse.fromString person.use
|> Maybe.withDefault Data.PersonUse.Both
|> Data.PersonUse.label
|> text
]
]
, td []
[ text person.name

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

@ -38,6 +38,7 @@ import Data.DropdownStyle as DS
import Data.Fields
import Data.Flags exposing (Flags)
import Data.Icons as Icons
import Data.PersonUse
import Data.UiSettings exposing (UiSettings)
import DatePicker exposing (DatePicker)
import Html exposing (..)
@ -561,14 +562,14 @@ updateDrop ddm flags settings msg model =
GetPersonResp (Ok ps) ->
let
( conc, corr ) =
List.partition .concerning ps.items
{ concerning, correspondent } =
Data.PersonUse.spanPersonList ps.items
concRefs =
List.map (\e -> IdName e.id e.name) conc
List.map (\e -> IdName e.id e.name) concerning
corrRefs =
List.map (\e -> IdName e.id e.name) corr
List.map (\e -> IdName e.id e.name) correspondent
next1 =
updateDrop ddm

90
modules/webapp/src/main/elm/Data/PersonUse.elm Normal file
View File

@ -0,0 +1,90 @@
module Data.PersonUse exposing
( PersonUse(..)
, all
, asString
, fromString
, label
, spanPersonList
)
import Api.Model.Person exposing (Person)
type PersonUse
= Correspondent
| Concerning
| Both
fromString : String -> Maybe PersonUse
fromString str =
case String.toLower str of
"concerning" ->
Just Concerning
"correspondent" ->
Just Correspondent
"both" ->
Just Both
_ ->
Nothing
asString : PersonUse -> String
asString pu =
case pu of
Correspondent ->
"correspondent"
Concerning ->
"concerning"
Both ->
"both"
label : PersonUse -> String
label pu =
case pu of
Correspondent ->
"Correspondent"
Concerning ->
"Concerning"
Both ->
"Both"
all : List PersonUse
all =
[ Correspondent, Concerning, Both ]
spanPersonList : List Person -> { concerning : List Person, correspondent : List Person }
spanPersonList input =
let
init =
{ concerning = [], correspondent = [] }
parseUse p =
fromString p.use
|> Maybe.withDefault Both
merge p res =
case parseUse p of
Concerning ->
{ res | concerning = p :: res.concerning }
Correspondent ->
{ res | correspondent = p :: res.correspondent }
Both ->
{ res
| correspondent = p :: res.correspondent
, concerning = p :: res.concerning
}
in
List.foldl merge init input