Skip to content
Snippets Groups Projects
Commit db9e49b7 authored by jojohoch's avatar jojohoch
Browse files

Rename property of Math table from lastHelperRowColor to helperRowColor

parent b524ef52
No related branches found
No related tags found
No related merge requests found
......@@ -135,9 +135,9 @@ iqb-aspect-definition@1.0.0
4.3.0
- Geometry: new property: trackedVariables
- new property in "OtherStyles": lastHelperRowColor
- new property in "OtherStyles": helperRowColor
- MathTable:
- new styling property: lastHelperRowColor
- new styling property: helperRowColor
- new property value: operation: 'variable'
- new property: variableLayoutOptions: {
allowArithmeticChars: boolean;
......
......@@ -35,7 +35,7 @@ import { ValueChangeElement } from 'common/models/elements/element';
elementModel.styling.fontSize * 2"
[style.font-size]="row.cells.length && row.isHelperRow && '70%'"
[style.background-color]="row.isHelperRow ?
elementModel.styling.lastHelperRowColor : 'transparent'">
elementModel.styling.helperRowColor : 'transparent'">
<td *ngFor="let cell of row.cells" [attr.contenteditable]="cell.isEditable"
[style.width.px]="elementModel.styling.fontSize * 2"
[class.strike-through]="cell.isCrossedOut"
......
......@@ -30,7 +30,7 @@ export class MathTableElement extends UIElement implements MathTableProperties {
};
styling: BasicStyles & {
lastHelperRowColor: string;
helperRowColor: string;
};
constructor(element?: MathTableProperties) {
......@@ -51,7 +51,7 @@ export class MathTableElement extends UIElement implements MathTableProperties {
if (element?.variableLayoutOptions !== undefined) this.variableLayoutOptions = { ...element.variableLayoutOptions };
this.styling = {
...PropertyGroupGenerators.generateBasicStyleProps(element?.styling),
lastHelperRowColor: 'transparent'
helperRowColor: 'transparent'
};
}
}
......@@ -97,7 +97,7 @@ export interface MathTableProperties extends UIElementProperties {
allowFirstLineCrossOut: boolean;
}
styling: BasicStyles & {
lastHelperRowColor: string;
helperRowColor: string;
};
}
......
......@@ -59,7 +59,7 @@ export interface OtherStyles {
firstLineColoring?: boolean;
firstLineColoringColor?: string;
selectionColor?: string;
lastHelperRowColor?: string;
helperRowColor?: string;
}
export interface PlayerProperties {
......
......@@ -6,19 +6,19 @@ import { Stylings } from 'common/models/elements/property-group-interfaces';
selector: 'aspect-element-style-properties',
template: `
<div class="fx-column-start-stretch" *ngIf="styles">
<mat-form-field *ngIf="styles.lastHelperRowColor !== undefined"
<mat-form-field *ngIf="styles.helperRowColor !== undefined"
appearance="fill" class="mdInput textsingleline">
<mat-label>{{'propertiesPanel.lastHelperRowColor' | translate }}</mat-label>
<input matInput type="text" [value]="styles.lastHelperRowColor"
<mat-label>{{'propertiesPanel.helperRowColor' | translate }}</mat-label>
<input matInput type="text" [value]="styles.helperRowColor"
(input)="unitService.updateSelectedElementsStyleProperty(
'lastHelperRowColor', $any($event.target).value)">
<button mat-icon-button matSuffix (click)="lastHelperRowColorInput.click()">
'helperRowColor', $any($event.target).value)">
<button mat-icon-button matSuffix (click)="helperRowColorInput.click()">
<mat-icon>edit</mat-icon>
</button>
</mat-form-field>
<input matInput type="color" hidden #lastHelperRowColorInput
[value]="styles.lastHelperRowColor"
(input)="unitService.updateSelectedElementsStyleProperty('lastHelperRowColor', $any($event.target).value)">
<input matInput type="color" hidden #helperRowColorInput
[value]="styles.helperRowColor"
(input)="unitService.updateSelectedElementsStyleProperty('helperRowColor', $any($event.target).value)">
<mat-checkbox *ngIf="styles.lineColoring !== undefined"
[checked]="$any(styles.lineColoring)"
......
......@@ -251,7 +251,7 @@
"tooltip": "Tooltip",
"stickyHeader": "Haftende Kopfzeile",
"crossOutChecked": "Auswahl durchstreichen",
"lastHelperRowColor": "Farbe unterer Hilfszeile",
"helperRowColor": "Farbe der Hilfszeile(n)",
"allowArithmeticChars": "Rechen- und Gleichheitszeichen erlauben",
"isFirstLineUnderlined": "Unterstreichung erste Zeile",
"showResultRow": "Ergebniszeile",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment