diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 2e6383af623..5dc2d15e926 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -10,7 +10,7 @@ def component = "citizen-ui" def camundaBranch = "master" def dmnBranch = "master" def waStandaloneBranch = "master" -def ccdBranch = "master" +def ccdBranch = "CIV-14451-Claim-status-on-the-landing-page-is-not-updated-after-raise-DJ" def generalappCCDBranch = "master" AppPipelineConfig pipelineConf diff --git a/charts/civil-citizen-ui/values.preview.template.yaml b/charts/civil-citizen-ui/values.preview.template.yaml index 4e50b22c479..bb6f7cb6c22 100644 --- a/charts/civil-citizen-ui/values.preview.template.yaml +++ b/charts/civil-citizen-ui/values.preview.template.yaml @@ -30,7 +30,7 @@ civil-service: java: applicationPort: 4000 releaseNameOverride: ${SERVICE_NAME}-civil-service - image: 'hmctspublic.azurecr.io/civil/service:latest' + image: 'hmctspublic.azurecr.io/civil/service:pr-5044' imagePullPolicy: Always ingressHost: ${SERVICE_NAME}-civil-service.preview.platform.hmcts.net devcpuRequests: 500m diff --git a/src/main/common/models/dashboard/dashboardItem.ts b/src/main/common/models/dashboard/dashboardItem.ts index 1d59c0610f2..c0877fb2ecd 100644 --- a/src/main/common/models/dashboard/dashboardItem.ts +++ b/src/main/common/models/dashboard/dashboardItem.ts @@ -36,7 +36,7 @@ export abstract class DashboardItem { ocmc?: boolean; draft?: boolean; url: string; - + defaultJudgementIssuedDate?: string; getHref() { return this.ocmc ? `${ocmcBaseUrl}${this.url.replace(':claimId', this.claimId)}` : this.url.replace(':claimId', this.claimId); } @@ -141,6 +141,7 @@ export class DashboardDefendantItem extends DashboardItem { const paramCCJRequestedDate = {key: 'ccjRequestedDate', value: formatDateToFullDate(this.ccjRequestedDate, lang)}; const paramResponseDeadline = {key: 'responseDeadline', value: formatDateToFullDate(this.responseDeadline, lang)}; const paramAdmittedAmount = {key: 'amount', value: this.respondToAdmittedClaimOwingAmountPounds?.toString() ?? this.admittedAmount?.toString()}; + const paramDefaultJudgementIssuedDate = { key: 'defaultJudgementIssuedDate', value: formatDateToFullDate(this.defaultJudgementIssuedDate as unknown as Date, lang) }; return { NO_STATUS: {translationKey: ''}, @@ -231,6 +232,10 @@ export class DashboardDefendantItem extends DashboardItem { DEFENDANT_APPLY_NOC: {translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.RESPONSE_BY_POST'}, DECISION_FOR_RECONSIDERATION_MADE: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.DECISION_ON_RECONSIDERATION' }, HEARING_FEE_UNPAID: { translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.HEARING_FEE_UNPAID'}, + DEFAULT_JUDGEMENT_ISSUED: { + translationKey: 'PAGES.DASHBOARD.STATUS_DEFENDANT.DEFAULT_JUDGEMENT_ISSUED_STATUS', + parameter: [paramDefaultJudgementIssuedDate], + }, }; } } diff --git a/src/main/modules/i18n/locales/cy.json b/src/main/modules/i18n/locales/cy.json index f62eea1a95e..a311064046b 100644 --- a/src/main/modules/i18n/locales/cy.json +++ b/src/main/modules/i18n/locales/cy.json @@ -2070,6 +2070,7 @@ "CLAIMANT_REQUESTED_CCJ": "Gofynnodd {{ claimantName }} am Ddyfarniad Llys Sirol yn eich erbyn ar {{ccjRequestedDate}}.", "CLAIMANT_REQUESTED_CCJ_BY_DETERMINATION": "Gofynnodd {{ claimantName }} am Ddyfarniad Llys Sirol yn eich erbyn.", "DECISION_ON_RECONSIDERATION": "An order has been made.", + "DEFAULT_JUDGEMENT_ISSUED_STATUS": "The claimant has requested a County Court Judgment (CCJ) against you on {{ defaultJudgementIssuedDate }}", "DOCUMENTS_BEING_TRANSLATED": "Mae’r dogfennau yn cael eu cyfieithu.", "IN_MEDIATION": "Bydd eich apwyntiad cyfryngu yn cael ei drefnu o fewn 28 diwrnod.", "MORE_DETAILS_REQUIRED": "Anfonwch fwy o fanylion atom cyn y gwrandawiad", diff --git a/src/main/modules/i18n/locales/en.json b/src/main/modules/i18n/locales/en.json index 2b729be67c5..1118198c7ca 100644 --- a/src/main/modules/i18n/locales/en.json +++ b/src/main/modules/i18n/locales/en.json @@ -2070,6 +2070,7 @@ "CLAIMANT_REQUESTED_CCJ": "{{ claimantName }} requested a County Court Judgment against you on {{ccjRequestedDate}}.", "CLAIMANT_REQUESTED_CCJ_BY_DETERMINATION": "{{ claimantName }} requested a County Court Judgment against you.", "DECISION_ON_RECONSIDERATION": "An order has been made.", + "DEFAULT_JUDGEMENT_ISSUED_STATUS": "The claimant has requested a County Court Judgment (CCJ) against you on {{ defaultJudgementIssuedDate }}", "DOCUMENTS_BEING_TRANSLATED": "The documents are being translated.", "IN_MEDIATION": "Your mediation appointment will be arranged within 28 days.", "MORE_DETAILS_REQUIRED": "Send us more details before the hearing.",