From e939892c54a4f35eb444bd661201ade85c2b6530 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 27 Dec 2021 14:41:10 +0300 Subject: [PATCH] fixed worklist issues --- Mohem/src/app/notification/home/home.component.html | 3 +++ Mohem/src/app/notification/home/home.component.scss | 6 ++++++ Mohem/src/app/notification/home/home.component.ts | 11 ++++++++--- .../worklist-advanced-search.component.html | 1 + .../worklist-advanced-search.component.ts | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 8d287a0c..a46c5462 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -19,6 +19,9 @@

{{newWorkListResponse[0].NO_OF_ROWS}}

{{ts.trPK('work-list','total')}}
{{ts.trPK('work-list','open-reqest')}}
+
+ +
diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index c1faeb72..9a9d0ea9 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -459,4 +459,10 @@ padding: 10px 30px; } .slideCss{ width: auto !important; +} + +.spinner-custom-class{ + position: absolute; + right: 160px; + top: 100px; } \ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index c75b458b..2070e4e8 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -194,6 +194,8 @@ export class HomeComponent implements OnInit { this.isLoading = true; } + + ionViewWillEnter() { const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); if (loadWorkList) { @@ -348,7 +350,9 @@ export class HomeComponent implements OnInit { component: WorklistAdvancedSearchComponent, cssClass: 'advanced-search-modal-custom', backdropDismiss: false, - componentProps: {} + componentProps: { + itemType: this.itemType + } }); modal.onDidDismiss().then(result => { if (result.data) { @@ -364,14 +368,15 @@ export class HomeComponent implements OnInit { this.WorkListObj.P_PAGE_NUM = 1; this.newWorkListResponse = []; this.showFormattedData = []; + this.allFormattedData = []; this.selectedFilter = 'ALL'; this.filters[this.currentActiveIndex].active = false; this.currentActiveIndex = 0; this.previousActiveIndex = 0; this.filters[this.currentActiveIndex].active = true; - if (this.itemType !== '') { + // if (this.itemType !== '') { // this.disableFilters(); - } + // } this.isPostNoLoad = false; this.getAllPushNotificationFun(); } diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index 67b487cc..a185754a 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -54,6 +54,7 @@ PR MR IC + STAMP diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts index 8b9db09f..319c5c60 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts @@ -15,7 +15,7 @@ export class WorklistAdvancedSearchComponent implements OnInit { public inputSearch = ''; public selectedValue = ''; public notificationType = ''; - public itemType = ''; + public itemType; public direction: string; constructor(