-
-
-
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 76ecc147..dc6ea786 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
@@ -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(
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 6b8a9fcf..9b2f7247 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
@@ -25,7 +25,8 @@
-
-
-
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 839a795d..e4945d93 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
@@ -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 (
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 16ed9cf8..72926ad4 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
@@ -23,7 +23,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 0c91d8b5..b3d01120 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
@@ -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 (
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 50fb327b..11bd4ac3 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
@@ -15,20 +15,20 @@
-
-
-
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
index 6ecdd443..785d9226 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss
@@ -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;
}
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 bb660db8..1f8a42cc 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
@@ -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(
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index 14855c6a..03914197 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -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": {