From cb3fb0acc214c22b8ca6cc33795881a601e9b404 Mon Sep 17 00:00:00 2001 From: Maciej Szewczyk Date: Thu, 27 Feb 2025 13:16:15 +0100 Subject: [PATCH 1/3] fix target population status display --- .../TargetPopulationForPeopleTableRow.tsx | 6 +++++- src/frontend/src/utils/utils.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/containers/tables/targeting/TargetPopulationForPeopleTable/TargetPopulationForPeopleTableRow.tsx b/src/frontend/src/containers/tables/targeting/TargetPopulationForPeopleTable/TargetPopulationForPeopleTableRow.tsx index 2862fae1c0..858301be05 100644 --- a/src/frontend/src/containers/tables/targeting/TargetPopulationForPeopleTable/TargetPopulationForPeopleTableRow.tsx +++ b/src/frontend/src/containers/tables/targeting/TargetPopulationForPeopleTable/TargetPopulationForPeopleTableRow.tsx @@ -5,7 +5,10 @@ import { BlackLink } from '@components/core/BlackLink'; import { StatusBox } from '@components/core/StatusBox'; import { ClickableTableRow } from '@components/core/Table/ClickableTableRow'; import { UniversalMoment } from '@components/core/UniversalMoment'; -import { paymentPlanStatusToColor } from '@utils/utils'; +import { + paymentPlanStatusToColor, + targetPopulationStatusDisplayMap, +} from '@utils/utils'; import { PaymentPlanNode } from '@generated/graphql'; import { useBaseUrl } from '@hooks/useBaseUrl'; import { ReactElement } from 'react'; @@ -67,6 +70,7 @@ export function TargetPopulationForPeopleTableRow({ diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts index e13e04b7ed..7d22790b4e 100644 --- a/src/frontend/src/utils/utils.ts +++ b/src/frontend/src/utils/utils.ts @@ -293,6 +293,7 @@ export function paymentPlanStatusToColor( status: string, ): string { const colorsMap = { + ['ASSIGNED']: theme.hctPalette.gray, [PaymentPlanStatus.Accepted]: theme.hctPalette.green, [PaymentPlanStatus.Draft]: theme.hctPalette.green, [PaymentPlanStatus.Finished]: theme.hctPalette.gray, From 96ca40d5c411acbe40fbacc96f126680a3fbd63f Mon Sep 17 00:00:00 2001 From: Maciej Szewczyk Date: Thu, 27 Feb 2025 13:20:25 +0100 Subject: [PATCH 2/3] change draft to ready for pp creation --- src/frontend/src/utils/utils.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts index 7d22790b4e..fb584fdf6a 100644 --- a/src/frontend/src/utils/utils.ts +++ b/src/frontend/src/utils/utils.ts @@ -195,6 +195,8 @@ export function targetPopulationStatusDisplayMap(status: string): string { switch (status) { case PaymentPlanStatus.TpOpen: return 'OPEN'; + case 'DRAFT': + return 'Ready for PP Creation'; case PaymentPlanStatus.TpLocked: return 'LOCKED'; case PaymentPlanStatus.Processing: From 7b47ad3b7e8be027f192f9605e6c1cd501ecfe5d Mon Sep 17 00:00:00 2001 From: Maciej Szewczyk Date: Thu, 27 Feb 2025 13:26:01 +0100 Subject: [PATCH 3/3] remove duplicated status --- src/frontend/src/utils/utils.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts index fb584fdf6a..5181a25622 100644 --- a/src/frontend/src/utils/utils.ts +++ b/src/frontend/src/utils/utils.ts @@ -195,8 +195,8 @@ export function targetPopulationStatusDisplayMap(status: string): string { switch (status) { case PaymentPlanStatus.TpOpen: return 'OPEN'; - case 'DRAFT': - return 'Ready for PP Creation'; + case PaymentPlanStatus.Draft: + return 'READY FOR PAYMENT MODULE'; case PaymentPlanStatus.TpLocked: return 'LOCKED'; case PaymentPlanStatus.Processing: @@ -209,8 +209,7 @@ export function targetPopulationStatusDisplayMap(status: string): string { return 'STEFICON ERROR'; case PaymentPlanStatus.SteficonCompleted: return 'STEFICON COMPLETED'; - case PaymentPlanStatus.Draft: - return 'READY FOR PAYMENT MODULE'; + // if other PP statuses ==> ASSIGNED default: return 'ASSIGNED';