Merge branch 'ashwaq-fix-bug' into master-newdesign

umar-issues
Mohamed Mekawy 6 years ago
commit 0cb4b1d43e

@ -26,7 +26,9 @@
</ion-segment-button>
<ion-segment-button value="attach" [ngClass]="activeSegment == 'attach' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{'general, file' | translate}}</ion-label>
<ion-label>
{{'worklistMain, attach-file' | translate}}
</ion-label>
</ion-segment-button>
@ -639,17 +641,22 @@
<ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVED')">
<img src="../assets/imgs/action-approve.png">
<ion-label> {{'worklistMain, approve' | translate}}</ion-label>
<ion-label style="white-space: nowrap"> {{approve_label}}</ion-label>
<!-- <ion-label> {{'worklistMain, approve' | translate}}</ion-label> -->
</ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
<img src="../assets/imgs/action-reject.png">
<ion-label> {{'worklistMain, reject' | translate}}</ion-label>
<ion-label style="white-space: nowrap"> {{reject_label}}</ion-label>
<!-- <ion-label> {{'worklistMain, reject' | translate}}</ion-label> -->
</ion-tab-button>
<ion-tab-button *ngIf="requestDis" (click)="actionButton('REQUEST_INFO')">
<img src="../assets/imgs/action-info.png">
<ion-label> {{'worklistMain, request' | translate}}</ion-label>
<ion-label style="white-space: nowrap"> {{reqInfo_label}}</ion-label>
<!-- <ion-label> {{'worklistMain, request' | translate}}</ion-label> -->
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<img src="../assets/imgs/action-skip.png">

