From 5e0d1b9b8782fb2adea3d41a42b1478749882e4d Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Tue, 7 Apr 2020 15:52:02 +0300 Subject: [PATCH] edit replacment issue & eit arabic text --- .../absence-replacement-list.component.ts | 5 +++-- .../app/absence/submit-absence/submit-absence.component.ts | 1 + Mohem/src/app/authentication/login/login.component.html | 4 ++-- Mohem/src/app/authentication/login/login.component.ts | 2 +- Mohem/src/app/eit/add-eit/add-eit.component.ts | 2 +- Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts | 2 +- Mohem/src/app/uI-elements/text.input.ts | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts index cee6305f..0fcacdb7 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts @@ -22,6 +22,7 @@ export class AbsenceReplacementListComponent implements OnInit { selectedValue: any; inputSearch: any; selEmpName: any; + selectedReplacedEmp: any; selectedUserInf: any; userNote: any; getPassNotificationDetails: any; @@ -63,7 +64,7 @@ export class AbsenceReplacementListComponent implements OnInit { } ngOnInit() { - + this.selectedReplacedEmp = this.cs.sharedService.getSharedData('selectedReplacedEmp'); this.demoeAttach = [{ USER_NAME: '18888', EMPLOYEE_DISPLAY_NAME: "AAA fgfhfhfhf hyutyututut ", @@ -147,7 +148,7 @@ export class AbsenceReplacementListComponent implements OnInit { // this.WorkListReplacmentEmployeeObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME=""; // this.WorkListReplacmentEmployeeObj.P_SEARCH_EMAIL_ADDRESS=this.inputSearch; // } - + this.WorkListReplacmentEmployeeObj.P_SELECTED_EMPLOYEE_NUMBER =this.selectedReplacedEmp; this.worklistService.getReplacmentEmployeeList(this.WorkListReplacmentEmployeeObj). subscribe((result: WorKListReplacmentEmployeeResponse) => { this.handleWorkListReplacmentEmployeeResult(result); diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index cd965432..1d16e33a 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -247,6 +247,7 @@ export class SubmitAbsenceComponent implements OnInit { } async SearchReplacment() { + this.common.sharedService.setSharedData(this.selEmp, 'selectedReplacedEmp'); const modal = await this.modalCtrl.create({ component: AbsenceReplacementListComponent, backdropDismiss: false diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 6fb821df..2d7c2a05 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -53,10 +53,10 @@ - +
{{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/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/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;