diff --git a/Mohem/src/app/authentication/business-card/business-card.component.html b/Mohem/src/app/authentication/business-card/business-card.component.html index 38fd96cb..fd7a5978 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -54,7 +54,7 @@

{{userInfo.name_en}}

{{jobName}}
{{userInfo.mobile}}
-
{{userInfo.email}}
+
{{userInfo.email}}
{{userInfo.company_url}}
diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index ce8635c3..c6345634 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -529,7 +529,7 @@ export class HomeComponent implements OnInit { } openNotificationDetail(obj) { - this.common.sharedService.setSharedData(this.selectedFilter, 'selectedFilter'); + this.common.sharedService.setSharedData(this.itemType, 'selectedFilter'); this.common.sharedService.setSharedData(false, 'loadWorkList'); this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA); if (obj.REQUEST_TYPE === 'PR') { 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 ae54bea2..0994d42a 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 @@ -85,7 +85,17 @@ -
+
+ + +
+

{{filter}}

+
+
+
+
+ +
@@ -170,6 +180,7 @@
+

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 1da215da..58ff1982 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 @@ -49,6 +49,7 @@ export class WorkListReplacementRollComponent implements OnInit { arr = []; favoriteUserList: any = []; isFilter = true; + isFavoriteLetterActive = false; public slideOptsOne = { slidesPerView: 6, @@ -526,7 +527,7 @@ export class WorkListReplacementRollComponent implements OnInit { this.favLetter.forEach((obj, index) => { if(this.activeSelectedLetter) {} if (index === 0) { - this.selectedLetter(obj); + // this.selectedLetter(obj); this.favIsActive.push(true); } else { this.favIsActive.push(false); @@ -650,6 +651,7 @@ export class WorkListReplacementRollComponent implements OnInit { } selectedLetter(el) { + this.isFavoriteLetterActive = true; this.favLetter.forEach((letter, index) => { if (letter === el) { this.favIsActive[index] = true; diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 61942553..4f98cba3 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -148,6 +148,7 @@ export class WorklistMainComponent implements OnInit { false ); this.selectedFilter = this.common.sharedService.getSharedData('selectedFilter', false); + console.log(this.selectedFilter); if (this.selEmp) { } else { this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { if (user) { diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 1f462eea..8cd0067e 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -1171,12 +1171,16 @@ $actionBtnSize: 36px; // width: 89%; // left: 10px; width: 90%; - left: 0px; + left: 5%; + padding-left: 0px; + margin-left: 0px; } .card-size-info-ar{ width: 90%; - right: 2%; + right: 5%; + padding-right: 0px; + margin-left: 0px; } // .header-label-text-form{ diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index d90e8f6d..716539d2 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -37,21 +37,6 @@

- - -
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index c824c8a6..090524b4 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -74,7 +74,8 @@ margin-top: 5px; margin-bottom: 10px; text-align: center; - margin-left: 74px; + // margin-left: 74px; + width: 100%; } .Text-ar{ margin: 0; @@ -167,9 +168,9 @@ } .gauge{ - transform: translate(-24px, -65px); - margin-bottom: -187px; - margin-top: -20px; + // transform: translate(-24px, -65px); + margin-bottom: -140px; + margin-top: -70px; } .gauge-ar{