From: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
Date: Thu, 12 Oct 2023 05:59:52 +0000 (+0530)
Subject: Fix Bug 2293: Password Expiry and Account Expiry Time Issue for today & tomorrow... 
X-Git-Tag: release-v15.0-start~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c6c72e359f949e7595f3e7594d5d811ee7fd9d39;p=osm%2FNG-UI.git

Fix Bug 2293: Password Expiry and Account Expiry Time Issue for today & tomorrow scenarios

	- For today & tomorrow used Math.round
	- For more than one day concept used Math.floor

Change-Id: Ifcc08ae030a7643b3ed0306867513065b06c2007
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
---

diff --git a/src/app/login/LoginComponent.ts b/src/app/login/LoginComponent.ts
index 1ffa8c3..53f6f98 100644
--- a/src/app/login/LoginComponent.ts
+++ b/src/app/login/LoginComponent.ts
@@ -318,24 +318,28 @@ export class LoginComponent implements OnInit {
                     this.sharedService.passwordToaster(this.lastLogin, this.failedAttempts, this.passwordNoOfDays,
                         this.passwordExpireMessage, this.passwordMessage);
                 } else {
-                    if (this.accountNoOfDays === '1') {
-                        this.accountExpireMessage = this.translateService.instant('PAGE.LOGIN.ACCOUNTEXPIRETOMORROW');
-                        this.accountMessage = '';
-                        this.accountNoOfDays = '';
-                    } else if (this.accountNoOfDays === '0') {
-                        this.accountExpireMessage = this.translateService.instant('PAGE.LOGIN.ACCOUNTEXPIRETODAY');
-                        this.accountMessage = '';
-                        this.accountNoOfDays = '';
-                    } else {
-                        this.accountExpireMessage = this.accountExpireMessage = this.translateService.instant('PAGE.LOGIN.ACCOUNTEXPIRE');
-                        this.accountMessage = this.translateService.instant('PAGE.LOGIN.DAYS');
-                    }
-                    this.sharedService.showToaster(this.lastLogin, this.failedAttempts, this.passwordNoOfDays, this.accountNoOfDays,
-                        this.passwordExpireMessage, this.accountExpireMessage, this.passwordMessage, this.accountMessage);
+                    this.accountDaysCheck();
                 }
             }
         }
     }
+    /** To check account no.of days with 0 & 1 @public */
+    public accountDaysCheck(): void {
+        if (this.accountNoOfDays === '1') {
+            this.accountExpireMessage = this.translateService.instant('PAGE.LOGIN.ACCOUNTEXPIRETOMORROW');
+            this.accountMessage = '';
+            this.accountNoOfDays = '';
+        } else if (this.accountNoOfDays === '0') {
+            this.accountExpireMessage = this.translateService.instant('PAGE.LOGIN.ACCOUNTEXPIRETODAY');
+            this.accountMessage = '';
+            this.accountNoOfDays = '';
+        } else {
+            this.accountExpireMessage = this.accountExpireMessage = this.translateService.instant('PAGE.LOGIN.ACCOUNTEXPIRE');
+            this.accountMessage = this.translateService.instant('PAGE.LOGIN.DAYS');
+        }
+        this.sharedService.showToaster(this.lastLogin, this.failedAttempts, this.passwordNoOfDays, this.accountNoOfDays,
+            this.passwordExpireMessage, this.accountExpireMessage, this.passwordMessage, this.accountMessage);
+    }
     /** To display account expiry Toaster with required data @public */
     public accountExpiryToaster(): void {
         if (!isNullOrUndefined(this.accountNoOfDays)) {
@@ -356,24 +360,28 @@ export class LoginComponent implements OnInit {
                     this.sharedService.accountToaster(this.lastLogin, this.failedAttempts,
                         this.accountNoOfDays, this.accountExpireMessage, this.accountMessage);
                 } else {
-                    if (this.passwordNoOfDays === '1') {
-                        this.passwordExpireMessage = this.translateService.instant('PAGE.LOGIN.PASSWORDEXPIRETOMORROW');
-                        this.passwordMessage = '';
-                        this.passwordNoOfDays = '';
-                    } else if (this.passwordNoOfDays === '0') {
-                        this.passwordExpireMessage = this.translateService.instant('PAGE.LOGIN.PASSWORDEXPIRETODAY');
-                        this.passwordMessage = '';
-                        this.passwordNoOfDays = '';
-                    } else {
-                        this.passwordExpireMessage = this.translateService.instant('PAGE.LOGIN.PASSWORDEXPIRE');
-                        this.passwordMessage = this.translateService.instant('PAGE.LOGIN.DAYS');
-                    }
-                    this.sharedService.showToaster(this.lastLogin, this.failedAttempts, this.passwordNoOfDays, this.accountNoOfDays,
-                        this.passwordExpireMessage, this.accountExpireMessage, this.passwordMessage, this.accountMessage);
+                    this.passwordDaysCheck();
                 }
             }
         }
     }
+    /** To check password no.of days with 0 & 1 @public */
+    public passwordDaysCheck(): void {
+        if (this.passwordNoOfDays === '1') {
+            this.passwordExpireMessage = this.translateService.instant('PAGE.LOGIN.PASSWORDEXPIRETOMORROW');
+            this.passwordMessage = '';
+            this.passwordNoOfDays = '';
+        } else if (this.passwordNoOfDays === '0') {
+            this.passwordExpireMessage = this.translateService.instant('PAGE.LOGIN.PASSWORDEXPIRETODAY');
+            this.passwordMessage = '';
+            this.passwordNoOfDays = '';
+        } else {
+            this.passwordExpireMessage = this.translateService.instant('PAGE.LOGIN.PASSWORDEXPIRE');
+            this.passwordMessage = this.translateService.instant('PAGE.LOGIN.DAYS');
+        }
+        this.sharedService.showToaster(this.lastLogin, this.failedAttempts, this.passwordNoOfDays, this.accountNoOfDays,
+            this.passwordExpireMessage, this.accountExpireMessage, this.passwordMessage, this.accountMessage);
+    }
     /** To display password & account expiry Toaster with required data @public */
     public showToaster(): void {
         if (!isNullOrUndefined(this.accountNoOfDays) && !isNullOrUndefined(this.passwordNoOfDays)) {
diff --git a/src/services/SharedService.ts b/src/services/SharedService.ts
index 8abe1d2..ba805e6 100644
--- a/src/services/SharedService.ts
+++ b/src/services/SharedService.ts
@@ -191,8 +191,12 @@ export class SharedService {
         if (!isNullOrUndefined(date)) {
             const today: Date = new Date();
             const accountDate: Date = new Date(date);
-            return Math.floor((accountDate.getTime() -
-                today.getTime()) / this.epochTime1000 / this.epochTime60 / this.epochTime60 / this.epochTime24);
+            const toasterDate: number = (accountDate.getTime() -
+                today.getTime()) / this.epochTime1000 / this.epochTime60 / this.epochTime60 / this.epochTime24;
+            if (toasterDate >= 0 || toasterDate < 1) {
+                return Math.round(toasterDate);
+            }
+            return Math.floor(toasterDate);
         }
         return this.translateService.instant('N/A');
     }