From 1644a903d023b438e8b25f6bba3445cf00163039 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 5 Sep 2021 16:12:41 +0300 Subject: [PATCH] add filter and change icon in replacement modal --- .../work-list-main-itg.component.ts | 2 +- .../work-list-replacement-roll.component.html | 26 ++++++---- .../work-list-replacement-roll.component.scss | 6 ++- .../work-list-replacement-roll.component.ts | 47 ++++++++++++++++-- .../imgs/mohemm-action/ReportGenerated.png | Bin 0 -> 3429 bytes Mohem/src/assets/localization/i18n.json | 21 +++++++- Mohem/src/theme/styles.scss | 7 +++ 7 files changed, 91 insertions(+), 18 deletions(-) create mode 100644 Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png 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 21058cca..f148197b 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 @@ -159,7 +159,7 @@ export class WorkListMainItgComponent implements OnInit { return '../assets/imgs/mohemm-action/info.png'; } if (actionName === 'ReportGenerated') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/ReportGenerated.png'; } if (actionName === 'Doable') { return '../assets/imgs/mohemm-action/info.png'; diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index ac55c4c9..1a97b1c9 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -22,21 +22,20 @@ - {{'addAttach, name' | translate}} + {{'replacementRoll, workflow' | translate}} - - {{'login, username' | translate}} + + {{'replacementRoll, favorite' | translate}} - - {{'general, email' | translate}} + + {{'replacementRoll, employee-id' | translate}} - - {{'replacementRoll, favorite' | translate}} + + {{'replacementRoll, employee-email' | translate}} - @@ -45,11 +44,16 @@ - +
- + + - +
+ +
+ +
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 f1bde295..b8b6f0bd 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 @@ -200,4 +200,8 @@ ion-radio{ } .top-radio-row{ font-size: 12px; - } \ No newline at end of file + display: block; + padding-bottom: 25px; + padding-top: 15px; + } + 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 3c2c856e..ef46b8c7 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 @@ -47,6 +47,7 @@ export class WorkListReplacementRollComponent implements OnInit { userSelected: boolean; actionHistory: [] = []; favoriteUserList: [] = []; + isFilter = true; constructor(public worklistService: WorklistService, private cs: CommonService, public ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) { this.P_PAGE_NUM = 1; this.P_PAGE_LIMIT = 50; @@ -408,16 +409,29 @@ export class WorkListReplacementRollComponent implements OnInit { closeModal() { this.modalCtrl.dismiss(); } + + selectedType; onChangeSelect(select) { console.log(select.detail.value); let selectValue = select.detail.value; - if (selectValue == "1" || selectValue == "2" || selectValue == "3") { + if (selectValue == '1') { + this.isSelect = true; + this.isFilter = true; + this.selectedType = 1; + this.listOfRealted = this.actionHistory; + } else if(selectValue === '4'){ + this.getFavruite(); + this.isFilter = true; + this.selectedType = 4; + } else if( selectValue === '2' || selectValue === '3'){ this.isSelect = true; - } if(selectValue === '4'){this.getFavruite();} + this.isFilter = false; + this.selectedType = 0; + } else { this.isSelect = false; - + this.selectedType = 0; } } @@ -450,6 +464,7 @@ export class WorkListReplacementRollComponent implements OnInit { if (this.cs.validResponse(result)) { this.cs.stopLoading(); this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList']; + this.listOfFav = this.favoriteUserList; } }) } @@ -518,4 +533,30 @@ export class WorkListReplacementRollComponent implements OnInit { // } // } + + listOfRealted: any = []; + listOfFav: any = []; + + filterList(event){ + const val = event.target.value; + if(this.selectedType === 1){ + if(val === '') { + this.actionHistory = this.listOfRealted; + } else { + this.actionHistory = this.listOfRealted.filter((item) => { + return (item.NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); + }); + } + } else if(this.selectedType === 4) { + if(val === '') { + this.favoriteUserList = this.listOfFav; + } else { + this.favoriteUserList = this.listOfFav.filter((item) => { + return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); + }); + } + }else{ + return; + } + } } diff --git a/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png b/Mohem/src/assets/imgs/mohemm-action/ReportGenerated.png new file mode 100644 index 0000000000000000000000000000000000000000..27417cb3d1fc13fc8f8b34f0b1dcff679323f848 GIT binary patch literal 3429 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 GFa8HWpb>`v literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 73e8de0d..28933bd8 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2194,8 +2194,8 @@ "ar": "البحث باسم المستخدم" }, "searchbyname": { - "en": "Search by name", - "ar": "البحث عن طريق الإسم" + "en": " Search by name", + "ar": "البحث عن طريق الإسم " }, "searchbyemail": { "en": "Search by email", @@ -2212,7 +2212,24 @@ "favorite": { "en": "Favorite", "ar": "مفضل" + }, + "workflow":{ + "en":"WorkFlow", + "ar":"سير العمل" + }, + "employee-id":{ + "en":"Employee ID", + "ar":"هوية الموظف" + }, + "employee-email":{ + "en":"Employee Email", + "ar":"البريد الإلكتروني للموظف" + }, + "employee-name":{ + "en":"Employee Name", + "ar":"اسم الموظف" } + }, "worklist": { "view": { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 1361c890..82e998ab 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1605,3 +1605,10 @@ ion-segment-button { .searchbar-input.sc-ion-searchbar-md { border-radius: 25px; } + .replacmentSearchBar{ + + + } + .replacmentSearchBar input{ + padding-left: 17px; +} \ No newline at end of file