diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.ts b/Mohem/src/app/authentication/digital-id/digital-id.component.ts
index da088354..9472fff8 100644
--- a/Mohem/src/app/authentication/digital-id/digital-id.component.ts
+++ b/Mohem/src/app/authentication/digital-id/digital-id.component.ts
@@ -16,6 +16,9 @@ export class DigitalIdComponent implements OnInit {
) { }
ngOnInit() {
+ if(JSON.parse(localStorage.getItem('digitalIDUser'))){
+ this.userInfo = JSON.parse(localStorage.getItem('digitalIDUser'));
+ }
console.log(this.userInfo);
}
diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
index db2c1fc6..150db4ab 100644
--- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
+++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
@@ -134,7 +134,7 @@ export class AuthenticationService {
mobileType = 'android';
}
request.VersionID = 2.8;
- request.Channel = 31;
+ request.Channel = 33;
request.LanguageID = TranslatorService.getCurrentLanguageCode();
request.MobileType = mobileType;
@@ -209,7 +209,7 @@ export class AuthenticationService {
public login(request: LoginRequest, onError: any, errorLabel: string): Observable
{
this.setPublicFields(request);
- request.P_APP_VERSION="CS";
+ request.P_APP_VERSION="HMG";
return this.con.post(AuthenticationService.login, request, onError, errorLabel);
}
@@ -336,6 +336,8 @@ export class AuthenticationService {
user.TokenID = result.TokenID;
user.CompanyImageDescription=result.CompanyImageDescription;
user.CompanyImageURL=result.CompanyImageURL;
+ user.CompanyBadge = result.CompanyBadge;
+ user.CompanyMainCompany = result.CompanyMainCompany;
user.LogInTokenID = this.cs.sharedService.getSharedData(
AuthenticationService.LOGIN_DATA,
false
@@ -464,7 +466,7 @@ export class AuthenticationService {
public checkUserAuthentication(request: CheckUserAuthenticationRequest, onError: any, errorLabel: string)
: Observable {
this.setPublicFields(request);
- request.P_APP_VERSION="CS";
+ request.P_APP_VERSION="HMG";
return this.con.post(AuthenticationService.userChecking, request, onError, errorLabel);
}
diff --git a/Mohem/src/app/hmg-common/services/authentication/models/authenticated-user.ts b/Mohem/src/app/hmg-common/services/authentication/models/authenticated-user.ts
index 2438134c..998e84ea 100644
--- a/Mohem/src/app/hmg-common/services/authentication/models/authenticated-user.ts
+++ b/Mohem/src/app/hmg-common/services/authentication/models/authenticated-user.ts
@@ -78,6 +78,8 @@ MobileNumber:string;
LogInTokenID:string;
CompanyImageDescription: string;
CompanyImageURL: string;
+CompanyMainCompany: string;
+CompanyBadge: string;
SERVICE_DAYS:Number;
SERVICE_MONTHS:Number;
SERVICE_YEARS:Number;
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 7c703fb2..73d27b74 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
@@ -15,6 +15,8 @@ export class SMSCheckResponse extends Response {
public LogInTokenID : string;
public CompanyImageDescription:string;
public CompanyImageURL:string;
+ public CompanyMainCompany: string;
+ public CompanyBadge: string;
public EMPLOYEE_MOBILE_NUMBER:string;
public EMPLOYEE_NAME:string;
public Mohemm_Wifi_SSID:string;
diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html
index e1c3a368..5af2c3cf 100644
--- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html
+++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.html
@@ -49,13 +49,17 @@
-
-
-
-
+
+
+
+ {{ts.trPK('general','digital-id')}}
+
+
+
+
-
+