From 526a5cbeb5541a4cc54b2813c754f9f099db3f89 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 2 Mar 2022 14:50:46 +0300 Subject: [PATCH] added new design for delegate and favourite --- .../work-list-main-itg.component.ts | 2 + .../work-list-replacement-itg.component.html | 71 ++++++++++++++----- .../work-list-replacement-itg.component.scss | 12 ++++ .../work-list-replacement-itg.component.ts | 28 ++++++++ .../work-list-replacement-roll.component.html | 71 +++++++++++++++---- .../work-list-replacement-roll.component.scss | 23 +++++- .../work-list-replacement-roll.component.ts | 4 ++ Mohem/src/theme/styles.scss | 7 +- 8 files changed, 183 insertions(+), 35 deletions(-) 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 20b990ad..afde12f7 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 @@ -498,6 +498,7 @@ export class WorkListMainItgComponent implements OnInit { } if (this.actionSelected === 'Delegate') { this.common.sharedService.setSharedData(info, 'selectedEmpInfo'), + this.common.sharedService.setSharedData('Delegate','pressedBtn') this.presentModal(4); } if (this.actionSelected === 'Doable') { @@ -516,6 +517,7 @@ export class WorkListMainItgComponent implements OnInit { this.actionService(2, this.commentText); } if (this.actionSelected === 'RequestInformation') { + this.common.sharedService.setSharedData('RequestInformation','pressedBtn') this.presentModal(3); } if (this.actionSelected === 'ReportGenerated') { diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 8dfbc335..a9a6c762 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -1,13 +1,12 @@ - - + @@ -60,9 +59,15 @@ --> - {{'replacementRoll, searchBy' | translate}} + + {{ + 'replacementRoll, title' | translate}} + {{ 'worklistMain, request' | translate}} + + {{ 'worklistMain, delegate' | translate}} - + + + +
+ + + +
+ + +
+ + + +
+ +
+ + +

{{'replacementRoll, workflow' | translate}}

+

{{'replacementRoll, favorite' | translate}}

+

{{'replacementRoll, employee-id' | translate}}

+

{{'replacementRoll, employee-email' | translate}}

+

{{'replacementRoll, employee-name' | translate}}

+
+
+
+
+
+
+ + + +
+ +
+
+
+
- - + diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index d478da6e..5c9b62ba 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -14,7 +14,9 @@ ion-radio { text-align: center; } .boldTxtNav { + text-align: start; font-weight: bold; + padding: 12px; } .employee-details { display: inline-block; @@ -284,3 +286,13 @@ ion-radio { border-radius: 60px; color: white; } +.vl { + border-left: 2px solid lightgray; + height: 36px; +} +.searchText{ + background: transparent; + color: #D55D5C; + font-weight: bold; + text-decoration: underline; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts index e70e8589..9ef56f82 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts @@ -41,6 +41,7 @@ export class WorkListReplacementItgComponent implements OnInit { arr = []; delegtedEmp; isFavoriteLetterActive = false; + getPassActionMode: any; public slideOptsOne = { slidesPerView: 6, @@ -63,7 +64,9 @@ export class WorkListReplacementItgComponent implements OnInit { // } ngOnInit() { + this.onChangeSelect1('1'); this.delegtedEmp = this.cs.sharedService.getSharedData('selectedEmpInfo', true); + this.getPassActionMode = this.cs.sharedService.getSharedData('pressedBtn', true); if (this.delegtedEmp === undefined) { if (!this.relatedList || this.relatedList.length === 0 || this.relatedList === undefined) { this.arr = this.cs.sharedService.getSharedData('workflow-user', false); @@ -223,6 +226,31 @@ export class WorkListReplacementItgComponent implements OnInit { } } + onChangeSelect1(select) { + let selectValue = select; + this.searchKey = ''; + if (selectValue == "1") { + this.listOfRealted = this.relatedList; + console.log(this.relatedList); + this.isSelect = true; + this.isFilter = true; + this.ReplacementList = []; + } else if (selectValue == "4") { + this.listOfFav = this.favoriteUserList; + this.isFilter = true; + this.ReplacementList = []; + // if(this.favoriteUserList.length === 0 || this.favoriteUserList === undefined){ + this.getFavruite(); + // } + } else if (selectValue === '2' || selectValue === '3' || selectValue === '5') { + this.isSelect = true; + this.isFilter = false; + } + else { + this.isSelect = false; + + } + } getPlaceHolder() { return this.searchKeySelect == '1' ? this.ts.trPK('replacementRoll', 'searchbyname') : this.searchKeySelect == '2' ? this.ts.trPK('replacementRoll', 'searchbyusername') : this.ts.trPK('replacementRoll', 'searchbyemail'); } 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 edb614b4..1f9c533d 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 @@ -1,14 +1,12 @@ - - - - {{ + + + - @@ -18,9 +16,15 @@ - {{'replacementRoll, searchBy' | translate}} + + {{ + 'replacementRoll, title' | translate}} + {{ 'worklistMain, request' | translate}} + + {{ 'worklistMain, delegate' | translate}} + - + -
+ @@ -80,12 +83,50 @@
+
--> + +
+ + + +
+ + +
+ + + +
+ +
+ + +

{{'replacementRoll, workflow' | translate}}

+

{{'replacementRoll, favorite' | translate}}

+

{{'replacementRoll, employee-id' | translate}}

+

{{'replacementRoll, employee-email' | translate}}

+

{{'replacementRoll, employee-name' | translate}}

+
+
+
+
+
- - + + + +
+ +
+
+
+
-
+
@@ -95,7 +136,7 @@
-
+
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 4eb8d499..b60d1508 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 @@ -158,8 +158,9 @@ ion-radio { padding: 5px; } .boldTxtNav { + text-align: start; font-weight: bold; - padding: 5px; + padding: 12px; } .employee-details { display: inline-block; @@ -212,3 +213,23 @@ ion-radio { border-radius: 60px; color: white; } +.vl { + border-left: 2px solid lightgray; + height: 36px; +} +.clearText{ + background: transparent; + color: #D55D5C; + font-weight: bold; + text-decoration: underline; +} +.searchText{ + background: transparent; + color: #D55D5C; + font-weight: bold; + text-decoration: underline; +} +.filterClass input{ + box-shadow: none !important; + -webkit-box-shadow: none !important; +} \ No newline at end of file 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 f7052c5f..9f3fad7f 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 @@ -673,4 +673,8 @@ selectedLetter(el) { returnIsActiveFunction(i) { return this.favIsActive[i]; } + +clearSearchInput(){ + this.inputSearch = ''; +} } diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 499f6f9b..e24bafc5 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1630,4 +1630,9 @@ ion-segment-button { .disabledField{ opacity: .5; pointer-events: none; -} \ No newline at end of file +} + +.filterClass input{ + box-shadow: none !important; + -webkit-box-shadow: none !important; + } \ No newline at end of file