Merge branch 'master-newdesign' into enad-issues

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);

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

Mohem/src/app/authentication/login/login.component.html

@@ -53,10 +53,10 @@
   </ion-item>
   
 
-  <ion-item>
+  <!-- <ion-item>
     <ion-label>{{ts.trPK('login','remeber-me')}}</ion-label>
     <ion-checkbox [(ngModel)]="remeberMe" (ionChange)="addValue($event)" ></ion-checkbox>
-  </ion-item>
+  </ion-item> -->
 
   <div class="centerDiv signupDiv" *ngIf="isAppleStore==false">
     <a>{{ts.trPK('login','signup')}}</a>

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;

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

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;
 }

Mohem/src/app/uI-elements/text.input.ts

@@ -26,7 +26,7 @@ export class TextInput extends UiElement {
             // "<div class='custom-text-area-element' style='" + this.hidden + "'>" +
             "<ion-item style='" + this.hidden + "' class='dynamicField'>" +
             " <ion-label position='floating' style='font-size: medium;' class='" + requiredClass + " dynamiclable-float'>" + this.label + "</ion-label>" +
-            " <ion-input style='' type='text' data-colm-text='" + this.textVal + "' id='" + this.elementId + "' value='" + this.value + "' " + this.disabled + "> </ion-input>" +
+            " <ion-input style='' type='text' data-colm-text='" + this.value + "' id='" + this.elementId + "' value='" + this.textVal + "' " + this.disabled + "></ion-input>" +
             "</ion-item> ";
 
         return template;