From b5e5209b6b359f991dfba38941d125fd6d2d231a Mon Sep 17 00:00:00 2001
From: jojohoch <joachim.hoch@iqb.hu-berlin.de>
Date: Mon, 29 Aug 2022 08:57:26 +0200
Subject: [PATCH] [editor] Rename interface 'SchemerData' to 'AnswerScheme'
---
.../cloze/cloze-child-elements/drop-list-simple.ts | 12 ++++++------
.../cloze-child-elements/text-field-simple.ts | 6 +++---
.../cloze/cloze-child-elements/toggle-button.ts | 10 +++++-----
.../compound-elements/likert/likert-row.ts | 10 +++++-----
projects/common/models/elements/element.ts | 14 +++++++-------
.../models/elements/input-elements/checkbox.ts | 10 +++++-----
.../models/elements/input-elements/drop-list.ts | 10 +++++-----
.../models/elements/input-elements/dropdown.ts | 10 +++++-----
.../input-elements/radio-button-group-complex.ts | 10 +++++-----
.../elements/input-elements/radio-button-group.ts | 10 +++++-----
.../models/elements/input-elements/slider.ts | 12 ++++++------
.../elements/input-elements/spell-correct.ts | 6 +++---
.../models/elements/input-elements/text-area.ts | 6 +++---
.../models/elements/input-elements/text-field.ts | 6 +++---
.../common/models/elements/media-elements/image.ts | 6 +++---
projects/common/models/elements/text/text.ts | 6 +++---
projects/common/models/page.ts | 6 +++---
projects/common/models/section.ts | 10 +++++-----
projects/common/models/unit.ts | 6 +++---
.../editor/src/app/services/verona-api.service.ts | 6 +++---
20 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/drop-list-simple.ts b/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/drop-list-simple.ts
index 4ca98e0af..cc50c783c 100644
--- a/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/drop-list-simple.ts
+++ b/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/drop-list-simple.ts
@@ -3,8 +3,8 @@ import {
BasicStyles,
DragNDropValueObject,
InputElement,
- SchemerData,
- SchemerValue
+ AnswerScheme,
+ AnswerSchemeValue
} from 'common/models/elements/element';
import { Type } from '@angular/core';
import { ElementComponent } from 'common/directives/element-component.directive';
@@ -37,23 +37,23 @@ export class DropListSimpleElement extends InputElement {
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(dropLists: Array<DropListElement | DropListSimpleElement>): SchemerData {
+ getAnswerScheme(dropLists: Array<DropListElement | DropListSimpleElement>): AnswerScheme {
return {
id: this.id,
type: 'string',
format: '',
multiple: true,
nullable: false,
- values: this.getSchemerValues(dropLists),
+ values: this.getAnswerSchemeValues(dropLists),
valuesComplete: true
};
}
- getSchemerValues(dropLists: Array<DropListElement | DropListSimpleElement>): SchemerValue[] {
+ getAnswerSchemeValues(dropLists: Array<DropListElement | DropListSimpleElement>): AnswerSchemeValue[] {
const valueDropLists = dropLists.filter(dropList => dropList.connectedTo.includes(this.id));
return [this, ...valueDropLists]
.map(dropList => dropList.value as DragNDropValueObject[])
diff --git a/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/text-field-simple.ts b/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/text-field-simple.ts
index 57447f946..4abc32a4b 100644
--- a/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/text-field-simple.ts
+++ b/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/text-field-simple.ts
@@ -1,6 +1,6 @@
import { ElementFactory } from 'common/util/element.factory';
import {
- BasicStyles, InputAssistancePreset, InputElement, SchemerData
+ BasicStyles, InputAssistancePreset, InputElement, AnswerScheme
} from 'common/models/elements/element';
import { Type } from '@angular/core';
import { ElementComponent } from 'common/directives/element-component.directive';
@@ -46,11 +46,11 @@ export class TextFieldSimpleElement extends InputElement {
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'string',
diff --git a/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/toggle-button.ts b/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/toggle-button.ts
index ad7cd8798..08c9889b8 100644
--- a/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/toggle-button.ts
+++ b/projects/common/models/elements/compound-elements/cloze/cloze-child-elements/toggle-button.ts
@@ -1,5 +1,5 @@
import { ElementFactory } from 'common/util/element.factory';
-import { BasicStyles, InputElement, SchemerData, SchemerValue } from 'common/models/elements/element';
+import { BasicStyles, InputElement, AnswerScheme, AnswerSchemeValue } from 'common/models/elements/element';
import { Type } from '@angular/core';
import { ElementComponent } from 'common/directives/element-component.directive';
import {
@@ -32,23 +32,23 @@ export class ToggleButtonElement extends InputElement {
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'integer',
format: '',
multiple: false,
nullable: !this.value && this.value === 0,
- values: this.getSchemerValues(),
+ values: this.getAnswerSchemeValues(),
valuesComplete: true
};
}
- private getSchemerValues(): SchemerValue[] {
+ private getAnswerSchemeValues(): AnswerSchemeValue[] {
return this.richTextOptions
.map((option, index) => ({ value: (index + 1).toString(), label: option }));
}
diff --git a/projects/common/models/elements/compound-elements/likert/likert-row.ts b/projects/common/models/elements/compound-elements/likert/likert-row.ts
index c6b80ddad..09009d38c 100644
--- a/projects/common/models/elements/compound-elements/likert/likert-row.ts
+++ b/projects/common/models/elements/compound-elements/likert/likert-row.ts
@@ -1,5 +1,5 @@
import { Type } from '@angular/core';
-import { InputElement, SchemerData, SchemerValue, TextImageLabel } from 'common/models/elements/element';
+import { InputElement, AnswerScheme, AnswerSchemeValue, TextImageLabel } from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import {
LikertRadioButtonGroupComponent
@@ -19,23 +19,23 @@ export class LikertRowElement extends InputElement {
if (element.verticalButtonAlignment) this.verticalButtonAlignment = element.verticalButtonAlignment;
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'integer',
format: '',
multiple: false,
nullable: !this.value && this.value !== 0,
- values: this.getSchemerValues(),
+ values: this.getAnswerSchemeValues(),
valuesComplete: true
};
}
- private getSchemerValues(): SchemerValue[] {
+ private getAnswerSchemeValues(): AnswerSchemeValue[] {
console.log(this.value);
return [
{ value: !this.value && this.value !== 0 ? 'null' : (this.value as number + 1).toString(),
diff --git a/projects/common/models/elements/element.ts b/projects/common/models/elements/element.ts
index 41e937b2c..898284797 100644
--- a/projects/common/models/elements/element.ts
+++ b/projects/common/models/elements/element.ts
@@ -70,7 +70,7 @@ export abstract class UIElement {
return [];
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return false;
}
@@ -95,7 +95,7 @@ export abstract class InputElement extends UIElement {
if (element.readOnly) this.readOnly = element.readOnly;
}
- abstract getSchemerData(options?: unknown): SchemerData;
+ abstract getAnswerScheme(options?: unknown): AnswerScheme;
}
@@ -111,11 +111,11 @@ export abstract class PlayerElement extends UIElement {
this.player = ElementFactory.initPlayerProps(element.player);
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'string',
@@ -128,18 +128,18 @@ export abstract class PlayerElement extends UIElement {
}
}
-export interface SchemerValue {
+export interface AnswerSchemeValue {
value: string;
label: string;
}
-export interface SchemerData {
+export interface AnswerScheme {
id: string;
type: string;
format?: string;
multiple?: boolean;
nullable?: boolean;
- values?: SchemerValue[];
+ values?: AnswerSchemeValue[];
valuesComplete?: boolean;
}
diff --git a/projects/common/models/elements/input-elements/checkbox.ts b/projects/common/models/elements/input-elements/checkbox.ts
index 03b327e60..aa820b603 100644
--- a/projects/common/models/elements/input-elements/checkbox.ts
+++ b/projects/common/models/elements/input-elements/checkbox.ts
@@ -5,7 +5,7 @@ import {
InputElement,
PositionedUIElement,
PositionProperties,
- SchemerData, SchemerValue
+ AnswerScheme, AnswerSchemeValue
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { CheckboxComponent } from 'common/components/input-elements/checkbox.component';
@@ -20,23 +20,23 @@ export class CheckboxElement extends InputElement implements PositionedUIElement
this.styling = ElementFactory.initStylingProps(element.styling);
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'boolean',
format: '',
multiple: false,
nullable: false,
- values: this.getSchemerValues(),
+ values: this.getAnswerSchemeValues(),
valuesComplete: true
};
}
- private getSchemerValues(): SchemerValue[] {
+ private getAnswerSchemeValues(): AnswerSchemeValue[] {
return [
{ value: 'true', label: `Angekreuzt: ${this.label}` },
{ value: 'false', label: `Nicht Angekreuzt: ${this.label}` }
diff --git a/projects/common/models/elements/input-elements/drop-list.ts b/projects/common/models/elements/input-elements/drop-list.ts
index ed80f461f..9cb089f7e 100644
--- a/projects/common/models/elements/input-elements/drop-list.ts
+++ b/projects/common/models/elements/input-elements/drop-list.ts
@@ -3,7 +3,7 @@ import { ElementFactory } from 'common/util/element.factory';
import {
InputElement, PositionedUIElement,
DragNDropValueObject,
- BasicStyles, PositionProperties, SchemerData, SchemerValue
+ BasicStyles, PositionProperties, AnswerScheme, AnswerSchemeValue
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { DropListComponent } from 'common/components/input-elements/drop-list.component';
@@ -47,23 +47,23 @@ export class DropListElement extends InputElement implements PositionedUIElement
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(options: Array<DropListElement | DropListSimpleElement>): SchemerData {
+ getAnswerScheme(options: Array<DropListElement | DropListSimpleElement>): AnswerScheme {
return {
id: this.id,
type: 'string',
format: '',
multiple: true,
nullable: false,
- values: this.getSchemerValues(options),
+ values: this.getAnswerSchemeValues(options),
valuesComplete: true
};
}
- private getSchemerValues( dropLists: Array<DropListElement | DropListSimpleElement>): SchemerValue[] {
+ private getAnswerSchemeValues( dropLists: Array<DropListElement | DropListSimpleElement>): AnswerSchemeValue[] {
const valueDropLists = dropLists.filter(dropList => dropList.connectedTo.includes(this.id) );
if (valueDropLists.length || this.isSortingList()) {
return [this, ...valueDropLists]
diff --git a/projects/common/models/elements/input-elements/dropdown.ts b/projects/common/models/elements/input-elements/dropdown.ts
index 2cdd6623d..ab1ece7b2 100644
--- a/projects/common/models/elements/input-elements/dropdown.ts
+++ b/projects/common/models/elements/input-elements/dropdown.ts
@@ -5,7 +5,7 @@ import {
InputElement,
PositionedUIElement,
PositionProperties,
- SchemerData, SchemerValue
+ AnswerScheme, AnswerSchemeValue
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { DropdownComponent } from 'common/components/input-elements/dropdown.component';
@@ -26,23 +26,23 @@ export class DropdownElement extends InputElement implements PositionedUIElement
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'integer',
format: '',
multiple: false,
nullable: this.allowUnset,
- values: this.getSchemerValues(),
+ values: this.getAnswerSchemeValues(),
valuesComplete: true
};
}
- private getSchemerValues(): SchemerValue[] {
+ private getAnswerSchemeValues(): AnswerSchemeValue[] {
return this.options.map((option, index) => ({ value: (index + 1).toString(), label: option }));
}
diff --git a/projects/common/models/elements/input-elements/radio-button-group-complex.ts b/projects/common/models/elements/input-elements/radio-button-group-complex.ts
index b5b8caaec..4b147d993 100644
--- a/projects/common/models/elements/input-elements/radio-button-group-complex.ts
+++ b/projects/common/models/elements/input-elements/radio-button-group-complex.ts
@@ -4,7 +4,7 @@ import {
BasicStyles,
InputElement,
PositionedUIElement,
- PositionProperties, SchemerData, SchemerValue,
+ PositionProperties, AnswerScheme, AnswerSchemeValue,
TextImageLabel
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
@@ -24,23 +24,23 @@ export class RadioButtonGroupComplexElement extends InputElement implements Posi
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'integer',
format: '',
multiple: false,
nullable: !this.value && this.value !== 0,
- values: this.getSchemerValues(),
+ values: this.getAnswerSchemeValues(),
valuesComplete: true
};
}
- private getSchemerValues(): SchemerValue[] {
+ private getAnswerSchemeValues(): AnswerSchemeValue[] {
return this.columns
.map((option, index) => ({ value: (index + 1).toString(), label: option.text })); //TODO iMAGE
}
diff --git a/projects/common/models/elements/input-elements/radio-button-group.ts b/projects/common/models/elements/input-elements/radio-button-group.ts
index c1aabbed7..a97c5c4f7 100644
--- a/projects/common/models/elements/input-elements/radio-button-group.ts
+++ b/projects/common/models/elements/input-elements/radio-button-group.ts
@@ -5,7 +5,7 @@ import {
InputElement,
PositionedUIElement,
PositionProperties,
- SchemerData, SchemerValue
+ AnswerScheme, AnswerSchemeValue
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { RadioButtonGroupComponent } from 'common/components/input-elements/radio-button-group.component';
@@ -34,23 +34,23 @@ export class RadioButtonGroupElement extends InputElement implements PositionedU
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'integer',
format: '',
multiple: false,
nullable: !this.value && this.value !== 0,
- values: this.getSchemerValues(),
+ values: this.getAnswerSchemeValues(),
valuesComplete: true
};
}
- private getSchemerValues(): SchemerValue[] {
+ private getAnswerSchemeValues(): AnswerSchemeValue[] {
return this.richTextOptions
.map((option, index) => ({ value: (index + 1).toString(), label: option }));
}
diff --git a/projects/common/models/elements/input-elements/slider.ts b/projects/common/models/elements/input-elements/slider.ts
index 3043b801b..756f989a4 100644
--- a/projects/common/models/elements/input-elements/slider.ts
+++ b/projects/common/models/elements/input-elements/slider.ts
@@ -5,7 +5,7 @@ import {
InputElement,
PositionedUIElement,
PositionProperties,
- SchemerData, SchemerValue
+ AnswerScheme, AnswerSchemeValue
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { SliderComponent } from 'common/components/input-elements/slider.component';
@@ -38,26 +38,26 @@ export class SliderElement extends InputElement implements PositionedUIElement {
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'integer',
format: '',
multiple: false,
nullable: !this.value && this.value !== 0,
- values: this.getSchemerValues(),
+ values: this.getAnswerSchemeValues(),
valuesComplete: true
};
}
- private getSchemerValues(): SchemerValue[] {
+ private getAnswerSchemeValues(): AnswerSchemeValue[] {
return Array.from({ length: (this.maxValue + 1 - this.minValue) }, (_, index) => (
{ value: (index + this.minValue).toString(), label: (index + this.minValue).toString() }
- )) as SchemerValue[];
+ )) as AnswerSchemeValue[];
}
getComponentFactory(): Type<ElementComponent> {
diff --git a/projects/common/models/elements/input-elements/spell-correct.ts b/projects/common/models/elements/input-elements/spell-correct.ts
index 9042671a8..219a1585a 100644
--- a/projects/common/models/elements/input-elements/spell-correct.ts
+++ b/projects/common/models/elements/input-elements/spell-correct.ts
@@ -5,7 +5,7 @@ import {
InputAssistancePreset,
InputElement,
PositionedUIElement,
- PositionProperties, SchemerData
+ PositionProperties, AnswerScheme
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { SpellCorrectComponent } from 'common/components/input-elements/spell-correct.component';
@@ -34,11 +34,11 @@ export class SpellCorrectElement extends InputElement implements PositionedUIEle
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'string',
diff --git a/projects/common/models/elements/input-elements/text-area.ts b/projects/common/models/elements/input-elements/text-area.ts
index 45215b956..434f578a3 100644
--- a/projects/common/models/elements/input-elements/text-area.ts
+++ b/projects/common/models/elements/input-elements/text-area.ts
@@ -5,7 +5,7 @@ import {
InputAssistancePreset,
InputElement,
PositionedUIElement,
- PositionProperties, SchemerData
+ PositionProperties, AnswerScheme
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { TextAreaComponent } from 'common/components/input-elements/text-area.component';
@@ -46,11 +46,11 @@ export class TextAreaElement extends InputElement implements PositionedUIElement
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'string',
diff --git a/projects/common/models/elements/input-elements/text-field.ts b/projects/common/models/elements/input-elements/text-field.ts
index d7e2f450d..55cbbf353 100644
--- a/projects/common/models/elements/input-elements/text-field.ts
+++ b/projects/common/models/elements/input-elements/text-field.ts
@@ -2,7 +2,7 @@ import { Type } from '@angular/core';
import { ElementFactory } from 'common/util/element.factory';
import {
BasicStyles, InputAssistancePreset, InputElement,
- PositionedUIElement, PositionProperties, SchemerData
+ PositionedUIElement, PositionProperties, AnswerScheme
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { TextFieldComponent } from 'common/components/input-elements/text-field.component';
@@ -53,11 +53,11 @@ export class TextFieldElement extends InputElement implements PositionedUIElemen
};
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return true;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'string',
diff --git a/projects/common/models/elements/media-elements/image.ts b/projects/common/models/elements/media-elements/image.ts
index ba734f5f5..3c72fd0cc 100644
--- a/projects/common/models/elements/media-elements/image.ts
+++ b/projects/common/models/elements/media-elements/image.ts
@@ -1,6 +1,6 @@
import { Type } from '@angular/core';
import { ElementFactory } from 'common/util/element.factory';
-import { PositionedUIElement, PositionProperties, SchemerData, UIElement } from 'common/models/elements/element';
+import { PositionedUIElement, PositionProperties, AnswerScheme, UIElement } from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { ImageComponent } from 'common/components/media-elements/image.component';
@@ -28,11 +28,11 @@ export class ImageElement extends UIElement implements PositionedUIElement {
return ImageComponent;
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return this.magnifier;
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'boolean',
diff --git a/projects/common/models/elements/text/text.ts b/projects/common/models/elements/text/text.ts
index e86291c94..7b122d20e 100644
--- a/projects/common/models/elements/text/text.ts
+++ b/projects/common/models/elements/text/text.ts
@@ -2,7 +2,7 @@ import { Type } from '@angular/core';
import { ElementFactory } from 'common/util/element.factory';
import {
BasicStyles, PositionedUIElement,
- PositionProperties, SchemerData, UIElement
+ PositionProperties, AnswerScheme, UIElement
} from 'common/models/elements/element';
import { ElementComponent } from 'common/directives/element-component.directive';
import { TextComponent } from 'common/components/text/text.component';
@@ -41,11 +41,11 @@ export class TextElement extends UIElement implements PositionedUIElement {
this.highlightableOrange;
}
- hasSchemerData(): boolean {
+ hasAnswerScheme(): boolean {
return this.isHighlightable();
}
- getSchemerData(): SchemerData {
+ getAnswerScheme(): AnswerScheme {
return {
id: this.id,
type: 'string',
diff --git a/projects/common/models/page.ts b/projects/common/models/page.ts
index 13071c284..c05532bad 100644
--- a/projects/common/models/page.ts
+++ b/projects/common/models/page.ts
@@ -1,6 +1,6 @@
import { Section } from 'common/models/section';
import { IDManager } from 'common/util/id-manager';
-import { SchemerData, UIElement } from 'common/models/elements/element';
+import { AnswerScheme, UIElement } from 'common/models/elements/element';
export class Page {
[index: string]: unknown;
@@ -28,7 +28,7 @@ export class Page {
return this.sections.map(section => section.getAllElements(elementType)).flat();
}
- getSchemerData(dropLists: UIElement[]): SchemerData[] {
- return this.sections.map(section => section.getSchemerData(dropLists)).flat();
+ getAnswerScheme(dropLists: UIElement[]): AnswerScheme[] {
+ return this.sections.map(section => section.getAnswerScheme(dropLists)).flat();
}
}
diff --git a/projects/common/models/section.ts b/projects/common/models/section.ts
index 4f42cc148..7a0291005 100644
--- a/projects/common/models/section.ts
+++ b/projects/common/models/section.ts
@@ -3,7 +3,7 @@ import { IDManager } from 'common/util/id-manager';
import {
InputElement, PlayerElement,
PositionedUIElement,
- SchemerData,
+ AnswerScheme,
UIElement,
UIElementValue
} from 'common/models/elements/element';
@@ -104,12 +104,12 @@ export class Section {
return allElements;
}
- getSchemerData(dropLists: UIElement[]): SchemerData[] {
+ getAnswerScheme(dropLists: UIElement[]): AnswerScheme[] {
return this.getAllElements()
- .filter(element => element.hasSchemerData())
+ .filter(element => element.hasAnswerScheme())
.map(element =>
(element.type === 'drop-list' || element.type === 'drop-list-simple') ?
- (element as InputElement).getSchemerData(dropLists) :
- (element as InputElement | PlayerElement | TextElement | ImageElement).getSchemerData());
+ (element as InputElement).getAnswerScheme(dropLists) :
+ (element as InputElement | PlayerElement | TextElement | ImageElement).getAnswerScheme());
}
}
diff --git a/projects/common/models/unit.ts b/projects/common/models/unit.ts
index b02b2c1db..fdf678954 100644
--- a/projects/common/models/unit.ts
+++ b/projects/common/models/unit.ts
@@ -1,7 +1,7 @@
import packageJSON from '../../../package.json';
import { Page } from 'common/models/page';
import { IDManager } from 'common/util/id-manager';
-import { SchemerData, UIElement } from 'common/models/elements/element';
+import { AnswerScheme, UIElement } from 'common/models/elements/element';
export class Unit {
type = 'aspect-unit-definition';
@@ -17,11 +17,11 @@ export class Unit {
return this.pages.map(page => page.getAllElements(elementType)).flat();
}
- getSchemerData(): SchemerData[] {
+ getAnswerScheme(): AnswerScheme[] {
const dropLists = [
...this.getAllElements('drop-list'),
...this.getAllElements('drop-list-simple')
];
- return this.pages.map(page => page.getSchemerData(dropLists)).flat();
+ return this.pages.map(page => page.getAnswerScheme(dropLists)).flat();
}
}
diff --git a/projects/editor/src/app/services/verona-api.service.ts b/projects/editor/src/app/services/verona-api.service.ts
index 08f720596..79e97ce8b 100644
--- a/projects/editor/src/app/services/verona-api.service.ts
+++ b/projects/editor/src/app/services/verona-api.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { fromEvent, Observable, Subject } from 'rxjs';
import packageJSON from '../../../../../package.json';
import { Unit } from 'common/models/unit';
-import { SchemerData } from 'common/models/elements/element';
+import { AnswerScheme } from 'common/models/elements/element';
@Injectable({
providedIn: 'root'
@@ -35,7 +35,7 @@ export class VeronaAPIService {
}
}
- private send(message: Record<string, string | SchemerData[]>): void {
+ private send(message: Record<string, string | AnswerScheme[]>): void {
// prevent posts in local (dev) mode
if (!this.isStandalone()) {
window.parent.postMessage(message, '*');
@@ -60,7 +60,7 @@ export class VeronaAPIService {
timeStamp: String(Date.now()),
unitDefinition: JSON.stringify(unit),
unitDefinitionType: `${unit.type}@${unit.version}`,
- variables: unit.getSchemerData()
+ variables: unit.getAnswerScheme()
});
}
--
GitLab