Skip to content

Commit

Permalink
Merge pull request #226 from fugu13/lastfixes
Browse files Browse the repository at this point in the history
Fix a few minor things and change to 1.0 release version!
  • Loading branch information
fugu13 authored Aug 1, 2017
2 parents 0f80331 + f4f68c7 commit 2ab26f5
Showing 4 changed files with 87 additions and 87 deletions.
112 changes: 56 additions & 56 deletions cmi5-profile.jsonld
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
"prefLabel": {
"en": "waived"
}
},
},
{
"@id": "https://w3id.org/xapi/cmi5/activities/block",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
@@ -52,7 +52,7 @@
"prefLabel": {
"en": "block"
}
},
},
{
"@id": "https://w3id.org/xapi/cmi5/activities/course",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
@@ -63,8 +63,8 @@
"prefLabel": {
"en": "course"
}
},
},

{
"id": "https://w3id.org/xapi/cmi5/result/extensions/progress",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
@@ -164,7 +164,7 @@
],
"templates": [
{
"id": "_:generalrestrictions",
"id": "https://w3id.org/xapi/cmi5#generalrestrictions",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"prefLabel": {
@@ -190,7 +190,7 @@
}
]
}, {
"id": "_:launched",
"id": "https://w3id.org/xapi/cmi5#launched",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/launched",
@@ -232,7 +232,7 @@
}
]
}, {
"id": "_:initialized",
"id": "https://w3id.org/xapi/cmi5#initialized",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/initialized",
@@ -255,7 +255,7 @@
}
]
}, {
"id": "_:completed",
"id": "https://w3id.org/xapi/cmi5#completed",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/completed",
@@ -285,7 +285,7 @@
}
]
}, {
"id": "_:passed",
"id": "https://w3id.org/xapi/cmi5#passed",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/passed",
@@ -315,7 +315,7 @@
}
]
}, {
"id": "_:failed",
"id": "https://w3id.org/xapi/cmi5#failed",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/failed",
@@ -345,7 +345,7 @@
}
]
}, {
"id": "_:abandoned",
"id": "https://w3id.org/xapi/cmi5#abandoned",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "https://w3id.org/xapi/adl/verbs/abandoned",
@@ -373,7 +373,7 @@
}
]
}, {
"id": "_:waived",
"id": "https://w3id.org/xapi/cmi5#waived",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/waived",
@@ -403,7 +403,7 @@
}
]
}, {
"id": "_:terminated",
"id": "https://w3id.org/xapi/cmi5#terminated",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/terminated",
@@ -431,7 +431,7 @@
}
]
}, {
"id": "_:satisfied",
"id": "https://w3id.org/xapi/cmi5#satisfied",
"type": "StatementTemplate",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"verb": "http://adlnet.gov/expapi/verbs/satisfied",
@@ -464,123 +464,123 @@
}],
"patterns": [
{
"id": "_:satisfieds",
"id": "https://w3id.org/xapi/cmi5#satisfieds",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"zeroOrMore": "_:satisfied"
"zeroOrMore": "https://w3id.org/xapi/cmi5#satisfied"
},
{
"id": "_:waivedsession",
"id": "https://w3id.org/xapi/cmi5#waivedsession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:satisfieds", "_:waived", "_:satisfieds"]
"sequence": ["https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#waived", "https://w3id.org/xapi/cmi5#satisfieds"]
},
{
"id": "_:noresultsession",
"id": "https://w3id.org/xapi/cmi5#noresultsession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:launched", "_:initialized", "_:terminatedorabandoned"]
"sequence": ["https://w3id.org/xapi/cmi5#launched", "https://w3id.org/xapi/cmi5#initialized", "https://w3id.org/xapi/cmi5#terminatedorabandoned"]
},
{
"id": "completionnosuccesssession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:launched", "_:initialized", "_:completed", "_:satisfieds", "_:terminatedorabandoned"]
"sequence": ["https://w3id.org/xapi/cmi5#launched", "https://w3id.org/xapi/cmi5#initialized", "https://w3id.org/xapi/cmi5#completed", "https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#terminatedorabandoned"]
},
{
"id": "passedsession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:launched", "_:initialized", "_:passed", "_:satisfieds", "_:terminatedorabandoned"]
"sequence": ["https://w3id.org/xapi/cmi5#launched", "https://w3id.org/xapi/cmi5#initialized", "https://w3id.org/xapi/cmi5#passed", "https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#terminatedorabandoned"]
},
{
"id": "_:completionpassedsession",
"id": "https://w3id.org/xapi/cmi5#completionpassedsession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:launched", "_:initialized", "_:completedandpassed", "_:satisfieds", "_:terminatedorabandoned"]
"sequence": ["https://w3id.org/xapi/cmi5#launched", "https://w3id.org/xapi/cmi5#initialized", "https://w3id.org/xapi/cmi5#completedandpassed", "https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#terminatedorabandoned"]
},
{
"id": "_:failedsession",
"id": "https://w3id.org/xapi/cmi5#failedsession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:launched", "_:initialized", "_:failed", "_:terminatedorabandoned"]
"sequence": ["https://w3id.org/xapi/cmi5#launched", "https://w3id.org/xapi/cmi5#initialized", "https://w3id.org/xapi/cmi5#failed", "https://w3id.org/xapi/cmi5#terminatedorabandoned"]
},
{
"id": "_:completionmaybefailedsession",
"id": "https://w3id.org/xapi/cmi5#completionmaybefailedsession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:launched", "_:initialized", "_:completedandmaybefailed", "_:satisfieds", "_:terminatedorabandoned"]
"sequence": ["https://w3id.org/xapi/cmi5#launched", "https://w3id.org/xapi/cmi5#initialized", "https://w3id.org/xapi/cmi5#completedandmaybefailed", "https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#terminatedorabandoned"]
},
{
"id": "_:terminatedorabandoned",
"id": "https://w3id.org/xapi/cmi5#terminatedorabandoned",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"alternates": ["_:terminated", "_:abandoned"]
"alternates": ["https://w3id.org/xapi/cmi5#terminated", "https://w3id.org/xapi/cmi5#abandoned"]
},
{
"id": "_:completedandpassed",
"id": "https://w3id.org/xapi/cmi5#completedandpassed",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"alternates": ["_:completedthenpassed", "_:passedthencompleted"]
"alternates": ["https://w3id.org/xapi/cmi5#completedthenpassed", "https://w3id.org/xapi/cmi5#passedthencompleted"]
},
{
"id": "_:completedthenpassed",
"id": "https://w3id.org/xapi/cmi5#completedthenpassed",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:completed", "_:satisfieds", "_:passed"]
"sequence": ["https://w3id.org/xapi/cmi5#completed", "https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#passed"]
},
{
"id": "_:passedthencompleted",
"id": "https://w3id.org/xapi/cmi5#passedthencompleted",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:passed", "_:satisfieds", "_:completed"]
"sequence": ["https://w3id.org/xapi/cmi5#passed", "https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#completed"]
},
{
"id": "_:completedandmaybefailed",
"id": "https://w3id.org/xapi/cmi5#completedandmaybefailed",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"alternates": ["_:maybecompletedthenfailed", "_:failedthenmaybecompleted"]
"alternates": ["https://w3id.org/xapi/cmi5#maybecompletedthenfailed", "https://w3id.org/xapi/cmi5#failedthenmaybecompleted"]
},
{
"id": "_:maybecompletedthenfailed",
"id": "https://w3id.org/xapi/cmi5#maybecompletedthenfailed",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:maybecompleted", "_:satisfieds", "_:failed"]
"sequence": ["https://w3id.org/xapi/cmi5#maybecompleted", "https://w3id.org/xapi/cmi5#satisfieds", "https://w3id.org/xapi/cmi5#failed"]
},
{
"id": "_:failedthenmaybecompleted",
"id": "https://w3id.org/xapi/cmi5#failedthenmaybecompleted",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:failed", "_:maybecompleted"]
"sequence": ["https://w3id.org/xapi/cmi5#failed", "https://w3id.org/xapi/cmi5#maybecompleted"]
},
{
"id": "_:maybecompleted",
"id": "https://w3id.org/xapi/cmi5#maybecompleted",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"optional": "_:completed"
"optional": "https://w3id.org/xapi/cmi5#completed"
},
{
"id": "_:typicalsession",
"id": "https://w3id.org/xapi/cmi5#typicalsession",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"alternates": [
"_:completionmaybefailedsession",
"_:completionpassedsession",
"_:failedsession",
"_:noresultsession",
"_:passedsession",
"_:completionnosuccesssession",
"_:waivedsession"
"https://w3id.org/xapi/cmi5#completionmaybefailedsession",
"https://w3id.org/xapi/cmi5#completionpassedsession",
"https://w3id.org/xapi/cmi5#failedsession",
"https://w3id.org/xapi/cmi5#noresultsession",
"https://w3id.org/xapi/cmi5#passedsession",
"https://w3id.org/xapi/cmi5#completionnosuccesssession",
"https://w3id.org/xapi/cmi5#waivedsession"
]
},
{
"id": "_:typicalsessions",
"id": "https://w3id.org/xapi/cmi5#typicalsessions",
"type": "Pattern",
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"zeroOrMore": "_:typicalsession"
"zeroOrMore": "https://w3id.org/xapi/cmi5#typicalsession"
},
{
"id": "_:toplevel",
"id": "https://w3id.org/xapi/cmi5#toplevel",
"type": "Pattern",
"primary": true,
"prefLabel": {
@@ -590,7 +590,7 @@
"en": "This pattern describes the sequence of statements sent over the an entire course registration"
},
"inScheme": "https://w3id.org/xapi/cmi5/context/categories/cmi5",
"sequence": ["_:satisfieds", "typicalsessions"]
"sequence": ["https://w3id.org/xapi/cmi5#satisfieds", "typicalsessions"]
}


