changes for files

src/app/start/start.component.css

@@ -5,7 +5,3 @@
 .status {
   background-color: lightgrey;
 }
-
-.error-msg {
-  color: brown;
-}

src/app/workspace/backend.service.ts

 import { GetFileResponseData, CheckWorkspaceResponseData, BookletsStarted, SysCheckStatistics, ReviewData, LogData, UnitResponse, ResultData, MonitorData } from './workspace.interfaces';
 import { Injectable, Inject } from '@angular/core';
-import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpErrorResponse, HttpUrlEncodingCodec } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 // import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { catchError } from 'rxjs/operators';
@@ -18,24 +18,6 @@ export class BackendService {
   }
 
 
-  // *******************************************************************
-  // Fehlerbehandlung beim Aufrufer
-  getFile(filetype: string, filename: string): Observable<GetFileResponseData[] | ServerError> {
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Content-Type':  'application/json'
-      })
-    };
-    return this.http
-      .post<GetFileResponseData[]>(this.serverUrl + 'getFile.php', {
-            ft: filetype,
-            fn: filename
-          }, httpOptions)
-        .pipe(
-          catchError(ErrorHandler.handle)
-        );
-  }
-
   // *******************************************************************
   getFiles(): Observable<GetFileResponseData[] | ServerError> {
     return this.http

src/app/workspace/files/files.component.ts

@@ -153,8 +153,10 @@ export class FilesComponent implements OnInit, OnDestroy {
   // ***********************************************************************************
   getDownloadRef(element: GetFileResponseData): string {
     return this.serverUrl
-        + 'admin/php_admin/getFile.php?t=' + element.type
-        + '&fn=' + element.filename;
+        + 'php/getFile.php?t=' + element.type
+        + '&fn=' + element.filename
+        + '&at=' + this.mds.adminToken
+        + '&ws=' + this.wds.ws.toString();
   }
 
   checkWorkspace() {

src/app/workspace/workspace.component.html

@@ -2,9 +2,9 @@
   <a [routerLink]="['/']">
     <img src="assets/IQB-LogoA.png" matTooltip="Startseite"/>
   </a>
-  <div fxLayout="row" fxLayoutAlign="end center">
-    <p>{{ pageTitle }}</p>
-  </div>
+  <div class="error-msg">{{ (mds.globalErrorMsg$ | async)?.labelNice }}</div>
+  <div>IQB-Testcenter Verwaltung</div>
+  <div>{{ pageTitle }}</div>
 </div>
 <div class="page-body">
   <div class="adminbackground">

src/styles.css

@@ -12,7 +12,7 @@
   overflow-x: auto;
   position: absolute;
   width: 100%;
-  top: 50px;
+  top: 60px;
   bottom: 0;
 }
 
@@ -33,3 +33,7 @@
 .logo img {
   width: 100px;
 }
+
+.error-msg {
+  color: brown;
+}