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 d120bee3..b4fd54bf 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1684,7 +1684,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', @@ -1692,7 +1692,8 @@ export class CommonService { '#38c9b3', '#cc3232', '#9e7e97', - '#ff9800' + '#ff9800', + '#787299' ], borderWidth: 6 }] 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, 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();