Merge branch 'BugFix-Issue-629' into unstable

ucoProject · Feb 26, 2025 · bd2b412 · bd2b412
2 parents 3802423 + d524b8e
commit bd2b412
Show file tree

Hide file tree

Showing 5 changed files with 441 additions and 451 deletions.
diff --git a/ontology/uco/action/action.ttl b/ontology/uco/action/action.ttl
@@ -42,6 +42,7 @@ action:Action
 	rdfs:comment "An action is something that may be done or performed."@en ;
 	owl:disjointWith core:Event ;
 	sh:property
+		action:Action-actionStatus-in-shape ,
 		[
 			sh:class action:Action ;
 			sh:nodeKind sh:IRI ;
@@ -113,20 +114,6 @@ action:Action
 			sh:path action:actionStatus ;
 			sh:severity sh:Warning ;
 		] ,
-		[
-			sh:in (
-				"Complete/Finish"
-				"Error"
-				"Fail"
-				"Ongoing"
-				"Pending"
-				"Success"
-				"Unknown"
-			) ;
-			sh:message "Value is not member of the vocabulary ActionStatusTypeVocab." ;
-			sh:path action:actionStatus ;
-			sh:severity sh:Info ;
-		] ,
 		[
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
@@ -136,6 +123,22 @@ action:Action
 	sh:targetClass action:Action ;
 	.
 
+action:Action-actionStatus-in-shape
+	a sh:PropertyShape ;
+	sh:in (
+		"Complete/Finish"
+		"Error"
+		"Fail"
+		"Ongoing"
+		"Pending"
+		"Success"
+		"Unknown"
+	) ;
+	sh:message "Value is not member of the vocabulary ActionStatusTypeVocab." ;
+	sh:path action:actionStatus ;
+	sh:severity sh:Info ;
+	.
+
 action:Action-disjointWith-Event-shape
 	a sh:NodeShape ;
 	sh:message "action:Action and core:Event are disjoint classes."@en ;
@@ -219,6 +222,7 @@ action:ActionFrequencyFacet
 	rdfs:label "ActionFrequencyFacet"@en ;
 	rdfs:comment "An action frequency facet is a grouping of characteristics unique to the frequency of occurrence for an action."@en ;
 	sh:property
+		action:ActionFrequencyFacet-trend-in-shape ,
 		[
 			sh:datatype xsd:decimal ;
 			sh:maxCount "1"^^xsd:integer ;
@@ -246,15 +250,6 @@ action:ActionFrequencyFacet
 			sh:path action:trend ;
 			sh:severity sh:Warning ;
 		] ,
-		[
-			sh:in (
-				"Decreasing"
-				"Increasing"
-			) ;
-			sh:message "Value is not member of the vocabulary TrendVocab." ;
-			sh:path action:trend ;
-			sh:severity sh:Info ;
-		] ,
 		[
 			sh:maxCount "1"^^xsd:integer ;
 			sh:minCount "1"^^xsd:integer ;
@@ -265,6 +260,17 @@ action:ActionFrequencyFacet
 	sh:targetClass action:ActionFrequencyFacet ;
 	.
 
+action:ActionFrequencyFacet-trend-in-shape
+	a sh:PropertyShape ;
+	sh:in (
+		"Decreasing"
+		"Increasing"
+	) ;
+	sh:message "Value is not member of the vocabulary TrendVocab." ;
+	sh:path action:trend ;
+	sh:severity sh:Info ;
+	.
+
 action:ActionLifecycle
 	a
 		owl:Class ,