bo/worklenz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

group by client / category

Browse Source
This commit is contained in:
Omindu Hirushka
2025-06-06 13:23:23 +05:30
parent 585a65be31
commit e9e9bffd9a
7 changed files with 164 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
worklenz-frontend/src/utils/project-group.ts
View File

@@ -1,19 +1,35 @@
// Updated project-group.ts
import { GroupedProject } from "@/types/project/project.types";
import { GroupedProject, ProjectGroupBy } from "@/types/project/project.types";
import { IProjectViewModel } from "@/types/project/projectViewModel.types";
export const groupProjectsByCategory = (projects: IProjectViewModel[]): GroupedProject[] => {
export const groupProjects = (
projects: IProjectViewModel[],
groupBy: ProjectGroupBy
): GroupedProject[] => {
const grouped: Record<string, GroupedProject> = {};
projects?.forEach(project => {
const categoryName = project.category_name || 'Uncategorized';
const categoryColor = project.category_color || '#888';
if (!grouped[categoryName]) {
grouped[categoryName] = {
groupKey: categoryName,
groupName: categoryName,
groupColor: categoryColor,
let groupKey: string;
let groupName: string;
let groupColor: string;
switch (groupBy) {
case ProjectGroupBy.CLIENT:
groupKey = project.client_name || 'No Client';
groupName = groupKey;
groupColor = '#688';
break;
case ProjectGroupBy.CATEGORY:
default:
groupKey = project.category_name || 'Uncategorized';
groupName = groupKey;
groupColor = project.category_color || '#888';
}
if (!grouped[groupKey]) {
grouped[groupKey] = {
groupKey,
groupName,
groupColor,
projects: [],
count: 0,
totalProgress: 0,
@@ -21,48 +37,10 @@ export const groupProjectsByCategory = (projects: IProjectViewModel[]): GroupedP
};
}
grouped[categoryName].projects.push(project);
grouped[categoryName].count++;
grouped[categoryName].totalProgress += project.progress || 0;
grouped[categoryName].totalTasks += project.task_count || 0;
});
// Calculate average progress for each category
Object.values(grouped).forEach(group => {
group.averageProgress = group.count > 0 ? Math.round(group.totalProgress / group.count) : 0;
});
return Object.values(grouped);
};
export const groupProjectsByClient = (projects: IProjectViewModel[]): GroupedProject[] => {
const grouped: Record<string, GroupedProject> = {};
projects?.forEach(project => {
const clientName = project.client_name || 'No Client';
const clientKey = project.client_id || 'no-client';
if (!grouped[clientKey]) {
grouped[clientKey] = {
groupKey: clientKey,
groupName: clientName,
groupColor: '#4A90E2', // Default blue color for clients
projects: [],
count: 0,
totalProgress: 0,
totalTasks: 0
};
}
grouped[clientKey].projects.push(project);
grouped[clientKey].count++;
grouped[clientKey].totalProgress += project.progress || 0;
grouped[clientKey].totalTasks += project.task_count || 0;
});
// Calculate average progress for each client
Object.values(grouped).forEach(group => {
group.averageProgress = group.count > 0 ? Math.round(group.totalProgress / group.count) : 0;
grouped[groupKey].projects.push(project);
grouped[groupKey].count++;
grouped[groupKey].totalProgress += project.progress || 0;
grouped[groupKey].totalTasks += project.task_count || 0;
});
return Object.values(grouped);