From 0ac8144a9896d30ef0efba80eeb2f3a77f271dd8 Mon Sep 17 00:00:00 2001 From: JustinMacaulay Date: Fri, 4 Oct 2024 14:28:50 -0700 Subject: [PATCH] Fixing void status issue on support --- .../src/UI/embc-responder/proxy.dev.support.conf.json | 6 +++--- .../support-details/support-details.component.ts | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/responders/src/UI/embc-responder/proxy.dev.support.conf.json b/responders/src/UI/embc-responder/proxy.dev.support.conf.json index e953c130a..3815a0a54 100644 --- a/responders/src/UI/embc-responder/proxy.dev.support.conf.json +++ b/responders/src/UI/embc-responder/proxy.dev.support.conf.json @@ -1,19 +1,19 @@ { "/api": { - "target": "https://era-responders-dev.apps.silver.devops.gov.bc.ca", + "target": "https://dev-sup-era-responders.apps.silver.devops.gov.bc.ca", "secure": false, "changeOrigin": true, "logLevel": "debug" }, "/env/info.json": { - "target": "https://era-responders-dev.apps.silver.devops.gov.bc.ca", + "target": "https://dev-sup-era-responders.apps.silver.devops.gov.bc.ca", "secure": false, "changeOrigin": true, "logLevel": "debug" }, "/version": { - "target": "https://era-responders-dev.apps.silver.devops.gov.bc.ca", + "target": "https://dev-sup-era-responders.apps.silver.devops.gov.bc.ca", "secure": false, "changeOrigin": true, "logLevel": "debug" diff --git a/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.ts b/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.ts index 8a06e1b1e..524bd703f 100644 --- a/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.ts +++ b/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.ts @@ -477,6 +477,7 @@ export class SupportDetailsComponent implements OnInit, OnDestroy { const sFrom = moment(s.from); const sTo = moment(s.to); return ( + s.status !== SupportStatus.Void && s.category === category && ((sFrom.isSameOrAfter(from) && sFrom.isSameOrBefore(to)) || (sTo.isSameOrAfter(from) && sTo.isSameOrBefore(to)) ||