diff --git a/src/app/maindata.service.ts b/src/app/maindata.service.ts index 4a2e1f778c1b485211bf3ee1d9617f3284d82931..59e8e2430f953a10eeff6dd511adb64fbf272b41 100644 --- a/src/app/maindata.service.ts +++ b/src/app/maindata.service.ts @@ -21,7 +21,7 @@ export class MainDataService { bookletlabel: '', costumTexts: {} }; - private static defaultCostumTexts = { + private static defaultCostumTexts: KeyValuePair = { 'app_title': 'IQB-Testcenter', 'app_loginErrorMsg': 'Die Anmeldedaten sind nicht korrekt.', 'login_testEndButtonText': 'Test beenden', @@ -189,7 +189,7 @@ export class MainDataService { } } if (MainDataService.defaultCostumTexts.hasOwnProperty(key)) { - return MainDataService.defaultCostumTexts[key]; + return MainDataService.defaultCostumTexts[key]; } return key; } diff --git a/src/app/test-controller/start-lock-input/start-lock-input.component.html b/src/app/test-controller/start-lock-input/start-lock-input.component.html index cb0b7675c0a743324c5781d75161f0981ad2d70d..523f279d0b19e9e78344340ab7c986c5a5588df7 100644 --- a/src/app/test-controller/start-lock-input/start-lock-input.component.html +++ b/src/app/test-controller/start-lock-input/start-lock-input.component.html @@ -1,11 +1,11 @@ <form [formGroup]="startkeyform" fxLayout="column"> - <h1 mat-dialog-title>Freigabewort</h1> + <h1 mat-dialog-title>{{ data.title }}</h1> <mat-dialog-content> - <mat-form-field *ngFor="let c of data.codes" fxLayout="column"> - <p>{{ c.prompt }}</p> - <input matInput [formControlName]="c.testletId" [(ngModel)]="c.value" (keyup.enter)="close()"> - </mat-form-field> + <mat-form-field *ngFor="let c of data.codes" fxLayout="column"> + <p>{{ c.prompt }}</p> + <input matInput [formControlName]="c.testletId" [(ngModel)]="c.value" (keyup.enter)="close()"> + </mat-form-field> </mat-dialog-content> <mat-dialog-actions> diff --git a/src/app/test-controller/test-controller.component.ts b/src/app/test-controller/test-controller.component.ts index 380f3e8f760de0ca91af9bb68ee1a8d0328fbe44..2ac224cccc5a263a7041b97f026b9a687e0d0f9d 100644 --- a/src/app/test-controller/test-controller.component.ts +++ b/src/app/test-controller/test-controller.component.ts @@ -158,7 +158,7 @@ export class TestControllerComponent implements OnInit, OnDestroy { const unitsElements = oDOM.documentElement.getElementsByTagName('Units'); if (unitsElements.length > 0) { - const costumTextsElements = oDOM.documentElement.getElementsByTagName('CostumTexts'); + const costumTextsElements = oDOM.documentElement.getElementsByTagName('CustomTexts'); if (costumTextsElements.length > 0) { const costumTexts = costumTextsElements[0].children; const costumTextsForBooklet = {}; @@ -171,6 +171,8 @@ export class TestControllerComponent implements OnInit, OnDestroy { } } this.tcs.setCostumTexts(costumTextsForBooklet); + console.log('##__##'); + console.log(costumTextsForBooklet); } const bookletConfigElements = oDOM.documentElement.getElementsByTagName('BookletConfig'); diff --git a/src/app/test-controller/unithost/unit-routing-guards.ts b/src/app/test-controller/unithost/unit-routing-guards.ts index 9c8c1adbc958c2bae2b3dcd91e631821a389c338..fccfc8d8899dac14dee79c8000f9dd102db0fe8b 100644 --- a/src/app/test-controller/unithost/unit-routing-guards.ts +++ b/src/app/test-controller/unithost/unit-routing-guards.ts @@ -107,7 +107,6 @@ export class UnitActivateGuard implements CanActivate { } else { const codeData = result as CodeInputData[]; let codesOk = true; - console.log(codeData); for (const c of codeData) { if (c.value.toUpperCase().trim() !== c.code) { codesOk = false; diff --git a/src/environments/environment.build.ts b/src/environments/environment.build.ts index 4bd5a151a71d16c598548449579ed0eb58bd2131..0fbdf20e217a473704fe5976e79fd13ac4cbe8ce 100644 --- a/src/environments/environment.build.ts +++ b/src/environments/environment.build.ts @@ -5,5 +5,5 @@ export const environment = { testcenterUrl: '/', appName: 'IQB-Testcenter', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', - appVersion: '1.1 - 25.3.2019' + appVersion: '1.1.1 - 26.3.2019' }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index fd9dd57b6a4b9894a46e5e0a673659801a116a5f..89c58eb1e3899768b66409435fbc70900a605b1f 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -5,5 +5,5 @@ export const environment = { testcenterUrl: '/', appName: 'IQB-Testcenter', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', - appVersion: '1.1 - 25.3.2019' + appVersion: '1.1.1 - 26.3.2019' };