Merge branch 'master-newdesign' into fatma-issu

enad-issues
Mohamed Mekawy 6 years ago
commit 333b4e7f80

@ -43,7 +43,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder "> <ion-col class="colItems " [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','operating_unit')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','operating_unit')}}
</label> </label>
<br /> <br />
@ -65,7 +65,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','revision')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','revision')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -87,7 +87,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','Supplier')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','Supplier')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -110,7 +110,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','uom')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','uom')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -133,7 +133,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity_received')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity_received')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -156,7 +156,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','purchase_price')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','purchase_price')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -179,7 +179,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','balance_quantity')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','balance_quantity')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>

@ -42,7 +42,7 @@
<!-- </ion-col> --> <!-- </ion-col> -->
<!-- </ion-row> --> <!-- </ion-row> -->
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder"> <ion-col size="6" class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','request_number')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','request_number')}}
</label> </label>
<br /> <br />
@ -64,7 +64,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder"> <ion-col size="6" class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -86,7 +86,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder"> <ion-col size="6" class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','line_status')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','line_status')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -109,7 +109,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder"> <ion-col size="6" class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','trans_type')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','trans_type')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -132,7 +132,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder"> <ion-col size="6" class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','organization_code')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','organization_code')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -155,7 +155,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder"> <ion-col size="6" class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','from_subinventory')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','from_subinventory')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -178,7 +178,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colItems colBorder"> <ion-col size="6" class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','to_subinventory')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','to_subinventory')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>

@ -17,7 +17,7 @@ style="margin-right: -22px;margin-top: -10px;">
</ion-list-header> </ion-list-header>
<div *ngFor="let button of actionBtns "> <div *ngFor="let button of actionBtns ">
<ion-item *ngIf="button.BUTTON_ACTION !='APPROVED' && button.BUTTON_ACTION !='APPROVE' && button.BUTTON_ACTION !='REJECTED' && button.BUTTON_ACTION !='REJECT' && button.BUTTON_ACTION !='REQUEST_INFO' " > <ion-item *ngIf="button.BUTTON_ACTION !='APPROVED' && button.BUTTON_ACTION !='APPROVE' && button.BUTTON_ACTION !='REJECTED' && button.BUTTON_ACTION !='REJECT' && button.BUTTON_ACTION !='REQUEST_INFO' && button.BUTTON_ACTION !='CLOSE' " >
<ion-label class="labelRadio"> {{button.BUTTON_LABEL}}</ion-label> <ion-label class="labelRadio"> {{button.BUTTON_LABEL}}</ion-label>
<ion-radio color="secondary" mode="md" value="{{button.BUTTON_ACTION}}" (ionSelect)="radioSelect(button)"></ion-radio> <ion-radio color="secondary" mode="md" value="{{button.BUTTON_ACTION}}" (ionSelect)="radioSelect(button)"></ion-radio>

@ -39,7 +39,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','QuotationNumber')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','QuotationNumber')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -60,7 +60,7 @@
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','item_code')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','item_code')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -84,7 +84,7 @@
<!-- </ion-row> <!-- </ion-row>
<ion-row> --> <ion-row> -->
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','QUOTATION_QTY')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','QUOTATION_QTY')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -109,7 +109,7 @@
<!-- </ion-row> <!-- </ion-row>
<ion-row> --> <ion-row> -->
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quotatio_net_price')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','quotatio_net_price')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -132,7 +132,7 @@
<!-- </ion-row> <!-- </ion-row>
<ion-row> --> <ion-row> -->
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quotatio_bonus_quantity')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','quotatio_bonus_quantity')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -156,7 +156,7 @@
<!-- </ion-row> <!-- </ion-row>
<ion-row> --> <ion-row> -->
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','MFG_part_number')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','MFG_part_number')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -179,7 +179,7 @@
<!-- </ion-row> <!-- </ion-row>
<ion-row> --> <ion-row> -->
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','RFQ_qty')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','RFQ_qty')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>

