diff --git a/api/src/constants/codes.ts b/api/src/constants/codes.ts index d6e806695d..b48e19332d 100644 --- a/api/src/constants/codes.ts +++ b/api/src/constants/codes.ts @@ -25,136 +25,136 @@ export const coordinator_agency = [ { id: 24, name: 'BBA Engineering Ltd.' }, { id: 25, name: 'BC Conservation Foundation (BCCF)' }, { id: 26, name: 'BC Hydro' }, - { id: 27, name: 'BC Ministry of Environment & Climate Change Strategy' }, - { id: 28, name: 'BC Ministry of Forests, Lands, Natural Resource Operations & Rural Development' }, - { id: 29, name: 'BC Ministry of Transportation & Infrastructure' }, - { id: 30, name: 'BCIT Fish Wildlife and Recreation Program' }, - { id: 31, name: 'Burt and Associates' }, - { id: 32, name: 'Canadian Forest Products' }, - { id: 33, name: 'Capital Regional District (CRD)' }, - { id: 34, name: 'Cariboo Environmental Quality Consulting Ltd.' }, - { id: 35, name: 'Cariboo Envirotech Ltd.' }, - { id: 36, name: 'Carleton University' }, - { id: 37, name: 'Cascade Environmental Resource Group Ltd.' }, - { id: 38, name: 'Castus Environmental Services Ltd.' }, - { id: 39, name: 'Central Westcoast Forest Society' }, - { id: 40, name: 'Chu Cho Environmental' }, - { id: 41, name: 'City of Abbotsford' }, - { id: 42, name: 'City of Chilliwack' }, - { id: 43, name: 'City of Coquitlam' }, - { id: 44, name: 'City of Kelowna Environment Division' }, - { id: 45, name: 'Clark University' }, - { id: 46, name: 'Clearwater Environmental Consulting' }, - { id: 47, name: 'Coast River Environmental Services Ltd.' }, - { id: 48, name: 'Coldstream Ecology Ltd.' }, - { id: 49, name: 'College of New Caledonia' }, - { id: 50, name: 'Columbia Environmental Consulting Ltd.' }, - { id: 51, name: 'Columbia Power Corporation' }, - { id: 52, name: 'Colville Confederated Tribes Fish and Wildlife' }, - { id: 53, name: 'Comox Valley Project Watershed Society' }, - { id: 54, name: 'Cooper Beauchesne and Associates Ltd.' }, - { id: 55, name: 'Copcan Contracting Ltd.' }, - { id: 56, name: 'Cornice Environmental Consulting Ltd.' }, - { id: 57, name: 'Corvidae Environmental Consulting Inc.' }, - { id: 58, name: 'Crane Creek Enterprises' }, - { id: 59, name: 'CSR Environmetnal Ltd.' }, - { id: 60, name: 'Current Environmental Ltd.' }, - { id: 61, name: 'D. Burt and Associates' }, - { id: 62, name: 'D.R. Clough Consulting' }, - { id: 63, name: 'David Bustard and Associates Ltd.' }, - { id: 64, name: 'Davis Environmental Ltd.' }, - { id: 65, name: 'Dayesi Services' }, - { id: 66, name: 'Department of Fisheries and Oceans (DFO)' }, - { id: 67, name: 'DGR Consulting' }, - { id: 68, name: 'Dillon Consulting Limited' }, - { id: 69, name: 'District of Kent' }, - { id: 70, name: 'District of North Vancouver' }, - { id: 71, name: 'District of Saanich' }, - { id: 72, name: 'Diversified Environmental Services Ltd.' }, - { id: 73, name: 'DWB Consulting Services Ltd.' }, - { id: 74, name: 'East Carolina University - Department of Biology' }, - { id: 75, name: 'EBB Environmental Consulting Inc.' }, - { id: 76, name: 'Ecofish Research Ltd.' }, - { id: 77, name: 'Ecofor Consulting' }, - { id: 78, name: 'Ecologic Consulting Ltd.' }, - { id: 79, name: 'EcoMetrix Incorporated' }, - { id: 80, name: 'Ecora Engineering and Resource Group Ltd.' }, - { id: 81, name: 'Ecoscape Environmental Consultants Ltd.' }, - { id: 82, name: 'Eco-Web Ecological Consulting Ltd.' }, - { id: 83, name: 'EDI Environmental Dynamics Inc.' }, - { id: 84, name: 'Elevate Environmental Inc.' }, - { id: 85, name: 'Elk River Alliance' }, - { id: 86, name: 'ENKON Environmental Ltd.' }, - { id: 87, name: 'Envirologic Consulting Inc.' }, - { id: 88, name: 'Environment and Climate Change Canada' }, - { id: 89, name: 'Envirowest Consultants Inc.' }, - { id: 90, name: 'ERM Consultants Canada Ltd.' }, - { id: 91, name: 'Esther Guimond Consulting' }, - { id: 92, name: 'Estsek Environmental Services LLP' }, - { id: 93, name: 'EXP Services Inc.' }, - { id: 94, name: 'FINS Consulting Ltd.' }, - { id: 95, name: 'Fish-Kissing Weasels Environmental' }, - { id: 96, name: 'ForFish Consulting' }, - { id: 97, name: 'Forsite Consultants Ltd.' }, - { id: 98, name: 'FortisBC' }, - { id: 99, name: 'Fraser Valley Watersheds Coalition' }, - { id: 100, name: 'Freshwater Fisheries Society of BC' }, - { id: 101, name: 'FSCI Biological Concultants' }, - { id: 102, name: 'G3 Consulting Ltd.' }, - { id: 103, name: 'GeoMarine Environmental Consultants Ltd.' }, - { id: 104, name: 'GG Oliver and Associates Environmental Science' }, - { id: 105, name: 'Gitanyow Fisheries Authority' }, - { id: 106, name: 'Gitksan Watershed Authorities' }, - { id: 107, name: 'Golder Associates Ltd.' }, - { id: 108, name: 'Grassroots Environmental Services' }, - { id: 109, name: 'Hatfield Consulting Ltd.' }, - { id: 110, name: 'HCR Environmental Consulting' }, - { id: 111, name: 'Hemmera' }, - { id: 112, name: 'High Country Consulting' }, - { id: 113, name: 'Hill Environmental Ltd.' }, - { id: 114, name: 'Hocquard Consulting' }, - { id: 115, name: 'I.C. Ramsay and Associates' }, - { id: 116, name: 'Ingersol Mountain Enterprise Ltd.' }, - { id: 117, name: 'Inland Timber Management Ltd.' }, - { id: 118, name: 'InStream Fisheries Research Inc.' }, - { id: 119, name: 'Interior Reforestation Co. Ltd.' }, - { id: 120, name: 'IRC Integrated Resource Consultants Inc.' }, - { id: 121, name: 'ISL Engineering and Land Services Ltd.' }, - { id: 122, name: 'Iverson & MacKenzie Biological Consulting Ltd.' }, - { id: 123, name: 'Jacobs Canada Inc.' }, - { id: 124, name: 'JBL Environmental Services Ltd.' }, - { id: 125, name: 'Karen L Grainger' }, - { id: 126, name: 'Kawa Enginnering Ltd.' }, - { id: 127, name: 'Kerr Wood Leidal Associates Ltd.' }, - { id: 128, name: 'Keystone Environmental Ltd.' }, - { id: 129, name: 'Klohn Crippen Berger Ltd.' }, - { id: 130, name: 'Knight Piesold Ltd.' }, - { id: 131, name: 'Ktunaxa Nation Council' }, - { id: 132, name: 'Lake Trail Environmental Consulting' }, - { id: 133, name: 'Letts Environmental Consultants Ltd.' }, - { id: 134, name: 'LGL Limited' }, - { id: 135, name: 'Lheidli T Enneh First Nations' }, - { id: 136, name: 'Limnotek Research and Development Inc.' }, - { id: 137, name: 'Living Resources Environmental' }, - { id: 138, name: 'Lorax Environmental Services Ltd.' }, - { id: 139, name: 'Lotic Environmental Ltd.' }, - { id: 140, name: 'M.C. Wright and Associates Ltd.' }, - { id: 141, name: 'Madrone Environmental Services Ltd.' }, - { id: 142, name: 'Mainstream Aquatics Ltd.' }, - { id: 143, name: 'Mainstream Biological Consulting Inc.' }, - { id: 144, name: 'Marine Harvest Canada' }, - { id: 145, name: 'Marlim Ecological Consulting Ltd.' }, - { id: 146, name: 'Masse Environmental Consultants Ltd.' }, - { id: 147, name: 'Matrix Solutions Inc.' }, - { id: 148, name: 'Max Planck Institute, Ploen, Germany' }, - { id: 149, name: 'McCleary Aquatic Systems Consulting' }, - { id: 150, name: 'McElhanney Ltd.' }, - { id: 151, name: 'McGill University, Redpath Museum' }, - { id: 152, name: 'McTavish Resource & Management Consultants Ltd.' }, - { id: 153, name: 'Metro Vancouver (GVRD)' }, - { id: 154, name: 'Metro Vancouver Regional Parks' }, - { id: 155, name: 'Michigan State University' }, - { id: 156, name: 'Mid Vancouver Island Habitat Enhancement Society' }, + { id: 27, name: 'BCIT Fish Wildlife and Recreation Program' }, + { id: 28, name: 'Burt and Associates' }, + { id: 29, name: 'Canadian Forest Products' }, + { id: 30, name: 'Capital Regional District (CRD)' }, + { id: 31, name: 'Cariboo Environmental Quality Consulting Ltd.' }, + { id: 32, name: 'Cariboo Envirotech Ltd.' }, + { id: 33, name: 'Carleton University' }, + { id: 34, name: 'Cascade Environmental Resource Group Ltd.' }, + { id: 35, name: 'Castus Environmental Services Ltd.' }, + { id: 36, name: 'Central Westcoast Forest Society' }, + { id: 37, name: 'Chu Cho Environmental' }, + { id: 38, name: 'City of Abbotsford' }, + { id: 39, name: 'City of Chilliwack' }, + { id: 40, name: 'City of Coquitlam' }, + { id: 41, name: 'City of Kelowna Environment Division' }, + { id: 42, name: 'Clark University' }, + { id: 43, name: 'Clearwater Environmental Consulting' }, + { id: 44, name: 'Coast River Environmental Services Ltd.' }, + { id: 45, name: 'Coldstream Ecology Ltd.' }, + { id: 46, name: 'College of New Caledonia' }, + { id: 47, name: 'Columbia Environmental Consulting Ltd.' }, + { id: 48, name: 'Columbia Power Corporation' }, + { id: 49, name: 'Colville Confederated Tribes Fish and Wildlife' }, + { id: 50, name: 'Comox Valley Project Watershed Society' }, + { id: 51, name: 'Cooper Beauchesne and Associates Ltd.' }, + { id: 52, name: 'Copcan Contracting Ltd.' }, + { id: 53, name: 'Cornice Environmental Consulting Ltd.' }, + { id: 54, name: 'Corvidae Environmental Consulting Inc.' }, + { id: 55, name: 'Crane Creek Enterprises' }, + { id: 56, name: 'CSR Environmental Ltd.' }, + { id: 57, name: 'Current Environmental Ltd.' }, + { id: 58, name: 'D. Burt and Associates' }, + { id: 59, name: 'D.R. Clough Consulting' }, + { id: 60, name: 'David Bustard and Associates Ltd.' }, + { id: 61, name: 'Davis Environmental Ltd.' }, + { id: 62, name: 'Dayesi Services' }, + { id: 63, name: 'Department of Fisheries and Oceans (DFO)' }, + { id: 64, name: 'DGR Consulting' }, + { id: 65, name: 'Dillon Consulting Limited' }, + { id: 66, name: 'District of Kent' }, + { id: 67, name: 'District of North Vancouver' }, + { id: 68, name: 'District of Saanich' }, + { id: 69, name: 'Diversified Environmental Services Ltd.' }, + { id: 70, name: 'DWB Consulting Services Ltd.' }, + { id: 71, name: 'East Carolina University - Department of Biology' }, + { id: 72, name: 'EBB Environmental Consulting Inc.' }, + { id: 73, name: 'Ecofish Research Ltd.' }, + { id: 74, name: 'Ecofor Consulting' }, + { id: 75, name: 'Ecologic Consulting Ltd.' }, + { id: 76, name: 'EcoMetrix Incorporated' }, + { id: 77, name: 'Ecora Engineering and Resource Group Ltd.' }, + { id: 78, name: 'Ecoscape Environmental Consultants Ltd.' }, + { id: 79, name: 'Eco-Web Ecological Consulting Ltd.' }, + { id: 80, name: 'EDI Environmental Dynamics Inc.' }, + { id: 81, name: 'Elevate Environmental Inc.' }, + { id: 82, name: 'Elk River Alliance' }, + { id: 83, name: 'ENKON Environmental Ltd.' }, + { id: 84, name: 'Envirologic Consulting Inc.' }, + { id: 85, name: 'Environment and Climate Change Canada' }, + { id: 86, name: 'Envirowest Consultants Inc.' }, + { id: 87, name: 'ERM Consultants Canada Ltd.' }, + { id: 88, name: 'Esther Guimond Consulting' }, + { id: 89, name: 'Estsek Environmental Services LLP' }, + { id: 90, name: 'EXP Services Inc.' }, + { id: 91, name: 'FINS Consulting Ltd.' }, + { id: 92, name: 'Fish-Kissing Weasels Environmental' }, + { id: 93, name: 'ForFish Consulting' }, + { id: 94, name: 'Forsite Consultants Ltd.' }, + { id: 95, name: 'FortisBC' }, + { id: 96, name: 'Fraser Valley Watersheds Coalition' }, + { id: 97, name: 'Freshwater Fisheries Society of BC' }, + { id: 98, name: 'FSCI Biological Concultants' }, + { id: 99, name: 'G3 Consulting Ltd.' }, + { id: 100, name: 'GeoMarine Environmental Consultants Ltd.' }, + { id: 101, name: 'GG Oliver and Associates Environmental Science' }, + { id: 102, name: 'Gitanyow Fisheries Authority' }, + { id: 103, name: 'Gitksan Watershed Authorities' }, + { id: 104, name: 'Golder Associates Ltd.' }, + { id: 105, name: 'Grassroots Environmental Services' }, + { id: 106, name: 'Hatfield Consulting Ltd.' }, + { id: 107, name: 'HCR Environmental Consulting' }, + { id: 108, name: 'Hemmera' }, + { id: 109, name: 'High Country Consulting' }, + { id: 110, name: 'Hill Environmental Ltd.' }, + { id: 111, name: 'Hocquard Consulting' }, + { id: 112, name: 'I.C. Ramsay and Associates' }, + { id: 113, name: 'Ingersol Mountain Enterprise Ltd.' }, + { id: 114, name: 'Inland Timber Management Ltd.' }, + { id: 115, name: 'InStream Fisheries Research Inc.' }, + { id: 116, name: 'Interior Reforestation Co. Ltd.' }, + { id: 117, name: 'IRC Integrated Resource Consultants Inc.' }, + { id: 118, name: 'ISL Engineering and Land Services Ltd.' }, + { id: 119, name: 'Iverson & MacKenzie Biological Consulting Ltd.' }, + { id: 120, name: 'Jacobs Canada Inc.' }, + { id: 121, name: 'JBL Environmental Services Ltd.' }, + { id: 122, name: 'Karen L Grainger' }, + { id: 123, name: 'Kawa Enginnering Ltd.' }, + { id: 124, name: 'Kerr Wood Leidal Associates Ltd.' }, + { id: 125, name: 'Keystone Environmental Ltd.' }, + { id: 126, name: 'Klohn Crippen Berger Ltd.' }, + { id: 127, name: 'Knight Piesold Ltd.' }, + { id: 128, name: 'Ktunaxa Nation Council' }, + { id: 129, name: 'Lake Trail Environmental Consulting' }, + { id: 130, name: 'Letts Environmental Consultants Ltd.' }, + { id: 131, name: 'LGL Limited' }, + { id: 132, name: 'Lheidli T Enneh First Nations' }, + { id: 133, name: 'Limnotek Research and Development Inc.' }, + { id: 134, name: 'Living Resources Environmental' }, + { id: 135, name: 'Lorax Environmental Services Ltd.' }, + { id: 136, name: 'Lotic Environmental Ltd.' }, + { id: 137, name: 'M.C. Wright and Associates Ltd.' }, + { id: 138, name: 'Madrone Environmental Services Ltd.' }, + { id: 139, name: 'Mainstream Aquatics Ltd.' }, + { id: 140, name: 'Mainstream Biological Consulting Inc.' }, + { id: 141, name: 'Marine Harvest Canada' }, + { id: 142, name: 'Marlim Ecological Consulting Ltd.' }, + { id: 143, name: 'Masse Environmental Consultants Ltd.' }, + { id: 144, name: 'Matrix Solutions Inc.' }, + { id: 145, name: 'Max Planck Institute, Ploen, Germany' }, + { id: 146, name: 'McCleary Aquatic Systems Consulting' }, + { id: 147, name: 'McElhanney Ltd.' }, + { id: 148, name: 'McGill University, Redpath Museum' }, + { id: 149, name: 'McTavish Resource & Management Consultants Ltd.' }, + { id: 150, name: 'Metro Vancouver (GVRD)' }, + { id: 151, name: 'Metro Vancouver Regional Parks' }, + { id: 152, name: 'Michigan State University' }, + { id: 153, name: 'Mid Vancouver Island Habitat Enhancement Society' }, + { id: 154, name: 'Ministry of Environment & Climate Change Strategy' }, + { id: 155, name: 'Ministry of Forests, Lands, Natural Resource Operations & Rural Development' }, + { id: 156, name: 'Ministry of Transportation & Infrastructure' }, { id: 157, name: 'Minnow Environmental Inc.' }, { id: 158, name: 'Montana Fish, Wildlife & Parks' }, { id: 159, name: 'Mount Polley Mining Corporation' }, diff --git a/api/src/models/project-create.ts b/api/src/models/project-create.ts index 8ccb622262..2bf8bdc510 100644 --- a/api/src/models/project-create.ts +++ b/api/src/models/project-create.ts @@ -34,7 +34,7 @@ export class PostProjectObject { } /** - * Processes POST /project coordinator data + * Processes POST /project contact data * * @export * @class PostCoordinatorData diff --git a/api/src/paths/project/{projectId}/update.ts b/api/src/paths/project/{projectId}/update.ts index 9e24b4f0fa..5c646590a5 100644 --- a/api/src/paths/project/{projectId}/update.ts +++ b/api/src/paths/project/{projectId}/update.ts @@ -341,7 +341,7 @@ export const getProjectCoordinatorData = async ( const result = (response && response.rows && response.rows[0]) || null; if (!result) { - throw new HTTP400('Failed to get project coordinator data'); + throw new HTTP400('Failed to get project contact data'); } return new GetCoordinatorData(result); diff --git a/api/src/queries/project/project-view-queries.test.ts b/api/src/queries/project/project-view-queries.test.ts index e540276e96..ba729bdc71 100644 --- a/api/src/queries/project/project-view-queries.test.ts +++ b/api/src/queries/project/project-view-queries.test.ts @@ -46,7 +46,7 @@ describe('getProjectListSQL', () => { expect(response).to.not.be.null; }); - it('returns a SQLStatement when filter fields provided (only coordinator agency)', () => { + it('returns a SQLStatement when filter fields provided (only contact agency)', () => { const response = getProjectListSQL(true, 1, { coordinator_agency: 'agency' }); expect(response).to.not.be.null; diff --git a/app/src/components/search-filter/ProjectAdvancedFilters.tsx b/app/src/components/search-filter/ProjectAdvancedFilters.tsx index bd86a90ed7..8960266576 100644 --- a/app/src/components/search-filter/ProjectAdvancedFilters.tsx +++ b/app/src/components/search-filter/ProjectAdvancedFilters.tsx @@ -96,7 +96,7 @@ const ProjectAdvancedFilters: React.FC = (props) = diff --git a/app/src/constants/i18n.ts b/app/src/constants/i18n.ts index b364d5e5bf..d2f77f10ed 100644 --- a/app/src/constants/i18n.ts +++ b/app/src/constants/i18n.ts @@ -57,10 +57,10 @@ export const EditObjectivesI18N = { }; export const EditCoordinatorI18N = { - editTitle: 'Edit Project Coordinator', - editErrorTitle: 'Error Editing Project Coordinator', + editTitle: 'Edit Project Contact', + editErrorTitle: 'Error Editing Project Contact', editErrorText: - 'An error has occurred while attempting to edit your project coordinator details, please try again. If the error persists, please contact your system administrator.' + 'An error has occurred while attempting to edit your project contact details, please try again. If the error persists, please contact your system administrator.' }; export const EditGeneralInformationI18N = { diff --git a/app/src/features/permits/PermitsPage.test.tsx b/app/src/features/permits/PermitsPage.test.tsx index a0b7680931..55cfe36974 100644 --- a/app/src/features/permits/PermitsPage.test.tsx +++ b/app/src/features/permits/PermitsPage.test.tsx @@ -47,14 +47,14 @@ describe('PermitsPage', () => { id: 1, number: '123', type: 'Wildlife', - coordinator_agency: 'coordinator agency', + coordinator_agency: 'contact agency', project_name: 'Project 1' }, { id: 2, number: '1234', type: 'Wildlife', - coordinator_agency: 'coordinator agency 2', + coordinator_agency: 'contact agency 2', project_name: null } ]); @@ -77,7 +77,7 @@ describe('PermitsPage', () => { id: 1, number: '123', type: 'Wildlife', - coordinator_agency: 'coordinator agency', + coordinator_agency: 'contact agency', project_name: 'Project 1' } ]); diff --git a/app/src/features/permits/PermitsPage.tsx b/app/src/features/permits/PermitsPage.tsx index 5e08d916fd..6dd12d9735 100644 --- a/app/src/features/permits/PermitsPage.tsx +++ b/app/src/features/permits/PermitsPage.tsx @@ -60,7 +60,7 @@ const PermitsPage: React.FC = () => { Number Type - Coordinator Agency + Contact Agency Associated Project @@ -83,7 +83,7 @@ const PermitsPage: React.FC = () => { Number Type - Coordinator Agency + Contact Agency Associated Project diff --git a/app/src/features/permits/__snapshots__/CreatePermitPage.test.tsx.snap b/app/src/features/permits/__snapshots__/CreatePermitPage.test.tsx.snap index 95782a8e9f..54a7bd9521 100644 --- a/app/src/features/permits/__snapshots__/CreatePermitPage.test.tsx.snap +++ b/app/src/features/permits/__snapshots__/CreatePermitPage.test.tsx.snap @@ -216,7 +216,7 @@ exports[`CreatePermitPage renders correctly when codes are loaded 1`] = ` for="coordinator_agency" id="coordinator_agency-label" > - Coordinator Agency + Contact Agency