From a879176c2434246ab0caebef31e502af4ced7def Mon Sep 17 00:00:00 2001 From: shancds Date: Thu, 22 May 2025 09:12:40 +0530 Subject: [PATCH] feat(ratecard): update currency default to USD and align rate columns to the right --- .../migrations/20250519000000-project-finance-module-tables.sql | 2 +- .../src/features/finance/ratecard-drawer/ratecard-drawer.tsx | 2 ++ .../finance/ratecard-tab/reatecard-table/ratecard-table.tsx | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/worklenz-backend/database/migrations/20250519000000-project-finance-module-tables.sql b/worklenz-backend/database/migrations/20250519000000-project-finance-module-tables.sql index a4c17fe5..de15213f 100644 --- a/worklenz-backend/database/migrations/20250519000000-project-finance-module-tables.sql +++ b/worklenz-backend/database/migrations/20250519000000-project-finance-module-tables.sql @@ -45,4 +45,4 @@ ALTER TABLE projects ADD COLUMN rate_card UUID REFERENCES finance_rate_cards(id) ON DELETE SET NULL; ALTER TABLE finance_rate_cards - ADD COLUMN currency TEXT NOT NULL DEFAULT 'LKR'; + ADD COLUMN currency TEXT NOT NULL DEFAULT 'USD'; diff --git a/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx b/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx index afe8183c..e6505ea5 100644 --- a/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx +++ b/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx @@ -249,6 +249,7 @@ const RatecardDrawer = ({ { title: `${t('ratePerHourColumn')} (${currency})`, dataIndex: 'rate', + align: 'right', render: (text: number, record: any, index: number) => ( { const updatedRoles = roles.map((role, idx) => diff --git a/worklenz-frontend/src/pages/projects/projectView/finance/ratecard-tab/reatecard-table/ratecard-table.tsx b/worklenz-frontend/src/pages/projects/projectView/finance/ratecard-tab/reatecard-table/ratecard-table.tsx index 923fc600..93a12c42 100644 --- a/worklenz-frontend/src/pages/projects/projectView/finance/ratecard-tab/reatecard-table/ratecard-table.tsx +++ b/worklenz-frontend/src/pages/projects/projectView/finance/ratecard-tab/reatecard-table/ratecard-table.tsx @@ -151,6 +151,7 @@ const RatecardTable: React.FC = () => { { title: `${t('ratePerHourColumn')} (${currency})`, dataIndex: 'rate', + align: 'right', render: (value: number, record: JobRoleType, index: number) => ( { boxShadow: 'none', padding: 0, width: 80, + textAlign: 'right', }} onChange={(e) => handleRateChange(e.target.value, index)} />