-
Notifications
You must be signed in to change notification settings - Fork 2
Hdpi 2983 build case details tab #1844
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
Open
gmmagruder
wants to merge
52
commits into
HDPI-2978-summary-tab
Choose a base branch
from
HDPI-2983-build-case-details-tab
base: HDPI-2978-summary-tab
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
05d6c29
HDPI-2983: build case details tab classes
gmmagruder 9d0f9a6
HDPI-2983: create CaseDetailsTabView and allow draft data to be viewe…
gmmagruder 4c0e1e5
HDPI-2983: add more claim details to CaseDetailsTabView
gmmagruder 35238c1
HDPI-2983: move details tab classes into separate directory and build…
gmmagruder 7e7bbe2
HDPI-2983: get label for secureOrFlexibleMandatoryGroundsAlt
gmmagruder a5cc784
Merge branch 'HDPI-2978-summary-tab' into HDPI-2983-build-case-detail…
gmmagruder be13cf7
HDPI-2983: fix spelling mistake
gmmagruder 3bdf586
HDPI-2983: apply shared tab details classes to case details tab
gmmagruder fa73d17
HDPI-2983: move grounds and rent arrears tab details builder into sha…
gmmagruder aa71cc5
HDPI-2983: move claimant information and reasons for possession tab d…
gmmagruder cb0a253
HDPI-2983: build claimant details and move defendant details into sha…
gmmagruder 69ba8a8
HDPI-2983: build mortgage, suspension of right to buy and demotion of…
gmmagruder c751ab3
HDPI-2983: add extra details for defendants tab details for case deta…
gmmagruder ceee783
HDPI-2983: fix buildSuspensionOfRightToBuyTabDetails null pointer exc…
gmmagruder 19df78b
HDPI-2983: show additional mortgage in case details tab
gmmagruder dfc39ba
HDPI-2983: reverse changes
gmmagruder 7a86a6a
HDPI-2983: add other description for assured tenancy grounds
gmmagruder ef1bd13
HDPI-2983: fix merge conflicts
gmmagruder ddfb797
HDPI-2983: fix draft demotion of tenancy and suspend of right to buy …
gmmagruder 15832b7
HDPI-2983: fix notice table bug and remove costs table since it has b…
gmmagruder c91eebe
HDPI-2983: add buildReasonsForPossession back into case summary
gmmagruder 492debf
HDPI-2983: add additional reasons for possession into case details tab
gmmagruder c57c1b9
HDPI-2983: fix bug where demotion of tenancy and suspension wasn't di…
gmmagruder 8b0f4f3
HDPI-2983: update tests
gmmagruder c2e839a
HDPI-2983: fix merge conflicts
gmmagruder 76eb724
HDPI-2983: update ClaimGroundSummaryBuilderTest
gmmagruder 704af27
HDPI-2983: add AdditionalDefendantInformationTabDetailsBuilderTest
gmmagruder ffa9bd5
HDPI-2983: add DefendantInformationTabDetailsBuilderTest
gmmagruder c99cf62
HDPI-2983: add ClaimantInformationTabDetailsBuilderTest
gmmagruder 6ff1f2d
HDPI-2983: add GroundsBuilderTest and ReasonsForPossessionTabDetailsB…
gmmagruder af237e9
HDPI-2983: add RentArrearsTabDetailsBuilderTest
gmmagruder 566d991
HDPI-2983: update CaseSummaryTabViewTest
gmmagruder 8c59689
HDPI-2983: update CaseTypeTest and DraftCaseJsonMergerTest
gmmagruder 0002be4
HDPI-2983: update CaseView tests and fix checkstyle
gmmagruder 243bf10
HDPI-2983: update RentArrearsTabDetails for case details tab and add …
gmmagruder 69605ea
HDPI-2983: fix RentArrearsTabDetails for case details tab
gmmagruder e50c5c7
HDPI-2983: fix to view rent details and documents after submit in cas…
gmmagruder 7b18915
HDPI-2983: fix null pointer exception
gmmagruder 83b3430
HDPI-2983: update CaseTabViewTest
gmmagruder b4bfe5d
HDPI-2983: add placeholder for date submitted while case is in draft
gmmagruder b1431a3
HDPI-2983: update RentArrearsTabDetailsBuilderTest
gmmagruder baed0dd
HDPI-2983: fix unit test
gmmagruder 4b54815
HDPI-2983: update tests coverage in RentArrearsTabDetailsBuilderTest
gmmagruder 6cc35a0
HDPI-2983: add CaseDetailsTabViewTest
gmmagruder d4a6e85
HDPI-2983: update view tests
gmmagruder 0c440cb
HDPI-2983: fix styling
gmmagruder a30f532
HDPI-2983: fix merge conflicts
gmmagruder f5341ee
HDPI-2983: add timezone to submitted date
gmmagruder 4252f2c
HDPI-2983: add timezone tests
gmmagruder ad5ec26
HDPI-2983: address review comments
gmmagruder 332ed36
HDPI-2983: fix label
gmmagruder 0a44c92
HDPI-2983: fix label
gmmagruder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/ActionsTakenTabDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class ActionsTakenTabDetails { | ||
|
|
||
| @CCD(label = "Pre-action protocol followed?") | ||
| private String preactionProtocolFollowed; | ||
|
|
||
| @CCD(label = "Explain why you have not followed the pre-action protocol") | ||
| private String preActionProtocolIncompleteExplanation; | ||
|
|
||
| @CCD(label = "Mediation attempted?") | ||
| private String mediationAttempted; | ||
|
|
||
| @CCD(label = "Settlement attempted?") | ||
| private String settlementAttempted; | ||
| } |
17 changes: 17 additions & 0 deletions
17
src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/ApplicationsTabDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class ApplicationsTabDetails { | ||
|
|
||
| @CCD(label = "Are you planning to make an application at the same time as your claim?") | ||
| private String planToMakeGeneralApplication; | ||
| } |
87 changes: 87 additions & 0 deletions
87
src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/CaseDetailsTab.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
| import com.fasterxml.jackson.databind.PropertyNamingStrategies; | ||
| import com.fasterxml.jackson.databind.annotation.JsonNaming; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
| import uk.gov.hmcts.ccd.sdk.type.AddressUK; | ||
| import uk.gov.hmcts.ccd.sdk.type.ListValue; | ||
| import uk.gov.hmcts.reform.pcs.ccd.domain.tabs.shared.AdditionalDefendantInformationTabDetails; | ||
| import uk.gov.hmcts.reform.pcs.ccd.domain.tabs.shared.ClaimantInformationTabDetails; | ||
| import uk.gov.hmcts.reform.pcs.ccd.domain.tabs.shared.DefendantInformationTabDetails; | ||
| import uk.gov.hmcts.reform.pcs.ccd.domain.tabs.shared.GroundsForPossessionTabDetails; | ||
| import uk.gov.hmcts.reform.pcs.ccd.domain.tabs.shared.ReasonsForPossessionTabDetails; | ||
| import uk.gov.hmcts.reform.pcs.ccd.domain.tabs.shared.RentArrearsTabDetails; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| @JsonNaming(PropertyNamingStrategies.UpperCamelCaseStrategy.class) | ||
| public class CaseDetailsTab { | ||
|
|
||
| @CCD(label = "Claim details") | ||
| private ClaimTabDetails claimDetails; | ||
|
|
||
| @CCD(label = "Address of property to be repossessed") | ||
| private AddressUK propertyAddress; | ||
|
|
||
| @CCD(label = "Grounds for possession") | ||
| private GroundsForPossessionTabDetails groundsForPossessionDetails; | ||
|
|
||
| @CCD(label = "Date claim Submitted") | ||
| private String dateClaimSubmitted; | ||
|
|
||
| @CCD(label = "Tenancy, occupation contract or licence details") | ||
| private TenancyLicenceTabDetails tenancyLicenceDetails; | ||
|
|
||
| @CCD(label = "Notice details") | ||
| private NoticeTabDetails noticeDetails; | ||
|
|
||
| @CCD(label = "Actions already taken") | ||
| private ActionsTakenTabDetails actionsTakenDetails; | ||
|
|
||
| @CCD(label = "Details of rent arrears") | ||
| private RentArrearsTabDetails rentArrearsDetails; | ||
|
|
||
| @CCD(label = "Reasons for possession") | ||
| private ReasonsForPossessionTabDetails reasonsForPossessionDetails; | ||
|
|
||
| @CCD(label = "Applications") | ||
| private ApplicationsTabDetails applicationsDetails; | ||
|
|
||
| @CCD(label = "Claimant") | ||
| private ClaimantInformationTabDetails claimantInformation; | ||
|
|
||
| @CCD(label = "Claimant address for service") | ||
| private AddressUK claimantAddress; | ||
|
|
||
| @CCD(label = "Claimant contact details") | ||
| private ClaimantContactTabDetails claimantContactDetails; | ||
|
|
||
| @CCD(label = "Claimant circumstances") | ||
| private ClaimantCircumstancesTabDetails claimantCircumstances; | ||
|
|
||
| @CCD(label = "Defendant 1") | ||
| private DefendantInformationTabDetails defendantInformationDetails; | ||
|
|
||
| @CCD(label = "Additional defendant") | ||
| private List<ListValue<AdditionalDefendantInformationTabDetails>> additionalDefendants; | ||
|
|
||
| @CCD(label = "Defendants’ circumstances") | ||
| private DefendantCircumstanceTabDetails defendantCircumstanceDetails; | ||
|
|
||
| @CCD(label = "Underlessee or mortgagee") | ||
| private List<ListValue<UnderlesseeOrMortgageInformationTabDetails>> mortgageDetails; | ||
|
|
||
| @CCD(label = "Demotion of tenancy claim") | ||
| private DemotionOfTenancyTabDetails demotionOfTenancyDetails; | ||
|
|
||
| @CCD(label = "Suspension of right to buy") | ||
| private SuspensionOfRightToBuyTabDetails suspensionOfRightToBuyDetails; | ||
| } |
19 changes: 19 additions & 0 deletions
19
src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/ClaimTabDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class ClaimTabDetails { | ||
| @CCD(label = "Claimant type") | ||
| private String claimantType; | ||
|
|
||
| @CCD(label = "Claim against trespassers?") | ||
| private String trespassClaim; | ||
| } | ||
20 changes: 20 additions & 0 deletions
20
...java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/ClaimantCircumstancesTabDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class ClaimantCircumstancesTabDetails { | ||
|
|
||
| @CCD(label = "Is there any information you’d like to provide about ${claimantNamePossessiveForm} circumstances?") | ||
| private String claimantCircumstancesGiven; | ||
|
|
||
| @CCD(label = "Claimant circumstances") | ||
| private String claimantCircumstancesDetails; | ||
| } |
24 changes: 24 additions & 0 deletions
24
src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/ClaimantContactTabDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class ClaimantContactTabDetails { | ||
|
|
||
| @CCD(label = "Email address for notifications") | ||
| private String emailAddress; | ||
|
|
||
|
gmmagruder marked this conversation as resolved.
|
||
| @CCD(label = "Do you want to provide a phone number for urgent updates about your case?") | ||
| private String phoneNumberProvided; | ||
|
|
||
| @CCD(label = "Contact phone number") | ||
| private String phoneNumber; | ||
| } | ||
23 changes: 23 additions & 0 deletions
23
...java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/DefendantCircumstanceTabDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class DefendantCircumstanceTabDetails { | ||
|
|
||
| @CCD( | ||
| label = "Is there any information you're required to provide, or you want to provide, " | ||
| + "about the defendants’ circumstances?" | ||
| ) | ||
| private String defendantCircumstancesGiven; | ||
|
|
||
| @CCD(label = "Defendants’ circumstances") | ||
| private String defendantCircumstances; | ||
| } |
31 changes: 31 additions & 0 deletions
31
...ain/java/uk/gov/hmcts/reform/pcs/ccd/domain/tabs/details/DemotionOfTenancyTabDetails.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package uk.gov.hmcts.reform.pcs.ccd.domain.tabs.details; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Data; | ||
| import lombok.NoArgsConstructor; | ||
| import uk.gov.hmcts.ccd.sdk.api.CCD; | ||
|
|
||
| @Builder | ||
| @Data | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class DemotionOfTenancyTabDetails { | ||
|
|
||
| @CCD( | ||
| label = "Section of the Housing Act demotion of tenancy claim made under" | ||
| ) | ||
| private String housingAct; | ||
|
|
||
| @CCD( | ||
| label = "Have you served the defendants with a statement of the express terms which will " | ||
| + "apply to the demoted tenancy?" | ||
| ) | ||
| private String statementOfExpressTermsServed; | ||
|
|
||
| @CCD(label = "Details of terms") | ||
| private String terms; | ||
|
|
||
| @CCD(label = "Reasons for requesting a demotion of tenancy order") | ||
| private String reasons; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There seems to be a difference between Figma and Excel, Figma shows to have the label you already have and Excel says to have label 'Is your claim a trespass claim?'. I think it needs clarifying which one to follow