diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html
index e7dec45b..13606458 100644
--- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html
+++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html
@@ -566,7 +566,7 @@
-
+
Skip
diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
index 85a195e0..fba4d82a 100644
--- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
+++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
@@ -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++) {
diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html
index b22aa453..c2161ae3 100644
--- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html
+++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html
@@ -435,7 +435,7 @@
{{reqInfo_label}}
-
+
{{'worklistMain, skip' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts
index ee81051b..1d08ec1f 100644
--- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts
+++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts
@@ -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;
diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html
index 59a8ead5..de2dff5f 100644
--- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html
+++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html
@@ -665,7 +665,7 @@
-
+
{{'worklistMain, skip' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts
index 2eca280e..bfdf25c6 100644
--- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts
+++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts
@@ -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;
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html
index 0c4f4e38..bd933831 100644
--- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html
+++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html
@@ -633,7 +633,7 @@
{{reqInfo_label}}
-
+
{{'worklistMain, skip' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts
index 4d51258f..f2e79a55 100644
--- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts
+++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts
@@ -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;
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html
index ccc730ee..69de2e55 100644
--- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html
+++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html
@@ -411,7 +411,7 @@
{{reqInfo_label}}
-
+
{{'worklistMain, skip' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts
index 76749312..74cc53ce 100644
--- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts
+++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts
@@ -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;
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
index 4ff66b17..0bc23f9c 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
@@ -821,7 +821,7 @@
{{reqInfo_label}}
-
+
{{'worklistMain, skip' | translate}}
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
index 66434456..4b9560b3 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
@@ -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;