diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts
index aee9f1a2..0c01d253 100644
--- a/Mohem/src/app/app.component.ts
+++ b/Mohem/src/app/app.component.ts
@@ -161,44 +161,44 @@ export class AppComponent implements OnInit {
this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME;
- this.authService.checkAds({
- EmployeeNumber: '',
- ItgEnableAt: "After Service Submission", //After Service Submission
- ItgServiceName: "Login"
- }, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => {
-
- var result = JSON.parse(res.Mohemm_ITG_ResponseItem).result.data;
-
- this.cs.sharedService.setSharedData(
- result,
- AuthenticationService.SERVEY_DATA
- )
- if (!CommonService.SKIP && result) {
- if (result.notificationType == 'Survey') {
- this.cs.navigateForward('/erm-channel/survey');
- } else {
- this.authService.adsDetails({
- "ItgNotificationMasterId": result['notificationMasterId']
- },
- () => { }, this.ts.trPK('general', 'ok')
- ).subscribe((result) => {
- var data = result.Mohemm_ITG_ResponseItem;
- if (data) {
- this.cs.sharedService.setSharedData(
- JSON.parse(data),
- AuthenticationService.ADS_DATA
- );
- this.cs.navigateForward('/erm-channel/home');
- }
-
- })
-
- }
-
- }
-
-
- });
+ // this.authService.checkAds({
+ // EmployeeNumber: '',
+ // ItgEnableAt: "After Service Submission", //After Service Submission
+ // ItgServiceName: "Login"
+ // }, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => {
+
+ // var result = JSON.parse(res.Mohemm_ITG_ResponseItem).result.data;
+
+ // this.cs.sharedService.setSharedData(
+ // result,
+ // AuthenticationService.SERVEY_DATA
+ // )
+ // if (!CommonService.SKIP && result) {
+ // if (result.notificationType == 'Survey') {
+ // this.cs.navigateForward('/erm-channel/survey');
+ // } else {
+ // this.authService.adsDetails({
+ // "ItgNotificationMasterId": result['notificationMasterId']
+ // },
+ // () => { }, this.ts.trPK('general', 'ok')
+ // ).subscribe((result) => {
+ // var data = result.Mohemm_ITG_ResponseItem;
+ // if (data) {
+ // this.cs.sharedService.setSharedData(
+ // JSON.parse(data),
+ // AuthenticationService.ADS_DATA
+ // );
+ // this.cs.navigateForward('/erm-channel/home');
+ // }
+
+ // })
+
+ // }
+
+ // }
+
+
+ // });
if (this.cs.getUpdateImage().status) {
this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img);
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 f472cb49..00ebe2fa 100644
--- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts
+++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
@@ -27,9 +27,9 @@ export class ConnectorService {
public static retryTimes = 0;
public static timeOut = 180 * 1000;
- public static host = 'https://uat.hmgwebservices.com/';
+ // public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/';
-
+ public static host = 'http://10.201.204.124:5818/' //MOE
constructor(public httpClient: HttpClient,
public cs: CommonService,
private events: Events,
diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html
index f189e43a..00a271ad 100644
--- a/Mohem/src/app/home/home.page.html
+++ b/Mohem/src/app/home/home.page.html
@@ -47,7 +47,7 @@
-
+
-
+
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts
index 98b422d6..7b0b26d5 100644
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@@ -73,11 +73,11 @@ export class HomePage implements OnInit {
public intervalCountdown: any;
public showLoader = true;
public statsButtons = [
- {
- title: this.ts.trPK('attendance-tracking', 'title'),
- link: '0',
- show: true
- },
+ // {
+ // title: this.ts.trPK('attendance-tracking', 'title'),
+ // link: '0',
+ // show: true
+ // },
{
title: this.ts.trPK('home', 'worklist'),
statsValue: 0,
@@ -85,13 +85,13 @@ export class HomePage implements OnInit {
link: '1',
show: true
},
- {
- title: this.ts.trPK('home', 'missing-swipes'),
- statsValue: 0,
- icon: 'assets/icon/new-design/missing_swipe.png',
- link: '2',
- show: true
- },
+ // {
+ // title: this.ts.trPK('home', 'missing-swipes'),
+ // statsValue: 0,
+ // icon: 'assets/icon/new-design/missing_swipe.png',
+ // link: '2',
+ // show: true
+ // },
{
title: this.ts.trPK('home', 'leave-balance'),
statsValue: 0,
@@ -380,11 +380,11 @@ export class HomePage implements OnInit {
this.openNotificationsDashbored();
}
- this.showOpenMissingSwipes();
- this.showAttendanceTracking();
- var accrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false);
- if (!accrualBalance)
- this.getAccrualBalance();
+ //this.showOpenMissingSwipes();
+ //this.showAttendanceTracking();
+ //var accrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false);
+ // if (!accrualBalance)
+ // this.getAccrualBalance();
}
public Vacation_Rule() {
@@ -665,12 +665,14 @@ export class HomePage implements OnInit {
if (this.common.validResponse(result)) {
const key = 'P_OPEN_NTF_NUMBER';
this.countAllNotification = result[key];
- this.ITGCountAllNotification();
+ //this.ITGCountAllNotification();
this.common.sharedService.setSharedData(
result,
'worklistNotifications'
);
this.common.setFilterValues(result['GetOpenNotificationsList']);
+ this.showLoader = false;
+
} else {
this.showLoader = false;
this.common.stopLoading();
@@ -712,10 +714,10 @@ export class HomePage implements OnInit {
const countResult = result.Mohemm_ITG_Pending_Task_ResponseItem;
const totalCount = countResult.escalation + countResult.waitingToClose + countResult.waitingForAcceptance + countResult.extendTATRequest;
this.common.filterKeys['COC'] = totalCount;
-
-
+
+
this.statsButtons[1].statsValue = Math.floor(this.statsButtons[1].statsValue + totalCount);
-
+
this.common.sharedService.setSharedData(this.statsButtons[1].statsValue, 'total-count');
this.showLoader = false;