From e939892c54a4f35eb444bd661201ade85c2b6530 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 27 Dec 2021 14:41:10 +0300 Subject: [PATCH 1/3] 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( From d23c52d460a200ad8733abec1eda913a4fb15315 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 27 Dec 2021 15:18:47 +0300 Subject: [PATCH 2/3] fixed worklist styling issue --- Mohem/src/app/notification/home/home.component.html | 2 +- Mohem/src/app/notification/home/home.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index a46c5462..326c7d16 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -105,7 +105,7 @@ - + diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 9a9d0ea9..b7444c88 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -355,7 +355,7 @@ z-index: 99; ion-col{ background: white; border-radius: 12px; - padding-right: 30px; + // padding-right: 30px; flex: none; ion-icon{ margin-right: 3px; From 4a25fea675c1c324f30698abb540ddd6e3ff7f54 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Tue, 28 Dec 2021 14:32:41 +0300 Subject: [PATCH 3/3] fixed issues --- Mohem/src/app/notification/home/home.component.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 2070e4e8..7b47aad2 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -330,7 +330,6 @@ export class HomeComponent implements OnInit { if (filter.key === this.itemType) { filter.disable = false; filter.active = true; - filter.value = 0; this.selectedFilter = filter.name; } else if (this.itemType === '') { filter.disable = false; @@ -345,6 +344,7 @@ export class HomeComponent implements OnInit { } } + async openSearchModal() { const modal = await this.modalController.create({ component: WorklistAdvancedSearchComponent, @@ -369,7 +369,12 @@ export class HomeComponent implements OnInit { this.newWorkListResponse = []; this.showFormattedData = []; this.allFormattedData = []; - this.selectedFilter = 'ALL'; + // this.selectedFilter = 'ALL'; + + if (this.itemType !== '') { + this.disableFilters(); + } + this.filters[this.currentActiveIndex].active = false; this.currentActiveIndex = 0; this.previousActiveIndex = 0;