Merge branch 'worklist-umar-Q3' into enad-pre-live

worklist-umar-Q3
enadhilal 4 years ago
commit aaa18bfce1

@ -19,6 +19,9 @@
<h2 *ngIf="showSearchButton && newWorkListResponse.length > 0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse[0].NO_OF_ROWS}}</h2>
<span>{{ts.trPK('work-list','total')}} <br> {{ts.trPK('work-list','open-reqest')}}</span>
</div>
<div *ngIf="!showChart || !receivedITGCount" class="spinner-custom-class">
<ion-spinner class="spinner" name="lines"></ion-spinner>
</div>
<p-chart *ngIf="!showChart || !receivedITGCount" class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
<p-chart *ngIf="showChart && receivedITGCount" class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
</div>
@ -102,7 +105,7 @@
</div>
<!-- </div> -->
<ion-infinite-scroll (ionInfinite)="doInfinite($event)" *ngIf="selectedFilter === 'ALL' || itemType !== ''">
<ion-infinite-scroll (ionInfinite)="doInfinite($event)" *ngIf="itemType !== ''">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>

@ -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;
}

@ -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();
}

@ -54,6 +54,7 @@
<ion-select-option value="REQAPPRV">PR</ion-select-option>
<ion-select-option value="INVMOA">MR</ion-select-option>
<ion-select-option value="INVITEM">IC</ion-select-option>
<ion-select-option value="STAMP">STAMP</ion-select-option>
</ion-select>
</ion-item>

@ -15,7 +15,7 @@ export class WorklistAdvancedSearchComponent implements OnInit {
public inputSearch = '';
public selectedValue = '';
public notificationType = '';
public itemType = '';
public itemType;
public direction: string;
constructor(

Loading…
Cancel
Save