{{ts.trPK('login','signup')}}
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts
index 5d486395..646557e9 100644
--- a/Mohem/src/app/authentication/login/login.component.ts
+++ b/Mohem/src/app/authentication/login/login.component.ts
@@ -71,7 +71,7 @@ export class LoginComponent implements OnInit, OnDestroy {
public password: string;
private language: string;
public username: string;
- public remeberMe: boolean;
+ public remeberMe = true;
private iosLink: string;
private androidLink: string;
public currentLang = 1;
diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts
index 48ab9c4d..d1b4ac7f 100644
--- a/Mohem/src/app/eit/add-eit/add-eit.component.ts
+++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts
@@ -323,7 +323,7 @@ export class AddEitComponent implements OnInit {
feildsList[i].APPLICATION_COLUMN_NAME,
defaultVal,
containerId,
- defaultVal,
+ defaultValText,
feildsList[i].MOBILE_ENABLED,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG
diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html
index 5e2466b4..f8192efd 100644
--- a/Mohem/src/app/eit/eit-list/eit-list.component.html
+++ b/Mohem/src/app/eit/eit-list/eit-list.component.html
@@ -24,7 +24,7 @@
doneText="Done"
cancelText="Cancel"
> -->
-
@@ -90,7 +90,10 @@
-
+
+ {{ts.trPK('work-list','No-data-available')}}
+
+
{{ts.trPK('work-list','No-data-available')}}
diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts
index 4a2dac84..c21a2830 100644
--- a/Mohem/src/app/notification/home/home.component.ts
+++ b/Mohem/src/app/notification/home/home.component.ts
@@ -214,10 +214,8 @@ export class HomeComponent implements OnInit {
} else if (notification.ITEM_TYPE === 'INVMOA') {
this.filters[4].value = this.totalMR;
this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER;
- } else if (notification.ITEM_TYPE === 'ITG') {
- this.filters[5].value = notification.OPEN_NTF_NUMBER;
- this.data.datasets[0].data[4] = notification.OPEN_NTF_NUMBER;
}
+ this.data.datasets[0].data[4] = this.ITGCount;
}
this.showChart = true;
this.common.stopLoading();
@@ -433,6 +431,9 @@ export class HomeComponent implements OnInit {
}
} else {
this.newWorkListResponse = [];
+ this.data.datasets[0].data[4] = this.ITGCount;
+ this.showChart = true;
+ this.common.stopLoading();
}
}
@@ -508,8 +509,11 @@ export class HomeComponent implements OnInit {
this.ITGSegment[0].names = names;
this.setActive(this.ITGSegment[0].code);
}
- for (let i = 1; i < result.RequestType.length; i++) {
- this.ITGSegment[i] = {
+ console.log(result.RequestType);
+ let count =1;
+ for (let i = 0; i < result.RequestType.length; i++) {
+ console.log()
+ this.ITGSegment[count] = {
name: result.RequestType[i].RequestTypeName,
code: result.RequestType[i].RequestTypeCode,
data: result.RequestType[i].RequestDetails,
@@ -517,7 +521,9 @@ export class HomeComponent implements OnInit {
};
datas[i] = result.RequestType[i].RequestDetails;
names[i] = result.RequestType[i].RequestTypeCode;
+ count++;
}
+ console.log(this.ITGSegment);
});
}
@@ -525,21 +531,12 @@ export class HomeComponent implements OnInit {
Details() {
this.workListService.getITGDetails('', '', this.isPostNoLoad)
.subscribe((result: any) => {
+ this.ITGCount = result.TotalCount;
this.totalRequestCount = this.totalRequestCount + result.TotalCount;
this.filters[5].value = result.TotalCount;
});
}
- ITGNotification() {
- // this.Details();
- this.isAll = false;
- this.isPR = false;
- this.isPO = false;
- this.isMR = false;
- this.isHR = false;
- this.isITG = true;
- }
-
searchBtn() {
this.isSearch = !this.isSearch;
}
diff --git a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts
index 3cbbc80c..828f62a6 100644
--- a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts
+++ b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts
@@ -7,5 +7,5 @@ public P_PAGE_LIMIT : Number;
public P_SEARCH_USER_NAME:String;
public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String;
public P_SEARCH_EMAIL_ADDRESS:String;
-
+public P_SELECTED_EMPLOYEE_NUMBER:any;
}
\ No newline at end of file
diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html
index d7ca6888..554d5407 100644
--- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html
+++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html
@@ -22,7 +22,11 @@
diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
index 5de8fd21..eeb5f349 100644
--- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
+++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
@@ -33,6 +33,7 @@ export class WorkListMainItgComponent implements OnInit {
public request_details: any;
public segmentsArray: { name: string, number: number }[] = [];
public segmentData: { name: string, data: any }[] = [];
+ public requestDetailsData: { name: string, data: any }[] = [];
public header: any = [];
public rows: any = [];
public workList: any;
@@ -84,10 +85,20 @@ export class WorkListMainItgComponent implements OnInit {
this.workListService.getITGFormDetails(this.request).subscribe((result: any) => {
this.request_details = result.ITGRequest;
this.grantInfo = result.ITGRequest.GrantFields;
+ let count =0;
for (let i = 0; i < result.ITGRequest.FieldGoups.length; i++) {
this.segmentsArray[i] = { name: result.ITGRequest.FieldGoups[i].Title, number: i };
this.segmentData[i] = { name: result.ITGRequest.FieldGoups[i].Title, data: result.ITGRequest.FieldGoups[i].Fields }
+
+ for (let j = 0; j < this.segmentData[i].data.length; j++) {
+ if (this.segmentData[i].data[j].TableValue){
+ this.requestDetailsData[count] ={ name:this.segmentData[i].data[j].TableValue.Header,
+ data: this.segmentData[i].data[j].TableValue.Rows}
+ count++;
+ }
+ }
}
+ console.log(this.requestDetailsData)
this.segmentsArray[this.segmentsArray.length] = { name: 'Approval Level', number: this.segmentsArray.length }
this.workList = this.request_details.WFHistory;
this.options = this.request_details.AllowedActions;
@@ -203,7 +214,7 @@ export class WorkListMainItgComponent implements OnInit {
request.ItemID = this.request_info.ItemID;
request.TaskID = this.request_info.ID;
request.Comments = this.commentText;
- request.Comments = this.request_info.Comments;
+ // request.Comments = this.request_info.Comments;
request.EmployeeNumber = this.request_info.EmployeeNumber;
request.NewUserEMPId = this.replcamentID;
this.common.confirmAlertDialogAction(
@@ -212,6 +223,7 @@ export class WorkListMainItgComponent implements OnInit {
url = WorkListMainItgComponent.APPROVAL;
this.workListService.getITGActionRequest(request, url)
.subscribe((result: any) => {
+ this.confirmMsg(1)
// this.common.openNotificationPage();
this.skip();
});
@@ -219,6 +231,7 @@ export class WorkListMainItgComponent implements OnInit {
url = WorkListMainItgComponent.REJECT;
this.workListService.getITGActionRequest(request, url)
.subscribe((result: any) => {
+ this.confirmMsg(2)
// this.common.openNotificationPage();
this.skip();
});
@@ -228,8 +241,10 @@ export class WorkListMainItgComponent implements OnInit {
if (!comments) {
this.common.presentAlert(this.ts.trPK('worklist', 'empty-comment'));
} else {
+ request.Comments = comments;
this.workListService.getITGActionRequest(request, url)
.subscribe((result: any) => {
+ this.confirmMsg(3)
// this.common.openNotificationPage();
this.skip();
});
@@ -239,6 +254,7 @@ export class WorkListMainItgComponent implements OnInit {
url = WorkListMainItgComponent.DELEGATE;
this.workListService.getITGActionRequest(request, url)
.subscribe((result: any) => {
+ this.confirmMsg(4)
// this.common.openNotificationPage();
this.skip();
});
@@ -249,6 +265,7 @@ export class WorkListMainItgComponent implements OnInit {
} else {
this.workListService.getITGActionRequest(request, url)
.subscribe((result: any) => {
+ this.confirmMsg(5)
// this.common.openNotificationPage();
this.skip();
});
@@ -263,6 +280,7 @@ export class WorkListMainItgComponent implements OnInit {
request.AdditionalFields = this.grantRequest;
this.workListService.getITGActionRequest(request, url)
.subscribe((result: any) => {
+ this.confirmMsg(6)
// this.common.openNotificationPage();
this.skip();
});
diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts
index 9a8632fe..985563b4 100644
--- a/Mohem/src/app/uI-elements/text.input.ts
+++ b/Mohem/src/app/uI-elements/text.input.ts
@@ -26,7 +26,7 @@ export class TextInput extends UiElement {
// "" +
"" +
" " + this.label + "" +
- " " +
+ " " +
" ";
return template;
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index cb894d9d..fa59ac65 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -2457,7 +2457,7 @@
},
"earnings":{
"en": "Earnings",
- "ar":"أرباح "
+ "ar":"مستحقات "
},
"deductions":{
"en": "Deductions",