From 5a11cbfb7e3af9d8c8e1501672247e3d2ca23a31 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sat, 11 Apr 2020 22:23:25 +0300 Subject: [PATCH 1/5] fixed css for itg --- .../work-list-main-itg.component.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index 6c7082f9..876af287 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -159,17 +159,17 @@ - + - {{action.name}} + {{action.name}} - + - Skip + Skip From bc1a637f939b33e05e36ca275f7b80f63be5d24e Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 12 Apr 2020 12:23:59 +0300 Subject: [PATCH 2/5] fixed itg issue --- Mohem/src/app/notification/home/home.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index e169299b..33bb32b3 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -596,6 +596,7 @@ export class HomeComponent implements OnInit { } this.common.sharedService.setSharedData(segmentInfo, HomeComponent.REQUSET_INFO); this.common.sharedService.setSharedData(this.ITGItem, HomeComponent.ALL_REQUEST); + this.common.sharedService.setSharedData(false, 'loadWorkList'); this.common.openWorklistITGPage(); } From f1a58c7dda04054bdd2234f520cfba34473ca83a Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 12 Apr 2020 12:51:44 +0300 Subject: [PATCH 3/5] added more checks --- .../work-list-main-itg.component.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index dfd4f5e3..1ba2a318 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -181,6 +181,7 @@ export class WorkListMainItgComponent implements OnInit { return false; } } else if (this.index === this.all_request_names.length) { //if its the end request redirecte to worklist home + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.openNotificationPage(); return false; } @@ -193,14 +194,16 @@ export class WorkListMainItgComponent implements OnInit { if (this.index !== this.all_request.length) { // check if its last one to redirecte to home otherwise to next request. this.clearDataArray(); this.changeITGForm(this.all_request[this.index], this.request_name); - break + break; } else { + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.openNotificationPage(); - break + break; } } else { + this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.openNotificationPage(); - break + break; } } } @@ -303,7 +306,7 @@ export class WorkListMainItgComponent implements OnInit { }, this.ts.trPK('general', 'ok'), () => { this.actionSelected = ''; - this.common.sharedService.setSharedData(true, 'loadWorkList'); + this.common.sharedService.setSharedData(true, 'loadWorkList'); }, this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), this.confirmMsg(action)); From 4a4e159ee5110a795d9acbbb21b896fb244437bb Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 12 Apr 2020 13:45:08 +0300 Subject: [PATCH 4/5] fixed sorting issue --- Mohem/src/app/notification/home/home.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 33bb32b3..3db98ab8 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -345,8 +345,10 @@ export class HomeComponent implements OnInit { arrayToFilter = this.newWorkListResponse.filter((workList) => { return workList.ITEM_TYPE === filter; }); - const sortData = this.sortArray(arrayToFilter); - this.showFormattedData = this.categorizeData(sortData); + const categorizeData = this.categorizeData(arrayToFilter); + this.showFormattedData = this.sortArray(categorizeData); + // const sortData = this.sortArray(arrayToFilter); + // this.showFormattedData = this.categorizeData(sortData); } } From e7963509dcd7c39e63361625e936430072a2a598 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Sun, 12 Apr 2020 16:31:42 +0300 Subject: [PATCH 5/5] fix text --- Mohem/src/app/authentication/sms-page/sms-page.page.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 631dcd70..f5fffbc7 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -62,6 +62,8 @@ export class SmsPageComponent implements OnInit { ngOnInit() { this.activeType=this.common.getActiveTypeLogin(); + console.log("active "+ this.common.sharedService.getSharedData('active-type',true)); + console.log("activeType :"+this.activeType); this.count = 0; this.initTimer(); @@ -178,6 +180,7 @@ export class SmsPageComponent implements OnInit { if (this.platform.is('cordova')) { this.insertMobileLogin(); } + this.activeType =this.common.setActiveTypeLogin(0); this.common.openHome(); }); }