8 changes: 4 additions & 4 deletions profile-context.jsonld
Original file line number Diff line number Diff line change
@@ -225,20 +225,20 @@
"@container": "@set"
},
"optional": {
"@id": "profile:alternates",
"@id": "profile:optional",
"@type": "@id"
},
"oneOrMore": {
"@id": "profile:alternates",
"@id": "profile:oneOrMore",
"@type": "@id"
},
"sequence": {
"@id": "profile:alternates",
"@id": "profile:sequence",
"@type": "@id",
"@container": "@list"
},
"zeroOrMore": {
"@id": "profile:alternates",
"@id": "profile:zeroOrMore",
"@type": "@id"
}
}
14 changes: 7 additions & 7 deletions xapi-profiles-structure.md
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ Part Three: [xAPI Profiles Communication and Processing Specification](./xapi-pr
* 2.1. [Statement Template Validation](./xapi-profiles-communication#2.1)
* 2.2. [Pattern Validation](./xapi-profiles-communication#2.2)
* 3.0. [Libraries](./xapi-profiles-communication#3.0)



<a name="parttwo"></a>
# Part Two: xAPI Profiles Document Structure Specification
@@ -82,9 +82,9 @@ A Profile includes a variety of metadata, both natural language text for humans
Property | Type | Description | Required
-------- | ---- | ----------- | --------
`id` | IRI | The IRI of the Profile overall (not a specific version) | Required
`@context` | URI | SHOULD be `http://example.org/figure/out/where/this/goes/profile-context.jsonld` and MUST contain this URI if array-valued. | Required
`@context` | URI | SHOULD be `https://w3id.org/xapi/profiles/context` and MUST contain this URI if array-valued. | Required
`type` | String | MUST be `Profile`. | Required
`conformsTo` | URI | Canonical URI of the Profile specification version conformed to. The Profile specification version of this document is https://github.com/DataInteroperability/xapi-profiles/tree/master#1.0-development, and it is a development version that may undergo incompatible changes without updating the version URI. | Required
`conformsTo` | URI | Canonical URI of the Profile specification version conformed to. The Profile specification version of this document is https://w3id.org/xapi/profiles#1.0. | Required
`prefLabel` | Object | Language map of names for this Profile. | Required
`definition` | Object | Language map of descriptions for this Profile. If there are additional rules for the Profile as a whole that cannot be expressed using this specification, include them here, or at the seeAlso URL. | Required
`seeAlso` | URL | A URL containing information about the Profile. Recommended instead of especially long definitions. | Optional
@@ -364,7 +364,7 @@ Property | Type | Description | Required

Name | Values
---- | ------
`@context` | SHOULD be `http://example.org/host/somewhere/activity-context.jsonld` and MUST contain this URI if array-valued.
`@context` | SHOULD be `https://w3id.org/xapi/profiles/activity-context` and MUST contain this URI if array-valued.
*other properties* | All as in xAPI 1.0.x Activity Definitions, defined at https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#activity-definition

Except for `@context`, the activityDefinition in this Concept MUST be a legal xAPI Activity Definition.
@@ -392,7 +392,7 @@ A Profile for competitive events might define Activities to represent standardiz
"type": "Activity",
"inScheme": "http://example.org/profiles/sports/v2",
"activityDefinition": {
"@context": "http://example.org/host/somewhere/activity-context.jsonld"
"@context": "https://w3id.org/xapi/profiles/activity-context"
"type": "http://example.org/profiles/sports/activitytypes/event"
"name": {
"en": "100 Meter Dash"
@@ -581,7 +581,7 @@ Learning Record Providers:
* when only one Profile or only one Pattern occurrence of each Profile will be used, in a given registration, subregistrations SHOULD NOT be used.
* if any Statements following a primary Pattern do not contain a subregistration, all Statements with the same registration and Profile version in category MUST follow that primary Pattern.
* if any Statements with a given registration contain the subregistration extension, then all Statements with that registration with the same subregistration identifier for a given Profile version MUST follow the same primary Pattern.
* the extension key of the subregistration extension is https://TODO/REPLACE/WITH/REAL/ID (a value in the w3id xAPI space will be used for this).
* the extension key of the subregistration extension is https://w3id.org/xapi/profiles/extensions/subregistration.
* the subregistration extension MUST only be present in Statements with a registration.
* the subregistration extension is an array-valued context extension. The array MUST NOT be empty. Each value of the array MUST be an object with the properties in the table below.

Loading

0 comments on commit 2ab26f5

Please sign in to comment.