From dcd2b52ea8f43a82a259cdbfa76cd7e87d05e03e Mon Sep 17 00:00:00 2001 From: R Ranathunga Date: Thu, 22 Aug 2024 09:33:19 -0700 Subject: [PATCH 1/3] fix: filtering for ccbc gcpe report --- app/backend/lib/reporting/gcpe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/backend/lib/reporting/gcpe.ts b/app/backend/lib/reporting/gcpe.ts index 2aa957666b..6a33c5a9ee 100644 --- a/app/backend/lib/reporting/gcpe.ts +++ b/app/backend/lib/reporting/gcpe.ts @@ -33,7 +33,7 @@ const getCbcDataQuery = ` const getCcbcQuery = ` query getCcbc { allApplications( - filter: {status: {in: ["conditionally_approved", "approved", "on_hold", "closed", "recommendation", "complete"]}} + filter: {analystStatus: {in: ["conditionally_approved", "approved", "on_hold", "closed", "recommendation", "complete"]}} ) { edges { node { From 657bf9fc1818644ec2c8d409d8283bfa86b8aa2a Mon Sep 17 00:00:00 2001 From: R Ranathunga Date: Tue, 27 Aug 2024 08:05:05 -0700 Subject: [PATCH 2/3] fix: analyst status to show in report correctly --- app/backend/lib/reporting/gcpe.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/backend/lib/reporting/gcpe.ts b/app/backend/lib/reporting/gcpe.ts index 6a33c5a9ee..0d98d90492 100644 --- a/app/backend/lib/reporting/gcpe.ts +++ b/app/backend/lib/reporting/gcpe.ts @@ -119,6 +119,7 @@ const getCcbcQuery = ` package projectName status + analystStatus intakeNumber organizationName } @@ -337,7 +338,7 @@ const generateExcelData = async ( // federal funding source { value: 'ISED-UBF Core' }, // status - { value: convertStatus(node?.status) }, + { value: convertStatus(node?.analystStatus) }, // project milestone complete percent { value: From 1ff409b919e634badbdacb881c8696f0b3201b7a Mon Sep 17 00:00:00 2001 From: CCBC Service Account <116113628+ccbc-service-account@users.noreply.github.com> Date: Tue, 27 Aug 2024 22:52:18 +0000 Subject: [PATCH 3/3] chore: release v1.186.1 --- CHANGELOG.md | 7 +++++++ db/sqitch.plan | 1 + package.json | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c420de8543..cdc2513bc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.186.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.186.0...v1.186.1) (2024-08-27) + +### Bug Fixes + +- analyst status to show in report correctly ([657bf9f](https://github.com/bcgov/CONN-CCBC-portal/commit/657bf9fc1818644ec2c8d409d8283bfa86b8aa2a)) +- filtering for ccbc gcpe report ([dcd2b52](https://github.com/bcgov/CONN-CCBC-portal/commit/dcd2b52ea8f43a82a259cdbfa76cd7e87d05e03e)) + # [1.186.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.185.0...v1.186.0) (2024-08-27) ### Bug Fixes diff --git a/db/sqitch.plan b/db/sqitch.plan index 80852551b9..e7abd004bc 100644 --- a/db/sqitch.plan +++ b/db/sqitch.plan @@ -648,3 +648,4 @@ tables/cbc_add_fk_update_constraint 2024-07-11T20:32:11Z Rafael Solorzano <61289 @1.185.0 2024-08-26T22:26:30Z CCBC Service Account # release v1.185.0 mutations/edit_cbc_project_communities 2024-08-21T15:16:56Z Anthony Bushara # Add and delete project communities to a cbc project @1.186.0 2024-08-27T20:55:46Z CCBC Service Account # release v1.186.0 +@1.186.1 2024-08-27T22:52:17Z CCBC Service Account # release v1.186.1 diff --git a/package.json b/package.json index aa86c8d79d..5961f769ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CONN-CCBC-portal", - "version": "1.186.0", + "version": "1.186.1", "main": "index.js", "repository": "https://github.com/bcgov/CONN-CCBC-portal.git", "author": "Romer, Meherzad CITZ:EX ",