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

3383 Commits

229 Branches

281 Tags

79 MiB

Tree: dc877c71eb

Commit Graph

Author SHA1 Message Date

Author	SHA1	Message	Date
Manny Dinssa	222a191d9c	CLDC-3740: Replace you didn't answer text with link to question (#2836 ) * Different versions of details_html * One version of details_html * Replace you didnt answer with link * Fix lint * Update some tests * Update some tests * Add question marks to yes no questions - test * Improve formatting helper * Improve formatting helper * Improve prompt message * Revert "Add question marks to yes no questions - test" This reverts commit `40bee289` * Rename question method * Add check answer prompt method to question model and translation key * Add translation key to soft validations * Lettings custom prompts * Update to handle new helpdesk ticket logic * Update copy * Update copy * Update method names * Add check answer prompt to soft validations * Change copy * Do not put error objects into cookies * Hide change link for inferred or derived values not yet answered * Revert "Hide change link for inferred or derived values not yet answered" This reverts commit `ec1fd1c9aa`. * Update lettings related check answer prompts * Update some sales related check answer prompts * Update some sales related check answer prompts * Bug fix * More sales prompts * Replace text for bulk upload * Update uprn known test with specific error message already used * Translation file to CSV * Revert "Translation file to CSV" This reverts commit `0565fea717`. * Add a red link to show questions that still must be answered (after bulk upload) * Lint * Update feature tests * Update component tests * Update helper tests * Update requests tests * Update request test * Refactor improvements * Refactor improvements 0.2 * Lint * Stay consistent with date question message * Rename variable * Add tests * Improvements * Refactor details table helper * Remove action link not just hide * Revert "Remove action link not just hide" This reverts commit `59ecac5cf3`. * Users - remove action link * Organisations - remove action link * Merge requests - remove action link * Revert "Refactor details table helper" This reverts commit `b74fd830f1`. * Schemes - remove action link * Location - remove action link * Logs - remove action link * Lint * Refactor V2 details table helper * Allow respond_to? to see private methods * Remove .presence duplication of logic * Change "Answer if" to "Tell us if" * Add missing CAP * Update age questions sales and lettings * Update postcode and la questions * Update wording * Updates and improvements * Another update * Fix bug * typo * typo * update relat to buyer/lead prompts * Update test * Additional copy * Additional copy * Update copy "housing-related" to "housing related" --------- Co-authored-by: Kat <54268893+kosiakkatrina@users.noreply.github.com>	3 months ago
kosiakkatrina	e69ed94513	CLDC-3382 Add support user functionality to merge organisations (#2566 ) * CLDC-2093 Merge organisations page - view all merge requests (#2561) * CLDC-3585 Update absorbing organisation question (#2564) * Update user permissions and absorbing org question order * Update absorbing organisation question and routing * CLDC 2094: View a merge request (#2565) * CLDC-3584 Update merging orgs question (#2567) * Update merging organisations question * Update rebase tests * Update routing between CYA and questions * CLDC-3586 Update merge date merge request question (#2571) * Remove unused paths and update merge date * lint * Create delete merge request functionality (#2568) * CLDC-3588: Add helpdesk ticket question (#2572) * Merge request fixes (#2578) * Add cancel button to merging orgs and update merging orgs selection * Update submit button text * Update back buttons * CLDC-2101 Add begin merge (#2575) * Calculate merge request status * Add start merge and merge request job * Update merge request when it gets processed * Refactor and display a banner for failed requests * update test * Update change links * Update copy for error message (#2583) * Do not display cancel button if there's no submit (#2584) * Update hint date (#2588) * CLDC-2100++ Add success notification after delete (#2589) * Update helpdesk_ticket.html.erb * CLDC-2094++ Merge details page adjustments (#2593) * Change page name and hide buttons during processing status * Update test * Make merge request status dynamic (#2592) * Make merge request status dynamic * Update tests * Keep check answers referrer when validation is hit (#2594) * Keep check answers referrer when validation is hit * Remove absorbing org from merging organisations list * Update text to handle singular merge requests * Add merge start confirmation page (#2601) * Set merge request as non processing if it fails (#2598) * Set merge request to no longer processing if it fails * clear last_failed_attempt as soon as we start processing the merge * CLDC-3603 View merged users outcomes (#2602) * Update user outcomes view link * Add user outcomes page * Set user outcomes before merge and on merge fail * Update hardcoded total user count * Account for singular user numbers * CLDC-3603 View scheme outcomes (#2604) * Update scheme outcomes view link * Add scheme outcomes page * Update scheme outcome before merge and on merge fail * Update back links in merge outcomes pages (#2611) * CLDC-3605 View relationships page (#2606) * CLDC-3609 Add existing absorbing organisation merge request question (#2600) * Add existing absorbing organisation page and field * Update status calculation and add new question to check answers * Call correct merge service flow * Update test * Update test * Return correct status when existing_absorbing_organisation is false (#2617) * Change styling of relationship outcomes page (#2619) * CLDC-3604 View logs outcomes (#2618) * Update view logs outcomes link * Add logs outcomes page * Set logs outcome before merge and on merge fail * Update logs outcomes text * Update line break * Fix incorrect filtering of relationships and count * Fix test * Fix test * Fix test * Make example date depend on collection year (#2620) --------- Co-authored-by: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>	8 months ago

Manny Dinssa

222a191d9c

CLDC-3740: Replace you didn't answer text with link to question (#2836 )

* Different versions of details_html

* One version of details_html

* Replace you didnt answer with link

* Fix lint

* Update some tests

* Update some tests

* Add question marks to yes no questions - test

* Improve formatting helper

* Improve formatting helper

* Improve prompt message

* Revert "Add question marks to yes no questions - test"

This reverts commit 40bee289

* Rename question method

* Add check answer prompt method to question model and translation key

* Add translation key to soft validations

* Lettings custom prompts

* Update to handle new helpdesk ticket logic

* Update copy

* Update copy

* Update method names

* Add check answer prompt to soft validations

* Change copy

* Do not put error objects into cookies

* Hide change link for inferred or derived values not yet answered

* Revert "Hide change link for inferred or derived values not yet answered"

This reverts commit ec1fd1c9aa.

* Update lettings related check answer prompts

* Update some sales related check answer prompts

* Update some sales related check answer prompts

* Bug fix

* More sales prompts

* Replace text for bulk upload

* Update uprn known test with specific error message already used

* Translation file to CSV

* Revert "Translation file to CSV"

This reverts commit 0565fea717.

* Add a red link to show questions that still must be answered (after bulk upload)

* Lint

* Update feature tests

* Update component tests

* Update helper tests

* Update requests tests

* Update request test

* Refactor improvements

* Refactor improvements 0.2

* Lint

* Stay consistent with date question message

* Rename variable

* Add tests

* Improvements

* Refactor details table helper

* Remove action link not just hide

* Revert "Remove action link not just hide"

This reverts commit 59ecac5cf3.

* Users - remove action link

* Organisations - remove action link

* Merge requests - remove action link

* Revert "Refactor details table helper"

This reverts commit b74fd830f1.

* Schemes - remove action link

* Location - remove action link

* Logs - remove action link

* Lint

* Refactor V2 details table helper

* Allow respond_to? to see private methods

* Remove .presence duplication of logic

* Change "Answer if" to "Tell us if"

* Add missing CAP

* Update age questions sales and lettings

* Update postcode and la questions

* Update wording

* Updates and improvements

* Another update

* Fix bug

* typo

* typo

* update relat to buyer/lead prompts

* Update test

* Additional copy

* Additional copy

* Update copy "housing-related" to "housing related"

---------

Co-authored-by: Kat <54268893+kosiakkatrina@users.noreply.github.com>

3 months ago

kosiakkatrina

e69ed94513

CLDC-3382 Add support user functionality to merge organisations (#2566 )

* CLDC-2093 Merge organisations page - view all merge requests (#2561)

* CLDC-3585 Update absorbing organisation question (#2564)

* Update user permissions and absorbing org question order

* Update absorbing organisation question and routing

* CLDC 2094: View a merge request (#2565)

* CLDC-3584 Update merging orgs question (#2567)

* Update merging organisations question

* Update rebase tests

* Update routing between CYA and questions

* CLDC-3586 Update merge date merge request question (#2571)

* Remove unused paths and update merge date

* lint

* Create delete merge request functionality (#2568)

* CLDC-3588: Add helpdesk ticket question (#2572)

* Merge request fixes (#2578)

* Add cancel button to merging orgs and update merging orgs selection

* Update submit button text

* Update back buttons

* CLDC-2101 Add begin merge (#2575)

* Calculate merge request status

* Add start merge and merge request job

* Update merge request when it gets processed

* Refactor and display a banner for failed requests

* update test

* Update change links

* Update copy for error message (#2583)

* Do not display cancel button if there's no submit (#2584)

* Update hint date (#2588)

* CLDC-2100++ Add success notification after delete (#2589)

* Update helpdesk_ticket.html.erb

* CLDC-2094++ Merge details page adjustments (#2593)

* Change page name and hide buttons during processing status

* Update test

* Make merge request status dynamic (#2592)

* Make merge request status dynamic

* Update tests

* Keep check answers referrer when validation is hit (#2594)

* Keep check answers referrer when validation is hit

* Remove absorbing org from merging organisations list

* Update text to handle singular merge requests

* Add merge start confirmation page (#2601)

* Set merge request as non processing if it fails (#2598)

* Set merge request to no longer processing if it fails

* clear last_failed_attempt as soon as we start processing the merge

* CLDC-3603 View merged users outcomes (#2602)

* Update user outcomes view link

* Add user outcomes page

* Set user outcomes before merge and on merge fail

* Update hardcoded total user count

* Account for singular user numbers

* CLDC-3603 View scheme outcomes (#2604)

* Update scheme outcomes view link

* Add scheme outcomes page

* Update scheme outcome before merge and on merge fail

* Update back links in merge outcomes pages (#2611)

* CLDC-3605 View relationships page (#2606)

* CLDC-3609 Add existing absorbing organisation merge request question (#2600)

* Add existing absorbing organisation page and field

* Update status calculation and add new question to check answers

* Call correct merge service flow

* Update test

* Update test

* Return correct status when existing_absorbing_organisation is false (#2617)

* Change styling of relationship outcomes page (#2619)

* CLDC-3604 View logs outcomes (#2618)

* Update view logs outcomes link

* Add logs outcomes page

* Set logs outcome before merge and on merge fail

* Update logs outcomes text

* Update line break

* Fix incorrect filtering of relationships and count

* Fix test

* Fix test

* Fix test

* Make example date depend on collection year (#2620)

---------

Co-authored-by: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>

8 months ago

2 Commits (dc877c71ebdf7ec49266958dfee9ddcd9562b97d)