From b7a45eb97c9a6753885b5224bec07ad50a554a70 Mon Sep 17 00:00:00 2001
From: Mechtel <mechtel@iqb.hu-berlin.de>
Date: Tue, 16 Apr 2019 17:21:22 +0200
Subject: [PATCH] bugfix logging unitenter/unittryleave
---
src/app/test-controller/test-controller.classes.ts | 4 +++-
src/app/test-controller/test-controller.component.ts | 5 +++--
src/app/test-controller/unithost/unit-routing-guards.ts | 4 ++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/app/test-controller/test-controller.classes.ts b/src/app/test-controller/test-controller.classes.ts
index d031b82c..e075e7b8 100644
--- a/src/app/test-controller/test-controller.classes.ts
+++ b/src/app/test-controller/test-controller.classes.ts
@@ -400,6 +400,7 @@ export class Testlet extends TestletContentElement {
// .....................................................................
// .....................................................................
export class EnvironmentData {
+ public appVersion: string;
public browserVersion = '';
public browserName = '';
public get browserTxt(): string {
@@ -412,7 +413,8 @@ export class EnvironmentData {
return `Bildschirmgröße ist ${this.screenSizeWidth} x ${this.screenSizeWidth}`;
}
- constructor () {
+ constructor (appVersion: string) {
+ this.appVersion = appVersion;
const deviceInfo = window.navigator.userAgent;
// browser + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/app/test-controller/test-controller.component.ts b/src/app/test-controller/test-controller.component.ts
index 8ed55d35..537f510e 100644
--- a/src/app/test-controller/test-controller.component.ts
+++ b/src/app/test-controller/test-controller.component.ts
@@ -7,7 +7,7 @@ import { ServerError } from '../backend.service';
import { BackendService } from './backend.service';
import { TestControllerService } from './test-controller.service';
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, Inject } from '@angular/core';
import { UnitDef, Testlet, UnitControllerData, EnvironmentData, MaxTimerData, UnitDefLoadQueue } from './test-controller.classes';
import { LastStateKey, LogEntryKey, BookletData, UnitData, MaxTimerDataType, TaggedString } from './test-controller.interfaces';
import { Subscription, Observable, of, forkJoin, interval, timer, from } from 'rxjs';
@@ -36,6 +36,7 @@ export class TestControllerComponent implements OnInit, OnDestroy {
private unitLoadQueue: TaggedString[] = [];
constructor (
+ @Inject('APP_VERSION') public appVersion: string,
private mds: MainDataService,
public tcs: TestControllerService,
private bs: BackendService,
@@ -467,7 +468,7 @@ export class TestControllerComponent implements OnInit, OnDestroy {
this.loginDataSubscription = this.mds.loginData$.subscribe(loginData => {
this.tcs.resetDataStore();
if ((loginData.persontoken.length > 0) && (loginData.booklet > 0)) {
- const envData = new EnvironmentData();
+ const envData = new EnvironmentData(this.appVersion);
this.tcs.addBookletLog(LogEntryKey.BOOKLETLOADSTART, JSON.stringify(envData));
this.tcs.mode = loginData.mode;
diff --git a/src/app/test-controller/unithost/unit-routing-guards.ts b/src/app/test-controller/unithost/unit-routing-guards.ts
index 3cf82309..8744c303 100644
--- a/src/app/test-controller/unithost/unit-routing-guards.ts
+++ b/src/app/test-controller/unithost/unit-routing-guards.ts
@@ -383,7 +383,7 @@ export class UnitActivateGuard implements CanActivate {
} else {
this.tcs.currentUnitSequenceId = targetUnitSequenceId;
this.tcs.updateMinMaxUnitSequenceId(this.tcs.currentUnitSequenceId);
- this.tcs.addUnitLog(newUnit.unitDef.id, LogEntryKey.UNITENTER);
+ this.tcs.addUnitLog(newUnit.unitDef.alias, LogEntryKey.UNITENTER);
return of(true);
}
}));
@@ -419,7 +419,7 @@ export class UnitDeactivateGuard implements CanDeactivate<UnithostComponent> {
const currentUnitSequenceId: number = Number(currentRoute.params['u']);
const currentUnit: UnitControllerData = this.tcs.rootTestlet.getUnitAt(currentUnitSequenceId);
- this.tcs.addUnitLog(currentUnit.unitDef.id, LogEntryKey.UNITTRYLEAVE);
+ this.tcs.addUnitLog(currentUnit.unitDef.alias, LogEntryKey.UNITTRYLEAVE);
}
return true;
}
--
GitLab