Support for multiple return to answer ids

[petechd]

What is the context of this PR?

In this PR we modify return_to_answer_id to be a list of calculated summary ids and answer ids. The continue button forces new behaviour (returns to the calculated summary anchored at answer_id and pop it off the list so it becomes return_to_answer_id=calculated_summary_id). This change is similar to what we did to return_to_block_id and makes the page focus on the right elements on calculated summaries and grand calculated summaries.

How to review

Existing tests were modified and some new assertions were added where applicable (description of the test changed as well).

Checklist

• New static content marked up for translation
• Newly defined schema content included in eq-translations repo

[petechd]

Support for multiple return to answer ids

[katie-gardner]

Have only functionally reviewed so far as found a couple of issues in test_grand_calculated_summary_overlapping_answers

From calculated-summary-1 if I click a change link, and then press continue, the url has return_to_answer_id=q1-a1 but it should be None, because this goes back to the cs page anchored at q1-a1 so its not an answer to return to anymore

From the grand calculated summary, I was expecting return_to_answer_id=q1-a1,calculated-summary-1 on the answer page after clicking two change links, similar to how the other params have a list, but instead I only have q1-a1 on the answer, its not following the same pattern as return_to and return_to_block_id (which I think might be what causes the above)

[petechd]

Have only functionally reviewed so far as found a couple of issues in test_grand_calculated_summary_overlapping_answers

From calculated-summary-1 if I click a change link, and then press continue, the url has return_to_answer_id=q1-a1 but it should be None, because this goes back to the cs page anchored at q1-a1 so its not an answer to return to anymore

From the grand calculated summary, I was expecting return_to_answer_id=q1-a1,calculated-summary-1 on the answer page after clicking two change links, similar to how the other params have a list, but instead I only have q1-a1 on the answer, its not following the same pattern as return_to and return_to_block_id (which I think might be what causes the above)

First issue from your comment addressed, need to spend more time on the second.

[petechd]

Have only functionally reviewed so far as found a couple of issues in test_grand_calculated_summary_overlapping_answers

From calculated-summary-1 if I click a change link, and then press continue, the url has return_to_answer_id=q1-a1 but it should be None, because this goes back to the cs page anchored at q1-a1 so its not an answer to return to anymore

From the grand calculated summary, I was expecting return_to_answer_id=q1-a1,calculated-summary-1 on the answer page after clicking two change links, similar to how the other params have a list, but instead I only have q1-a1 on the answer, its not following the same pattern as return_to and return_to_block_id (which I think might be what causes the above)

The second issue fixed now (hopefully).

[katie-gardner]

The return to answer id can still have too many items in it on a calc summary page, but have commented where I think causes it, looks correct on answer page now

[katie-gardner]

Functionally all working nicely now 👍 Just a couple minor comments
And I think there should be a test in test_router similar to the existing ones around multiple block ids for the multiple answer ids (might be able to just edit an existing one)

[petechd]

Functionally all working nicely now 👍 Just a couple minor comments And I think there should be a test in test_router similar to the existing ones around multiple block ids for the multiple answer ids (might be able to just edit an existing one)

Added two tests in test_router that hopefully covers it all now.

[katie-gardner]

Changes and coverage all good 👍
The test_router tests test_return_to_calculated_summary_from_incomplete_section, test_return_to_grand_calculated_summary_from_answer and test_return_to_grand_calculated_summary_from_answer_incomplete_section and test_return_to_grand_calculated_summary_from_repeating_answer are all using multiple return tos and return to blocks, but not with your new answer change, and I think it would be good to fix so the tests are more similar to actual usage

[petechd]

Changes and coverage all good 👍 The test_router tests test_return_to_calculated_summary_from_incomplete_section, test_return_to_grand_calculated_summary_from_answer and test_return_to_grand_calculated_summary_from_answer_incomplete_section and test_return_to_grand_calculated_summary_from_repeating_answer are all using multiple return tos and return to blocks, but not with your new answer change, and I think it would be good to fix so the tests are more similar to actual usage

This one fixed now, thanks.