@ -16,7 +16,7 @@
<ion-segment-button value="item-req" [ngClass]="activeSegment == 'item-req' ? 'active-Segment' : 'normal-Segment'"> <ion-segment-button value="item-req" [ngClass]="activeSegment == 'item-req' ? 'active-Segment' : 'normal-Segment'">
<ion-label>{{ts.trPK('worklistMain','itemReq')}}</ion-label> <ion-label>{{'worklistMain , itemReq'| translate}}</ion-label>
</ion-segment-button> </ion-segment-button>
@ -33,7 +33,7 @@
</ion-segment-button> </ion-segment-button>
<ion-segment-button value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'"> <ion-segment-button value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{ts.trPK('worklistMain','info')}}</ion-label> <ion-label> {{'worklistMain , info'| translate}}</ion-label>
</ion-segment-button> </ion-segment-button>
</ion-segment> </ion-segment>
@ -55,7 +55,7 @@
<ion-card-content> <ion-card-content>
<ion-grid style="text-align: left"> <ion-grid style="text-align: left">
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for=""> {{ts.trPK('worklistMain','from')}} <label class="colItemReq" for=""> {{ts.trPK('worklistMain','from')}}
</label> </label>
@ -77,7 +77,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','sent')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','sent')}}
</label> </label>
<br /> <br />
@ -103,7 +103,7 @@
</ion-row> --> </ion-row> -->
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','id')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','id')}}
</label> </label>
<br /> <br />
@ -226,7 +226,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems " [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','code')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','code')}}
</label> </label>
<br /> <br />
@ -251,7 +251,7 @@
<!-- </ion-row> <!-- </ion-row>
<ion-row> --> <ion-row> -->
<ion-col class="colItems colBorder"> <ion-col class="colItems " [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -274,7 +274,7 @@
<!-- </ion-row> <!-- </ion-row>
<ion-row> --> <ion-row> -->
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','line_status')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','line_status')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -295,7 +295,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','trans_type')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','trans_type')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -315,7 +315,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','organization_code')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','organization_code')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -334,7 +334,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','from_subinventory')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','from_subinventory')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -355,7 +355,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','to_subinventory')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','to_subinventory')}} </label>
<br /> <br />
<!-- </ion-col> <!-- </ion-col>
@ -646,6 +646,12 @@
<!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> --> <!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> -->
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="closeDis" (click)="actionButton('CLOSE')">
<img src="../assets/imgs/action-approve.png">
<!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{close_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')"> <ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
<img src="../assets/imgs/action-reject.png"> <img src="../assets/imgs/action-reject.png">
<ion-label style="white-space: nowrap"> {{reject_label}}</ion-label> <ion-label style="white-space: nowrap"> {{reject_label}}</ion-label>

@ -113,6 +113,8 @@ export class WorklistMainMRComponent implements OnInit {
approve_label: any =""; approve_label: any ="";
reject_label: any=""; reject_label: any="";
reqInfo_label: any=""; reqInfo_label: any="";
close_label: any;
closeDis: boolean = false;
constructor( constructor(
@ -154,6 +156,7 @@ export class WorklistMainMRComponent implements OnInit {
this.approveDis = false; this.approveDis = false;
this.rejectDis = false; this.rejectDis = false;
this.requestDis = false; this.requestDis = false;
this.closeDis = false;
this.moreDisabled = true; this.moreDisabled = true;
if (this.messageSuccess) { if (this.messageSuccess) {
@ -299,8 +302,13 @@ export class WorklistMainMRComponent implements OnInit {
this.requestDis = true; this.requestDis = true;
} // if result == null } // if result == null
else if // if result == null
(this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.closeDis = true;
}
else if( else if(
this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE")
{ {
this.moreDisabled = false; this.moreDisabled = false;

@ -15,7 +15,7 @@
<ion-segment-button value="line_details" <ion-segment-button value="line_details"
[ngClass]="activeSegment == 'line_details' ? 'active-Segment' : 'normal-Segment'"> [ngClass]="activeSegment == 'line_details' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{ts.trPK('worklistMain','line_details')}} </ion-label> <ion-label> {{'worklistMain,line_details'| translate}} </ion-label>
</ion-segment-button> </ion-segment-button>
<ion-segment-button value="action-history" <ion-segment-button value="action-history"
@ -30,7 +30,7 @@
</ion-segment-button> </ion-segment-button>
<ion-segment-button checked value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'" > <ion-segment-button checked value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'" >
<ion-label> {{ts.trPK('worklistMain','info')}} </ion-label> <ion-label> {{'worklistMain, info'| translate}} </ion-label>
</ion-segment-button> </ion-segment-button>
</ion-segment> </ion-segment>
@ -50,7 +50,7 @@
<ion-card-content> <ion-card-content>
<ion-grid style="text-align: left"> <ion-grid style="text-align: left">
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for=""> {{ts.trPK('worklistMain','description')}} <label class="colItemReq" for=""> {{ts.trPK('worklistMain','description')}}
</label> </label>
@ -71,7 +71,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','to')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','to')}}
</label> </label>
<br /> <br />
@ -91,7 +91,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','closed')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','closed')}}
</label> </label>
<br /> <br />
@ -133,7 +133,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','Supplier')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','Supplier')}} </label>
<br /> <br />
@ -149,7 +149,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col size="6" class="colBorder"> <ion-col size="6" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','Buyer')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','Buyer')}} </label>
<br /> <br />
@ -165,7 +165,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','CreationDate')}}</label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','CreationDate')}}</label>
<br /> <br />
@ -182,7 +182,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','QuotationNumber')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','QuotationNumber')}}
</label> </label>
<br /> <br />
@ -200,7 +200,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','PaymentTerms')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','PaymentTerms')}} </label>
<br /> <br />
@ -216,7 +216,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','GrossAmount')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','GrossAmount')}} </label>
<br /> <br />
@ -233,7 +233,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" <label class="colItemReq"
for="">{{ts.trPK('worklistMain','TotalPODiscount')}}</label> for="">{{ts.trPK('worklistMain','TotalPODiscount')}}</label>
<br /> <br />
@ -251,7 +251,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','CustomDuty')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','CustomDuty')}} </label>
<br /> <br />
@ -267,7 +267,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','OtherCharges')}}</label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','OtherCharges')}}</label>
<br /> <br />
@ -371,7 +371,7 @@
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder "> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','code')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','code')}} </label>
<br /> <br />
@ -388,7 +388,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems " [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' " >
<label class="colItemReq" for="">{{ts.trPK('worklistMain','LINE_TYPE')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','LINE_TYPE')}}
</label> </label>
<br /> <br />
@ -409,7 +409,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','price')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','price')}} </label>
<br /> <br />
@ -430,7 +430,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','quantity')}} </label>
<br /> <br />
@ -451,7 +451,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','NEED_TO')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','NEED_TO')}} </label>
<br /> <br />
@ -473,7 +473,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder"> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','DELIVER_TO')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','DELIVER_TO')}}
</label> </label>
<br /> <br />
@ -778,6 +778,13 @@
<ion-label style="white-space: nowrap"> {{approve_label}}</ion-label> <ion-label style="white-space: nowrap"> {{approve_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="closeDis" (click)="actionButton('CLOSE')">
<img src="../assets/imgs/action-approve.png">
<!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{close_label}}</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')"> <ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')">

