Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug

mekawy-issues
ashwaq 6 years ago
commit 8451b5fdac

@ -345,8 +345,10 @@ export class HomeComponent implements OnInit {
arrayToFilter = this.newWorkListResponse.filter((workList) => { arrayToFilter = this.newWorkListResponse.filter((workList) => {
return workList.ITEM_TYPE === filter; return workList.ITEM_TYPE === filter;
}); });
const sortData = this.sortArray(arrayToFilter); const categorizeData = this.categorizeData(arrayToFilter);
this.showFormattedData = this.categorizeData(sortData); this.showFormattedData = this.sortArray(categorizeData);
// const sortData = this.sortArray(arrayToFilter);
// this.showFormattedData = this.categorizeData(sortData);
} }
} }
@ -596,6 +598,7 @@ export class HomeComponent implements OnInit {
} }
this.common.sharedService.setSharedData(segmentInfo, HomeComponent.REQUSET_INFO); this.common.sharedService.setSharedData(segmentInfo, HomeComponent.REQUSET_INFO);
this.common.sharedService.setSharedData(this.ITGItem, HomeComponent.ALL_REQUEST); this.common.sharedService.setSharedData(this.ITGItem, HomeComponent.ALL_REQUEST);
this.common.sharedService.setSharedData(false, 'loadWorkList');
this.common.openWorklistITGPage(); this.common.openWorklistITGPage();
} }

@ -166,17 +166,17 @@
<ion-tab-bar class="tabBar" slot="bottom" style="overflow-x: scroll;"> <ion-tab-bar class="tabBar" slot="bottom" style="overflow-x: scroll;">
<!-- <ion-tab-button *ngFor='let action of actionBTN' [hidden]="action.isAvailable" > --> <!-- <ion-tab-button *ngFor='let action of actionBTN' [hidden]="action.isAvailable" > -->
<ion-tab-button *ngFor='let action of actionBTN; let i=index' [hidden]='!action.isAvailable' <ion-tab-button style="max-width: 20%;" *ngFor='let action of actionBTN; let i=index' [hidden]='!action.isAvailable'
(click)="selectAtion(action.name)" [ngClass]="i === 0 ? 'tabs-margin' : ''"> (click)="selectAtion(action.name)">
<img [src]="action.image"> <img [src]="action.image">
<ion-label style="font-size: 12px;">{{action.name}}</ion-label> <ion-label style="font-size: 11px;">{{action.name}}</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button (click)="skip()"> <ion-tab-button (click)="skip()" style="max-width: 20%;">
<img src="../assets/imgs/action-skip.png"> <img src="../assets/imgs/action-skip.png">
<ion-label style="font-size: 12px;">Skip</ion-label> <ion-label style="font-size: 11px;">Skip</ion-label>
</ion-tab-button> </ion-tab-button>
</ion-tab-bar> </ion-tab-bar>

@ -181,6 +181,7 @@ export class WorkListMainItgComponent implements OnInit {
return false; return false;
} }
} else if (this.index === this.all_request_names.length) { //if its the end request redirecte to worklist home } else if (this.index === this.all_request_names.length) { //if its the end request redirecte to worklist home
this.common.sharedService.setSharedData(true, 'loadWorkList');
this.common.openNotificationPage(); this.common.openNotificationPage();
return false; return false;
} }
@ -193,14 +194,16 @@ export class WorkListMainItgComponent implements OnInit {
if (this.index !== this.all_request.length) { // check if its last one to redirecte to home otherwise to next request. if (this.index !== this.all_request.length) { // check if its last one to redirecte to home otherwise to next request.
this.clearDataArray(); this.clearDataArray();
this.changeITGForm(this.all_request[this.index], this.request_name); this.changeITGForm(this.all_request[this.index], this.request_name);
break break;
} else { } else {
this.common.sharedService.setSharedData(true, 'loadWorkList');
this.common.openNotificationPage(); this.common.openNotificationPage();
break break;
} }
} else { } else {
this.common.sharedService.setSharedData(true, 'loadWorkList');
this.common.openNotificationPage(); this.common.openNotificationPage();
break break;
} }
} }
} }
@ -359,7 +362,7 @@ export class WorkListMainItgComponent implements OnInit {
}, this.ts.trPK('general', 'ok'), }, this.ts.trPK('general', 'ok'),
() => { () => {
this.actionSelected = ''; this.actionSelected = '';
this.common.sharedService.setSharedData(true, 'loadWorkList'); this.common.sharedService.setSharedData(true, 'loadWorkList');
}, this.ts.trPK('general', 'cancel'), }, this.ts.trPK('general', 'cancel'),
this.ts.trPK('vacation-rule', 'confirmation'), this.ts.trPK('vacation-rule', 'confirmation'),
this.confirmMsg(action)); this.confirmMsg(action));

Loading…
Cancel
Save