From f95f2811d6c16b4fe0692daea91171ddfac1a166 Mon Sep 17 00:00:00 2001
From: jojohoch <joachim.hoch@iqb.hu-berlin.de>
Date: Thu, 6 Jan 2022 16:52:15 +0100
Subject: [PATCH] Revert "[player] Change VopMetaData to verona version 4.0"
This reverts commit 93e62a4ae437f2815d88514eaf268edc487fec15.
Teststudio does not accept verona 4 specification data
---
projects/player/src/app/app.component.ts | 4 +-
projects/player/src/app/models/verona.ts | 5 +-
.../src/app/services/meta-data.service.ts | 4 +-
.../src/app/services/verona-post.service.ts | 2 +-
projects/player/src/html_wrapper/index.html | 59 +++++++------------
projects/player/src/index.html | 48 ++++++---------
6 files changed, 49 insertions(+), 73 deletions(-)
diff --git a/projects/player/src/app/app.component.ts b/projects/player/src/app/app.component.ts
index 8b6cbfa0f..ccb97b70a 100644
--- a/projects/player/src/app/app.component.ts
+++ b/projects/player/src/app/app.component.ts
@@ -41,7 +41,7 @@ export class AppComponent implements OnInit {
ngOnInit(): void {
this.initSubscriptions();
- this.veronaPostService.sendVopReadyNotification({ metadata: this.metaDataService.playerMetadata });
+ this.veronaPostService.sendVopReadyNotification(this.metaDataService.playerMetadata);
this.translateService.addLangs(['de']);
this.translateService.setDefaultLang('de');
registerLocaleData(localeDe);
@@ -76,7 +76,7 @@ export class AppComponent implements OnInit {
data: {
title: this.translateService.instant('dialogTitle.wrongUnitDefinitionType'),
content: this.translateService.instant('dialogContent.wrongUnitDefinitionType',
- { version: this.metaDataService.playerMetadata })
+ { version: this.metaDataService.playerMetadata.supportedUnitDefinitionTypes })
}
});
}
diff --git a/projects/player/src/app/models/verona.ts b/projects/player/src/app/models/verona.ts
index 52db8c41a..b1aa1db02 100644
--- a/projects/player/src/app/models/verona.ts
+++ b/projects/player/src/app/models/verona.ts
@@ -95,7 +95,10 @@ export interface VopReadyNotification extends VopMetaData{
}
export interface VopMetaData {
- metadata: string;
+ apiVersion: string;
+ notSupportedApiFeatures?: string;
+ supportedUnitDefinitionTypes?: string;
+ supportedUnitStateDataTypes?: string;
}
export interface VopStateChangedNotification {
diff --git a/projects/player/src/app/services/meta-data.service.ts b/projects/player/src/app/services/meta-data.service.ts
index a0ed54d38..495247c19 100644
--- a/projects/player/src/app/services/meta-data.service.ts
+++ b/projects/player/src/app/services/meta-data.service.ts
@@ -5,12 +5,12 @@ import { DOCUMENT } from '@angular/common';
providedIn: 'root'
})
export class MetaDataService {
- playerMetadata!: string;
+ playerMetadata!: any;
constructor(@Inject(DOCUMENT) private document: Document) {
const playerMetadata: string | null | undefined = document.getElementById('meta_data')?.textContent;
if (playerMetadata) {
- this.playerMetadata = JSON.stringify(playerMetadata);
+ this.playerMetadata = JSON.parse(playerMetadata);
}
}
diff --git a/projects/player/src/app/services/verona-post.service.ts b/projects/player/src/app/services/verona-post.service.ts
index 247918a24..d4706ae6c 100644
--- a/projects/player/src/app/services/verona-post.service.ts
+++ b/projects/player/src/app/services/verona-post.service.ts
@@ -34,7 +34,7 @@ export class VeronaPostService {
private send(message: VopMessage): void {
// prevent posts in local (dev) mode
- if (this.isStandalone()) {
+ if (!this.isStandalone()) {
window.parent.postMessage(message, '*');
} else {
// eslint-disable-next-line no-console
diff --git a/projects/player/src/html_wrapper/index.html b/projects/player/src/html_wrapper/index.html
index 87af20a5c..5439a5d92 100644
--- a/projects/player/src/html_wrapper/index.html
+++ b/projects/player/src/html_wrapper/index.html
@@ -15,47 +15,32 @@
<script type="application/ld+json" id="meta_data" >
{
- "$schema": "https://raw.githubusercontent.com/verona-interfaces/metadata/master/verona-module-metadata.json",
- "type": "player",
- "id": "iqb-player-aspect",
- "name": [
- {
- "value": "IQB-Player (Aspect)",
- "lang": "de"
- },
- {
- "value": "IQB-Player (Aspect)",
- "lang": "en"
- }
- ],
- "version": "version-placeholder",
- "specVersion": "4.0",
- "description": [
- {
- "value": "Dieser Player wird vom IQB für komplexe Testaufgaben in der Kompetenzdiagnostik verwendet.",
- "lang": "de"
- }
- ],
+ "@context": "https://w3id.org/iqb/verona-modules",
+ "@type": "player",
+ "@id": "iqb-player-aspect",
+ "name": {
+ "de": "IQB-Player (Aspect)",
+ "en": "IQB player (Aspect)"
+ },
"maintainer": {
- "name": [
- {
- "value": "IQB - Institut zur Qualitätsentwicklung im Bildungswesen",
- "lang": "de"
- },
- {
- "value": "IQB - Institute for Educational Quality Improvement",
- "lang": "en"
- }
- ],
+ "name": {
+ "de": "IQB - Institut zur Qualitätsentwicklung im Bildungswesen",
+ "en": "IQB - Institute for Educational Quality Improvement"
+ },
"url": "https://www.iqb.hu-berlin.de",
"email": "iqb-tbadev@hu-berlin.de"
},
- "code": {
- "repositoryType": "git",
- "repositoryUrl": "https://github.com/iqb-berlin/verona-modules-aspect",
- "licenseType": "MIT",
- "licenseUrl": "https://opensource.org/licenses/MIT"
- }
+ "description": {
+ "de": "TODO",
+ "en": "TODO"
+ },
+ "version": "version-placeholder",
+ "apiVersion": "3.0.0",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/iqb-berlin/verona-modules-apect"
+ },
+ "notSupportedFeatures": []
}
</script>
<link rel="stylesheet" href="player.css">
diff --git a/projects/player/src/index.html b/projects/player/src/index.html
index 0d8fba9c3..d1998118e 100644
--- a/projects/player/src/index.html
+++ b/projects/player/src/index.html
@@ -7,44 +7,32 @@
{
"$schema": "https://raw.githubusercontent.com/verona-interfaces/metadata/master/verona-module-metadata.json",
"type": "player",
- "id": "iqb-player-aspect",
- "name": [
- {
- "value": "IQB-Player (Aspect)",
- "lang": "de"
- },
- {
- "value": "IQB-Player (Aspect)",
- "lang": "en"
- }
- ],
- "version": "version-placeholder",
- "specVersion": "4.0",
- "description": [
- {
- "value": "Dieser Player wird vom IQB für komplexe Testaufgaben in der Kompetenzdiagnostik verwendet.",
- "lang": "de"
- }
- ],
+ "id": "verona-player-aspect",
+ "version": "placeholder",
+ "specVersion": "4.0.0",
+ "name": [{
+ "lang": "de",
+ "value": "Verona-Player (Aspect)"
+ }],
"maintainer": {
"name": [
{
- "value": "IQB - Institut zur Qualitätsentwicklung im Bildungswesen",
- "lang": "de"
- },
- {
- "value": "IQB - Institute for Educational Quality Improvement",
- "lang": "en"
+ "lang": "de",
+ "value": "IQB - Institut zur Qualitätsentwicklung im Bildungswesen"
}
],
"url": "https://www.iqb.hu-berlin.de",
"email": "iqb-tbadev@hu-berlin.de"
},
- "code": {
- "repositoryType": "git",
- "repositoryUrl": "https://github.com/iqb-berlin/verona-modules-aspect",
- "licenseType": "MIT",
- "licenseUrl": "https://opensource.org/licenses/MIT"
+ "description": [
+ {
+ "lang": "de",
+ "value": "TODO"
+ }
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/iqb-berlin/verona-modules-apect"
}
}
</script>
--
GitLab