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 57e8971a..a4c17fe5 100644 --- a/worklenz-backend/database/migrations/20250519000000-project-finance-module-tables.sql +++ b/worklenz-backend/database/migrations/20250519000000-project-finance-module-tables.sql @@ -11,17 +11,17 @@ CREATE TABLE finance_rate_cards ); -- Dropping existing finance_project_rate_card_roles table -DROP TABLE IF EXISTS finance_project_rate_card_roles; +DROP TABLE IF EXISTS finance_project_rate_card_roles CASCADE; -- Creating table with single id primary key CREATE TABLE finance_project_rate_card_roles ( id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), project_id UUID NOT NULL REFERENCES projects (id) ON DELETE CASCADE, - role_id UUID NOT NULL REFERENCES roles (id) ON DELETE CASCADE, + job_title_id UUID NOT NULL REFERENCES job_titles (id) ON DELETE CASCADE, rate DECIMAL(10, 2) NOT NULL CHECK (rate >= 0), created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, - CONSTRAINT unique_project_role UNIQUE (project_id, role_id) + CONSTRAINT unique_project_role UNIQUE (project_id, job_title_id) ); -- Dropping existing finance_rate_card_roles table diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx index c4567f2e..26453b20 100644 --- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx +++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/custom-columns/custom-column-cells/custom-column-selection-cell/custom-column-selection-cell.tsx @@ -23,11 +23,11 @@ const CustomColumnSelectionCell = ({ const { t } = useTranslation('task-list-table'); // Debug the selectionsList and value - console.log('CustomColumnSelectionCell props:', { - selectionsList, - value, - selectionsCount: selectionsList?.length || 0 - }); + // console.log('CustomColumnSelectionCell props:', { + // selectionsList, + // value, + // selectionsCount: selectionsList?.length || 0 + // }); // Set initial selection based on value prop useEffect(() => { diff --git a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx index 059454c3..6c58ad71 100644 --- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx +++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-list-table.tsx @@ -854,10 +854,10 @@ const SelectionFieldCell: React.FC<{ useEffect(() => { if (!loggedInfo) { - console.log('Selection column data:', { - columnKey, - selectionsList, - }); + // console.log('Selection column data:', { + // columnKey, + // selectionsList, + // }); setLoggedInfo(true); } }, [columnKey, selectionsList, loggedInfo]);