sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 243: Message bei Inaktivität geädnert

Browse Source 
Message bei Inaktivität geädnert

Related work items: #738
This commit is contained in:
Lorenz Hilpert
2020-09-02 15:33:56 +00:00
committed by Sebastian Neumair
parent 56a2fce2b3 87885cb0bd
commit 2bf7987280
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/sales/src/app/core/error/component/error.component.ts
View File

@@ -10,7 +10,7 @@ import { ErrorService } from './error.service';
@Component({
selector: 'app-error',
templateUrl: './error.component.html',
styleUrls: ['./error.component.scss']
styleUrls: ['./error.component.scss'],
})
export class ErrorComponent implements OnInit, OnDestroy {
id = 'error-modal';
@@ -42,7 +42,7 @@ export class ErrorComponent implements OnInit, OnDestroy {
this.formatInvalidProperties(invalidProperties);
}
this.title = logout ? 'Willkommen zurück!' : 'Irgendwas hat nicht funktioniert…';
this.message = logout ? 'Sie waren seit 5 Stunden nicht in der ISA.<br> Bitte melden Sie sich erneut an.' : '';
this.message = logout ? 'Sie waren zu lange nicht in der ISA aktiv.<br>Bitte melden Sie sich erneut an.' : '';
if (this.validMessageCodes.includes(code) && !isNullOrUndefined(message)) {
this.message = message;
}
@@ -76,13 +76,9 @@ export class ErrorComponent implements OnInit, OnDestroy {
}
formatInvalidProperties(invalidProperties: string) {
const properties = invalidProperties
.replace('{', '')
.replace('}', '')
.replace(/"/g, '')
.split(',');
const properties = invalidProperties.replace('{', '').replace('}', '').replace(/"/g, '').split(',');
if (properties && properties.length > 0) {
this.invalidAttributes = properties.map(propertie => {
this.invalidAttributes = properties.map((propertie) => {
const keyValuePropertie = propertie.split(':');
return { key: keyValuePropertie[0], value: keyValuePropertie[1] };
});