diff --git a/worklenz-frontend/src/features/finance/finance-drawer/finance-drawer.tsx b/worklenz-frontend/src/features/finance/finance-drawer/finance-drawer.tsx index 395cc99c..382c8c66 100644 --- a/worklenz-frontend/src/features/finance/finance-drawer/finance-drawer.tsx +++ b/worklenz-frontend/src/features/finance/finance-drawer/finance-drawer.tsx @@ -62,8 +62,8 @@ const FinanceDrawer = () => { } open={isDrawerOpen} onClose={handleClose} - destroyOnClose={true} - width={480} + destroyOnHidden={true} + width={640} >
| - {t('labourHoursColumn')} + Role / Member | { padding: 8, }} > - {t('costColumn')} ({currency}) + Logged Hours + | ++ Hourly Rate ({currency}) + | ++ Actual Cost ({currency}) | @@ -129,22 +203,34 @@ const FinanceDrawer = () => { }} className="border-b-[1px] font-semibold" > -{group.jobRole} | +{group.jobRole} | - {group.estimated_hours?.toFixed(2) || '0.00'} + {group.logged_hours?.toFixed(2) || '0.00'} | - {group.estimated_cost?.toFixed(2) || '0.00'} + - + | ++ {group.actual_cost?.toFixed(2) || '0.00'} | {/* Member Rows */} @@ -168,7 +254,7 @@ const FinanceDrawer = () => { padding: 8, }} > - {member.estimated_hours?.toFixed(2) || '0.00'} + {member.logged_hours?.toFixed(2) || '0.00'}{ padding: 8, }} > - {member.estimated_cost?.toFixed(2) || '0.00'} + {member.hourly_rate?.toFixed(2) || '0.00'} + | ++ {member.actual_cost?.toFixed(2) || '0.00'} | ))} @@ -184,6 +278,7 @@ const FinanceDrawer = () => { ))}
|---|