diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
index 1f34b0ad..8c93b89f 100644
--- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts
+++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
@@ -21,7 +21,7 @@ export class ConnectorService {
headers: new HttpHeaders({ 'Content-Type': 'application/json' })
};
public static retryTimes = 0;
- public static timeOut = 120 * 1000;
+ public static timeOut = 240 * 1000;
// public static host = 'http://10.50.100.113:6060/'; // development service
public static host = 'https://uat.hmgwebservices.com/';
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 967c4ce5..57b9aa7d 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
@@ -180,8 +180,10 @@
-
+
@@ -496,7 +498,7 @@
- Note: {{actionHistory.NOTE}} {{actionHistory.NOTE}}
+ Note: {{actionHistory.NOTE}}
@@ -522,7 +524,8 @@
-
+
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 ce610cf9..82084a7b 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
@@ -77,7 +77,7 @@ export class WorklistMainMRComponent implements OnInit {
attachmentRes: any;
PRHeader: any;//change the tpye later
PRLines: any;//change the tpye later
- IsReachEnd: boolean = false;
+ IsReachEnd: boolean = true;
P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 100;
headerTotal: any;
@@ -678,7 +678,7 @@ export class WorklistMainMRComponent implements OnInit {
}
getActionHistory(WorkListActionHistoryObj) {
- this.IsReachEnd = false;
+ this.IsReachEnd = true;
this.worklistService.getActionHistory(WorkListActionHistoryObj).
subscribe((result: WorkListActionHistoryResponse) => {
this.handleWorkListActionHistoryResult(result);
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 74f64e09..34bc6067 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
@@ -338,7 +338,9 @@
-
+
@@ -638,7 +640,9 @@
-
+
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 d6655739..e877615c 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
@@ -83,7 +83,7 @@ export class WorklistMainPoComponent implements OnInit {
attachmentRes: any;
PRHeader: any;//change the tpye later
PRLines: any;//change the tpye later
- IsReachEnd: boolean = false;
+ IsReachEnd: boolean = true;
P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 100;
headerTotal: any;
@@ -714,7 +714,7 @@ export class WorklistMainPoComponent implements OnInit {
}
getActionHistory(WorkListActionHistoryObj) {
- this.IsReachEnd = false;
+ this.IsReachEnd = true;
this.worklistService.getActionHistory(WorkListActionHistoryObj).
subscribe((result: WorkListActionHistoryResponse) => {
this.handleWorkListActionHistoryResult(result);
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 2546220a..377cd30e 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
@@ -165,8 +165,10 @@
-
+
@@ -251,16 +253,16 @@
-
+
{{Lines.UNIT_PRICE}}
-
+
-
+
{{Lines.LINE_AMOUNT}}
@@ -269,13 +271,22 @@
-
+
{{Lines.QUANTITY}}
+
+
+
+
+
+
+ {{Lines.ITEM_AMU}}
+
+
@@ -361,8 +372,8 @@
-
+
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 6d9d4ee0..6b436ab0 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
@@ -75,7 +75,7 @@ export class WorklistMainPRComponent implements OnInit {
attachmentRes: any;
PRHeader: any;//change the tpye later
PRLines: any;//change the tpye later
- IsReachEnd: boolean = false;
+ IsReachEnd: boolean = true;
P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 100;
headerTotal: any;
@@ -712,7 +712,7 @@ export class WorklistMainPRComponent implements OnInit {
}
getActionHistory(WorkListActionHistoryObj) {
- this.IsReachEnd = false;
+ this.IsReachEnd = true;
this.worklistService.getActionHistory(WorkListActionHistoryObj).
subscribe((result: WorkListActionHistoryResponse) => {
this.handleWorkListActionHistoryResult(result);
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 2d6b35f0..f9b2de69 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
@@ -369,8 +369,8 @@
{{actionHistory.ACTION}}
+ [ngClass]="{'bg-blue-txt' : actionHistory.ACTION === 'Submite' || actionHistory.ACTION === 'Submit' ,'bg-orange-txt' : actionHistory.ACTION === 'Pending' ,'bg-red-txt' : actionHistory.ACTION === 'Reject','bg-green-txt' : actionHistory.ACTION != 'Pending' && actionHistory.ACTION != 'Reject' && actionHistory.ACTION != 'Submitted' && actionHistory.ACTION != 'Submit'}"
+ class=""> {{actionHistory.ACTION}}
@@ -382,8 +382,9 @@
-
+
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 fda530d3..972712cd 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
@@ -81,7 +81,7 @@ export class WorklistMainComponent implements OnInit {
lines_note_limit: any = 24;
attachmentRes: any;
private WorkListActionHistoryObj: WorkListActionHistoryRequest;
- IsReachEnd: boolean = false;
+ IsReachEnd: boolean = true;
notiActionBtnMore: any = [];
messageSuccess: boolean = false;
confirmMsg: string;
@@ -719,7 +719,7 @@ export class WorklistMainComponent implements OnInit {
}
getActionHistory(WorkListActionHistoryObj) {
- this.IsReachEnd = false;
+ this.IsReachEnd = true;
this.worklistService.getActionHistory(WorkListActionHistoryObj).
subscribe((result: WorkListActionHistoryResponse) => {
this.handleWorkListActionHistoryResult(result);
@@ -979,9 +979,10 @@ export class WorklistMainComponent implements OnInit {
loadMoreActionHistory() {
- console.log("doInfinite action history MR");
if (!this.IsReachEnd) {
+ console.log("doInfinite action history MR");
+
this.worklistService.getActionHistory(this.WorkListActionHistoryObj).
subscribe((result: any) => {
if (this.common.validResponse(result)) {
@@ -1009,6 +1010,8 @@ export class WorklistMainComponent implements OnInit {
});
} else {
+ console.log("no doInfinite action history MR");
+
//if (infiniteScroll)
//infiniteScroll.target.complete();
}
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index d219a9d4..bd4a9d54 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -202,6 +202,15 @@
"en": "Birth Date",
"ar": "تاريخ الميلاد"
},
+ "sar": {
+ "en": "SAR",
+ "ar": "ريال"
+ },
+
+ "load-more": {
+ "en": "Load More",
+ "ar": "إظهار المزيد"
+ },
"timeout": {
"en": " The connection timeout expired due to an error in the network or servers may be busy!",
"ar": " انتهت مهلة الاتصال بسبب خطأ في الشبكة أو الخوادم قد تكون مشغولة!"
@@ -2336,8 +2345,11 @@
"request_number":{
"en": "Request Number",
"ar":"Request Number"
- }
-
+ },
+ "ITEM_AMU":{
+ "en": "AMU (Last 3 months)",
+ "ar":"AMU (Last 3 months)"
+ }
},
"payslip": {
"title":{
diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss
index eb1d83b5..c10ea687 100644
--- a/Mohem/src/theme/worklist.scss
+++ b/Mohem/src/theme/worklist.scss
@@ -444,6 +444,9 @@ left: 66px;
border-radius: 3px;
width: 85%;
height: 40px;
+ display: block;
+ margin: 0 auto;
+ margin-top: 10px;
}