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

3138 Commits

229 Branches

287 Tags

80 MiB

Tree: 7877861f59

Commit Graph

Author	SHA1	Message	Date
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>	10 months ago
kosiakkatrina	6b66053595	CLDC-2055 Add merging organisations merge request page (#1535 ) * Create merge_request table and paths * Save merging organisations wip * Add update organisations * Add merging organisations validation * merge fixes * Update schema to have merge_request_organisations * Add relationships between merge request and organisations * Update validations and saving organisations * Add ability to remove merging orgs from the list * Allow support users to create merge request for any organisation * Update wording in organisations view * Allow adding other merging organisations * Add back button, update content * Add validation if the organisation is not selected * Fix path * Use generic update method * Update validations * fix remove organisation * remove reloads * Update routes * Authenticate scope * PR review changes * Add status, run validations unless the status is unsubmitted and save requesting organisation as a merging organisation as well * PR comments * Display continue button when there are at least 2 merging organisations	2 years ago

Author

SHA1

Message

Date

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>

10 months ago

kosiakkatrina

6b66053595

CLDC-2055 Add merging organisations merge request page (#1535 )

* Create merge_request table and paths

* Save merging organisations wip

* Add update organisations

* Add merging organisations validation

* merge fixes

* Update schema to have merge_request_organisations

* Add relationships between merge request and organisations

* Update validations and saving organisations

* Add ability to remove merging orgs from the list

* Allow support users to create merge request for any organisation

* Update wording in organisations view

* Allow adding other merging organisations

* Add back button, update content

* Add validation if the organisation is not selected

* Fix path

* Use generic update method

* Update validations

* fix remove organisation

* remove reloads

* Update routes

* Authenticate scope

* PR review changes

* Add status, run validations unless the status is unsubmitted and save requesting organisation as a merging organisation as well

* PR comments

* Display continue button when there are at least 2 merging organisations

2 years ago

2 Commits (7877861f59bbb75007d5f5882f6bddd92a7888ff)