Skip to content

Commit

Permalink
Merge commit 'b8ac5179ca697f1598915a7b133c47efa8fde121' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jdvorak001 committed Feb 13, 2024
2 parents d7a8016 + b8ac517 commit 4faf866
Show file tree
Hide file tree
Showing 22 changed files with 2,014 additions and 242 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/plantuml.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: generate plantuml
on: push
on:
push:
branches:
- main
jobs:
generate_plantuml:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion diagrams/core.puml
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
!endsub

!startsub Contribution_to_Document
"Contribution_to_Document" --> "Document" : document >
"Contribution_to_Document" --> "Document" : document <<ordered>> >
!endsub

!startsub Authorship
Expand Down
4 changes: 2 additions & 2 deletions entities/Affiliation_Statement.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ They can exist as standalone objects (typically where an institution makes state

## Attributes

display affiliation: [String](../datatypes/String.md) -- the raw string form of the affiliation as found e.g. in scholarly publications; more structured statements make use of the *institution* and/or *organisation unit* relationships below
display affiliation: [String](../datatypes/String.md) the raw string form of the affiliation as found e.g. in scholarly publications; more structured statements make use of the *institution* and/or *organisation unit* relationships below

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
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

contacts: List<[Contact Information](../datatypes/Contact_Information.md)>

Expand Down
6 changes: 3 additions & 3 deletions entities/Application.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Based on one or more such outcomes, a [Decision](../entities/Decision.md) is mad

This entity represents the act of applying rather than the application [Document](../entities/Document.md).

Subclasses specify the nature of the application as well the details.
An application typically contains the request (what is proposed to happen) and its justification (what benefits it would bring).

## Attributes

application date: [Date](../datatypes/Date.md)

Subclasses specify the nature of the application as well the details.
An application typically contains the request (what is proposed to happen) and its justification (what benefits it would bring).

## Relationships

An application always references the *applicant*, the [Agent](../entities/Agent.md) that makes the application. (Note the role can be called differently in specific contexts.)
Expand Down
2 changes: 1 addition & 1 deletion entities/Authorship.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Beside those inherited from [Contribution to Document](../entities/Contribution_to_Document.md#attributes), there are also the following specific attribute:

corresponding author flag: [Boolean](../datatypes/Boolean.md) - indicates whether this author is responsible for correspondence (true)
corresponding author flag: [Boolean](../datatypes/Boolean.md) indicates whether this author is responsible for correspondence (true)

## Relationships

Expand Down
5 changes: 3 additions & 2 deletions entities/Call_for_Applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ It is typically published or circulated among potential candidates.

Examples include job advertisements, funding calls (requests for grant proposals), calls for nominations for an award etc.

Subclasses specify the nature of the invitation for application as well the details.
A Call for Applications typically covers a goal (what is intended), a means (what is requested), an offer (what is offered to support the goal) and the guidelines for preparing and submitting applications.

## Specialization of
[Resource Request](../entities/Resource_Request.md)

## Attributes
deadline: [Date](../datatypes/Date.md) – until when applications can be submitted

Subclasses specify the nature of the invitation for application as well the details.
A Call for Applications typically covers a goal (what is intended), a means (what is requested), an offer (what is offered to support the goal) and the guidelines for preparing and submitting applications.

## Relationships
<a name="rel__inviter">A Call for Applications always references the *[inviter](../entities/Agent.md#user-content-rel__solicits)*, the [Agent](../entities/Agent.md) that solicits the applications. (Note the role can be called differently in specific contexts.)</a>
Expand Down
4 changes: 2 additions & 2 deletions entities/Contribution.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Just those of [Activity](../entities/Activity.md).
## Relationships
Beside those inherited from [Activity](../entities/Activity.md#relationships):

A Contribution has any number of *contribution statements*: instances of [Contribution Statement](../entities/Contribution_Statement).
<a name="rel__has-contribution-statement">A Contribution has any number of *[contribution statements](../entities/Contribution_Statement.md#user-content-rel__contribution)*: instances of [Contribution Statement](../entities/Contribution_Statement.md).</a>

A Contribution has any number of *acknowledgement statements*: instances of [Acknowledgement Statement](../entities/Acknowledgement_Statement).
<a name="rel__has-acknowledgement-statement">A Contribution has any number of *acknowledgement statements*: instances of [Acknowledgement Statement](../entities/Acknowledgement_Statement).</a>

---
## Matches
Expand Down
3 changes: 3 additions & 0 deletions entities/Contribution_Statement.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ Another example of a structured contribution statement:
statement: [Multilingual String](../datatypes/Multilingual_String.md)

## Relationships

<a name="rel__contribution">A Contribution Statements *[references](../entities/Contribution.md#user-content-rel__has-contribution-statement)* the [Contribution](../entities/Contribution.md) to which it relates.</a>

<a name="rel__resource">A Contribution Statement can optionally *[reference](../entities/Resource.md#user-content-rel__produced-by)* a [Resource](../entities/Resource.md) that it produced. For instance it can be funding, expertise, equipment, time or space.</a>
2 changes: 1 addition & 1 deletion entities/Contribution_to_Evaluation_Outcome.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Those inherited from [Contribution](../entities/Contribution.md#attributes)

Beside those inherited from [Contribution](../entities/Contribution.md#relationships):

A Contribution to Evaluation Outcome always has the *[evaluation outcome]*: an instance of [Evaluation Outcome](../entities/Evaluation_Outcome.md).
<a name="rel__outcome">A Contribution to Evaluation Outcome always has the *[evaluation outcome](../entities/Evaluation_Outcome.md#user-content-rel__contributions)*: an instance of [Evaluation Outcome](../entities/Evaluation_Outcome.md).</a>

## Illustrative Diagram

Expand Down
2 changes: 2 additions & 0 deletions entities/Evaluation_Outcome.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ The conclusions of an evaluation process.

## Relationships

<a name="rel__contributions">An Evaluation Outcome can have any number of *[contributions](../entities/Contribution_to_Evaluation_Outcome.md#user-content-rel__outcome)*, instances of [Contribution to Evaluation Outcome](../entities/Contribution_to_Evaluation_Outcome.md).</a>

---
## Matches

Expand Down
5 changes: 4 additions & 1 deletion entities/FundRef_Identifier.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
## Definition
A FundRef<sup>[1](#fn1)</sup> identifier assigned to an [Organisation unit](../entities/Organisation_Unit.md).

## Usage Notes
FundRef identifiers are assigned to organizations that (also) fund research.

## Specialization of
[Agent Identifier](../entities/Agent_Identifier.md)

## Attributes
Besides those of [Agent Identifier](../entities/Agent_Identifier.md):

FundRef ID: [FundFef ID Type](../datatypes/FundRef_ID.md) for organizations that also fund research
FundRef ID : [FundFef ID Type](../datatypes/FundRef_ID.md)

## Relationships
None besides those of [Agent Identifier](../entities/Agent_Identifier.md).
Expand Down
1 change: 1 addition & 0 deletions entities/Group_or_Organisation_Unit.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ acronym: [String](../datatypes/String.md)
description: [Multilingual String](../datatypes/Multilingual_String.md)

## Relationships

<a name="rel__has-involvement">A Group or Organisation Unit can *[have any number of involvements](../entities/Involvement.md#user-content-rel__in)*, instances of [Involvement](../entities/Involvement.md), which involve [Agents](../entities/Agent.md).</a>
2 changes: 1 addition & 1 deletion entities/Involvement.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Involvements may form a hierarchic structure which may in part reflect a hierarc
[Activity](../entities/Activity.md)

## Relationships
<a name="rel__in">An Involvement specifies the [Group or Organisation Unit](../entities/Group_or_Organisation_Unit.md) the Agent is *[involved in](../entities/Group_or_Organisation_Unit.md#user-content-rel__has-involvement)*.</a>
<a name="rel__in">An Involvement specifies that the Agent is *[involved in](../entities/Group_or_Organisation_Unit.md#user-content-rel__has-involvement)* a [Group or Organisation Unit](../entities/Group_or_Organisation_Unit.md).</a>

<a name="rel__have-parent">An Involvement can have a *[parent](../entities/Involvement.md#user-content-rel__have-child)* [Involvement](../entities/Involvement.md).</a>
Inversely, <a name="rel__have-child">an Involvement can have any number of *[child](../entities/Involvement.md#user-content-rel__have-parent)* [Involvements](../entities/Involvement.md).</a>
Expand Down
Loading

0 comments on commit 4faf866

Please sign in to comment.