diff --git a/docs/booklet-config.md b/docs/booklet-config.md index c23d6d6d7b744f62adaf4a036996fc1dc0a460d7..ba7768ab4980494b565ad0fba66dc49c26817f00 100644 --- a/docs/booklet-config.md +++ b/docs/booklet-config.md @@ -42,11 +42,24 @@ Ladeverhalten beim Start * "LAZY" (default): Start sobald wie möglich, Laden im Hintergrund fortsetzen * "EAGER": Testheft erst dann starten, wenn alle Inhalte geladen sind -#### `log_mode` +#### `logPolicy` Erfassen und Speichern von Log-Daten - * "OFF": Ausgeschaltet - * "LEAN": Nur wichtige Meldungen - * "RICH" (default): Alles + * "disabled": Ausgeschaltet + * "lean": Nur wichtige Meldungen + * "rich" (default): Alles außer debug-informationen + * "debug": Auch debug-informationen + +#### `pagingMode` +pagingMode (https://verona-interfaces.github.io/player/#operation-publish-vopStartCommand) + * "separate" (default): pages are separated + * "concat-scroll": concat-scroll + * "concat-scroll-snap": concat-scroll-snap + +#### `stateReportPolicy` +stateReportPolicy (https://verona-interfaces.github.io/player/#operation-publish-vopStartCommand) + * "none": pages are separated + * "eager" (default): concat-scroll + * "on-demand": concat-scroll-snap #### `page_navibuttons` Navigationsbuttons für die Seitennavigation (innerhalb einer Aufgabe) diff --git a/src/app/config/booklet-config.json b/src/app/config/booklet-config.json index aa9df76e21bedd60e1fb2818940e6f199c264c64..00e4202cdd97644d95af3fe878e09e85bee49bb8 100644 --- a/src/app/config/booklet-config.json +++ b/src/app/config/booklet-config.json @@ -7,14 +7,33 @@ }, "defaultvalue": "LAZY" }, - "log_mode": { + "logPolicy": { "label": "Erfassen und Speichern von Log-Daten", "options": { - "OFF": "Ausgeschaltet", - "LEAN": "Nur wichtige Meldungen", - "RICH": "Alles" + "disabled": "Ausgeschaltet", + "lean": "Nur wichtige Meldungen", + "rich": "Alles außer debug-informationen", + "debug": "Auch debug-informationen" + }, + "defaultvalue": "rich" + }, + "pagingMode": { + "label": "pagingMode (https://verona-interfaces.github.io/player/#operation-publish-vopStartCommand)", + "options": { + "separate": "pages are separated", + "concat-scroll": "concat-scroll", + "concat-scroll-snap": "concat-scroll-snap" + }, + "defaultvalue": "separate" + }, + "stateReportPolicy": { + "label": "stateReportPolicy (https://verona-interfaces.github.io/player/#operation-publish-vopStartCommand)", + "options": { + "none": "pages are separated", + "eager": "concat-scroll", + "on-demand": "concat-scroll-snap" }, - "defaultvalue": "RICH" + "defaultvalue": "eager" }, "page_navibuttons": { "label": "Navigationsbuttons für die Seitennavigation (innerhalb einer Aufgabe)", diff --git a/src/app/config/booklet-config.ts b/src/app/config/booklet-config.ts index 86e40c63e19fcba55ffe54affa24418fc414f68e..15c258e3d4da2db6becbd0e5c060e372a4ef3d14 100644 --- a/src/app/config/booklet-config.ts +++ b/src/app/config/booklet-config.ts @@ -3,7 +3,9 @@ export class BookletConfig { // do not change anything here directly! loading_mode: "LAZY" | "EAGER" = "LAZY"; - log_mode: "OFF" | "LEAN" | "RICH" = "RICH"; + logPolicy: "disabled" | "lean" | "rich" | "debug" = "rich"; + pagingMode: "separate" | "concat-scroll" | "concat-scroll-snap" = "separate"; + stateReportPolicy: "none" | "eager" | "on-demand" = "eager"; page_navibuttons: "OFF" | "MERGED" | "SEPARATE_TOP" | "SEPARATE_BOTTOM" = "SEPARATE_BOTTOM"; unit_navibuttons: "OFF" | "ARROWS_ONLY" | "FULL" = "FULL"; unit_menu: "OFF" | "ENABLED_ONLY" | "FULL" = "OFF"; @@ -16,7 +18,9 @@ export class BookletConfig { public setFromKeyValuePairs(config) { if (config) { if (config['loading_mode']) { this.loading_mode = config['loading_mode']} - if (config['log_mode']) { this.log_mode = config['log_mode']} + if (config['logPolicy']) { this.logPolicy = config['logPolicy']} + if (config['pagingMode']) { this.pagingMode = config['pagingMode']} + if (config['stateReportPolicy']) { this.stateReportPolicy = config['stateReportPolicy']} if (config['page_navibuttons']) { this.page_navibuttons = config['page_navibuttons']} if (config['unit_navibuttons']) { this.unit_navibuttons = config['unit_navibuttons']} if (config['unit_menu']) { this.unit_menu = config['unit_menu']} @@ -38,8 +42,14 @@ export class BookletConfig { case 'loading_mode': this.loading_mode = configValue; break; - case 'log_mode': - this.log_mode = configValue; + case 'logPolicy': + this.logPolicy = configValue; + break; + case 'pagingMode': + this.pagingMode = configValue; + break; + case 'stateReportPolicy': + this.stateReportPolicy = configValue; break; case 'page_navibuttons': this.page_navibuttons = configValue; diff --git a/src/app/test-controller/unithost/unithost.component.ts b/src/app/test-controller/unithost/unithost.component.ts index 72b3afb06db2ed7f35e9ff77235a095b8b933d9a..e340aef58add8fe1335431ca092b413731ff1bfc 100644 --- a/src/app/test-controller/unithost/unithost.component.ts +++ b/src/app/test-controller/unithost/unithost.component.ts @@ -83,7 +83,13 @@ export class UnithostComponent implements OnInit, OnDestroy { dataParts: pendingUnitDataToRestore }, playerConfig: { - logPolicy: 'eager' // 'debug' + logPolicy: this.tcs.bookletConfig.logPolicy, + unitNumber: this.myUnitSequenceId, + unitTitle: this.unitTitle, + unitId: this.myUnitDbKey, + unitCount: this.tcs.maxUnitSequenceId, + stateReportPolicy: this.tcs.bookletConfig.stateReportPolicy, + pagingMode: this.tcs.bookletConfig.pagingMode } }, '*'); }