From 8c2248d357d17833921271f365345ae5fc134541 Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Wed, 10 Nov 2021 18:26:43 +0100
Subject: [PATCH] Fix likert element row preset labels and allow null value
Also reorder translations a bit.
---
projects/editor/src/app/dialog.service.ts | 6 ++++--
.../properties-panel/element-properties.component.html | 9 +++++----
projects/editor/src/assets/i18n/de.json | 2 ++
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/projects/editor/src/app/dialog.service.ts b/projects/editor/src/app/dialog.service.ts
index 7d12c70ee..96a319bf3 100644
--- a/projects/editor/src/app/dialog.service.ts
+++ b/projects/editor/src/app/dialog.service.ts
@@ -321,14 +321,16 @@ export class LikertColumnEditDialog {
template: `
<mat-dialog-content fxLayout="column">
<mat-form-field>
- <mat-label>Text</mat-label>
+ <mat-label>{{'text' | translate }}</mat-label>
<input #textField matInput type="text" [value]="data.row.text">
</mat-form-field>
<mat-form-field>
- <mat-label>ID</mat-label>
+ <mat-label>{{'id' | translate }}</mat-label>
<input #idField matInput type="text" [value]="data.row.id">
</mat-form-field>
+ {{'preset' | translate }}
<mat-select #valueField [value]="data.row.value">
+ <mat-option [value]="null">{{'propertiesPanel.undefined' | translate }}</mat-option>
<mat-option *ngFor="let column of data.columns; let i = index" [value]="i">
{{column.text}}
</mat-option>
diff --git a/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html
index 0e173600f..df7cee20d 100644
--- a/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html
+++ b/projects/editor/src/app/unit-view/page-view/properties-panel/element-properties.component.html
@@ -111,7 +111,7 @@
<mat-form-field disabled="true" *ngIf="combinedProperties.connectedTo !== undefined">
<ng-container>
- <mat-label>{{'propertiesPanel.value' | translate }}</mat-label>
+ <mat-label>{{'preset' | translate }}</mat-label>
<div class="drop-list" cdkDropList [cdkDropListData]="combinedProperties.value"
(cdkDropListDropped)="reorderOptions('value', $any($event))">
<div *ngFor="let value of $any(combinedProperties.value); let i = index" cdkDrag
@@ -186,7 +186,7 @@
<mat-form-field *ngIf="combinedProperties.options !== undefined && !combinedProperties.connectedTo"
appearance="fill">
- <mat-label>{{'propertiesPanel.preset' | translate }}</mat-label>
+ <mat-label>{{'preset' | translate }}</mat-label>
<mat-select [value]="combinedProperties.value"
(selectionChange)="updateModel('value', $event.value)">
<mat-option [value]="null">{{'propertiesPanel.undefined' | translate }}</mat-option>
@@ -209,7 +209,7 @@
</mat-form-field>
<ng-container *ngIf="combinedProperties.value === true || combinedProperties.value === false">
- {{'propertiesPanel.preset' | translate }}
+ {{'preset' | translate }}
<mat-button-toggle-group [value]="combinedProperties.value"
(change)="updateModel('value', $event.value)">
<mat-button-toggle [value]="true">{{'propertiesPanel.true' | translate }}</mat-button-toggle>
@@ -217,12 +217,13 @@
</mat-button-toggle-group>
</ng-container>
+ <!-- TODO wtf-->
<mat-form-field *ngIf="combinedProperties.value !== undefined &&
!combinedProperties.options && !combinedProperties.columns &&
combinedProperties.connectedTo === undefined &&
combinedProperties.value !== true && combinedProperties.value !== false"
appearance="fill">
- <mat-label>{{'propertiesPanel.preset' | translate }}</mat-label>
+ <mat-label>{{'preset' | translate }}</mat-label>
<textarea matInput type="text"
[value]="combinedProperties.value"
(input)="updateModel('value', $any($event.target).value)">
diff --git a/projects/editor/src/assets/i18n/de.json b/projects/editor/src/assets/i18n/de.json
index af95d6a0b..32fb47e22 100644
--- a/projects/editor/src/assets/i18n/de.json
+++ b/projects/editor/src/assets/i18n/de.json
@@ -20,6 +20,8 @@
"removeImage": "Bild entfernen",
"above": "oben",
"below": "unten",
+ "preset": "Vorbelegung",
+ "id": "ID",
"toolbar": {
"loadUnit": "Unit laden",
"saveUnit": "Unit speichern"
--
GitLab