fix pr load more + missing AMU

MOHEMM-Q3-DEV-LATEST
ashwaq 6 years ago
parent d706ece7b6
commit 788b3bfb6e

@ -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/';

@ -180,8 +180,10 @@
</ion-grid>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreNotificationBody()">Load
More</button>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreNotificationBody()">
{{ 'general, load-more' | translate}}
</button>
</ion-card-content>
@ -496,7 +498,7 @@
<div *ngIf="checkLines(actionHistory.NOTE)">
<div class="containerNote" [ngClass]="actionHistory.visible ? 'show' : '' ">
Note: {{actionHistory.NOTE}} {{actionHistory.NOTE}}
Note: {{actionHistory.NOTE}}
</div>
@ -522,7 +524,8 @@
</ion-list>
</div>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">Load More</button>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()"> {{ 'general, load-more' | translate}}
</button>
</ion-card-content>
</ion-card>

@ -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);

@ -338,7 +338,9 @@
</ion-grid>
<!-- -->
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreNotificationBody()">Load More</button>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreNotificationBody()">
{{ 'general, load-more' | translate}}
</button>
</ion-card-content>
@ -638,7 +640,9 @@
</div>
</ion-list>
</div>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">Load More</button>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
{{ 'general, load-more' | translate}}
</button>
</ion-card-content>

@ -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);

@ -165,8 +165,10 @@
</ion-grid>
<button *ngIf="!IsReachEnd" ion-button class="itemHISBtn" (click)="loadMoreNotificationBody()">Load
More</button>
<button *ngIf="!IsReachEnd" ion-button class="itemHISBtn" (click)="loadMoreNotificationBody()">
{{ 'general, load-more' | translate}}
</button>
</ion-card-content>
@ -251,16 +253,16 @@
<ion-col class="colItems">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','price')}} </label>
<label class="colItemReq" for="">{{ts.trPK('worklistMain','price')}} ({{ 'general, sar' | translate}})</label>
<br />
<ion-label class="labelValue" for="">{{Lines.UNIT_PRICE}} </ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-row class="rowBorder">
<ion-col class="colItems colBorder ">
<label class="colItemReq" for="">{{ts.trPK('payslip','amount')}} </label>
<label class="colItemReq" for="">{{ts.trPK('payslip','amount')}} ({{ 'general, sar' | translate}})</label>
<br />
<ion-label class="labelValue" for="">{{Lines.LINE_AMOUNT}} </ion-label>
@ -269,13 +271,22 @@
<ion-col class="colItems">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label>
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label>
<br />
<ion-label class="labelValue" for="">{{Lines.QUANTITY}} </ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="colItems">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','ITEM_AMU')}} </label>
<br />
<ion-label class="labelValue" for="">{{Lines.ITEM_AMU}} </ion-label>
</ion-col>
</ion-row>
</div>
</accordin-tab-custom>
</accordin-custom>
@ -361,8 +372,8 @@
</div>
</ion-list>
</div>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">Load
More</button>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
{{ 'general, load-more' | translate}} </button>
</ion-card-content>

@ -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);

@ -369,8 +369,8 @@
</div>
</div>
<ion-label
[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}}</ion-label>
[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}}</ion-label>
<ion-label *ngIf="actionHistory.NOTIFICATION_DATE != ''" class="dateActionHistory">
@ -382,8 +382,9 @@
</ion-list>
</div>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">Load
More</button>
<button ion-button *ngIf="!IsReachEnd" class="itemHISBtn" (click)="loadMoreActionHistory()">
{{ 'general, load-more' | translate}}
</button>
</ion-card-content>
</ion-card>

@ -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();
}

@ -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":{

@ -444,6 +444,9 @@ left: 66px;
border-radius: 3px;
width: 85%;
height: 40px;
display: block;
margin: 0 auto;
margin-top: 10px;
}

Loading…
Cancel
Save