Skip to content

Commit

Permalink
Fix Prize award and Prize relations (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
chenejac committed Jun 3, 2024
1 parent ff09dd3 commit 3b3477c
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 6 deletions.
30 changes: 28 additions & 2 deletions diagrams/core.puml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,24 @@
"Contribution" <|-d- "Contribution_to_Infrastructure"
!endsub

!startsub Contribution_to_Prize
class "Contribution_to_Prize" #ffffff {
}
!endsub

!startsub Contribution_to_Prize
"Contribution" <|-d- "Contribution_to_Prize"
!endsub

!startsub Contribution_to_Prize_Award
class "Contribution_to_Prize_Award" #ffffff {
}
!endsub

!startsub Contribution_to_Prize_Award
"Contribution" <|-d- "Contribution_to_Prize_Award"
!endsub


!startsub Activity
"Document" "0..*" -- "0..*" "Activity" : prove >
Expand Down Expand Up @@ -638,6 +656,14 @@
"Contribution_to_Event" --> "Event" : event >
!endsub

!startsub Contribution_to_Prize
"Contribution_to_Prize" --> "Prize" : has target >
!endsub

!startsub Contribution_to_Prize_Award
"Contribution_to_Prize_Award" --> "Prize_Award" : has target >
!endsub

!startsub Contribution
"Contribution_Statement" --> "0..1" "Resource" : provides >
!endsub
Expand All @@ -663,11 +689,11 @@
!endsub

!startsub Prize_Award
"Prize_Award" "0..*" -l-o "Prize" : of >
"Prize_Award" "0..*" -l-o "Prize" : awards >
!endsub

!startsub Prize_Award
"Prize_Award" --> "Agent" : recipient >
"Prize_Award" "0..*" <--> "0..*" "Agent" : recipient >
!endsub

!startsub Prize_Award
Expand Down
3 changes: 3 additions & 0 deletions entities/Agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ contacts : List<[Contact_Information](../datatypes/Contact_Information.md)>

