added all changes from editor branch

slonl · Dec 12, 2022 · 3aabda1 · 3aabda1
1 parent 8fea714
commit 3aabda1
Show file tree

Hide file tree

Showing 7 changed files with 194,934 additions and 44,446 deletions.
diff --git a/context.json b/context.json
@@ -1,33 +1,52 @@
 {
 	"definitions": {
-		"syllabus_specifieke_eindterm": {
+		"syllabus_vakleergebied": {
 			"allOf": [ { "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" } ],
 			"properties": {
-				"description": { "type": "string" },
-				"ce_se": { "type": "string" },
-				"prefix": { "type": "string" },
+				"vakleergebied_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/vakleergebied" } }
+					]
+				}
+			},
+			"required": [ "id", "title", "vakleergebied_id" ]			
+		},
+		"syllabus" : {
+			"allOf": [ { "$ref":"https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" } ],
+			"properties" : {
+				"ingangsdatum" : { "type" : "string" },
+				"examenjaar" : { "type" : "string" },
+				"url" : { "type" : "string" },
+				"versie" : { "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" } }
 					]
 				},
-				"examenprogramma_eindterm_id" : {
+				"examenprogramma_id": {
 					"allOf": [
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_eindterm" } }
+						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma" } }
 					]
 				},
-				"examenprogramma_domein_id": {
+				"syllabus_vakleergebied_id" : {
 					"allOf": [
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_domein" } }
+						{ "items": { "itemTypeReference": "#/definitions/syllabus_vakleergebied" } }
 					]
 				},
-				"examenprogramma_subdomein_id": {
+				"syllabus_specifieke_eindterm_id": {
 					"allOf": [
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_subdomein" } }
+						{ "items": { "itemTypeReference": "#/definitions/syllabus_specifieke_eindterm" } }
+					]
+				},
+				"syllabus_toelichting_id": {
+					"allOf": [
+						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
+						{ "items": { "itemTypeReference": "#/definitions/syllabus_toelichting" } }
 					]
 				},
 				"syllabus_vakbegrip_id": {
@@ -36,20 +55,15 @@
 						{ "items": { "itemTypeReference": "#/definitions/syllabus_vakbegrip" } }
 					]
 				}
-			}
+			},
+			"required": ["id", "title", "examenprogramma_id", "syllabus_specifieke_eindterm_id"]
 		},
-		"syllabus_toelichting" : {
+		"syllabus_specifieke_eindterm": {
 			"allOf": [ { "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" } ],
 			"properties": {
 				"description": { "type": "string" },
 				"ce_se": { "type": "string" },
 				"prefix": { "type": "string" },
-				"syllabus_specifieke_eindterm_id" : {
-					"allOf": [
-						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "#/definitions/syllabus_specifieke_eindterm" } }
-					]
-				},
 				"examenprogramma_eindterm_id" : {
 					"allOf": [
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
@@ -67,10 +81,22 @@
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
 						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_subdomein" } }
 					]
+				},
+				"syllabus_vakbegrip_id": {
+					"allOf": [
+						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
+						{ "items": { "itemTypeReference": "#/definitions/syllabus_vakbegrip" } }
+					]
+				},
+				"syllabus_toelichting_id": {
+					"allOf": [
+						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
+						{ "items": { "itemTypeReference": "#/definitions/syllabus_toelichting" } }
+					]
 				}
 			}
 		},
-		"syllabus_vakbegrip": {
+		"syllabus_toelichting" : {
 			"allOf": [ { "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" } ],
 			"properties": {
 				"description": { "type": "string" },
@@ -81,69 +107,41 @@
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
 						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_eindterm" } }
 					]
-				}
-			}
-		},
-		"syllabus_vakleergebied": {
-			"allOf": [ { "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" } ],
-			"properties": {
-				"vakleergebied_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/vakleergebied" } }
-					]
-				}
-			},
-			"required": [ "id", "title", "vakleergebied_id" ]			
-		},
-		"syllabus" : {
-			"allOf": [ { "$ref":"https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" } ],
-			"properties" : {
-				"ingangsdatum" : { "type" : "string" },
-				"examenjaar" : { "type" : "string" },
-				"url" : { "type" : "string" },
-				"versie" : { "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" } }
-					]
 				},
