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

fix(finance-table): correct cost calculations in finance table

Browse Source 
- Updated the cost display logic to show actual costs from logs instead of estimated costs.
- Adjusted the total cost calculation to reflect the difference between total actual and fixed costs.
- Enhanced the accumulation of actual costs in the finance table's totals computation.
This commit is contained in:
chamikaJ
2025-05-30 16:50:15 +05:30
parent 6a4bf4d672
commit 035617c8e8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
worklenz-frontend/src/pages/projects/projectView/finance/finance-tab/finance-table/finance-table.tsx
View File

@@ -119,7 +119,7 @@ const FinanceTable = ({
case FinanceTableColumnKeys.ESTIMATED_COST: case FinanceTableColumnKeys.ESTIMATED_COST:
return <Typography.Text>{formatNumber(formattedTotals.estimated_cost)}</Typography.Text>; return <Typography.Text>{formatNumber(formattedTotals.estimated_cost)}</Typography.Text>;
case FinanceTableColumnKeys.COST: case FinanceTableColumnKeys.COST:
return <Typography.Text>{formatNumber(formattedTotals.estimated_cost)}</Typography.Text>; return <Typography.Text>{formatNumber(formattedTotals.actual_cost_from_logs)}</Typography.Text>;
case FinanceTableColumnKeys.FIXED_COST: case FinanceTableColumnKeys.FIXED_COST:
return <Typography.Text>{formatNumber(formattedTotals.fixed_cost)}</Typography.Text>; return <Typography.Text>{formatNumber(formattedTotals.fixed_cost)}</Typography.Text>;
case FinanceTableColumnKeys.TOTAL_BUDGET: case FinanceTableColumnKeys.TOTAL_BUDGET:
@@ -335,7 +335,7 @@ const FinanceTable = ({
case FinanceTableColumnKeys.TOTAL_ACTUAL: case FinanceTableColumnKeys.TOTAL_ACTUAL:
return <Typography.Text>{formatNumber(task.total_actual)}</Typography.Text>; return <Typography.Text>{formatNumber(task.total_actual)}</Typography.Text>;
case FinanceTableColumnKeys.COST: case FinanceTableColumnKeys.COST:
return <Typography.Text>{formatNumber(task.estimated_cost || 0)}</Typography.Text>; return <Typography.Text>{formatNumber((task.total_actual || 0) - (task.fixed_cost || 0))}</Typography.Text>;
default: default:
return null; return null;
} }
@@ -364,6 +364,7 @@ const FinanceTable = ({
hours: acc.hours + (task.estimated_seconds || 0), hours: acc.hours + (task.estimated_seconds || 0),
total_time_logged: acc.total_time_logged + (task.total_time_logged_seconds || 0), total_time_logged: acc.total_time_logged + (task.total_time_logged_seconds || 0),
estimated_cost: acc.estimated_cost + (task.estimated_cost || 0), estimated_cost: acc.estimated_cost + (task.estimated_cost || 0),
actual_cost_from_logs: acc.actual_cost_from_logs + ((task.total_actual || 0) - (task.fixed_cost || 0)),
fixed_cost: acc.fixed_cost + (task.fixed_cost || 0), fixed_cost: acc.fixed_cost + (task.fixed_cost || 0),
total_budget: acc.total_budget + (task.total_budget || 0), total_budget: acc.total_budget + (task.total_budget || 0),
total_actual: acc.total_actual + (task.total_actual || 0), total_actual: acc.total_actual + (task.total_actual || 0),
@@ -373,6 +374,7 @@ const FinanceTable = ({
hours: 0, hours: 0,
total_time_logged: 0, total_time_logged: 0,
estimated_cost: 0, estimated_cost: 0,
actual_cost_from_logs: 0,
fixed_cost: 0, fixed_cost: 0,
total_budget: 0, total_budget: 0,
total_actual: 0, total_actual: 0,
@@ -386,6 +388,7 @@ const FinanceTable = ({
hours: formatSecondsToTimeString(totals.hours), hours: formatSecondsToTimeString(totals.hours),
total_time_logged: formatSecondsToTimeString(totals.total_time_logged), total_time_logged: formatSecondsToTimeString(totals.total_time_logged),
estimated_cost: totals.estimated_cost, estimated_cost: totals.estimated_cost,
actual_cost_from_logs: totals.actual_cost_from_logs,
fixed_cost: totals.fixed_cost, fixed_cost: totals.fixed_cost,
total_budget: totals.total_budget, total_budget: totals.total_budget,
total_actual: totals.total_actual, total_actual: totals.total_actual,