Skip to content

[Improvement] Update Broken UI for "Employee/Team" Column in Project List View (#8539) #8898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

[Improvement] Update Broken UI for "Employee/Team" Column in Project List View (#8539) #8898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b46dac
fix(project-list): update broken UI for "Employee/Team" column
samuelmbabhazi Apr 4, 2025
552fef0
refactor design
samuelmbabhazi Apr 4, 2025
10379fa
change max display
samuelmbabhazi Apr 4, 2025
277ee91
fix Cspell
samuelmbabhazi Apr 4, 2025
e4b60ca
feedback integration
samuelmbabhazi Apr 6, 2025
e521c8b
feedback integration
samuelmbabhazi Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 23 additions & 28 deletions ...re/shared/src/lib/table-components/employee-with-links/employee-with-links.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
<div class="main">
<ng-container *ngFor="let groups of employees">
<div *ngIf="value" class="avatar-container">
<div class="avatar-group">
<ng-container *ngFor="let employee of groups; let i = index">
<a
class="avatar"
*ngIf="employee?.user"
(click)="
selectEmployee(
employee,
employee.user.firstName,
employee.user.lastName,
employee.user.imageUrl
)
"
>
<img
class="img"
type="user"
[src]="employee.user.imageUrl"
/>
<span
>{{ employee.user.firstName }}
{{ employee.user.lastName }}</span
>
</a>
</ng-container>
<div *ngIf="value" class="avatar-container">
<div class="avatar-group">
<ng-container *ngFor="let employee of displayedEmployees">
<a
class="avatar"
*ngIf="employee?.user"
(click)="
selectEmployee(
employee,
employee.user.firstName,
employee.user.lastName,
employee.user.imageUrl
)
"
>
<img class="img" type="user" [src]="employee.user.imageUrl" />
<span>{{ employee.user.firstName }} {{ employee.user.lastName }}</span>
</a>
</ng-container>

<div *ngIf="remainingCount > 0" class="remaining-count">
<span>+{{ remainingCount }}</span>
</div>
</div>
</ng-container>
</div>
</div>
31 changes: 24 additions & 7 deletions ...re/shared/src/lib/table-components/employee-with-links/employee-with-links.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ $radius: var(--button-rectangle-border-radius);
height: 2.5rem;

.avatar-group {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
justify-content: flex-start;

.avatar {
background-color: var(--gauzy-primary-background);
Expand All @@ -41,8 +40,30 @@ $radius: var(--button-rectangle-border-radius);
&:hover {
text-overflow: clip;
width: fit-content;
z-index: 10;
}
}

.remaining-count {
background-color: #3366ff;
color: white;
border-radius: $radius;
padding: 5px 7px;
font-size: 12px;
font-weight: 600;
z-index: 2;
border: 2px solid #ffffff;
display: flex;
align-items: center;
justify-content: center;
height: 2rem;
min-width: 2rem;
cursor: pointer;

position: static;
margin-left: 0;
order: 999;
}
}
}

Expand All @@ -57,12 +78,8 @@ $radius: var(--button-rectangle-border-radius);
}

:host {
.avatar-group .avatar+.avatar {
.avatar-group .avatar + .avatar {
@include nb-ltr(margin-left, -4rem);
@include nb-rtl(margin-right, -4rem);
}
}

.main {
width: 7rem;
}
41 changes: 14 additions & 27 deletions ...core/shared/src/lib/table-components/employee-with-links/employee-with-links.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,33 @@ export class EmployeeWithLinksComponent implements OnInit {
@Input() rowData: any;
@Input() value: any;

employees: any[] = [];
displayedEmployees: IEmployee[] = [];
maxDisplay = 5;
remainingCount = 0;

constructor(private readonly store: Store, private readonly router: Router) {}

ngOnInit(): void {
this.initializeGrouping();
this.initializeEmployees();
}

/**
* Initializes the grouping of employees into groups of size 3.
*
* This function takes no parameters and modifies the `employees` property of the class.
* It iterates over the `value` property of the class and groups employees into arrays of size 3.
* The resulting groups are stored in the `employees` property.
* Initializes the employees array with a single group of visible employees (max 5)
* and calculates remaining count.
*
* @return {void} This function does not return anything.
*/
initializeGrouping(): void {
if (!this.value) {
initializeEmployees(): void {
if (!this.value || !Array.isArray(this.value)) {
return;
}

const GROUP = 3;
const SIZE = this.value.length;
let count = 0;
let group: any[] = [];

for (let employee of this.value) {
if ((2 * count - 1) % GROUP === 0) {
group.push(employee);
this.employees.push(group);
group = [];
} else {
group.push(employee);
if (SIZE - count < GROUP - 1 && SIZE - count > 0) {
this.employees.push(group);
}
}
count++;
if (this.value.length > this.maxDisplay) {
this.displayedEmployees = this.value.slice(0, this.maxDisplay);
this.remainingCount = this.value.length - this.maxDisplay;
} else {
this.displayedEmployees = [...this.value];
this.remainingCount = 0;
}
}

Expand All @@ -69,7 +57,6 @@ export class EmployeeWithLinksComponent implements OnInit {
this.store.selectedEmployee.lastName = lastName;
this.store.selectedEmployee.imageUrl = imageUrl;

//
this.navigateToEmployeeStatistics(employee.id);
}

Expand Down
Loading