fixed worklist issues

worklist-umar-Q3
umasoodch 4 years ago
parent a22d3c64de
commit e939892c54

@ -19,6 +19,9 @@
<h2 *ngIf="showSearchButton && newWorkListResponse.length > 0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse[0].NO_OF_ROWS}}</h2> <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> <span>{{ts.trPK('work-list','total')}} <br> {{ts.trPK('work-list','open-reqest')}}</span>
</div> </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>
<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> </div>

@ -460,3 +460,9 @@ padding: 10px 30px;
.slideCss{ .slideCss{
width: auto !important; width: auto !important;
} }
.spinner-custom-class{
position: absolute;
right: 160px;
top: 100px;
}

@ -194,6 +194,8 @@ export class HomeComponent implements OnInit {
this.isLoading = true; this.isLoading = true;
} }
ionViewWillEnter() { ionViewWillEnter() {
const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false);
if (loadWorkList) { if (loadWorkList) {
@ -348,7 +350,9 @@ export class HomeComponent implements OnInit {
component: WorklistAdvancedSearchComponent, component: WorklistAdvancedSearchComponent,
cssClass: 'advanced-search-modal-custom', cssClass: 'advanced-search-modal-custom',
backdropDismiss: false, backdropDismiss: false,
componentProps: {} componentProps: {
itemType: this.itemType
}
}); });
modal.onDidDismiss().then(result => { modal.onDidDismiss().then(result => {
if (result.data) { if (result.data) {
@ -364,14 +368,15 @@ export class HomeComponent implements OnInit {
this.WorkListObj.P_PAGE_NUM = 1; this.WorkListObj.P_PAGE_NUM = 1;
this.newWorkListResponse = []; this.newWorkListResponse = [];
this.showFormattedData = []; this.showFormattedData = [];
this.allFormattedData = [];
this.selectedFilter = 'ALL'; this.selectedFilter = 'ALL';
this.filters[this.currentActiveIndex].active = false; this.filters[this.currentActiveIndex].active = false;
this.currentActiveIndex = 0; this.currentActiveIndex = 0;
this.previousActiveIndex = 0; this.previousActiveIndex = 0;
this.filters[this.currentActiveIndex].active = true; this.filters[this.currentActiveIndex].active = true;
if (this.itemType !== '') { // if (this.itemType !== '') {
// this.disableFilters(); // this.disableFilters();
} // }
this.isPostNoLoad = false; this.isPostNoLoad = false;
this.getAllPushNotificationFun(); this.getAllPushNotificationFun();
} }

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

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

Loading…
Cancel
Save