diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 4469f7ec..98955dfd 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -235,7 +235,7 @@ export class DetailsComponent implements OnInit { ngOnInit() { this.common.startLoading(); this.intializeMemberDetail(); - this.showAttendanceTracking(); + // this.showAttendanceTracking(); // tslint:disable-next-line: max-line-length this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex); } @@ -266,6 +266,7 @@ export class DetailsComponent implements OnInit { if (this.activeSegment === 'Attendance') { this.common.startLoading(); this.initAttendance(); + this.showAttendanceTracking(); } else if (this.activeSegment != 'Attendance' && this.activeSegment != 'TeamMembers') { this.activeSegment = 'About'; diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html index 9f1ef3f6..490f2123 100644 --- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html @@ -18,15 +18,15 @@ -

item type

+

item type

-

FYA

+

FYA

         -

FYI

+

FYI

-

{{data.ITEM_TYPE}}

+

{{data.ITEM_TYPE}}

    diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index ef433546..5cd0e320 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -852,7 +852,7 @@ $actionBtnSize : 36px; font-size: 18px; } span{ - font-size: 11px; + font-size: 9px; } } } diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 638d68e0..98f15742 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -184,7 +184,7 @@ export class TimeCardDetailsComponent implements OnInit { { data: [this.absentDays, this.attendedDays], backgroundColor: [ - '#269DB8', + '#292F42', '#269DB8' ], borderWidth: 2