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.

Sign up for GitHub

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

CIV-16009 New text for docs being translated #6216

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+32 −17
Open

CIV-16009 New text for docs being translated #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd43110
CIV-16009 New text for docs being translated
paul-pearson Feb 28, 2025
4762a74
CIV-16009 Fix test compilation
paul-pearson Feb 28, 2025
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
17 changes: 17 additions & 0 deletions src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,21 @@ && isHearingLessThanDaysAway(3 * 7)
&& (lastOrderDate.isEmpty()
|| lastOrderDate.get().isBefore(bundleDate.get()));
}

@Override
public boolean isWaitingForClaimantIntentDocUploadPreDefendantNocOnline() {
return isWaitingForClaimantIntentDocUpload()
&& !featureToggleService.isDefendantNoCOnlineForCase(caseData);
}

@Override
public boolean isWaitingForClaimantIntentDocUploadPostDefendantNocOnline() {
return isWaitingForClaimantIntentDocUpload()
&& featureToggleService.isDefendantNoCOnlineForCase(caseData);
}

private boolean isWaitingForClaimantIntentDocUpload() {
return caseData.isRespondentResponseFullDefence() && caseData.getApplicant1ResponseDate() != null
&& caseData.getCcdState() == CaseState.AWAITING_APPLICANT_INTENTION && caseData.isClaimantBilingual();
}
}
5 changes: 0 additions & 5 deletions ...main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,6 @@ public boolean defendantRespondedWithPreferredLanguageWelsh() {
&& caseData.getCcdState() == CaseState.AWAITING_RESPONDENT_ACKNOWLEDGEMENT;
}

public boolean isWaitingForClaimantIntentDocUpload() {
return caseData.isRespondentResponseFullDefence() && caseData.getApplicant1ResponseDate() != null
&& caseData.getCcdState() == CaseState.AWAITING_APPLICANT_INTENTION && caseData.isClaimantBilingual();
}

public boolean isNocForDefendant() {
return isPaperResponse() && (caseData.getBusinessProcess() != null
&& CaseEvent.APPLY_NOC_DECISION_DEFENDANT_LIP.name()
Expand Down
7 changes: 0 additions & 7 deletions ...ain/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,6 @@ public boolean defendantRespondedWithPreferredLanguageWelsh() {
return caseData.isRespondentResponseBilingual() && caseData.getCcdState() == CaseState.AWAITING_RESPONDENT_ACKNOWLEDGEMENT;
}

public boolean isWaitingForClaimantIntentDocUpload() {
return caseData.isRespondentResponseFullDefence()
&& caseData.getApplicant1ResponseDate() != null
&& caseData.getCcdState() == CaseState.AWAITING_APPLICANT_INTENTION
&& caseData.isClaimantBilingual();
}

@Override
public boolean isClaimSubmittedNotPaidOrFailedNotHwF() {
return false;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ public interface Claim {

boolean defendantRespondedWithPreferredLanguageWelsh();

boolean isWaitingForClaimantIntentDocUpload();
boolean isWaitingForClaimantIntentDocUploadPreDefendantNocOnline();

boolean isWaitingForClaimantIntentDocUploadPostDefendantNocOnline();

boolean isClaimSubmittedNotPaidOrFailedNotHwF();

Expand Down
7 changes: 5 additions & 2 deletions src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,11 @@ public enum DashboardClaimStatus {
IN_MEDIATION(
Claim::isMediationPending
),
WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD(
Claim::isWaitingForClaimantIntentDocUpload
WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD_PRE_DEF_NOC_ONLINE(
Claim::isWaitingForClaimantIntentDocUploadPreDefendantNocOnline
),
WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD_POST_DEF_NOC_ONLINE(
Claim::isWaitingForClaimantIntentDocUploadPostDefendantNocOnline
),
CLAIM_ENDED(
Claim::hasClaimEnded
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,12 @@ public boolean defendantRespondedWithPreferredLanguageWelsh() {
}

@Override
public boolean isWaitingForClaimantIntentDocUpload() {
public boolean isWaitingForClaimantIntentDocUploadPreDefendantNocOnline() {
return false;
}

@Override
public boolean isWaitingForClaimantIntentDocUploadPostDefendantNocOnline() {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion ...st/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ void givenBilingualLanguageIsWelsh_ClaimantIntentDocUploadPending_thenReturnDocU
DashboardClaimStatus status = ccdClaimStatusDashboardFactory.getDashboardClaimStatus(new CcdDashboardClaimantClaimMatcher(
caseData, featureToggleService, Collections.emptyList()));

assertThat(status).isEqualTo(DashboardClaimStatus.WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD);
assertThat(status).isEqualTo(DashboardClaimStatus.WAITING_FOR_CLAIMANT_INTENT_DOC_UPLOAD_PRE_DEF_NOC_ONLINE);
}

@Test
Expand Down