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

Merge branch 'feature/project-finance' of https://github.com/Worklenz/worklenz into feature/project-finance

Browse Source
This commit is contained in:
root
2025-06-09 07:35:27 +00:00
parent 0e2c37aef2 e3e1b2dc14
commit 4a3f4ccc08
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worklenz-backend/src/controllers/tasks-controller-base.ts
View File

@@ -52,15 +52,17 @@ export default class TasksControllerBase extends WorklenzControllerBase {
} }
// For tasks with no subtasks and no manual progress // For tasks with no subtasks and no manual progress
else { else {
// Only calculate time-based progress if time-based calculation is enabled for the project // Only calculate progress based on time if time-based progress is enabled for the project
if (task.project_use_time_progress && task.total_minutes_spent && task.total_minutes) { if (task.project_use_time_progress && task.total_minutes_spent && task.total_minutes) {
task.progress = ~~(task.total_minutes_spent / task.total_minutes * 100); // Cap the progress at 100% to prevent showing more than 100% progress
task.complete_ratio = task.progress; task.progress = Math.min(~~(task.total_minutes_spent / task.total_minutes * 100), 100);
} else { } else {
// Default to 0% progress for incomplete tasks when time-based calculation is not enabled // Default to 0% progress when time-based calculation is not enabled
task.progress = 0; task.progress = 0;
task.complete_ratio = 0;
} }
// Set complete_ratio to match progress
task.complete_ratio = task.progress;
} }
// Ensure numeric values // Ensure numeric values