From ad45089c70c9c15bc9c25b4d3a9b20675a893923 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 6 Jun 2022 15:30:23 +0300 Subject: [PATCH 1/3] fixed issues --- Mohem/src/app/hmg-common/services/common/common.service.ts | 5 +++-- Mohem/src/app/home/home.page.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 4bfffd47..2a8ae0fd 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1680,7 +1680,7 @@ export class CommonService { public data = { datasets: [ { - data: [0, 0, 0, 0, 0, 0, 0], + data: [0, 0, 0, 0, 0, 0, 0, 0], backgroundColor: [ '#18a169', '#3cb9d5', @@ -1688,7 +1688,8 @@ export class CommonService { '#38c9b3', '#cc3232', '#9e7e97', - '#ff9800' + '#ff9800', + '#787299' ], borderWidth: 6 }] diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 04bed0e1..98b422d6 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -832,7 +832,7 @@ export class HomePage implements OnInit { // this.getDeviceLocation(); this.showAttendanceOptions(); // tslint:disable-next-line: triple-equals - } else if (link == '1') { + } else if (link == '1' && this.showLoader === false) { this.common.sharedService.setSharedData(this.statsButtons[1].statsValue, 'total-count'); this.common.startLoading(); this.common.openNotificationPage(); From 09a63bcd3522f9628361c156d49cdae5c391469b Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 6 Jun 2022 16:35:33 +0300 Subject: [PATCH 2/3] version id 3.6 for mohemm Q3 --- .../services/authentication/authentication.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7c6bdb82..55367138 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -145,7 +145,7 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 3.5; + request.VersionID = 3.6; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; From 3cf85a898b8a35b75d204e7ec877c38233d22d76 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Tue, 7 Jun 2022 11:07:13 +0300 Subject: [PATCH 3/3] server link added for Live --- .../app/hmg-common/services/connector/connector.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index ccee3973..5a1959c6 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - public static host = 'https://uat.hmgwebservices.com/'; - //public static host = 'https://hmgwebservices.com/'; + // public static host = 'https://uat.hmgwebservices.com/'; + public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService,