0 && !userSelected && ReplacementList.length==0 && searchBy != '4'">
-
- {{'replacementRoll, related' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+ {{"replacementRoll, question" | translate}} :
+ {{pQuestion}} ?
+ {{"replacementRoll, answer" | translate}}
+
+
+
+
+
+
0 && !userSelected && ReplacementList.length==0 && searchBy === '1'">
+
+ {{'replacementRoll, related' | translate}}
+
+
+
+
+
-
-
-
-
-
![]()
-

+
![]()
+
-
- {{employee.NAME}}
-
+
+ {{employee.NAME}}
+
-
-
-
-
-
-
-
0 && !userSelected && ReplacementList.length ==0 && searchBy == '4'">
-
- {{'replacementRoll, favorite' | translate}}
+
+
+
-
-
-
-
-
![]()
-

+
+
0 && !userSelected && ReplacementList.length ==0 && searchBy == '4'">
+
+ {{'replacementRoll, favorite' | translate}}
+
+
+
+
+
+
+
![]()
+
-
- {{employee.EMPLOYEE_DISPLAY_NAME}}
-
+
+ {{employee.EMPLOYEE_DISPLAY_NAME}}
+
-
-
-
-
-
0 && !userSelected" class="uk-margin">
- {{'replacementRoll, search-result' | translate}}
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-

-
-
- {{employee.EMPLOYEE_DISPLAY_NAME}}
-
+
+
+
+
+
+ {{employee.EMPLOYEE_DISPLAY_NAME}}
+
-
-
-

-
+
+
+

+
-
-
-
-
+
-
-
+
+
-
-
-
-
-
Transaction Successful
-
+
+
+
+
+
+ Transaction Successful
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
index b8b6f0bd..64b9ebd1 100644
--- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
+++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
@@ -204,4 +204,8 @@ ion-radio{
padding-bottom: 25px;
padding-top: 15px;
}
+ .textSearchType{
+ padding-top: 8px;
+ font-size: 12px;
+ }
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts
index ef46b8c7..27f66955 100644
--- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts
+++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts
@@ -53,7 +53,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.P_PAGE_LIMIT = 50;
this.getPassActionMode = this.cs.sharedService.getSharedData('passActionMode', false);
console.log(this.getPassActionMode);
- // this.getFavruite();
+ this.getFavruite();
this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo', false);
this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr', false);
console.log(this.getpassResAttr);
@@ -113,6 +113,14 @@ export class WorkListReplacementRollComponent implements OnInit {
this.WorkListReplacmentEmployeeObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = "";
break;
}
+ case '5': {
+
+ this.WorkListReplacmentEmployeeObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = this.inputSearch;
+ this.WorkListReplacmentEmployeeObj.P_SEARCH_USER_NAME = "";
+ this.WorkListReplacmentEmployeeObj.P_SEARCH_EMAIL_ADDRESS = "";
+
+ break;
+ }
default: {
this.WorkListReplacmentEmployeeObj.P_SEARCH_USER_NAME = "";
this.WorkListReplacmentEmployeeObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME = "";
@@ -421,10 +429,10 @@ export class WorkListReplacementRollComponent implements OnInit {
this.selectedType = 1;
this.listOfRealted = this.actionHistory;
} else if(selectValue === '4'){
- this.getFavruite();
+ // this.getFavruite();
this.isFilter = true;
this.selectedType = 4;
- } else if( selectValue === '2' || selectValue === '3'){
+ } else if( selectValue === '2' || selectValue === '3' || selectValue === '5'){
this.isSelect = true;
this.isFilter = false;
this.selectedType = 0;