+ status="success"
+ [text]="
+ ('DASHBOARD_PAGE.CHARTS.WORKING_NOW' | translate) + ' ' + team?.statistics?.countOnline
+ "
+ >
+ status="warning"
+ [text]="
+ ('DASHBOARD_PAGE.CHARTS.WORKING_TODAY' | translate) +
+ ' ' +
+ (team?.statistics?.countWorking - team?.statistics?.countOnline).toString()
+ "
+ >
+ status="danger"
+ [text]="
+ ('DASHBOARD_PAGE.CHARTS.NOT_WORKING' | translate) +
+ ' ' +
+ team?.statistics?.countNotWorking
+ "
+ >
@@ -118,9 +127,8 @@
{{ 'TIMESHEET.WORKED_FOR_DAY' | translate }}
-
-
+
+
diff --git a/apps/gauzy/src/app/pages/dashboard/team/all-team/all-team.component.ts b/apps/gauzy/src/app/pages/dashboard/team/all-team/all-team.component.ts
index 2288f17a312..df7b0c1e580 100644
--- a/apps/gauzy/src/app/pages/dashboard/team/all-team/all-team.component.ts
+++ b/apps/gauzy/src/app/pages/dashboard/team/all-team/all-team.component.ts
@@ -1,7 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { UntilDestroy } from '@ngneat/until-destroy';
-import { Store } from '@gauzy/ui-core/core';
-import { OrganizationProjectsService } from '@gauzy/ui-core/core';
+import { OrganizationProjectsService, Store } from '@gauzy/ui-core/core';
@UntilDestroy({ checkProperties: true })
@Component({
diff --git a/apps/gauzy/src/app/pages/dashboard/team/chart/chart.component.ts b/apps/gauzy/src/app/pages/dashboard/team/chart/chart.component.ts
index 5ce74085fcc..dc00d560f7f 100644
--- a/apps/gauzy/src/app/pages/dashboard/team/chart/chart.component.ts
+++ b/apps/gauzy/src/app/pages/dashboard/team/chart/chart.component.ts
@@ -7,7 +7,7 @@ import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
@UntilDestroy({ checkProperties: true })
@Component({
- selector: 'gauzy-chart',
+ selector: 'gz-doughnut-chart',
templateUrl: './chart.component.html',
styleUrls: ['./chart.component.scss']
})
@@ -23,13 +23,14 @@ export class ChartComponent extends TranslationBaseComponent implements OnInit,
}
private get _labels() {
+ // Retrieve the statistics
+ const { countOnline, countWorking, countNotWorking } = this.statistics;
+ // Build the labels
return {
labels: [
- `${this.getTranslation('DASHBOARD_PAGE.CHARTS.WORKING_NOW')}: ${this.statistics.countOnline}`,
- `${this.getTranslation('DASHBOARD_PAGE.CHARTS.WORKING')}: ${
- this.statistics.countWorking - this.statistics.countOnline
- }`,
- `${this.getTranslation('DASHBOARD_PAGE.CHARTS.NOT_WORKING')}: ${this.statistics.countNotWorking}`
+ `${this.getTranslation('DASHBOARD_PAGE.CHARTS.WORKING_NOW')}: ${countOnline}`,
+ `${this.getTranslation('DASHBOARD_PAGE.CHARTS.WORKING')}: ${countWorking - countOnline}`,
+ `${this.getTranslation('DASHBOARD_PAGE.CHARTS.NOT_WORKING')}: ${countNotWorking}`
]
};
}
diff --git a/apps/gauzy/src/app/pages/dashboard/team/index.ts b/apps/gauzy/src/app/pages/dashboard/team/index.ts
new file mode 100644
index 00000000000..6fa5cbe50a1
--- /dev/null
+++ b/apps/gauzy/src/app/pages/dashboard/team/index.ts
@@ -0,0 +1,5 @@
+export * from './all-team/all-team.component';
+export * from './team-card/team-card.component';
+export * from './team-member/team-member.component';
+export * from './team.component';
+export * from './chart/chart.component';
diff --git a/apps/gauzy/src/app/pages/dashboard/team/team-card/team-card.component.ts b/apps/gauzy/src/app/pages/dashboard/team/team-card/team-card.component.ts
index 3dcbe4de865..82c7ee03305 100644
--- a/apps/gauzy/src/app/pages/dashboard/team/team-card/team-card.component.ts
+++ b/apps/gauzy/src/app/pages/dashboard/team/team-card/team-card.component.ts
@@ -1,46 +1,33 @@
import { Component, Input, OnInit } from '@angular/core';
-import { IEmployee, IOrganizationTeam, RolesEnum } from "@gauzy/contracts";
+import { IEmployee, IOrganizationTeam, RolesEnum } from '@gauzy/contracts';
@Component({
- selector: 'gauzy-team-card',
- templateUrl: './team-card.component.html',
- styleUrls: ['./team-card.component.scss']
+ selector: 'gauzy-team-card',
+ templateUrl: './team-card.component.html',
+ styleUrls: ['./team-card.component.scss']
})
export class TeamCardComponent implements OnInit {
- constructor() {
- }
-
- private _managers: IEmployee[];
-
- get managers(): IEmployee[] {
- return this._team.members
- .filter(
- (member) =>
- member.role &&
- member.role.name === RolesEnum.MANAGER
- )
- .map((item) => item.employee);
- }
-
- private _members: IEmployee[];
-
- get members(): IEmployee[] {
- return this._team.members
- .filter((member) => !member.role)
- .map((item) => item.employee);
- }
-
- private _team: IOrganizationTeam | any;
-
- public get team(): IOrganizationTeam | any {
- return this._team;
- }
-
- @Input()
- public set team(value: IOrganizationTeam | any) {
- this._team = value;
- };
-
- ngOnInit(): void {
- }
+ constructor() {}
+
+ _managers: IEmployee[];
+ get managers(): IEmployee[] {
+ return this._team.members
+ .filter((member) => member.role && member.role.name === RolesEnum.MANAGER)
+ .map((item) => item.employee);
+ }
+
+ _members: IEmployee[];
+ get members(): IEmployee[] {
+ return this._team.members.filter((member) => !member.role).map((item) => item.employee);
+ }
+
+ private _team: IOrganizationTeam | any;
+ public get team(): IOrganizationTeam | any {
+ return this._team;
+ }
+ @Input() public set team(value: IOrganizationTeam | any) {
+ this._team = value;
+ }
+
+ ngOnInit(): void {}
}
diff --git a/apps/gauzy/src/app/pages/dashboard/team/team-member/team-member.component.ts b/apps/gauzy/src/app/pages/dashboard/team/team-member/team-member.component.ts
index f92f22c24a8..72038de7285 100644
--- a/apps/gauzy/src/app/pages/dashboard/team/team-member/team-member.component.ts
+++ b/apps/gauzy/src/app/pages/dashboard/team/team-member/team-member.component.ts
@@ -1,7 +1,7 @@
import { Component, Input, OnInit } from '@angular/core';
+import * as moment from 'moment';
import { IOrganizationTeamEmployee } from '@gauzy/contracts';
import { progressStatus } from '@gauzy/ui-core/common';
-import * as moment from 'moment';
@Component({
selector: 'gauzy-team-member',
@@ -9,10 +9,6 @@ import * as moment from 'moment';
styleUrls: ['./team-member.component.scss']
})
export class TeamMemberComponent implements OnInit {
- constructor() {
- this._isClassic = false;
- }
-
private _member: IOrganizationTeamEmployee | any;
public get member(): IOrganizationTeamEmployee | any {
@@ -49,5 +45,9 @@ export class TeamMemberComponent implements OnInit {
return moment.duration(duration, 'seconds').humanize();
}
+ constructor() {
+ this._isClassic = false;
+ }
+
ngOnInit(): void {}
}
diff --git a/apps/gauzy/src/app/pages/dashboard/team/team.component.html b/apps/gauzy/src/app/pages/dashboard/team/team.component.html
index 77fb7fd78e9..b5034381cfd 100644
--- a/apps/gauzy/src/app/pages/dashboard/team/team.component.html
+++ b/apps/gauzy/src/app/pages/dashboard/team/team.component.html
@@ -1,14 +1,20 @@
-
-