submit-social-housing-lettings-and-sales-data

3433 Commits

233 Branches

285 Tags

80 MiB

Branch: CLDC-4039-fix-merge-functionality-not-working

Commit Graph

Author	SHA1	Message	Date
David May-Miller	4a31906d45	CLDC-853 Added validations for sales income2 (#1101 ) * CLDC-853 Added hard validations for sales income2 * CLDC-853 Added soft validation for sales income2 * CLDC-853 Fix tests broken by new code * CLDC-853 Add new tests for new page and refactor slightly * CLDC-853 Fix linting errors * CLDC-853 Rename migration and update schema version * CLDC-853 Fix broken sales income2 test * CLDC-853 Rename migration * CLDC-853 Move income 2 to cya card 2 and commonise combined income validation * CLDC-853 Actually use the validate_combined_income method * combine duplicate methods after rebase, ensure hard validations are triggered on all relevant fields * move validation on child income to financial validations to stop it being triggered on lettings logs, minor amendments to tests broken by changes * revamp financial validations tests against income to reflect updates * amend child income validation to reflect specifications and write tests to cover this validation * correct linting errors and play a little code golf * change copy for some validations, add sales log method and amend interruption screen helper to support this * extract duplicate code to private method * update buyer 1 and 2 income value check to be consistent * remove ecstat from income checks, the only ecstat we care about is child which is dealt with elsewhere * rename constant struct with same anme as existing variable * amend tests to reflect the chagnes in validations and copy * enable currency formatting of numbers for inserting into informative_text or title_text * update evil test in form handler spec * rebase and fix conflicts and tests * change a variable name and correct minor rebase errors * update interruption screen helper tests * correct linting errors, minor test failure and typo * add tests for new sales log method for formatting currency * fix merge conflicts --------- Co-authored-by: Arthur Campbell <arfa.camble@gmail.com>	2 years ago

Author

SHA1

Message

Date

David May-Miller

4a31906d45

CLDC-853 Added validations for sales income2 (#1101 )

* CLDC-853 Added hard validations for sales income2

* CLDC-853 Added soft validation for sales income2

* CLDC-853 Fix tests broken by new code

* CLDC-853 Add new tests for new page and refactor slightly

* CLDC-853 Fix linting errors

* CLDC-853 Rename migration and update schema version

* CLDC-853 Fix broken sales income2 test

* CLDC-853 Rename migration

* CLDC-853 Move income 2 to cya card 2 and commonise combined income validation

* CLDC-853 Actually use the validate_combined_income method

* combine duplicate methods after rebase, ensure hard validations are triggered on all relevant fields

* move validation on child income to financial validations to stop it being triggered on lettings logs, minor amendments to tests broken by changes

* revamp financial validations tests against income to reflect updates

* amend child income validation to reflect specifications and write tests to cover this validation

* correct linting errors and play a little code golf

* change copy for some validations, add sales log method and amend interruption screen helper to support this

* extract duplicate code to private method

* update buyer 1 and 2 income value check to be consistent

* remove ecstat from income checks, the only ecstat we care about is child which is dealt with elsewhere

* rename constant struct with same anme as existing variable

* amend tests to reflect the chagnes in validations and copy

* enable currency formatting of numbers for inserting into informative_text or title_text

* update evil test in form handler spec

* rebase and fix conflicts and tests

* change a variable name and correct minor rebase errors

* update interruption screen helper tests

* correct linting errors, minor test failure and typo

* add tests for new sales log method for formatting currency

* fix merge conflicts

---------

Co-authored-by: Arthur Campbell <arfa.camble@gmail.com>

2 years ago

1 Commits (CLDC-4039-fix-merge-functionality-not-working)