Skip to content
Snippets Groups Projects
Commit 5e7bd01a authored by Martin Mechtel's avatar Martin Mechtel
Browse files

v 1.1.1 startcode box title

parent f81d75d5
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,7 @@ export class MainDataService { ...@@ -21,7 +21,7 @@ export class MainDataService {
bookletlabel: '', bookletlabel: '',
costumTexts: {} costumTexts: {}
}; };
private static defaultCostumTexts = { private static defaultCostumTexts: KeyValuePair = {
'app_title': 'IQB-Testcenter', 'app_title': 'IQB-Testcenter',
'app_loginErrorMsg': 'Die Anmeldedaten sind nicht korrekt.', 'app_loginErrorMsg': 'Die Anmeldedaten sind nicht korrekt.',
'login_testEndButtonText': 'Test beenden', 'login_testEndButtonText': 'Test beenden',
...@@ -189,7 +189,7 @@ export class MainDataService { ...@@ -189,7 +189,7 @@ export class MainDataService {
} }
} }
if (MainDataService.defaultCostumTexts.hasOwnProperty(key)) { if (MainDataService.defaultCostumTexts.hasOwnProperty(key)) {
return MainDataService.defaultCostumTexts[key]; return MainDataService.defaultCostumTexts[key];
} }
return key; return key;
} }
......
<form [formGroup]="startkeyform" fxLayout="column"> <form [formGroup]="startkeyform" fxLayout="column">
<h1 mat-dialog-title>Freigabewort</h1> <h1 mat-dialog-title>{{ data.title }}</h1>
<mat-dialog-content> <mat-dialog-content>
<mat-form-field *ngFor="let c of data.codes" fxLayout="column"> <mat-form-field *ngFor="let c of data.codes" fxLayout="column">
<p>{{ c.prompt }}</p> <p>{{ c.prompt }}</p>
<input matInput [formControlName]="c.testletId" [(ngModel)]="c.value" (keyup.enter)="close()"> <input matInput [formControlName]="c.testletId" [(ngModel)]="c.value" (keyup.enter)="close()">
</mat-form-field> </mat-form-field>
</mat-dialog-content> </mat-dialog-content>
<mat-dialog-actions> <mat-dialog-actions>
......
...@@ -158,7 +158,7 @@ export class TestControllerComponent implements OnInit, OnDestroy { ...@@ -158,7 +158,7 @@ export class TestControllerComponent implements OnInit, OnDestroy {
const unitsElements = oDOM.documentElement.getElementsByTagName('Units'); const unitsElements = oDOM.documentElement.getElementsByTagName('Units');
if (unitsElements.length > 0) { if (unitsElements.length > 0) {
const costumTextsElements = oDOM.documentElement.getElementsByTagName('CostumTexts'); const costumTextsElements = oDOM.documentElement.getElementsByTagName('CustomTexts');
if (costumTextsElements.length > 0) { if (costumTextsElements.length > 0) {
const costumTexts = costumTextsElements[0].children; const costumTexts = costumTextsElements[0].children;
const costumTextsForBooklet = {}; const costumTextsForBooklet = {};
...@@ -171,6 +171,8 @@ export class TestControllerComponent implements OnInit, OnDestroy { ...@@ -171,6 +171,8 @@ export class TestControllerComponent implements OnInit, OnDestroy {
} }
} }
this.tcs.setCostumTexts(costumTextsForBooklet); this.tcs.setCostumTexts(costumTextsForBooklet);
console.log('##__##');
console.log(costumTextsForBooklet);
} }
const bookletConfigElements = oDOM.documentElement.getElementsByTagName('BookletConfig'); const bookletConfigElements = oDOM.documentElement.getElementsByTagName('BookletConfig');
......
...@@ -107,7 +107,6 @@ export class UnitActivateGuard implements CanActivate { ...@@ -107,7 +107,6 @@ export class UnitActivateGuard implements CanActivate {
} else { } else {
const codeData = result as CodeInputData[]; const codeData = result as CodeInputData[];
let codesOk = true; let codesOk = true;
console.log(codeData);
for (const c of codeData) { for (const c of codeData) {
if (c.value.toUpperCase().trim() !== c.code) { if (c.value.toUpperCase().trim() !== c.code) {
codesOk = false; codesOk = false;
......
...@@ -5,5 +5,5 @@ export const environment = { ...@@ -5,5 +5,5 @@ export const environment = {
testcenterUrl: '/', testcenterUrl: '/',
appName: 'IQB-Testcenter', appName: 'IQB-Testcenter',
appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
appVersion: '1.1 - 25.3.2019' appVersion: '1.1.1 - 26.3.2019'
}; };
...@@ -5,5 +5,5 @@ export const environment = { ...@@ -5,5 +5,5 @@ export const environment = {
testcenterUrl: '/', testcenterUrl: '/',
appName: 'IQB-Testcenter', appName: 'IQB-Testcenter',
appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
appVersion: '1.1 - 25.3.2019' appVersion: '1.1.1 - 26.3.2019'
}; };
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