diff --git a/worklenz-frontend/public/locales/en/project-view-finance.json b/worklenz-frontend/public/locales/en/project-view-finance.json index ed43b4bf..bb2bc30b 100644 --- a/worklenz-frontend/public/locales/en/project-view-finance.json +++ b/worklenz-frontend/public/locales/en/project-view-finance.json @@ -26,6 +26,10 @@ "jobTitleColumn": "Job Title", "ratePerHourColumn": "Rate per hour", "ratecardPluralText": "Rate Cards", - "labourHoursColumn": "Labour Hours" + "labourHoursColumn": "Labour Hours", + "actions": "Actions", + "selectJobTitle": "Select Job Title", + "ratecardsPluralText": "Rate Card Templates" + } \ No newline at end of file diff --git a/worklenz-frontend/public/locales/en/settings/ratecard-settings.json b/worklenz-frontend/public/locales/en/settings/ratecard-settings.json index 374b69a8..e42e9883 100644 --- a/worklenz-frontend/public/locales/en/settings/ratecard-settings.json +++ b/worklenz-frontend/public/locales/en/settings/ratecard-settings.json @@ -19,6 +19,7 @@ "currency": "Currency", "actionsColumn": "Actions", "addAllButton": "Add All", - "removeAllButton": "Remove All" + "removeAllButton": "Remove All", + "selectJobTitle": "Select job title" } 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 c0644c2d..15a0d62a 100644 --- a/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx +++ b/worklenz-frontend/src/features/finance/ratecard-drawer/ratecard-drawer.tsx @@ -220,6 +220,9 @@ const RatecardDrawer = ({ setAddingRowIndex(null); }} onBlur={() => { + if (roles[index].job_title_id === ""){ + handleDeleteRole(index); + } setEditingRowIndex(null); setAddingRowIndex(null); }} @@ -241,7 +244,7 @@ const RatecardDrawer = ({ return ( setEditingRowIndex(index)} + // onClick={() => setEditingRowIndex(index)} > {record.jobtitle} 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 6641c80d..2a92b505 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 @@ -255,6 +255,7 @@ const RatecardTable: React.FC = () => { { title: t('actions'), key: 'actions', + align: 'center', render: (_: any, record: JobRoleType, index: number) => ( { pagination={false} loading={isLoading || isLoadingMembers} footer={() => ( - + - + */} )} />