diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 0221f3ab..ba5b928a 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -61,7 +61,7 @@
-{{title}}
{{title}}
+{{title}}
+
+
-
-
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..a00287ea 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,11 @@ export class WorklistMainMRComponent implements OnInit {
public isPostNoLoad = true;
public worklistNotifications: any;
public totalRequestCount = 0;
+ approve_label: any ="";
+ reject_label: any="";
+ reqInfo_label: any="";
+ close_label: any;
+ closeDis: boolean = false;
constructor(
@@ -147,6 +152,13 @@ export class WorklistMainMRComponent implements OnInit {
}
intializeNotificationDetail() {
+
+ this.approveDis = false;
+ this.rejectDis = false;
+ this.requestDis = false;
+ this.closeDis = false;
+ this.moreDisabled = true;
+
if (this.messageSuccess) {
document.getElementById('notificationDynamicFieldsMR').innerHTML = '';
}
@@ -277,16 +289,26 @@ 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 // if result == null
+ (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
+ 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 != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE")
{
this.moreDisabled = false;
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..1d129790 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
@@ -15,7 +15,7 @@
-
+
+
-
-
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..c459c4b0 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,11 @@ export class WorklistMainPoComponent implements OnInit {
moreDisabled: boolean = true;
direction: string;
defaultSegment = '';
+ approve_label: any;
+ reject_label: any;
+ reqInfo_label: any;
+ closeDis: boolean = false;;
+ close_label: any;
constructor(
public common: CommonService,
@@ -152,6 +157,12 @@ export class WorklistMainPoComponent implements OnInit {
}//ngOn
intializeNotificationDetail() {
+ this.approveDis = false;
+ this.rejectDis = false;
+ this.requestDis = false;
+ this.closeDis=false;
+ this.moreDisabled = true;
+
if (this.messageSuccess) {
document.getElementById("notificationDynamicFieldsPO").innerHTML = "";
}
@@ -306,16 +317,26 @@ 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 // if result == null
+ (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
+ this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
+ this.closeDis = true;
+ }
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;
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..da469ac2 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
@@ -15,7 +15,7 @@
-
+
+
-
-
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..3cbbbcd4 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,11 @@ export class WorklistMainPRComponent implements OnInit {
moreDisabled: boolean = true;
direction: string;
defaultSegment = '';
+ approve_label: any;
+ reject_label: any;
+ reqInfo_label: any;
+ close_label: any;
+ closeDis: boolean = false;
constructor(
@@ -143,6 +148,12 @@ export class WorklistMainPRComponent implements OnInit {
intializeNotificationDetail() {
+ this.approveDis = false;
+ this.rejectDis = false;
+ this.requestDis = false;
+ this.closeDis =false;
+ this.moreDisabled = true;
+
if (this.messageSuccess) {
document.getElementById('notificationDynamicFieldsPR').innerHTML = '';
}
@@ -308,16 +319,25 @@ 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 // if result == null
+ (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
+ this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
+ this.closeDis = true;
+ }
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;
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..2adc87d2 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..6b31e493 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
@@ -53,8 +53,8 @@ export class WorklistMainComponent implements OnInit {
getPassNotificationDetails: any;
public static PASS_RES_ATTR = "passResAttr";
TransactionID: number = -999;
- notificationBodyRes: any =[];
- actionHistoryRes: any =[];
+ notificationBodyRes: any = [];
+ actionHistoryRes: any = [];
notificationButtonRes: any;
actionMode: any;
pInformation: string = "";
@@ -70,7 +70,7 @@ export class WorklistMainComponent implements OnInit {
P_RESPOND_ATTRIBUTES_TBL: any;
selEmployeeID: any;
actionType: string = "";
- notificationArray: any =[];
+ notificationArray: any = [];
notificationDynamicAttributeArr: any;
private textInput: TextInput;
private textArea: TextAreaInput;
@@ -80,7 +80,7 @@ export class WorklistMainComponent implements OnInit {
notificationCount: any;
activeSegment: any = "item-req";
lines_note_limit: any = 24;
- attachmentRes: any =[];
+ attachmentRes: any = [];
private WorkListActionHistoryObj: WorkListActionHistoryRequest;
IsReachEnd: boolean = true;
notiActionBtnMore: any = [];
@@ -88,7 +88,7 @@ export class WorklistMainComponent implements OnInit {
confirmMsg: string;
newArr: any = [];
selEmp: any;
- subordinatesleaveList: any =[];
+ subordinatesleaveList: any = [];
private WorkListSubmitterInfoObj: WorkListSubmitterInfoRequest;
submitterInfoRes: any;
approveDis: boolean = false;
@@ -101,6 +101,11 @@ export class WorklistMainComponent implements OnInit {
public isPostNoLoad = true;
public worklistNotifications: any;
public totalRequestCount = 0;
+ approve_label: any = "";
+ reject_label: any = "";
+ reqInfo_label: any = "";
+ close_label: any;
+ closeDis: boolean = false;
constructor(
public worklistService: WorklistService,
@@ -121,6 +126,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() {
@@ -139,13 +145,13 @@ export class WorklistMainComponent implements OnInit {
}
//name=document.getElementById('notificationDynamicFields').value;
- //removeElement('parentDiv', name);"
+ //removeElement('parentDiv', name);"
- //var navbar = document.getElementById("notificationDynamicFields").value;
+ //var navbar = document.getElementById("notificationDynamicFields").value;
// document.querySelector('svg .gauge.chart > text').remove();
// var inputValue = (