<a name="rel__made">made</a> / [made-by](../entities/Decision.md#user-content-rel__made-by) : An Agent can make a [Decision](../entities/Decision.md) on Resource Request based or not on Evaluation Outcomes.

<a name="rel__awards-prize"></a> / [awards-prize](../entities/Event.md#user-content-rel__awarded-by-whom) : An Agent can award any number of [Prize Awards](../entities/Prize_Award.md).



## Illustrative Diagram
![The Agent diagram](../diagrams/agent.svg)
Expand Down
2 changes: 1 addition & 1 deletion entities/Contribution_to_Prize.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Any contribution an [Agent](../entities/Agent.md) made to a [Prize](../entities/

## Usage notes

Anything that helps the Prize to exist and be awarded.
Anything that helps the Prize to exist.

## Specialization of
[Contribution](../entities/Contribution.md)
Expand Down
20 changes: 20 additions & 0 deletions entities/Contribution_to_Prize_Award.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Contribution to Prize Award

## Definition
Any contribution an [Agent](../entities/Agent.md) made to a [Prize Award](../entities/Prize_Award.md).

## Usage notes

Anything that helps the Prize to be awarded.

## Specialization of
[Contribution](../entities/Contribution.md)

## Attributes
Those inherited from [Contribution](../entities/Contribution.md#attributes)

## Relationships
Besides those of [Contribution](../entities/Contribution.md):

<a name="rel__has-target">has-target</a> / [has-contribution](../entities/Prize_Award.md#user-content-rel__has-contribution) : A Contribution to Prize Award always has the target [Prize Award](../entities/Prize_Award.md).

2 changes: 1 addition & 1 deletion entities/Document.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ publication date: [Date](../datatypes/Date.md) in case the document has gone thr

<a name="rel__presents-decision">presents-decision</a> / [is-expressed-by](../entities/Decision.md#user-content-rel__is-expressed-by) : A Document can present a [Decision](../entities/Decision.md).

<a name="rel__awarded-by">awarded-by</a> / [awarded-for](../entities/Prize_Award.md#user-content-rel__awarded-for) : A Document can be awarded by a [Prize Award](../entities/Prize_Award.md).
<a name="rel__awarded-by">awarded-by</a> / [awarded-for-a-document](../entities/Prize_Award.md#user-content-rel__awarded-for-a-document) : A Document can be awarded by a [Prize Award](../entities/Prize_Award.md).

<a name="rel__proves">proves</a> / [is-evidenced-by](../entities/Activity.md#user-content-rel__is-evidenced-by) : A Document can provide evidence of any number of [Activities](../entities/Activity.md).

Expand Down
3 changes: 3 additions & 0 deletions entities/Event.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ contacts : List<[Contact_Information](../datatypes/Contact_Information.md)>

<a name="rel__belongs-to-series">belongs-to-series</a> / [has-instances](../entities/Event_Series.md#user-content-rel__has-instances) : An Event can be an instance of [Event Series](../entities/Event_Series.md).

<a name="rel__awarded-by">awarded-by</a> / [awarded-for-an-event](../entities/Prize_Award.md#user-content-rel__awarded-for-an-event) : An Event can be awarded by a [Prize Award](../entities/Prize_Award.md).


---
## Matches
Narrow match of Schema.org [Event](https://schema.org/Event).
Expand Down
15 changes: 13 additions & 2 deletions entities/Prize_Award.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,26 @@
A [prize](../entities/Prize.md) or a sum of money that a person or organization is given for an achievement.<sup>[1](#fn1)</sup>

## Attributes
FIXME

statement : [Multilingual String](../datatypes/Multilingual_String.md)
date : [Date](../datatypes/Date.md)

## Relationships

<a name="rel__awards">awards</a> / [is-awarded-as](../entities/Prize.md#user-content-rel__is-awarded-as) : A Prize Award awards a specific [Prize](../entities/Prize.md).

<a name="rel__has-recipient">has-recipient</a> / [is-recipient-of](../entities/Agent.md#user-content-rel__is-recipient-of) : A Prize Award can have any number of recipients, instances of [Agent](../entities/Agent.md).

<a name="rel__awarded-for">awarded-for</a> / [awarded-by](../entities/Document.md#user-content-rel__awarded-by) : A Prize can be awarded for a [Document](../entities/Document.md).
<a name="rel__awarded-for-a-document">awarded-for-a-document</a> / [awarded-by](../entities/Document.md#user-content-rel__awarded-by) : A Prize can be awarded for a [Document](../entities/Document.md).

<a name="rel__awarded-for-a-project">awarded-for-a-project</a> / [awarded-by](../entities/Project.md#user-content-rel__awarded-by) : A Prize can be awarded for a [Project](../entities/Project.md).

<a name="rel__awarded-for-an-event">awarded-for-an-event</a> / [awarded-by](../entities/Event.md#user-content-rel__awarded-by) : A Prize can be awarded for an [Event](../entities/Event.md).

<a name="rel__awarded-by-whom">awarded-by-whom</a> / [awards-prize](../entities/Event.md#user-content-rel__awards-prize) : A Prize can be awarded by any number of [Agents](../entities/Agent.md).

<a name="rel__has-contribution">has-contribution</a> / [has-target](../entities/Contribution_to_Prize_Awards.md#user-content-rel__has-target) : A Prize Award can have any number of [contributions](../entities/Contribution_to_Prize_Awards.md) that help its organization.


---
## Matches
Expand Down
3 changes: 3 additions & 0 deletions entities/Project.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ acronym : [String](../datatypes/String.md)

<a name="rel__has-contribution">has-contribution</a> / [has-target](../entities/Contribution_to_Project.md#user-content-rel__has-target) : A Project can have any number of [contributions](../entities/Contribution_to_Project.md) that help it happen.

<a name="rel__awarded-by">awarded-by</a> / [awarded-for-a-project](../entities/Prize_Award.md#user-content-rel__awarded-for-a-project) : A Project can be awarded by a [Prize Award](../entities/Prize_Award.md).


---
## Matches

Expand Down

0 comments on commit 3b3477c

Please sign in to comment.