diff --git a/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.html b/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.html index 593b9c2c81022ae3357d9875baeef579572a6601..e4bfc80e945b3fde7ae9deb0936d12e2fa26bad0 100644 --- a/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.html +++ b/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.html @@ -1,6 +1,7 @@ <h2 mat-dialog-title>{{ "session.expiration.dialog.title" | translate }}</h2> <mat-dialog-content> - <div innerHTML='{{"session.expiration.dialog.label.session.about.to.expire" | translate:{timeLeft: data.timeLeft, timeout: data.timeout} }}'></div> + <div innerHTML='{{"session.expiration.dialog.label.session.about.to.expire" | translate:{timeLeft: data.timeLeft, + timeoutMinutes: sessionDurationInMinutes, timeoutSeconds: sessionDurationInMinutesReminder} }}'></div> </mat-dialog-content> <mat-dialog-actions> <button mat-raised-button mat-dialog-close (click)="onLogoutClicked()" tabindex="-1"> diff --git a/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.ts b/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.ts index 126f7d769912facedf070c48b6f90cad443a4743..403310ef55eaa63f8138bd41aab2633e435b7560 100644 --- a/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.ts +++ b/smp-angular/src/app/common/dialogs/session-expiration-dialog/session-expiration-dialog.component.ts @@ -24,5 +24,13 @@ export class SessionExpirationDialogComponent { this.securityService.logout(); this.dialogRef.close(); } + + get sessionDurationInMinutes() { + return Math.floor(this.data.timeout / 60); + } + + get sessionDurationInMinutesReminder() { + return this.data.timeout % 60; + } } diff --git a/smp-angular/src/assets/i18n/en.json b/smp-angular/src/assets/i18n/en.json index 38db15b9a2666f29f89f5f1feca84821de8aacd2..a369a8c5f5030b6a85b54ab337ba7ebfcd549873 100644 --- a/smp-angular/src/assets/i18n/en.json +++ b/smp-angular/src/assets/i18n/en.json @@ -92,7 +92,7 @@ "session.expiration.dialog.button.expire": "Extend", "session.expiration.dialog.button.logout": "Logout", "session.expiration.dialog.title": "Extend session", - "session.expiration.dialog.label.session.about.to.expire": "Your session is about to expire in <b>{{timeLeft}}</b> seconds!<br />Would you like to logout now or extend it for another <b>{{timeout}}</b> seconds?", + "session.expiration.dialog.label.session.about.to.expire": "Your session is about to expire in <b>{{timeLeft}}</b> seconds!<br />Would you like to logout now or extend it<br /> for another <b>{{timeoutMinutes}}</b> minute(s) and <b>{{timeoutSeconds}}</b> second(s)?", "session.alert.message.logout.expired": "Your session has expired, and you have been logged out", "alert.panel.title": "Alerts", "alert.panel.user.title": "{{value}} (Email: '{{mailTo}}')",