From 1499ab81084b36d203c2ffaa779cb17b167f7edf Mon Sep 17 00:00:00 2001
From: mechtelm <nicht@mehr.fragen>
Date: Mon, 23 Mar 2020 11:11:06 +0100
Subject: [PATCH] updated to angular9: tests fail still
---
src/app/app-routing.module.ts | 10 +++++-----
src/app/app.module.ts | 3 ++-
src/app/backend.service.ts | 4 +++-
src/app/superadmin/backend.service.ts | 4 +++-
src/app/workspace-admin/backend.service.ts | 4 +++-
src/app/workspace-monitor/backend.service.ts | 4 +++-
src/tsconfig.app.json | 2 +-
7 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 6dd129c5..e654b3a2 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -8,11 +8,11 @@ const routes: Routes = [
{path: '', component: StartComponent, pathMatch: 'full'},
{path: 'start', component: StartComponent},
{path: 'about', component: AboutComponent},
- {path: 'check', loadChildren: './sys-check/sys-check.module#SysCheckModule'},
- {path: 'admin', loadChildren: './workspace-admin/workspace.module#WorkspaceModule'},
- {path: 'superadmin', loadChildren: './superadmin/superadmin.module#SuperadminModule'},
- {path: 'wsmonitor', loadChildren: './workspace-monitor/workspace-monitor.module#WorkspaceMonitorModule'},
- {path: 't', loadChildren: './test-controller/test-controller.module#TestControllerModule'}
+ {path: 'check', loadChildren: () => import('./sys-check/sys-check.module').then(m => m.SysCheckModule)},
+ {path: 'admin', loadChildren: () => import('./workspace-admin/workspace.module').then(m => m.WorkspaceModule)},
+ {path: 'superadmin', loadChildren: () => import('./superadmin/superadmin.module').then(m => m.SuperadminModule)},
+ {path: 'wsmonitor', loadChildren: () => import('./workspace-monitor/workspace-monitor.module').then(m => m.WorkspaceMonitorModule)},
+ {path: 't', loadChildren: () => import('./test-controller/test-controller.module').then(m => m.TestControllerModule)}
];
@NgModule({
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7a5fa81f..1509ca7e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,7 +2,7 @@ import { AboutComponent } from './about/about.component';
import { BrowserModule } from '@angular/platform-browser';
import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgModule } from '@angular/core';
+import {ApplicationModule, NgModule} from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
@@ -39,6 +39,7 @@ import {MatTooltipModule} from "@angular/material/tooltip";
ErrormsgComponent
],
imports: [
+ ApplicationModule,
BrowserModule,
BrowserAnimationsModule,
MatButtonModule,
diff --git a/src/app/backend.service.ts b/src/app/backend.service.ts
index abdaf1fc..8d9f57b4 100644
--- a/src/app/backend.service.ts
+++ b/src/app/backend.service.ts
@@ -7,7 +7,9 @@ import {LoginData, BookletStatus, PersonTokenAndTestId, KeyValuePair, SysConfig}
import {ErrorHandler, ServerError} from 'iqb-components';
// ============================================================================
-@Injectable()
+@Injectable({
+ providedIn: 'root'
+})
export class BackendService {
constructor(
diff --git a/src/app/superadmin/backend.service.ts b/src/app/superadmin/backend.service.ts
index 00da11b3..fc1c5329 100644
--- a/src/app/superadmin/backend.service.ts
+++ b/src/app/superadmin/backend.service.ts
@@ -4,7 +4,9 @@ import { Observable, of } from 'rxjs';
import { catchError } from 'rxjs/operators';
-@Injectable()
+@Injectable({
+ providedIn: 'root'
+})
export class BackendService {
diff --git a/src/app/workspace-admin/backend.service.ts b/src/app/workspace-admin/backend.service.ts
index 336c92db..d092983c 100644
--- a/src/app/workspace-admin/backend.service.ts
+++ b/src/app/workspace-admin/backend.service.ts
@@ -6,7 +6,9 @@ import { Observable } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { ErrorHandler, ServerError } from 'iqb-components';
-@Injectable()
+@Injectable({
+ providedIn: 'root'
+})
export class BackendService {
diff --git a/src/app/workspace-monitor/backend.service.ts b/src/app/workspace-monitor/backend.service.ts
index 2730e41c..ac1d1bf6 100644
--- a/src/app/workspace-monitor/backend.service.ts
+++ b/src/app/workspace-monitor/backend.service.ts
@@ -5,7 +5,9 @@ import { Observable } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { ErrorHandler, ServerError } from 'iqb-components';
-@Injectable()
+@Injectable({
+ providedIn: 'root'
+})
export class BackendService {
private serverUrlSlim = '';
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index 722c370d..1c44057e 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -2,7 +2,7 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
- "module": "es2015",
+ "module": "esnext",
"types": []
},
"exclude": [
--
GitLab