-				"examenprogramma_id": {
-					"allOf": [
-						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma" } }
-					]
-				},
-				"syllabus_vakleergebied_id" : {
-					"allOf": [
-						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "#/definitions/syllabus_vakleergebied" } }
-					]
-				},
-				"syllabus_specifieke_eindterm_id": {
+				"examenprogramma_domein_id": {
 					"allOf": [
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "#/definitions/syllabus_specifieke_eindterm" } }
+						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_domein" } }
 					]
 				},
-				"syllabus_toelichting_id": {
+				"examenprogramma_subdomein_id": {
 					"allOf": [
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "#/definitions/syllabus_toelichting" } }
+						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_subdomein" } }
 					]
-				},
-				"syllabus_vakbegrip_id": {
+				}
+			}
+		},
+		"syllabus_vakbegrip": {
+			"allOf": [ { "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/base" } ],
+			"properties": {
+				"description": { "type": "string" },
+				"ce_se": { "type": "string" },
+				"prefix": { "type": "string" },
+				"examenprogramma_eindterm_id" : {
 					"allOf": [
 						{ "$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray" },
-						{ "items": { "itemTypeReference": "#/definitions/syllabus_vakbegrip" } }
+						{ "items": { "itemTypeReference": "https://opendata.slo.nl/curriculum/schemas/curriculum-examenprogramma/context.json#/definitions/examenprogramma_eindterm" } }
 					]
 				}
-			},
-			"required": ["id", "title", "examenprogramma_id", "syllabus_specifieke_eindterm_id"]
+			}
 		},
         "allEntities" : {
             "properties" : {
+                "syllabus_vakleergebied_id" : {
+                    "allOf": [ {"$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray"} ],
+                    "items": {"itemTypeReference": "#/definitions/syllabus_vakleergebied" }
+                },
                 "syllabus_id" : {
                     "allOf": [ {"$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray"} ],
                     "items": { "itemTypeReference": "#/definitions/syllabus" }
@@ -159,10 +157,6 @@
                 "syllabus_vakbegrip_id" : {
                     "allOf": [ {"$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray"} ],
                     "items": {"itemTypeReference": "#/definitions/syllabus_vakbegrip" }
-                },
-                "syllabus_vakleergebied_id" : {
-                    "allOf": [ {"$ref": "https://opendata.slo.nl/curriculum/schemas/curriculum-basis/context.json#/definitions/uuidArray"} ],
-                    "items": {"itemTypeReference": "#/definitions/syllabus_vakleergebied" }
                 }
             }
         }
@@ -171,6 +165,20 @@
 	"$schema": "http://json-schema.org/draft-07/schema#",
 	"type": "object",
 	"properties": {
+		"syllabus_vakleergebied": {
+			"#file": "data/vakleergebieden.json",
+			"type" : "array",
+			"items": {
+				"$ref": "#/definitions/syllabus_vakleergebied"
+			}
+		},
+		"syllabus" : {
+			"#file": "data/syllabus.json",
+			"type" : "array",
+			"items": {
+				"$ref": "#/definitions/syllabus"
+			}
+		},
 		"syllabus_specifieke_eindterm": {
 			"#file": "data/specifieke_eindtermen.json",
 			"type" : "array",
@@ -192,20 +200,6 @@
 				"$ref": "#/definitions/syllabus_vakbegrip"
 			}
 		},
-		"syllabus_vakleergebied": {
-			"#file": "data/vakleergebieden.json",
-			"type" : "array",
-			"items": {
-				"$ref": "#/definitions/syllabus_vakleergebied"
-			}
-		},
-		"syllabus" : {
-			"#file": "data/syllabus.json",
-			"type" : "array",
-			"items": {
-				"$ref": "#/definitions/syllabus"
-			}
-		},
 		"deprecated": {
 			"#file": "data/deprecated.json",
 			"type" : "array"