updates for 2024-1

slonl · Apr 3, 2024 · e98813e · e98813e
1 parent 2e553d8
commit e98813e
Show file tree

Hide file tree

Showing 9 changed files with 16,879 additions and 1,373 deletions.
diff --git a/context.json b/context.json
@@ -3,7 +3,7 @@
 	"$schema": "http://json-schema.org/draft-07/schema#",
 	"type": "object",
 	"definitions": {
-		"fo_domein": {
+		"fo_set": {
 			"allOf": [ 
 				{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" },
 				{
@@ -14,15 +14,46 @@
 								{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/vakleergebied" } }
 							]
 						},
+						"fo_domein_id": {
+							"allOf": [
+								{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
+								{ "items": { "itemTypeReference": "#/definitions/fo_domein" } }
+							]
+						},
+						"prefix": { "type": "string" },
+						"karakteristiek": { "type": "string" }
+					},
+					"required": ["id", "title", "vakleergebied_id", "fo_domein_id"]
+				}
+			]
+		},
+		"fo_domein": {
+			"allOf": [ 
+				{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" },
+				{
+					"properties": {
 						"fo_subdomein_id": {
 							"allOf": [
 								{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
 								{ "items": { "itemTypeReference": "#/definitions/fo_subdomein" } }
 							]
 						},
+						"fo_doelzin_id": {
+							"allOf": [
+								{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
+								{ "items": { "itemTypeReference": "#/definitions/fo_doelzin" } }
+							]
+						},
 						"prefix": { "type": "string" }
 					},
-					"required": ["id", "title", "vakleergebied_id", "fo_subdomein_id"]
+				"anyOf": [
+					{
+						"required": ["id","title","fo_subdomein_id"]
+					},
+					{
+						"required": ["id","title","fo_doelzin_id"]
+					}
+				]			
 				}
 			]
 		},
@@ -39,7 +70,7 @@
 						},
 						"prefix": { "type": "string" }
 					},
-					"required": ["id", "title", "fo_doelzin_id"]
+					"required": ["id", "title","fo_doelzin_id"]
 				}
 			]
 		},
@@ -61,17 +92,10 @@
 							]
 						},
 						"prefix": { "type": "string" },
-						"niveau_id" : {
-							"allOf": [
-								{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-								{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/niveau" } }
-							]
-						},
-						"soort": { "type": "string",
-								  "enum": ["kerndoel", "eindterm"]	
-						}
+						"soort": { "type": "string",   "enum": ["kerndoel", "eindterm"]	},
+						"ce_se": { "type": "string" }
 					},
-					"required": ["id", "title", "fo_toelichting_id", "fo_uitwerking_id"]
+					"required": ["id", "title", "fo_uitwerking_id"]
 				}
 			]
 		},
@@ -82,6 +106,12 @@
 					"properties": {
 						"prefix": { "type": "string" }
 					},
+					"niveau_id" : {
+						"allOf": [
+							{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
+							{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/niveau" } }
+						]
+					},
 					"required": ["id", "title"]
 				}
 			]
@@ -93,12 +123,24 @@
 					"properties": {
 						"prefix": { "type": "string" }
 					},
+					"niveau_id" : {
+						"allOf": [
+							{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
+							{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/niveau" } }
+						]
+					},
 					"required": ["id", "title"]
 				}
 			]
 		},
 		"allEntities" : {
 			"properties" : {
+				"fo_set_id" : {
+					"allOf": [ {"$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray"} ],
+					"items": {
+						"itemTypeReference": "#/definitions/fo_set"
+					}
+				},
 				"fo_domein_id" : {
 					"allOf": [ {"$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray"} ],
 					"items": {
@@ -133,6 +175,13 @@
 		}
 	},
 	"properties": {
+		"fo_set": {
+			"#file": "data/sets.json",
+			"type" : "array",
+			"items": {
+				"$ref": "#/definitions/fo_set"
+			}
+		},
 		"fo_domein": {
 			"#file": "data/domeinen.json",
 			"type" : "array",
@@ -173,5 +222,5 @@
 			"type" : "array"
 		}
 	},
-	"required": ["fo_domein","fo_subdomein","fo_doelzin","fo_uitwerking","fo_toelichting"]
+	"required": ["fo_set","fo_domein","fo_subdomein","fo_doelzin","fo_uitwerking","fo_toelichting"]
 }