diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html
index 8d287a0c..326c7d16 100644
--- a/Mohem/src/app/notification/home/home.component.html
+++ b/Mohem/src/app/notification/home/home.component.html
@@ -19,6 +19,9 @@
0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse[0].NO_OF_ROWS}}
{{ts.trPK('work-list','total')}}
{{ts.trPK('work-list','open-reqest')}}
+
+
+
@@ -102,7 +105,7 @@
-
+
diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss
index c1faeb72..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;
@@ -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..7b47aad2 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) {
@@ -328,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;
@@ -343,12 +344,15 @@ export class HomeComponent implements OnInit {
}
}
+
async openSearchModal() {
const modal = await this.modalController.create({
component: WorklistAdvancedSearchComponent,
cssClass: 'advanced-search-modal-custom',
backdropDismiss: false,
- componentProps: {}
+ componentProps: {
+ itemType: this.itemType
+ }
});
modal.onDidDismiss().then(result => {
if (result.data) {
@@ -364,14 +368,20 @@ export class HomeComponent implements OnInit {
this.WorkListObj.P_PAGE_NUM = 1;
this.newWorkListResponse = [];
this.showFormattedData = [];
- this.selectedFilter = 'ALL';
+ this.allFormattedData = [];
+ // this.selectedFilter = 'ALL';
+
+ if (this.itemType !== '') {
+ this.disableFilters();
+ }
+
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(