Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions js/LearningObjectives.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ export const SCHEMA = {
"description": "Schema for Learning Objectives mapping",
"additionalProperties": false,
"definitions": {
"uuid": {
"hex-uuid": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
"description": "A unique identifier in the form of a UUID v4 or v5"
"pattern": "^[0-9a-f]{32}$",
"description": "A unique identifier in the form of the compact hex representations of a UUID v4 or v5"
},
"learning_objective_id": {
"$ref": "#/definitions/uuid",
"$ref": "#/definitions/hex-uuid",
"description": "Unique identifier for the Learning Objective"
}
},
Expand Down Expand Up @@ -51,7 +51,7 @@ export const SCHEMA = {
"minProperties": 1,
"additionalProperties": false,
"patternProperties": {
"^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$": {
"^[0-9a-f]{32}$": {
"type": "array",
"items": {
"$ref": "#/definitions/learning_objective_id"
Expand Down
6 changes: 3 additions & 3 deletions js/MasteryCriteria.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const SCHEMA = {
"minItems": 2,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
"pattern": "^[0-9a-f]{32}$"
},
"description": "List of assessment item UUIDs for version A and B of the pre/post test"
},
Expand All @@ -52,7 +52,7 @@ export const SCHEMA = {
"minItems": 1,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
"pattern": "^[0-9a-f]{32}$"
},
"description": "List of assessment item UUIDs for version A of the pre/post test"
},
Expand All @@ -61,7 +61,7 @@ export const SCHEMA = {
"minItems": 1,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
"pattern": "^[0-9a-f]{32}$"
},
"description": "List of assessment item UUIDs for version B of the pre/post test"
}
Expand Down
2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"version": "0.2.13"
"version": "0.2.14"
}
10 changes: 5 additions & 5 deletions le_utils/constants/learning_objectives.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"description": "Schema for Learning Objectives mapping",
"additionalProperties": False,
"definitions": {
"uuid": {
"hex-uuid": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
"description": "A unique identifier in the form of a UUID v4 or v5",
"pattern": "^[0-9a-f]{32}$",
"description": "A unique identifier in the form of the compact hex representations of a UUID v4 or v5",
},
"learning_objective_id": {
"$ref": "#/definitions/uuid",
"$ref": "#/definitions/hex-uuid",
"description": "Unique identifier for the Learning Objective",
},
},
Expand Down Expand Up @@ -55,7 +55,7 @@
"minProperties": 1,
"additionalProperties": False,
"patternProperties": {
"^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$": {
"^[0-9a-f]{32}$": {
"type": "array",
"items": {"$ref": "#/definitions/learning_objective_id"},
}
Expand Down
15 changes: 3 additions & 12 deletions le_utils/constants/mastery_criteria.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,19 @@
"assessment_item_ids": {
"type": "array",
"minItems": 2,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
},
"items": {"type": "string", "pattern": "^[0-9a-f]{32}$"},
"description": "List of assessment item UUIDs for version A and B of the pre/post test",
},
"version_a_item_ids": {
"type": "array",
"minItems": 1,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
},
"items": {"type": "string", "pattern": "^[0-9a-f]{32}$"},
"description": "List of assessment item UUIDs for version A of the pre/post test",
},
"version_b_item_ids": {
"type": "array",
"minItems": 1,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
},
"items": {"type": "string", "pattern": "^[0-9a-f]{32}$"},
"description": "List of assessment item UUIDs for version B of the pre/post test",
},
},
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
setup(
name="le-utils",
packages=find_packages(),
version="0.2.13",
version="0.2.14",
description="LE-Utils contains shared constants used in Kolibri, Ricecooker, and Kolibri Studio.",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down
10 changes: 5 additions & 5 deletions spec/schema-learning_objectives.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"description": "Schema for Learning Objectives mapping",
"additionalProperties": false,
"definitions": {
"uuid": {
"hex-uuid": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
"description": "A unique identifier in the form of a UUID v4 or v5"
"pattern": "^[0-9a-f]{32}$",
"description": "A unique identifier in the form of the compact hex representations of a UUID v4 or v5"
},
"learning_objective_id": {
"$ref": "#/definitions/uuid",
"$ref": "#/definitions/hex-uuid",
"description": "Unique identifier for the Learning Objective"
}
},
Expand Down Expand Up @@ -46,7 +46,7 @@
"minProperties": 1,
"additionalProperties": false,
"patternProperties": {
"^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$": {
"^[0-9a-f]{32}$": {
"type": "array",
"items": {
"$ref": "#/definitions/learning_objective_id"
Expand Down
6 changes: 3 additions & 3 deletions spec/schema-mastery_criteria.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"minItems": 2,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
"pattern": "^[0-9a-f]{32}$"
},
"description": "List of assessment item UUIDs for version A and B of the pre/post test"
},
Expand All @@ -38,7 +38,7 @@
"minItems": 1,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
"pattern": "^[0-9a-f]{32}$"
},
"description": "List of assessment item UUIDs for version A of the pre/post test"
},
Expand All @@ -47,7 +47,7 @@
"minItems": 1,
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[45][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
"pattern": "^[0-9a-f]{32}$"
},
"description": "List of assessment item UUIDs for version B of the pre/post test"
}
Expand Down
Loading
Loading