From 823bd01d53f856c089dd667cfdf6ad35164b4650 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Thu, 27 Jun 2019 15:06:51 +0300 Subject: [PATCH] dashboard update --- Mohem/src/app/app.component.html | 2 +- Mohem/src/app/app.component.ts | 2 ++ .../authentication/models/check-activation-code.response.ts | 3 +++ .../services/authentication/models/smscheck.response.ts | 2 ++ Mohem/src/app/home/home.page.ts | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 6d62d18f..6c1e3f07 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -36,7 +36,7 @@ {{ts.trPK('userProfile','title')}} - + diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 5e38b6f6..f46c777f 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -106,6 +106,8 @@ export class AppComponent implements OnInit, AfterViewInit { // this.menuService.disableSession(req).subscribe((result: any) => { // }); this.cs.sharedService.clearAll(); + this.menu.toggle(); this.cs.openLogin(); + } } diff --git a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts index 44749b80..f7718603 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/check-activation-code.response.ts @@ -9,5 +9,8 @@ export class CheckActivationCodeResponse extends Response { LogInTokenID:string; EMPLOYEE_MOBILE_NUMBER:string; TokenID:string; + CompanyImageDescription:string; + CompanyImageURL: string; + MemberInformationList:AuthenticatedUser[]; } diff --git a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts index 741288ce..1ba738fd 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts @@ -10,5 +10,7 @@ export class SMSCheckResponse extends Response { public P_SESSION_ID: number; public MobileNumber : string; public LogInTokenID : string; + public CompanyImageDescription:string; + public CompanyImageURL:string; public EMPLOYEE_MOBILE_NUMBER:string; } diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 9c83887b..602ac627 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -40,7 +40,7 @@ export class HomePage implements OnInit { if (user) { this.events.publish('setMenu'); this.userData = user; - this.user_image=user.EMPLOYEE_IMAGE?user.EMPLOYEE_IMAGE: this.user_image; + this.user_image = user.EMPLOYEE_IMAGE ? "data:image/png;base64,"+user.EMPLOYEE_IMAGE : this.user_image; console.log(user); } else { console.log(user);