From 3bda1313a25159b9c438ac414b5489e340299ad0 Mon Sep 17 00:00:00 2001 From: Dragan Ivanovic Date: Tue, 17 Oct 2023 13:47:20 +0200 Subject: [PATCH] Add Contact information data type (#8) --- README.md | 1 + datatypes/Contact_Information.md | 14 ++++++++++++++ diagrams/core.puml | 23 ++++++++++------------- entities/Affiliation_Statement.md | 4 +--- entities/Agent.md | 2 ++ entities/Group.md | 6 ------ entities/Organisation_Unit.md | 6 ------ 7 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 datatypes/Contact_Information.md diff --git a/README.md b/README.md index e6ed70d..9e4e6e1 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,7 @@ for instance the [DOI Identifier](./entities/DOI_Identifier.md). * [Postal Address](./datatypes/Postal_Address.md) * [Simple Postal Address](./datatypes/Simple_Postal_Address.md) * [Structured Postal Address](./datatypes/Structured_Postal_Address.md) +* [Contact Information](./datatypes/Contact_Information.md) * [Language](./datatypes/Language.md), [Country](./datatypes/Country.md), [Script](./datatypes/Script.md) * [Language Tag](./datatypes/Language_Tag.md) * [Monetary Amount](./datatypes/Monetary_Amount.md) diff --git a/datatypes/Contact_Information.md b/datatypes/Contact_Information.md new file mode 100644 index 0000000..2e02596 --- /dev/null +++ b/datatypes/Contact_Information.md @@ -0,0 +1,14 @@ +# Contact Information + +## Definition + +The contact information assigned to an [Agent](../entities/Organisation_Unit.md). The contact information might be +Postal address, Visiting address, Email address, Telephone number, Website URL + +## Components + +- postalAddress : [Postal Address](../datatypes/Postal_Address.md) +- visitingAddress : [Postal Address](../datatypes/Postal_Address.md) +- phone : [String](../datatypes/String.md) +- emailAddress : [URI](../datatypes/URI.md) +- web site URL : [URI](../datatypes/URI.md) diff --git a/diagrams/core.puml b/diagrams/core.puml index 5b6f582..8e3d8dc 100644 --- a/diagrams/core.puml +++ b/diagrams/core.puml @@ -84,10 +84,6 @@ "Person" ..> "name" "Person_Name" !endsub -!startsub Postal_Address - "Organisation_Unit" ..> "0..1" "Postal_Address" : address > -!endsub - !startsub Group_or_Organisation_Unit class "Group_or_Organisation_Unit" #ffffff { } @@ -110,9 +106,7 @@ class "Organisation_Unit" #ffffff { name : Multilingual_String acronym : String - address : Postal_Address - webSiteURL : URI - email : URI + contacts : List } !endsub @@ -335,6 +329,14 @@ "Postal_Address" <|-d- "Simple_Postal_Address" "Postal_Address" <|-d- "Structured_Postal_Address" + + datatype("Contact_Information") { + postalAddress : Postal_Address + visitingAddress : Postal_Address + phone : String + emailAddress : URI + webSiteURL : URI + } !endsub !startsub Country @@ -352,8 +354,7 @@ class "Affiliation_Statement" #ffffff { displayAffiliation_Statement : String displayPersonName : String - address : Postal_Address - contacts : List + contacts : List } !endsub @@ -469,10 +470,6 @@ "Contribution_to_Evaluation_Outcome" --> "Evaluation_Outcome" !endsub -!startsub Postal_Address - "Affiliation_Statement" o..> "Postal_Address" : address > -!endsub - !startsub Affiliation_Statement "Activity" "0..*" o-- "0..*" "Affiliation_Statement" : affilations > !endsub diff --git a/entities/Affiliation_Statement.md b/entities/Affiliation_Statement.md index bca5a9a..e4b579c 100644 --- a/entities/Affiliation_Statement.md +++ b/entities/Affiliation_Statement.md @@ -18,9 +18,7 @@ display affiliation: [String](../datatypes/String.md) -- the raw string form of display person name: [String](../datatypes/String.md) -- the raw string form of the name of the person as found e.g. in scholarly publications; more structured statements make use of the *person* relationship below -address: [Postal Address](../datatypes/Postal_Address.md) - -contacts: List<[URI](../datatypes/URI.md)> +contacts: List<[Contact Information](../datatypes/Contact_Information.md)> ## Relationships diff --git a/entities/Agent.md b/entities/Agent.md index 66c848d..640f77d 100644 --- a/entities/Agent.md +++ b/entities/Agent.md @@ -16,6 +16,8 @@ keywords: List<[Multilingual String](../datatypes/Multilingual_String.md)> lifetime : [Date Range](../datatypes/Date_Range.md) +contacts : List<[Contact_Information](../datatypes/Contact_Information.md)> + ## Relationships An Agent can *[be the actor](../entities/Activity.md#user-content-rel__actor)* of any number of [Activities](../entities/Activity.md). diff --git a/entities/Group.md b/entities/Group.md index fb4e72b..6bcbd79 100644 --- a/entities/Group.md +++ b/entities/Group.md @@ -13,12 +13,6 @@ name: [Multilingual String](../datatypes/Multilingual_String.md) acronym: [String](../datatypes/String.md) -address: [Postal Address](../datatypes/Postal_Address.md) - -web site URL: [URI](../datatypes/URI.md) - -email: [URI](../datatypes/URI.md) - ## Relationships Those of [Agent](../entities/Agent.md#relationships) diff --git a/entities/Organisation_Unit.md b/entities/Organisation_Unit.md index fc541e4..4d108c8 100644 --- a/entities/Organisation_Unit.md +++ b/entities/Organisation_Unit.md @@ -22,12 +22,6 @@ name: [Multilingual String](../datatypes/Multilingual_String.md) acronym: [String](../datatypes/String.md) -address: [Postal Address](../datatypes/Postal_Address.md) - -web site URL: [URI](../datatypes/URI.md) - -email: [URI](../datatypes/URI.md) - ## Relationships Those of [Agent](../entities/Agent.md#relationships)