@ -125,6 +125,8 @@ export class WorklistMainPoComponent implements OnInit {
approve_label: any; approve_label: any;
reject_label: any; reject_label: any;
reqInfo_label: any; reqInfo_label: any;
closeDis: boolean = false;;
close_label: any;
constructor( constructor(
public common: CommonService, public common: CommonService,
@ -158,6 +160,7 @@ export class WorklistMainPoComponent implements OnInit {
this.approveDis = false; this.approveDis = false;
this.rejectDis = false; this.rejectDis = false;
this.requestDis = false; this.requestDis = false;
this.closeDis=false;
this.moreDisabled = true; this.moreDisabled = true;
if (this.messageSuccess) { if (this.messageSuccess) {
@ -327,8 +330,13 @@ export class WorklistMainPoComponent implements OnInit {
this.requestDis = true; this.requestDis = true;
} // if result == null } // if result == null
else if // if result == null
(this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.closeDis = true;
}
else if ( else if (
this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE")
{ {
this.moreDisabled = false; this.moreDisabled = false;

@ -15,7 +15,7 @@
<ion-segment-button value="item-req" <ion-segment-button value="item-req"
[ngClass]="activeSegment == 'item-req' ? 'active-Segment' : 'normal-Segment'"> [ngClass]="activeSegment == 'item-req' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{ts.trPK('worklistMain','itemReq')}} </ion-label> <ion-label> {{'worklistMain, itemReq'| translate}} </ion-label>
</ion-segment-button> </ion-segment-button>
<ion-segment-button value="action-history" <ion-segment-button value="action-history"
[ngClass]="activeSegment == 'action-history' ? 'active-Segment' : 'normal-Segment'"> [ngClass]="activeSegment == 'action-history' ? 'active-Segment' : 'normal-Segment'">
@ -30,7 +30,7 @@
<ion-segment-button checked value="info" <ion-segment-button checked value="info"
[ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'"> [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{ts.trPK('worklistMain','info')}} </ion-label> <ion-label> {{'worklistMain, info'| translate}} </ion-label>
</ion-segment-button> </ion-segment-button>
</ion-segment> </ion-segment>
@ -47,7 +47,7 @@
<ion-grid style="text-align: left"> <ion-grid style="text-align: left">
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for=""> {{ts.trPK('worklistMain','from')}} <label class="colItemReq" for=""> {{ts.trPK('worklistMain','from')}}
</label> </label>
@ -69,7 +69,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','sent')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','sent')}}
</label> </label>
<br /> <br />
@ -91,7 +91,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','id')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','id')}}
</label> </label>
<br /> <br />
@ -207,7 +207,7 @@
</ion-col> </ion-col>
</ion-row> --> </ion-row> -->
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder "> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' " class="colItems">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','cost-center')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','cost-center')}}
</label> </label>
<br /> <br />
@ -228,7 +228,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder "> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' " class="colItems ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','unit')}} </label> <label class="colItemReq" for="">{{ts.trPK('worklistMain','unit')}} </label>
<br /> <br />
@ -245,7 +245,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colItems colBorder "> <ion-col class="colItems" [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('payslip','amount')}} ({{ 'general, sar' | translate}})</label> <label class="colItemReq" for="">{{ts.trPK('payslip','amount')}} ({{ 'general, sar' | translate}})</label>
<br /> <br />
@ -492,6 +492,13 @@
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="closeDis" (click)="actionButton('CLOSE')">
<img src="../assets/imgs/action-approve.png">
<!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{close_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')"> <ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')">
<img src="../assets/imgs/action-reject.png"> <img src="../assets/imgs/action-reject.png">
<!-- <ion-label> {{'worklistMain, reject' | translate}}</ion-label> --> <!-- <ion-label> {{'worklistMain, reject' | translate}}</ion-label> -->

@ -110,6 +110,8 @@ export class WorklistMainPRComponent implements OnInit {
approve_label: any; approve_label: any;
reject_label: any; reject_label: any;
reqInfo_label: any; reqInfo_label: any;
close_label: any;
closeDis: boolean = false;
constructor( constructor(
@ -149,6 +151,7 @@ export class WorklistMainPRComponent implements OnInit {
this.approveDis = false; this.approveDis = false;
this.rejectDis = false; this.rejectDis = false;
this.requestDis = false; this.requestDis = false;
this.closeDis =false;
this.moreDisabled = true; this.moreDisabled = true;
if (this.messageSuccess) { if (this.messageSuccess) {
@ -328,8 +331,13 @@ export class WorklistMainPRComponent implements OnInit {
this.requestDis = true; this.requestDis = true;
} // if result == null } // if result == null
else if // if result == null
(this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.closeDis = true;
}
else if ( else if (
this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE")
{ {
this.moreDisabled = false; this.moreDisabled = false;

@ -15,7 +15,7 @@
<ion-segment-button value="item-req" <ion-segment-button value="item-req"
[ngClass]="activeSegment == 'item-req' ? 'active-Segment' : 'normal-Segment'"> [ngClass]="activeSegment == 'item-req' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{ts.trPK('worklistMain','details-emp')}}</ion-label> <ion-label> {{'worklistMain, details-emp'| translate}}</ion-label>
</ion-segment-button> </ion-segment-button>
<ion-segment-button value="action-history" <ion-segment-button value="action-history"
@ -28,7 +28,7 @@
</ion-segment-button> </ion-segment-button>
<ion-segment-button value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'"> <ion-segment-button value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{ts.trPK('worklistMain','info')}} </ion-label> <ion-label> {{'worklistMain, info'| translate}} </ion-label>
</ion-segment-button> </ion-segment-button>
</ion-segment> </ion-segment>
@ -71,7 +71,7 @@
</div> </div>
<div style="margin: 10px; " *ngIf="subordinatesleaveList != undefined && subordinatesleaveList?.length > 0"> <div style="margin: 10px;font-weight: bold; " *ngIf="subordinatesleaveList != undefined && subordinatesleaveList?.length > 0">
{{ts.trPK('worklistMain','employee-on-leave')}} </div> {{ts.trPK('worklistMain','employee-on-leave')}} </div>
<ion-item lines="none" <ion-item lines="none"
[ngClass]=" direction === 'en' ? 'subOrdinateList' :'subOrdinateList-Ar' " [ngClass]=" direction === 'en' ? 'subOrdinateList' :'subOrdinateList-Ar' "
@ -137,7 +137,7 @@
<div> <div>
<ion-grid style="text-align: left"> <ion-grid style="text-align: left">
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for=""> {{ts.trPK('worklistMain','from')}} <label class="colItemReq" for=""> {{ts.trPK('worklistMain','from')}}
</label> </label>
@ -160,7 +160,7 @@
</ion-row> </ion-row>
<ion-row class="rowBorder"> <ion-row class="rowBorder">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','sent')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','sent')}}
</label> </label>
<br /> <br />
@ -180,7 +180,7 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row class=""> <ion-row class="">
<ion-col class="colBorder"> <ion-col [ngClass]=" direction === 'en' ? 'colBorder' :'colBorder-ar' ">
<label class="colItemReq" for="">{{ts.trPK('worklistMain','id')}} <label class="colItemReq" for="">{{ts.trPK('worklistMain','id')}}
</label> </label>
<br /> <br />
@ -513,6 +513,12 @@
<!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> --> <!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{approve_label}}</ion-label> <ion-label style="white-space: nowrap"> {{approve_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="closeDis" (click)="actionButton('CLOSE')">
<img src="../assets/imgs/action-approve.png">
<!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{close_label}}</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')"> <ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">

@ -104,6 +104,8 @@ export class WorklistMainComponent implements OnInit {
approve_label: any = ""; approve_label: any = "";
reject_label: any = ""; reject_label: any = "";
reqInfo_label: any = ""; reqInfo_label: any = "";
close_label: any;
closeDis: boolean = false;
constructor( constructor(
public worklistService: WorklistService, public worklistService: WorklistService,
@ -165,6 +167,7 @@ export class WorklistMainComponent implements OnInit {
this.rejectDis = false; this.rejectDis = false;
this.requestDis = false; this.requestDis = false;
this.moreDisabled = true; this.moreDisabled = true;
this.closeDis = false;
// this.approve_label=""; // this.approve_label="";
// this.reject_label=""; // this.reject_label="";
// this.reqInfo_label=""; // this.reqInfo_label="";
@ -352,10 +355,13 @@ export class WorklistMainComponent implements OnInit {
if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") {
this.reqInfo_label = this.notificationButtonRes[i].BUTTON_LABEL; this.reqInfo_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.requestDis = true; this.requestDis = true;
} // if result == null } else if // if result == null
else if( (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
{ this.closeDis = true;
} else if
(this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") {
this.moreDisabled = false; this.moreDisabled = false;
} }

@ -467,6 +467,10 @@ left: 66px;
.colBorder{ .colBorder{
border-right: solid 0.02cm var(--grayBG); border-right: solid 0.02cm var(--grayBG);
}
.colBorder-ar{
border-left: solid 0.02cm var(--grayBG);
} }
.dateActionHistory{ .dateActionHistory{

Loading…
Cancel
Save