diff --git a/package.json b/package.json
index 021743d5681a88e068ae5e0bf55bdcc80e8622a9..456223dee08034cbe119228cc247eb349527eb0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "itc-ng",
- "version": "1.3.1",
+ "version": "1.5.2",
"scripts": {
"ng": "ng",
"start": "ng serve",
diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts
index 675674ca1472c730544f7578089579857a7237d1..990f371830d04c01c9ba594c646da8aa30ff1cd0 100644
--- a/src/app/about/about.component.ts
+++ b/src/app/about/about.component.ts
@@ -1,7 +1,6 @@
-import { MainDataService } from 'src/app/maindata.service';
import { Component, Inject } from '@angular/core';
-import {Router} from "@angular/router";
-import {CustomtextService} from "iqb-components";
+import { Router } from '@angular/router';
+import { CustomtextService } from 'iqb-components';
@Component({
templateUrl: './about.component.html'
@@ -13,8 +12,7 @@ export class AboutComponent {
@Inject('APP_PUBLISHER') public appPublisher: string,
@Inject('APP_VERSION') public appVersion: string,
private router: Router,
- public mds: MainDataService,
- private cts: CustomtextService
+ public cts: CustomtextService
) { }
goBack() {
diff --git a/src/app/admin/workspace.component.ts b/src/app/admin/workspace.component.ts
index 8625e467762de856f786c34d456487bb4b5a1a0b..2f0cb6b3f30f22c89c0511b305411fd08ad3a146 100644
--- a/src/app/admin/workspace.component.ts
+++ b/src/app/admin/workspace.component.ts
@@ -9,7 +9,7 @@ import {Subscription} from "rxjs";
})
export class WorkspaceComponent implements OnInit, OnDestroy {
private routingSubscription: Subscription = null;
- private myWorkspace = -1;
+ public myWorkspace = -1;
constructor(
private route: ActivatedRoute,
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 9eaabf9ef4aeea796fc62768007f697da9c0bcd5..cb7cd04fbd5cb01dc96994960b469d65466e7dde 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core';
import { BackendService } from './backend.service';
import { LoginData } from './app.interfaces';
import {CustomtextService, ServerError} from 'iqb-components';
-import {appconfig} from "./app.config";
+import { appconfig } from './app.config';
@Component({
selector: 'tc-root',
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index b93e962ff8a2e7fdcb9c651c1809f5602f09c1d2..ebf413c6c432a633ba5def3af901f34daca929d4 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -1,8 +1,8 @@
-import {CustomTextDefs} from "iqb-components";
+import { CustomTextDefs } from 'iqb-components';
export interface CustomTextsDefList {
keyPrefix: string;
- description : string;
+ description: string;
defList: CustomTextDefs;
}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9a9d7c77e008ff9d89c44bcc3a6cb6629a07384e..8f8bbe6bade39d6689e34bec4a78a1115f57fc31 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -17,7 +17,8 @@ import { LocationStrategy, HashLocationStrategy } from '@angular/common';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ErrormsgComponent } from './errormsg/errormsg.component';
import { httpInterceptorProviders } from './app.interceptor';
-import {IqbComponentsModule} from "iqb-components";
+import { IqbComponentsModule } from 'iqb-components';
+
@NgModule({
@@ -59,6 +60,8 @@ import {IqbComponentsModule} from "iqb-components";
useClass: HashLocationStrategy
}
],
+ entryComponents: [
+ ],
bootstrap: [AppComponent]
})
export class AppModule { }
diff --git a/src/app/maindata.service.ts b/src/app/maindata.service.ts
index abc48fc6d6960d316687f45d5b1e9fa72ba862bc..0d6600cc17b71fb6c539de4779df1e5b8dd7dd21 100644
--- a/src/app/maindata.service.ts
+++ b/src/app/maindata.service.ts
@@ -2,8 +2,8 @@ import { BackendService } from './backend.service';
import { BehaviorSubject, Subject, forkJoin } from 'rxjs';
import { Injectable } from '@angular/core';
import { LoginData } from './app.interfaces';
-import {CustomtextService, ServerError} from "iqb-components";
-import {appconfig, customtextKeySeparator, CustomTextsDefList} from "./app.config";
+import { CustomtextService, ServerError } from 'iqb-components';
+import { appconfig, customtextKeySeparator, CustomTextsDefList } from './app.config';
@Injectable({
providedIn: 'root'
@@ -165,15 +165,15 @@ export class MainDataService {
this.cts.addCustomTexts(myCustomTexts);
}
- public setDefaultCustomtexts(newTexts: {[key: string]: string;}) {
+ public setDefaultCustomtexts(newTexts: {[key: string]: string;}) {
if (newTexts) {
for (const ctKey of Object.keys(newTexts)) {
const sepIndex = ctKey.indexOf(customtextKeySeparator);
if (sepIndex > 1) {
- const keyPrefix = ctKey.slice(0 , sepIndex-1);
- const keyId = ctKey.slice(sepIndex+1);
+ const keyPrefix = ctKey.slice(0 , sepIndex - 1);
+ const keyId = ctKey.slice(sepIndex + 1);
- switch(keyPrefix) {
+ switch (keyPrefix) {
case 'app': {
appconfig.customtextsApp.defList[keyId].defaultvalue = newTexts[ctKey];
break;
diff --git a/src/app/start/start.component.ts b/src/app/start/start.component.ts
index ab95f5e46fb4ae85c4212a93c1385a2c63459a14..3a21184c371af645f9e27acc2b49ec3fb2920c28 100644
--- a/src/app/start/start.component.ts
+++ b/src/app/start/start.component.ts
@@ -8,7 +8,7 @@ import { Router } from '@angular/router';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { StartButtonData } from './start-button-data.class';
-import {appconfig} from "../app.config";
+import { appconfig } from '../app.config';
@Component({
templateUrl: './start.component.html',
@@ -47,7 +47,7 @@ export class StartComponent implements OnInit, OnDestroy {
public messsageDialog: MatDialog,
private router: Router,
private bs: BackendService,
- private cts: CustomtextService) {
+ public cts: CustomtextService) {
}
ngOnInit() {
diff --git a/src/app/sys-check/backend.service.ts b/src/app/sys-check/backend.service.ts
index 735123b4dce8926a95673d2dd00689a898fb08a7..6eca4ea7fb37fd92db185b7ebb6dcc0a7cfdb745 100644
--- a/src/app/sys-check/backend.service.ts
+++ b/src/app/sys-check/backend.service.ts
@@ -29,7 +29,7 @@ export class BackendService {
return this.http
.post<CheckConfig[]>(this.serverUrl + 'getSysCheckConfigs.php', {}, httpOptions)
.pipe(
- catchError(err => {
+ catchError(() => {
const myreturn: CheckConfig[] = [];
return of(myreturn);
})
@@ -103,9 +103,6 @@ export class BackendService {
};
return new Promise(function(resolve, reject) {
- if (reject) {
- console.log('reject is set');
- }
const xhr = new XMLHttpRequest();
xhr.open('POST', serverUrl + 'doSysCheckDownloadTest.php?size=' +
diff --git a/src/app/sys-check/network-check/network-check.component.ts b/src/app/sys-check/network-check/network-check.component.ts
index 4dd996356b46db1b72c95cbaf0a24b2d287387b0..be704f61ab456bf229c0ebedb8987594ffeb41ca 100644
--- a/src/app/sys-check/network-check/network-check.component.ts
+++ b/src/app/sys-check/network-check/network-check.component.ts
@@ -6,7 +6,7 @@ import {
DetectedNetworkInformation,
NetworkCheckStatus,
NetworkRating, NetworkRequestTestResult, ReportEntry
-} from "../sys-check.interfaces";
+} from '../sys-check.interfaces';
@Component({
selector: 'iqb-network-check',
@@ -137,10 +137,10 @@ export class NetworkCheckComponent implements OnInit {
let statsLength;
if (isDownloadPart) {
this.networkStatsDownload.push(averageBytesPerSecond);
- statsLength = this.networkStatsDownload.length
+ statsLength = this.networkStatsDownload.length;
} else {
this.networkStatsUpload.push(averageBytesPerSecond);
- statsLength = this.networkStatsUpload.length
+ statsLength = this.networkStatsUpload.length;
}
this.showBenchmarkSequenceResults(isDownloadPart, this.getAverageNetworkStat(isDownloadPart), results);
@@ -154,7 +154,6 @@ export class NetworkCheckComponent implements OnInit {
return resolve();
}
- console.log("mmmmmm " + statsLength.toString());
if (
(statsLength < 3) ||
(Math.abs(averageOfPreviousLoops - averageBytesPerSecond) > benchmarkDefinition.maxDevianceBytesPerSecond)
diff --git a/src/app/sys-check/questionnaire/questionnaire.component.ts b/src/app/sys-check/questionnaire/questionnaire.component.ts
index ad953608358d826ceb0d5e58e21a1118c2bd60fb..e605d4b330ffa20f3fdff89ded223ce80c3feb87 100644
--- a/src/app/sys-check/questionnaire/questionnaire.component.ts
+++ b/src/app/sys-check/questionnaire/questionnaire.component.ts
@@ -1,8 +1,8 @@
import { FormControl, FormGroup } from '@angular/forms';
import { SysCheckDataService } from '../sys-check-data.service';
import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';
-import {FormDefEntry, ReportEntry} from "../sys-check.interfaces";
-import {CustomtextService} from "iqb-components";
+import { FormDefEntry, ReportEntry } from '../sys-check.interfaces';
+import { CustomtextService } from 'iqb-components';
@Component({
selector: 'iqb-questionnaire',
@@ -11,13 +11,12 @@ import {CustomtextService} from "iqb-components";
})
export class QuestionnaireComponent implements OnInit {
@ViewChild('questionnaireBody', { static: true }) questionnaireBody: ElementRef;
- questionnaireEnabled = false;
questions: FormDefEntry[] = [];
form: FormGroup;
constructor(
private ds: SysCheckDataService,
- private cts: CustomtextService
+ public cts: CustomtextService
) {
}
diff --git a/src/app/sys-check/report/report.component.ts b/src/app/sys-check/report/report.component.ts
index 10d6be08c77be590f94d3a0a9cda396ca96bd54f..a3abd8fc07d385b7858b3d9aa87cd06b9c383a17 100644
--- a/src/app/sys-check/report/report.component.ts
+++ b/src/app/sys-check/report/report.component.ts
@@ -1,10 +1,10 @@
-import {BackendService} from '../backend.service';
+import { BackendService } from '../backend.service';
import { SysCheckDataService } from '../sys-check-data.service';
-import {Component, Input} from '@angular/core';
-import {SaveReportComponent} from './save-report/save-report.component';
-import {MatDialog, MatSnackBar} from '@angular/material';
-import {ReportEntry} from "../sys-check.interfaces";
-import {Subscription} from "rxjs";
+import { Component, Input } from '@angular/core';
+import { SaveReportComponent } from './save-report/save-report.component';
+import { MatDialog, MatSnackBar } from '@angular/material';
+import { ReportEntry } from '../sys-check.interfaces';
+import { Subscription } from 'rxjs';
@Component({
selector: 'iqb-report',
diff --git a/src/app/sys-check/start.component.ts b/src/app/sys-check/start.component.ts
index 214684cf95dd3f06883d8b9b03f146e478d6e66d..335fbb6f004a4cdb9ec64f538a624b54887a2e61 100644
--- a/src/app/sys-check/start.component.ts
+++ b/src/app/sys-check/start.component.ts
@@ -1,9 +1,9 @@
import { SysCheckDataService } from './sys-check-data.service';
import { Router, ActivatedRoute } from '@angular/router';
import { BackendService } from './backend.service';
-import {Component, OnInit, SkipSelf} from '@angular/core';
+import { Component, OnInit, SkipSelf } from '@angular/core';
import { CheckConfig } from './sys-check.interfaces';
-import {CustomtextService} from "iqb-components";
+import { CustomtextService } from 'iqb-components';
@@ -21,7 +21,7 @@ export class StartComponent implements OnInit {
private ds: SysCheckDataService,
private route: ActivatedRoute,
private router: Router,
- @SkipSelf() private cts: CustomtextService) { }
+ @SkipSelf() public cts: CustomtextService) { }
ngOnInit() {
this.dataLoading = true;
diff --git a/src/app/sys-check/sys-check.component.ts b/src/app/sys-check/sys-check.component.ts
index 8166eb29726d223a7eb190aa073f022fd7976d42..13b32ffa07a33df2f4726a0a7e8028a0f42d97a7 100644
--- a/src/app/sys-check/sys-check.component.ts
+++ b/src/app/sys-check/sys-check.component.ts
@@ -1,9 +1,9 @@
import { SysCheckDataService } from './sys-check-data.service';
import { ActivatedRoute, ParamMap } from '@angular/router';
-import { Component, OnInit} from '@angular/core';
-import {BackendService} from './backend.service';
-import {Subscription} from "rxjs";
-import {CustomtextService} from "iqb-components";
+import {Component, OnDestroy, OnInit} from '@angular/core';
+import { BackendService } from './backend.service';
+import { Subscription } from 'rxjs';
+import { CustomtextService } from 'iqb-components';
interface Checks {
@@ -19,7 +19,7 @@ interface Checks {
templateUrl: './sys-check.component.html',
styleUrls: ['./sys-check.component.scss']
})
-export class SysCheckComponent implements OnInit {
+export class SysCheckComponent implements OnInit, OnDestroy {
private taskSubscription: Subscription = null;
dataLoading = false;
@@ -63,7 +63,7 @@ export class SysCheckComponent implements OnInit {
const myCustomTexts: {[key: string]: string} = {};
checkConfig.customtexts.forEach(ct => {
myCustomTexts[ct.key] = ct.value;
- })
+ });
this.cts.addCustomTexts(myCustomTexts);
}
this.ds.nextTask();
diff --git a/src/app/sys-check/unit-check/tc-navi-buttons/unit-navi-buttons.component.ts b/src/app/sys-check/unit-check/tc-navi-buttons/unit-navi-buttons.component.ts
index fc58ae7f81034b1a9b62d76ed8cfa6ce31242268..7efa477aeaa0392525939e167c86c5042369b83f 100644
--- a/src/app/sys-check/unit-check/tc-navi-buttons/unit-navi-buttons.component.ts
+++ b/src/app/sys-check/unit-check/tc-navi-buttons/unit-navi-buttons.component.ts
@@ -1,5 +1,5 @@
import { SysCheckDataService } from '../../sys-check-data.service';
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
@Component({
selector: 'tc-navi-buttons',
diff --git a/src/app/sys-check/unit-check/unit-check.component.html b/src/app/sys-check/unit-check/unit-check.component.html
index 46268b6d4f439f31662b1e75e1b72bfe92765265..13a75a20d83cd278e22418737ecf2fa9a794b74a 100644
--- a/src/app/sys-check/unit-check/unit-check.component.html
+++ b/src/app/sys-check/unit-check/unit-check.component.html
@@ -5,7 +5,7 @@
</mat-card-title>
<mat-card-subtitle>Bitte beachten Sie die Anweisungen in den einzelnen Aufgaben und bearbeiten Sie hierzu die Fragen auf der rechten Seite.</mat-card-subtitle>
- <tc-navi-buttons></tc-navi-buttons><!-- TODO needed? -->
+ <tc-navi-buttons></tc-navi-buttons>
</mat-card-header>
<mat-card-content style="height: 610px; overflow: auto">
diff --git a/src/app/test-controller/test-controller.module.ts b/src/app/test-controller/test-controller.module.ts
index 36adf4b9d757e04241629c3d9a6fede82789b332..2b783d383a6e5425247c093142d668b33da6c8c3 100644
--- a/src/app/test-controller/test-controller.module.ts
+++ b/src/app/test-controller/test-controller.module.ts
@@ -1,4 +1,4 @@
-import {IqbComponentsModule} from "iqb-components";
+import { IqbComponentsModule } from 'iqb-components';
export { TestControllerService } from './test-controller.service';
import { NgModule } from '@angular/core';
@@ -39,6 +39,7 @@ import { StartLockInputComponent } from './start-lock-input/start-lock-input.com
MatToolbarModule,
MatIconModule,
IqbComponentsModule.forChild()
+
],
declarations: [
UnithostComponent,
diff --git a/src/app/test-controller/unithost/unit-routing-guards.ts b/src/app/test-controller/unithost/unit-routing-guards.ts
index 37f45d5ec758f8f2c4d4ef5b5f4238d86b181824..ba5e494f9d827beb21f0765fbcf67241223adb7c 100644
--- a/src/app/test-controller/unithost/unit-routing-guards.ts
+++ b/src/app/test-controller/unithost/unit-routing-guards.ts
@@ -1,5 +1,5 @@
import { StartLockInputComponent } from '../start-lock-input/start-lock-input.component';
-import {ConfirmDialogComponent, ConfirmDialogData, CustomtextService} from 'iqb-components';
+import { ConfirmDialogComponent, ConfirmDialogData, CustomtextService } from 'iqb-components';
import { MatDialog, MatSnackBar } from '@angular/material';
import { TestControllerService } from '../test-controller.service';
import { switchMap, map, filter, take } from 'rxjs/operators';
@@ -146,7 +146,10 @@ export class UnitActivateGuard implements CanActivate {
return of(true);
} else {
- this.snackBar.open('Die Eingabe war nicht korrekt.', this.cts.getCustomText('booklet_codeToEnterTitle'), {duration: 3000});
+ this.snackBar.open(
+ 'Die Eingabe war nicht korrekt.', this.cts.getCustomText('booklet_codeToEnterTitle'),
+ {duration: 3000}
+ );
return of(false);
}
}
diff --git a/src/environments/environment.build.ts b/src/environments/environment.build.ts
index b2b213fb5dfac65fc77e1afe11ced3412fc4edfd..f995f058d5591b1c4c20dbb6c10a9fde747feafd 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.3.1 - 26.4.2019'
+ appVersion: '1.5.2 - 12.2.2020'
};
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 754a979fe7a54656788c90e87321fb2dddb73d1e..df10906299fa3fa39d3ebc3ae178258620967f7e 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.5.1 - 11.2.2020'
+ appVersion: '1.5.2 - 12.2.2020'
};