Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test/CIV-14451 #4205

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile_CNP
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion charts/civil-citizen-ui/values.preview.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion src/main/common/models/dashboard/dashboardItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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: ''},
Expand Down Expand Up @@ -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],
},
};
}
}
Expand Down
1 change: 1 addition & 0 deletions src/main/modules/i18n/locales/cy.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions src/main/modules/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
Loading