From 26351013e27608b0d53e9f9e2990242963cbf3fc Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Wed, 18 May 2022 16:47:55 +0200
Subject: [PATCH] Fix reading of sections and pages
Elements read as classes were overwritten by the plain objects passed to
the constructors.
---
projects/common/models/page.ts | 3 +--
projects/common/models/section.ts | 8 ++++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/projects/common/models/page.ts b/projects/common/models/page.ts
index 96b6f0e9b..067521644 100644
--- a/projects/common/models/page.ts
+++ b/projects/common/models/page.ts
@@ -2,7 +2,6 @@ import { Section } from 'common/models/section';
export class Page {
[index: string]: any;
-
sections: Section[] = [];
hasMaxWidth: boolean = false;
maxWidth: number = 900;
@@ -13,7 +12,7 @@ export class Page {
alwaysVisibleAspectRatio: number = 50;
constructor(page?: Page) {
- this.sections = page?.sections.map(section => new Section(section)) || [new Section()];
Object.assign(this, page);
+ this.sections = page?.sections.map(section => new Section(section)) || [new Section()];
}
}
diff --git a/projects/common/models/section.ts b/projects/common/models/section.ts
index b8344f3f6..19bd84511 100644
--- a/projects/common/models/section.ts
+++ b/projects/common/models/section.ts
@@ -1,4 +1,4 @@
-import { PositionedUIElement } from 'common/models/elements/element';
+import { PositionedUIElement, UIElement } from 'common/models/elements/element';
import { ElementFactory } from 'common/util/element.factory';
export class Section {
@@ -15,13 +15,17 @@ export class Section {
activeAfterID: string | null = null;
constructor(section?: Partial<Section>) {
+ Object.assign(this, section);
this.elements =
section?.elements?.map(element => ElementFactory.createElement(element.type, element) as PositionedUIElement) ||
[];
- Object.assign(this, section);
}
setProperty(property: string, value: any): void {
this[property] = value;
}
+
+ getElements(): UIElement[] {
+ return this.elements;
+ }
}
--
GitLab