From 549c6bc21e6ce92bfcbb1bcc8f45e0855f91406f Mon Sep 17 00:00:00 2001 From: mechtelm <nicht@mehr.fragen> Date: Sun, 23 Aug 2020 16:20:20 +0200 Subject: [PATCH] verona version added as environment variable --- package.json | 2 +- src/app/app-root/status-card/status-card.component.html | 9 +++++---- src/app/app-root/status-card/status-card.component.ts | 1 + src/environments/environment.dev.ts | 3 ++- src/environments/environment.prod.docker.ts | 3 ++- src/main.ts | 4 ++++ 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 365713d1..4f167d06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "itc-ng", - "version": "3.1.2", + "version": "4.0.0", "license": "MIT", "repository": { "type": "git", diff --git a/src/app/app-root/status-card/status-card.component.html b/src/app/app-root/status-card/status-card.component.html index 5bf55649..354b4fb0 100644 --- a/src/app/app-root/status-card/status-card.component.html +++ b/src/app/app-root/status-card/status-card.component.html @@ -1,21 +1,22 @@ <div fxLayout="column"> <div *ngIf="loginName"> <p><b>Status: Angemeldet als "{{loginName}}"</b></p> - <p style="margin-bottom: 0px;"> + <p style="margin-bottom: 0;"> <b *ngIf="loginAuthority.length > 1">Berechtigungen:</b> <b *ngIf="loginAuthority.length === 1">Berechtigung:</b> </p> - <ul style="margin: 0px;"> + <ul style="margin: 0;"> <li *ngFor="let loginAuth of loginAuthority">{{loginAuth}}</li> </ul> </div> <p *ngIf="!loginName"><b>Status: Derzeit nicht angemeldet.</b></p> - <p style="margin-bottom: 0px;"><b>Angaben zu dieser Web-Anwendung:</b></p> - <ul style="margin: 0px;"> + <p style="margin-bottom: 0;"><b>Angaben zu dieser Web-Anwendung:</b></p> + <ul style="margin: 0;"> <li>Interner Programmname: {{ appName }}</li> <li>Programmversion: {{ appVersion }}</li> <li *ngIf="!isProductionMode">Build-Modus: Dev</li> <li>Erforderliche Version der Server-Programmierung: {{ apiVersionExpected }}</li> + <li>Unterstützte Version der Verona Interfaces Player Definition: {{ veronaApiVersionSupported }}</li> <li>Copyright: {{ appPublisher }}</li> </ul> </div> diff --git a/src/app/app-root/status-card/status-card.component.ts b/src/app/app-root/status-card/status-card.component.ts index 921c2acb..a20864e0 100644 --- a/src/app/app-root/status-card/status-card.component.ts +++ b/src/app/app-root/status-card/status-card.component.ts @@ -16,6 +16,7 @@ export class StatusCardComponent implements OnInit { @Inject('APP_PUBLISHER') public appPublisher: string, @Inject('APP_VERSION') public appVersion: string, @Inject('API_VERSION_EXPECTED') public apiVersionExpected: string, + @Inject('VERONA_API_VERSION_SUPPORTED') public veronaApiVersionSupported: string, @Inject('IS_PRODUCTION_MODE') public isProductionMode ) { } diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 5e71ee33..67b1234e 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -6,5 +6,6 @@ export const environment = { production: false, testcenterUrl: 'http://localhost:8000/', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', - apiVersionExpected: '5.0.1' + apiVersionExpected: '5.0.1', + veronaApiVersionSupported: '2.1.0' }; diff --git a/src/environments/environment.prod.docker.ts b/src/environments/environment.prod.docker.ts index fad35c3d..71319342 100644 --- a/src/environments/environment.prod.docker.ts +++ b/src/environments/environment.prod.docker.ts @@ -4,5 +4,6 @@ export const environment = { production: true, testcenterUrl: 'http://localhost:9092/', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', - apiVersionExpected: '5.0.1' + apiVersionExpected: '5.0.1', + veronaApiVersionSupported: '2.1.0' }; diff --git a/src/main.ts b/src/main.ts index e7efdfe8..6d56526f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -31,6 +31,10 @@ platformBrowserDynamic(<StaticProvider[]>[ useValue: environment.apiVersionExpected }, { + provide: 'VERONA_API_VERSION_SUPPORTED', + useValue: environment.veronaApiVersionSupported + }, +{ provide: 'REPOSITORY_URL', useValue: repository.url }, -- GitLab