Skip to content
Snippets Groups Projects
Commit f77d89fc authored by paflov's avatar paflov
Browse files

rename run.compoment to sys-check-component

parent 247d1474
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 75 additions and 184 deletions
src/app/sys-check/run.component.ts deleted 100644 → 0
+ 0
− 175
View file @ 247d1474
import { SaveReportComponent } from './report/save-report/save-report.component';
import { NetworkCheckComponent } from './network-check/network-check.component';
import { SyscheckDataService } from './syscheck-data.service';
import { ActivatedRoute, ParamMap } from '@angular/router';
import { Component, OnInit, ViewChild } from '@angular/core';
import {BackendService, CheckConfig, CheckConfigData, FormDefEntry, Rating} from './backend.service';
import { UnitCheckComponent } from './unit-check/unit-check.component';
import { MatDialog, MatSnackBar } from '@angular/material';
import { map, skip, zip } from 'rxjs/operators';
import { StepperSelectionEvent } from '@angular/cdk/stepper';
interface Checks { // a cleaned version of CheckConfigData .. TODO maybe merge them togeether
environment: boolean;
unit: boolean;
questions: boolean;
network: boolean;
report: boolean;
}
@Component({
selector: 'app-run',
templateUrl: './run.component.html',
styleUrls: ['./run.component.scss']
})
export class RunComponent implements OnInit {
checks: Checks = {
environment: true,
unit: false,
questions: false,
network: false,
report: true
};
title: String = '';
constructor(
private bs: BackendService,
private ds: SyscheckDataService,
private route: ActivatedRoute
) {
}
ngOnInit() {
this.route.paramMap.subscribe((params: ParamMap) => {
const paramId = params.get('c');
if (paramId === this.bs.basicTestConfig.id) {
this.loadTestConfig(this.bs.basicTestConfigData);
} else {
this.bs.getCheckConfigData(paramId).subscribe(config => this.loadTestConfig(config));
}
});
}
loadTestConfig(checkConfig: CheckConfigData) {
console.log('loading', checkConfig);
this.title = 'IQB-Testcenter: ' + checkConfig.label;
this.checks.environment = !checkConfig.questionsonlymode;
this.checks.unit = checkConfig.hasunit && !checkConfig.questionsonlymode;
this.checks.network = !checkConfig.skipnetwork && !checkConfig.questionsonlymode;
this.checks.questions = checkConfig.questions.length > 0;
this.checks.report = checkConfig.cansave;
console.log('this.checks', this.checks);
this.ds.checkConfig$.next(checkConfig);
if (this.checks.unit) { this.ds.taskQueue.push('loadunit'); }
if (this.checks.network) { this.ds.taskQueue.push('speedtest'); }
this.ds.nextTask();
}
// this.ds.networkData$.subscribe(nd => {
// // if (typeof this.stepNetwork !== 'undefined') {
// // this.stepNetwork.completed = nd.length > 0;
// // }
// });
//
// this.route.paramMap.subscribe((params: ParamMap) => {
// this.paramId = params.get('c');
// if (this.paramId === this.bs.basicTestConfig.id) {
// this.ds.checkConfig$.next(this.bs.basicTestConfigData);
// // this.stepper.selectedIndex = 0;
// // if (typeof this.stepNetwork !== 'undefined') {
// // this.stepNetwork.completed = false;
// // }
// this.unitcheckAvailable = false;
// this.questionnaireAvailable = false;
// this.questionsonlymode = false;
// this.skipnetwork = false;
// } else {
// this.bs.getCheckConfigData(this.paramId).subscribe(
// scData => {
// scData.downloadGood = this.bs.basicTestConfigData.downloadGood;
// scData.downloadMinimum = this.bs.basicTestConfigData.downloadMinimum;
// scData.uploadGood = this.bs.basicTestConfigData.uploadGood;
// scData.uploadMinimum = this.bs.basicTestConfigData.uploadMinimum;
// scData.pingGood = this.bs.basicTestConfigData.pingGood;
// scData.pingMinimum = this.bs.basicTestConfigData.pingMinimum;
//
// if (typeof scData.ratings !== 'undefined') {
// for (let i = 0; i < scData.ratings.length; i++) {
// if (scData.ratings[i].type === 'download') {
// scData.downloadGood = scData.ratings[i].good;
// scData.downloadMinimum = scData.ratings[i].min;
// } else if (scData.ratings[i].type === 'upload') {
// scData.uploadGood = scData.ratings[i].good;
// scData.uploadMinimum = scData.ratings[i].min;
// } else if (scData.ratings[i].type === 'ping') {
// scData.pingGood = scData.ratings[i].good;
// scData.pingMinimum = scData.ratings[i].min;
// }
// }
// }
//
// this.ds.checkConfig$.next(scData);
// // this.stepper.selectedIndex = 0;
// this.skipnetwork = scData.skipnetwork;
// // if (typeof this.stepNetwork !== 'undefined') {
// // this.stepNetwork.completed = this.skipnetwork;
// // }
// this.saveEnabled = scData.cansave;
// this.questionsonlymode = scData.questionsonlymode;
// if (this.questionsonlymode) {
// // worst case: step is shown but no questions
// this.questionnaireAvailable = true;
// this.unitcheckAvailable = false;
// } else {
// this.questionnaireAvailable = scData.questions.length > 0;
// this.unitcheckAvailable = scData.hasunit;
// }
// }
// );
// }
// });
//
//
//
// this.stepper.animationDone
// .pipe(
// skip(1), // animationDone gets called when the the stepper is rendered the frist time on step 1, but not selectionChange
// zip(this.stepper.selectionChange),
// map((combined: [any, StepperSelectionEvent]) => combined[1])
// )
// // .subscribe(stepEvent => {this.stepperSelectionChanged(stepEvent); });
// }
//
// stepperSelectionChanged(e: StepperSelectionEvent) {
// this.ds.showNaviButtons$.next(false);
//
// if (e.selectedStep === this.stepUnit) {
// this.ds.showNaviButtons$.next(true);
// if (!this.stepUnit.completed) {
// const cd = this.ds.checkConfig$.getValue();
// this.compUnit.loadUnitandPlayer(cd.id);
// this.stepUnit.completed = true;
// }
// } else if (e.selectedStep === this.stepNetwork) {
// if (this.skipnetwork) {
// this.stepNetwork.completed = true;
// } else {
// if (!this.stepNetwork.completed) {
// this.compNetwork.startCheck();
// }
// }
// }
// }
}
src/app/sys-check/sys-check-routing.module.ts
+ 2
− 2
View file @ f77d89fc
import { RunComponent } from './run.component';
import { SysCheckComponent } from './sys-check.component';
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { StartComponent } from './start.component';
......@@ -14,7 +14,7 @@ const routes: Routes = [
},
{
path: 'run/:c',
component: RunComponent
component: SysCheckComponent
}];
@NgModule({
......
src/app/sys-check/run.component.spec.ts → src/app/sys-check/sys-check.component.spec.ts
+ 5
− 5
View file @ f77d89fc
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { RunComponent } from './run.component';
import { SysCheckComponent } from './sys-check.component';
describe('RunComponent', () => {
let component: RunComponent;
let fixture: ComponentFixture<RunComponent>;
let component: SysCheckComponent;
let fixture: ComponentFixture<SysCheckComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ RunComponent ]
declarations: [ SysCheckComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(RunComponent);
fixture = TestBed.createComponent(SysCheckComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
......
src/app/sys-check/sys-check.component.ts 0 → 100644
+ 66
− 0
View file @ f77d89fc
import { SyscheckDataService } from './syscheck-data.service';
import { ActivatedRoute, ParamMap } from '@angular/router';
import { Component, OnInit} from '@angular/core';
import {BackendService, CheckConfigData, FormDefEntry, Rating} from './backend.service';
interface Checks {
environment: boolean;
unit: boolean;
questions: boolean;
network: boolean;
report: boolean;
}
@Component({
selector: 'app-run',
templateUrl: './sys-check.component.html',
styleUrls: ['./sys-check.component.scss']
})
export class SysCheckComponent implements OnInit {
checks: Checks = {
environment: true,
unit: false,
questions: false,
network: false,
report: true
};
title: String = '';
constructor(
private bs: BackendService,
private ds: SyscheckDataService,
private route: ActivatedRoute
) {
}
ngOnInit() {
this.route.paramMap.subscribe((params: ParamMap) => {
const paramId = params.get('c');
if (paramId === this.bs.basicTestConfig.id) {
this.loadTestConfig(this.bs.basicTestConfigData);
} else {
this.bs.getCheckConfigData(paramId).subscribe(config => this.loadTestConfig(config));
}
});
}
loadTestConfig(checkConfig: CheckConfigData) {
this.title = 'IQB-Testcenter: ' + checkConfig.label;
this.checks.environment = !checkConfig.questionsonlymode;
this.checks.unit = checkConfig.hasunit && !checkConfig.questionsonlymode;
this.checks.network = !checkConfig.skipnetwork && !checkConfig.questionsonlymode;
this.checks.questions = checkConfig.questions.length > 0;
this.checks.report = checkConfig.cansave;
this.ds.checkConfig$.next(checkConfig);
if (this.checks.unit) { this.ds.taskQueue.push('loadunit'); }
if (this.checks.network) { this.ds.taskQueue.push('speedtest'); }
this.ds.nextTask();
}
}
src/app/sys-check/sys-check.module.ts
+ 2
− 2
View file @ f77d89fc
......@@ -6,7 +6,7 @@ import { CommonModule } from '@angular/common';
import { SysCheckRoutingModule } from './sys-check-routing.module';
import { StartComponent } from './start.component';
import { RunComponent } from './run.component';
import { SysCheckComponent } from './sys-check.component';
import { FlexLayoutModule } from '@angular/flex-layout';
import { MatButtonModule, MatCheckboxModule, MatCardModule, MatStepperModule,
MatIconModule, MatDialogModule, MatFormFieldModule, MatInputModule, MatSelectModule,
......@@ -48,7 +48,7 @@ import { TcSpeedChartComponent } from './network-check/tc-speed-chart.component'
],
declarations: [
StartComponent,
RunComponent,
SysCheckComponent,
EnvironmentCheckComponent,
NetworkCheckComponent,
UnitCheckComponent,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Impressum | Datenschutzerklärung