WORKLIST SKIP COUNT

enad-pre-live
Sultan Khan 4 years ago
parent 1e83686fad
commit f256793ff0

@ -566,7 +566,7 @@
</ion-tab-button>
<ion-tab-button (click)="skip()">
<ion-tab-button (click)="skip('skip')">
<img src="../assets/imgs/mohemm-action/Skip.png" class="footer-btn-img">
<ion-label style="font-size: 10px;">Skip</ion-label>
</ion-tab-button>

@ -193,12 +193,14 @@ export class WorkListMainItgComponent implements OnInit {
});
}
skip() {
skip(flag?) {
// check if the user clicked on all type of request
this.common.setTotalNumberOfWorklistRequest();
// this.common.assignDataToFilters(this.common.sharedService.getSharedData('worklistNotifications', false), 'ITG');
if (this.common.filterKeys['ITG'] != 0)
this.common.filterKeys['ITG'] = (this.common.filterKeys['ITG'] - 1)
if (flag != 'skip') {
this.common.setTotalNumberOfWorklistRequest();
// this.common.assignDataToFilters(this.common.sharedService.getSharedData('worklistNotifications', false), 'ITG');
if (this.common.filterKeys['ITG'] != 0)
this.common.filterKeys['ITG'] = (this.common.filterKeys['ITG'] - 1)
}
if (this.is_all_items_sents) {
for (let i = 1; i < this.all_request_names.length; i++) {
for (let j = 0; j < this.all_request_names[i].data.length; j++) {

@ -435,7 +435,7 @@
<img src="../assets/imgs/mohemm-action/info.png">
<ion-label class="action-btn"> {{reqInfo_label}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<ion-tab-button (click)="nextNotfification('skip')">
<img src="../assets/imgs/mohemm-action/Skip.png">
<ion-label class="action-btn"> {{'worklistMain, skip' | translate}}</ion-label>
</ion-tab-button>

@ -461,7 +461,7 @@ export class WorklistMainIcComponent implements OnInit {
// }
// }
public nextNotfification() {
public nextNotfification(flag?) {
if (document.getElementById('notificationDynamicFieldsPO') != null) {
document.getElementById('notificationDynamicFieldsPO').innerHTML = '';
}
@ -470,7 +470,7 @@ export class WorklistMainIcComponent implements OnInit {
let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo);
let previousRequest = this.notificationArray[index].REQUEST_TYPE;
let previousRequestType = this.notificationArray[index].ITEM_TYPE;
if (this.common.filterKeys[previousRequestType] != 0)
if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip')
this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1)
index += 1;

@ -665,7 +665,7 @@
<!-- <ion-label> {{'worklistMain, request' | translate}}</ion-label> -->
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<ion-tab-button (click)="nextNotfification('skip')">
<img src="../assets/imgs/mohemm-action/Skip.png">
<ion-label> {{'worklistMain, skip' | translate}}</ion-label>

@ -406,7 +406,7 @@ export class WorklistMainMRComponent implements OnInit {
// }
public nextNotfification() {
public nextNotfification(flag?) {
//let itemExist = false;
if (document.getElementById("notificationDynamicFieldsMR") != null) {
document.getElementById("notificationDynamicFieldsMR").innerHTML = "";
@ -417,7 +417,7 @@ export class WorklistMainMRComponent implements OnInit {
let previousRequest = this.notificationArray[index].REQUEST_TYPE;
let previousRequestType = this.notificationArray[index].ITEM_TYPE;
if (this.common.filterKeys[previousRequestType] != 0)
if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip')
this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1)
index += 1;

@ -633,7 +633,7 @@
<img src="../assets/imgs/mohemm-action/info.png">
<ion-label class = "action-btn"> {{reqInfo_label}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<ion-tab-button (click)="nextNotfification('skip')">
<img src="../assets/imgs/mohemm-action/Skip.png">
<ion-label class = "action-btn"> {{'worklistMain, skip' | translate}}</ion-label>
</ion-tab-button>

@ -437,7 +437,7 @@ export class WorklistMainPoComponent implements OnInit {
// }
// }
public nextNotfification() {
public nextNotfification(flag?) {
if (document.getElementById('notificationDynamicFieldsPO') != null) {
document.getElementById('notificationDynamicFieldsPO').innerHTML = '';
}
@ -447,7 +447,7 @@ export class WorklistMainPoComponent implements OnInit {
let previousRequest = this.notificationArray[index].REQUEST_TYPE;
let previousRequestType = this.notificationArray[index].ITEM_TYPE;
if (this.common.filterKeys[previousRequestType] != 0)
if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip')
this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1)
index += 1;

@ -411,7 +411,7 @@
<ion-label class = "action-btn"> {{reqInfo_label}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<ion-tab-button (click)="nextNotfification('skip')">
<img src="../assets/imgs/mohemm-action/Skip.png">
<ion-label class = "action-btn"> {{'worklistMain, skip' | translate}}</ion-label>
</ion-tab-button>

@ -425,7 +425,7 @@ export class WorklistMainPRComponent implements OnInit {
// }
public nextNotfification() {
public nextNotfification(flag?) {
//let itemExist = false;
if (document.getElementById("notificationDynamicFieldsPR") != null) {
@ -438,7 +438,7 @@ export class WorklistMainPRComponent implements OnInit {
let previousRequest = this.notificationArray[index].REQUEST_TYPE;
let previousRequestType = this.notificationArray[index].ITEM_TYPE;
if (this.common.filterKeys[previousRequestType] != 0)
if (this.common.filterKeys[previousRequestType] != 0 && flag != 'skip')
this.common.filterKeys[previousRequestType] = (this.common.filterKeys[previousRequestType] - 1)
index += 1;

@ -821,7 +821,7 @@
<ion-label class="action-btn"> {{reqInfo_label}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<ion-tab-button (click)="nextNotfification('skip')">
<img src="../assets/imgs/mohemm-action/Skip.png">
<ion-label class="action-btn"> {{'worklistMain, skip' | translate}}</ion-label>
</ion-tab-button>

@ -596,7 +596,7 @@ export class WorklistMainComponent implements OnInit {
// }
public nextNotfification() {
public nextNotfification(flag?) {
if (document.getElementById("notificationDynamicFields") != null) {
document.getElementById("notificationDynamicFields").innerHTML = "";
}
@ -613,7 +613,7 @@ export class WorklistMainComponent implements OnInit {
} else {
previousRequest = itemType;
}
if (this.common.filterKeys[previousRequest] != 0)
if (this.common.filterKeys[previousRequest] != 0 && flag != 'skip')
this.common.filterKeys[previousRequest] = (this.common.filterKeys[previousRequest] - 1)
index += 1;

Loading…
Cancel
Save