@ -110,6 +110,9 @@ export class WorklistMainMRComponent implements OnInit {
public isPostNoLoad = true;
public worklistNotifications: any;
public totalRequestCount = 0;
approve_label: any ="";
reject_label: any="";
reqInfo_label: any="";
constructor(
@ -147,6 +150,12 @@ export class WorklistMainMRComponent implements OnInit {
}
intializeNotificationDetail() {
this.approveDis = false;
this.rejectDis = false;
this.requestDis = false;
this.moreDisabled = true;
if (this.messageSuccess) {
document.getElementById('notificationDynamicFieldsMR').innerHTML = '';
}
@ -277,12 +286,17 @@ export class WorklistMainMRComponent implements OnInit {
console.log('test' + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED" ) {
this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED" ) {
this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') {
this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.requestDis = true;
} // if result == null
else if(

@ -25,7 +25,8 @@
<ion-segment-button value="attach"
[ngClass]="activeSegment == 'attach' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{'general, file' | translate}} </ion-label>
<ion-label> {{'worklistMain, attach-file' | translate}}
</ion-label>
</ion-segment-button>
<ion-segment-button checked value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'" >
@ -772,17 +773,24 @@
<ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVE')">
<img src="../assets/imgs/action-approve.png">
<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-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')">
<img src="../assets/imgs/action-reject.png">
<ion-label> {{'worklistMain, reject' | translate}}</ion-label>
<!-- <ion-label> {{'worklistMain, reject' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{reject_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="requestDis" (click)="actionButton('REQUEST_INFO')">
<img src="../assets/imgs/action-info.png">
<ion-label> {{'worklistMain, request' | translate}}</ion-label>
<ion-label style="white-space: nowrap"> {{reqInfo_label}}</ion-label>
<!-- <ion-label> {{'worklistMain, request' | translate}}</ion-label> -->
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<img src="../assets/imgs/action-skip.png">

@ -122,6 +122,9 @@ export class WorklistMainPoComponent implements OnInit {
moreDisabled: boolean = true;
direction: string;
defaultSegment = '';
approve_label: any;
reject_label: any;
reqInfo_label: any;
constructor(
public common: CommonService,
@ -152,6 +155,11 @@ export class WorklistMainPoComponent implements OnInit {
}//ngOn
intializeNotificationDetail() {
this.approveDis = false;
this.rejectDis = false;
this.requestDis = false;
this.moreDisabled = true;
if (this.messageSuccess) {
document.getElementById("notificationDynamicFieldsPO").innerHTML = "";
}
@ -306,12 +314,17 @@ export class WorklistMainPoComponent implements OnInit {
console.log("test" + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") {
this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") {
this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") {
this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.requestDis = true;
} // if result == null
else if (

@ -23,7 +23,8 @@
</ion-segment-button>
<ion-segment-button value="attach" [ngClass]="activeSegment == 'attach' ? 'active-Segment' : 'normal-Segment'">
<ion-label> {{'general, file' | translate}} </ion-label>
<ion-label> {{'worklistMain, attach-file' | translate}}
</ion-label>
</ion-segment-button>
@ -485,17 +486,23 @@
<ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVE')">
<img src="../assets/imgs/action-approve.png">
<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-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')">
<img src="../assets/imgs/action-reject.png">
<ion-label> {{'worklistMain, reject' | translate}}</ion-label>
<!-- <ion-label> {{'worklistMain, reject' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{reject_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="requestDis" (click)="actionButton('REQUEST_INFO')">
<img src="../assets/imgs/action-info.png">
<ion-label> {{'worklistMain, request' | translate}}</ion-label>
<!-- <ion-label> {{'worklistMain, request' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{reqInfo_label}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<img src="../assets/imgs/action-skip.png">

@ -107,6 +107,9 @@ export class WorklistMainPRComponent implements OnInit {
moreDisabled: boolean = true;
direction: string;
defaultSegment = '';
approve_label: any;
reject_label: any;
reqInfo_label: any;
constructor(
@ -143,6 +146,11 @@ export class WorklistMainPRComponent implements OnInit {
intializeNotificationDetail() {
this.approveDis = false;
this.rejectDis = false;
this.requestDis = false;
this.moreDisabled = true;
if (this.messageSuccess) {
document.getElementById('notificationDynamicFieldsPR').innerHTML = '';
}
@ -308,12 +316,16 @@ export class WorklistMainPRComponent implements OnInit {
console.log('test' + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == 'APPROVE') {
this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == 'REJECT') {
this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') {
this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.requestDis = true;
} // if result == null
else if (

@ -15,20 +15,20 @@
<ion-segment-button value="item-req"
[ngClass]="activeSegment == 'item-req' ? 'active-Segment' : 'normal-Segment'">
{{ts.trPK('worklistMain','title')}}
<ion-label> {{ts.trPK('worklistMain','details-emp')}}</ion-label>
</ion-segment-button>
<ion-segment-button value="action-history"
[ngClass]="activeSegment == 'action-history' ? 'active-Segment' : 'normal-Segment'">
{{'worklistMain, action' | translate}}
<ion-label> {{'worklistMain, action' | translate}}</ion-label>
</ion-segment-button>
<ion-segment-button value="attach" [ngClass]="activeSegment == 'attach' ? 'active-Segment' : 'normal-Segment'">
{{'general, file' | translate}}
<ion-label> {{'worklistMain, attach-file' | translate}}</ion-label>
</ion-segment-button>
<ion-segment-button value="info" [ngClass]="activeSegment == 'info' ? 'active-Segment' : 'normal-Segment'">
{{ts.trPK('worklistMain','info')}}
<ion-label> {{ts.trPK('worklistMain','info')}} </ion-label>
</ion-segment-button>
</ion-segment>
@ -73,12 +73,16 @@
<div style="margin: 10px; " *ngIf="subordinatesleaveList != undefined && subordinatesleaveList?.length > 0">
{{ts.trPK('worklistMain','employee-on-leave')}} </div>
<ion-item lines="none" class="subOrdinateList" *ngFor="let List of subordinatesleaveList;">
<ion-item lines="none"
[ngClass]=" direction === 'en' ? 'subOrdinateList' :'subOrdinateList-Ar' "
*ngFor="let List of subordinatesleaveList;">
<ion-grid class="gridSubordinates">
<div class="subOrdinateDiv">
<ion-grid
[ngClass]=" direction === 'en' ? 'gridSubordinates' :'gridSubordinates-Ar' ">
<div
[ngClass]=" direction === 'en' ? 'subOrdinateDiv' :'subOrdinateDiv-Ar' ">
<!-- <img class="subOrdinateImg" src="../assets/imgs/profile.png"> -->
@ -87,7 +91,9 @@
<img *ngIf="List.EMPLOYEE_IMAGE == null"
class="empImgeSub" src="../assets/imgs/profile.png">
</div>
<ion-row class="rowHeader subOrdinateRow">
<ion-row class="rowHeader "
[ngClass]=" direction === 'en' ? 'subOrdinateRow' :'subOrdinateRow-Ar' "
>
<ion-col size="9">
<label style="font-weight: bold; " class="label" for="">{{List.EMPLOYEE_NAME}} </label>
@ -96,11 +102,11 @@
</ion-col>
<ion-col class="status" size="3">
<label class="label" for="label">{{List.STATUS}}</label>
<label class="label" style="font-size: 11px;" for="label">{{List.STATUS}}</label>
</ion-col>
</ion-row>
<br />
<ion-row class="subOrdinateRow">
<ion-row [ngClass]=" direction === 'en' ? 'subOrdinateRow' :'subOrdinateRow-Ar'">
<ion-col>
<label class="label" for=""> {{ts.trPK('worklistMain','from')}}</label><br />
@ -260,7 +266,7 @@
</ion-row>
<ion-row class="rowBorder submitterInfo">
<ion-col>
<label class="colItemReq" for="">{{'userProfile, position' | translate}}</label>
<label class="colItemReq" for="">{{'worklistMain, job-name' | translate}}</label>
<br />
<label for="">{{submitterInfo.POSITION_NAME}}</label>
</ion-col>
@ -274,42 +280,42 @@
</ion-row>
<ion-row class="rowBorder submitterInfo">
<ion-col>
<label class="colItemReq" for="">{{'userProfile, job' | translate}}</label>
<label class="colItemReq" for="">{{'worklistMain, job_cate' | translate}}</label>
<br />
<label for="">{{submitterInfo.JOB_NAME}}</label>
</ion-col>
</ion-row>
<ion-row class="rowBorder submitterInfo">
<ion-col>
<label class="colItemReq" for="">{{'userProfile, category' | translate}}</label>
<label class="colItemReq" for="">{{'worklistMain, category' | translate}}</label>
<br />
<label for="">{{submitterInfo.EMPLOYMENT_CATEGORY_MEANING}}</label>
</ion-col>
</ion-row>
<ion-row class="rowBorder submitterInfo">
<ion-col>
<label class="colItemReq" for="">{{'userProfile, orgEmail' | translate}}</label>
<label class="colItemReq" for="">{{'worklistMain, emp-email' | translate}}</label>
<br />
<label for="">{{submitterInfo.EMPLOYEE_EMAIL_ADDRESS}}</label>
</ion-col>
</ion-row>
<ion-row class="rowBorder submitterInfo">
<ion-col>
<label class="colItemReq" for="">{{'userProfile, orgName' | translate}}</label>
<label class="colItemReq" for="">{{'worklistMain, org-name' | translate}}</label>
<br />
<label for="">{{submitterInfo.ORGANIZATION_NAME}}</label>
</ion-col>
</ion-row>
<ion-row class="rowBorder submitterInfo">
<!-- <ion-row class="rowBorder submitterInfo">
<ion-col>
<label class="colItemReq" for="">{{'userProfile, busG' | translate}}</label>
<br />
<label for="">{{submitterInfo.BUSINESS_GROUP_NAME}}</label>
</ion-col>
</ion-row>
</ion-row> -->
<ion-row class="rowBorder submitterInfo">
<ion-col>
<label class="colItemReq" for="">{{'userProfile, locName' | translate}}</label>
<label class="colItemReq" for="">{{'worklistMain, loc-name' | translate}}</label>
<br />
<label for="">{{submitterInfo.LOCATION_NAME}}</label>
@ -317,7 +323,7 @@
</ion-row>
<ion-row>
<ion-col>
<label class="colItemReq" for="">{{'userProfile, payrol' | translate}}</label>
<label class="colItemReq" for="">{{'worklistMain, branch-payrol' | translate}}</label>
<br />
<label for="">{{submitterInfo.PAYROLL_NAME}}</label>
@ -504,17 +510,23 @@
<ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVED')">
<img src="../assets/imgs/action-approve.png">
<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-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
<img src="../assets/imgs/action-reject.png">
<ion-label> {{'worklistMain, reject' | translate}}</ion-label>
<!-- <ion-label > {{'worklistMain, reject' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{reject_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="requestDis" (click)="actionButton('REQUEST_INFO')">
<img src="../assets/imgs/action-info.png">
<ion-label> {{'worklistMain, request' | translate}}</ion-label>
<!-- <ion-label > {{'worklistMain, request' | translate}}</ion-label> -->
<ion-label style="white-space: nowrap"> {{reqInfo_label}}</ion-label>
</ion-tab-button>
<ion-tab-button (click)="nextNotfification()">
<img src="../assets/imgs/action-skip.png">

@ -242,6 +242,35 @@ color: white;
margin-left: 55px;
}
/////////////Subordinate-Arabic///////////////////
.subOrdinateList-Ar {
--background: transparent;
margin-left: -3px;
margin-right: -13px;
margin-bottom: 8px;
}
.gridSubordinates-Ar{
border-top-right-radius: 28px;
border-bottom-right-radius: 40px;
background: var(--light);
border-top-left-radius: 16px;
border-bottom-left-radius: 16px;
margin-right: 42px;
}
.subOrdinateRow-Ar {
margin-right: 55px;
}
.subOrdinateDiv-Ar {
z-index: 4;
margin-right: -46px;
position: absolute;
top: -2px;
}
///////////////////////////////////////////////
.label{
font-size: 14px;
}

@ -101,6 +101,9 @@ export class WorklistMainComponent implements OnInit {
public isPostNoLoad = true;
public worklistNotifications: any;
public totalRequestCount = 0;
approve_label: any="";
reject_label: any="";
reqInfo_label: any="";
constructor(
public worklistService: WorklistService,
@ -121,6 +124,7 @@ export class WorklistMainComponent implements OnInit {
this.WorkListActionHistoryObj = new WorkListActionHistoryRequest();
this.WorkListActionHistoryObj.P_PAGE_NUM = 1;
this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT;
}
ngOnInit() {
@ -157,6 +161,13 @@ export class WorklistMainComponent implements OnInit {
}
intializeNotificationDetail() {
this.approveDis = false;
this.rejectDis = false;
this.requestDis = false;
this.moreDisabled = true;
// this.approve_label="";
// this.reject_label="";
// this.reqInfo_label="";
if (this.messageSuccess) {
document.getElementById("notificationDynamicFields").innerHTML = "";
@ -331,12 +342,15 @@ export class WorklistMainComponent implements OnInit {
console.log("test" + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") {
this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") {
this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") {
this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL;
this.requestDis = true;
} // if result == null
else if(

@ -1165,7 +1165,7 @@
"vacation-rule": {
"vacationRule": {
"en": "Vacation Rule",
"ar": "قواعد الإجازات"
"ar": "الإنابة بالإجازات"
},
"apply-for-vacation-rule": {
"en": "Apply for vacation Rule",
@ -1969,15 +1969,15 @@
},
"approve": {
"en": "Approve",
"ar": "موافق"
"ar": "إعتماد"
},
"reject": {
"en": "Reject",
"ar": "رفض"
},
"request": {
"en": "Request",
"ar": "طلب"
"en": "Request info",
"ar": "طلب معلومات"
},
"title": {
"en": "Details",
@ -2005,7 +2005,7 @@
},
"info": {
"en": "Info",
"ar": "تفاصيل"
"ar": "تفاصيل الطلب"
},
"notfDetails": {
"en": "Notification Details",
@ -2041,7 +2041,7 @@
},
"action": {
"en": "Action",
"ar": "الحركة"
"ar": "تاريخ الإجراءات"
},
"actionRequird": {
"en": "Action is required",
@ -2373,9 +2373,48 @@
},
"Tran_Succ":{
"en": "Transaction Successful",
"ar":"عملية ناجحه"
}
"ar":"عملية ناجحة"
},
"req_detail":{
"en": "ٌRequest Details",
"ar":"تفاصيل الطلب"
},
"job_cate":{
"en": "Job category",
"ar":"الفئة الوظيفية"
},
"category":{
"en": "Category",
"ar":"نوع العقد"
},
"job-name":{
"en": "Job Title",
"ar":"المسمى الوظيفي"
},
"emp-email": {
"en": "Employee Email Address",
"ar": "البريد الإلكتروني للموظف"
},
"org-name": {
"en": "Adminstration Name",
"ar": "إسم الإدارة"
},
"loc-name": {
"en": "Company Name",
"ar": "إسم الشركة"
},
"branch-payrol": {
"en": "Payroll Branch",
"ar": "فرع الرواتب"
},
"attach-file": {
"en": "Files",
"ar": "المرفقات"
},
"details-emp": {
"en": "Details",
"ar": "تفاصيل الموظف"
}
},
"payslip": {
"title": {

Loading…
Cancel
Save