feature/277839 master funding agreement changes - #759
Merged
thomasmcinnes-nimble merged 5 commits intoJun 8, 2026
Merged
Conversation
SteBradbury
changed the title
SteBradbury
marked this pull request as ready for review
June 4, 2026 13:04
SteBradbury
changed the title
tristancollen
approved these changes
Jun 5, 2026
tristancollen
approved these changes
Jun 5, 2026
|
thomasmcinnes-nimble
had a problem deploying
to
test
June 8, 2026 07:59 — with 
GitHub Actions
Failure
GitHub Actions
Failure
thomasmcinnes-nimble
had a problem deploying
to
test
June 8, 2026 07:59 — with
GitHub Actions
Failure
GitHub Actions
Failure
thomasmcinnes-nimble
merged commit Jun 8, 2026
8d56507
into
feature/task_list
16 of 18 checks passed
SteBradbury
added a commit
that referenced
this pull request
Jul 1, 2026
* change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com>
thomasmcinnes-nimble
added a commit
that referenced
this pull request
Jul 2, 2026
* Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * work in progress * added link * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * fix unit test * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * Feature/279038 subleases (#760) * Make UI changes * update cypress * update changelog * add sublease links * WIP * Fix cypress --------- Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk> * regen contracts * content update * fixed changelog * Update commercial-transfer-agreement.cy.ts * Update taskHelper.ts * Update taskApi.ts --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Muhammad Ali Shah <113431816+alidfe@users.noreply.github.com> Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk>
thomasmcinnes-nimble
added a commit
that referenced
this pull request
Jul 3, 2026
* Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * Feature/279038 subleases (#760) * Make UI changes * update cypress * update changelog * add sublease links * WIP * Fix cypress --------- Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk> * Fix the broken tests of task list (#785) * Fix the broken tests of task list * Fixing code smell --------- Co-authored-by: tmcinnes <tmcinnes@SL634600> * Ui changes for confirm all conditions met (#781) * Ui changes for confirm all conditions met * Update CHANGELOG.md * Add migration to include tenancy at will licence fields in conversion_tasks_data table - Added columns for tenancy_at_will_being_used, tenancy_at_will_cleared, tenancy_at_will_licence_to_occupy_being_used, and tenancy_at_will_received to the conversion_tasks_data table. * Update CHANGELOG.md to include Tenancy at Will additional fields * Fixed unit test * regenerated .g contracts and fixed test from merge * fixed test from merge --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: tmcinnes <tmcinnes@SL634600>
thomasmcinnes-nimble
added a commit
that referenced
this pull request
Jul 3, 2026
* Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * Enhance Redact and Send Documents task * fix changelog * fix for app settings * Update commercial-transfer-agreement.cy.ts * Update taskApi.ts * Update taskHelper.ts --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com>
thomasmcinnes-nimble
added a commit
that referenced
this pull request
Jul 3, 2026
* Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * 282908 - Updated Expenditure certificate task page for Conversions (copy/content change) * 282908 - Updated Changelog * 282908 - Remove redundant test * 282908 - Added 'select all that may apply' legend hint * Update taskHelper.ts * Update CHANGELOG.md --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Muhammad Ali Shah <113431816+alidfe@users.noreply.github.com> Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Will Smith <will.smith@education.gov.uk>
thomasmcinnes-nimble
added a commit
that referenced
this pull request
Jul 20, 2026
* Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * Feature/279038 subleases (#760) * Make UI changes * update cypress * update changelog * add sublease links * WIP * Fix cypress --------- Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk> * Fix the broken tests of task list (#785) * Fix the broken tests of task list * Fixing code smell --------- Co-authored-by: tmcinnes <tmcinnes@SL634600> * Ui changes for confirm all conditions met (#781) * Ui changes for confirm all conditions met * Update CHANGELOG.md * Feature/282882 - Action Confirmation (#787) * 282882 - Updated school actions task content * 282882 - Added legend hint for 'select all that may apply' * 282882 - Updated Cypress tests * 282882 - Changelog updated * 282882 - Updated list items to capitalise start * 282882 - Bulleted the list --------- Co-authored-by: Will Smith <will.smith@education.gov.uk> * fix changelog * Feature/282872 confirm bank details (#777) * Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * work in progress * added link * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * fix unit test * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * Feature/279038 subleases (#760) * Make UI changes * update cypress * update changelog * add sublease links * WIP * Fix cypress --------- Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk> * regen contracts * content update * fixed changelog * Update commercial-transfer-agreement.cy.ts * Update taskHelper.ts * Update taskApi.ts --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Muhammad Ali Shah <113431816+alidfe@users.noreply.github.com> Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk> * Feature/279040 tenancy at will (#788) * Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * Feature/279038 subleases (#760) * Make UI changes * update cypress * update changelog * add sublease links * WIP * Fix cypress --------- Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk> * Fix the broken tests of task list (#785) * Fix the broken tests of task list * Fixing code smell --------- Co-authored-by: tmcinnes <tmcinnes@SL634600> * Ui changes for confirm all conditions met (#781) * Ui changes for confirm all conditions met * Update CHANGELOG.md * Add migration to include tenancy at will licence fields in conversion_tasks_data table - Added columns for tenancy_at_will_being_used, tenancy_at_will_cleared, tenancy_at_will_licence_to_occupy_being_used, and tenancy_at_will_received to the conversion_tasks_data table. * Update CHANGELOG.md to include Tenancy at Will additional fields * Fixed unit test * regenerated .g contracts and fixed test from merge * fixed test from merge --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: tmcinnes <tmcinnes@SL634600> * Enhance Redact and Send Documents task (#782) * Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * Enhance Redact and Send Documents task * fix changelog * fix for app settings * Update commercial-transfer-agreement.cy.ts * Update taskApi.ts * Update taskHelper.ts --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * 282908 - Updated Expenditure Certificate task content (#783) * Feature/277812 supplemental funding agreement merge questions (#757) * update leading text * remove team leader option from UI * remove team leader option from backend Co-authored-by: Copilot <copilot@github.com> * add draft saved in SharePoint field * update UI Co-authored-by: Copilot <copilot@github.com> * exclude draft from complete status Co-authored-by: Copilot <copilot@github.com> * update guidance text Co-authored-by: Copilot <copilot@github.com> * update external link helper Co-authored-by: Copilot <copilot@github.com> * fix tests * update link --------- Co-authored-by: Copilot <copilot@github.com> * Feature/278434 deed of variation wording updates (#751) * Update dependency Azure.Core to 1.47.3 (#750) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * split task into conversion and transfer variants * resolve launchSettings config issue * update wording on task * update checkboxes * add draft saved DB field * update handlers * update field * update cypress * resolve tests * update migrations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Feature/279042 private finance initiative (#756) * initial commit * Initial commit * moved task to correct list * test fixes * fix for progress when No is selected for clauses inserted * feature/277839 master funding agreement changes (#759) * change for master funding agreement for conversions * updated changelog and link * Update MasterFundingAgreementTask.cshtml --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/277820 church supplemental agreement (#761) * WIP - content * WIP * WIP * WIP * WIP * WIP * Updated changelog * Fixed link * Missing comma in appsettings * Fix link to contact policy team in church supplemental agreement task * Update src/Frontend/Dfe.Complete/appsettings.json Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> * Feature/277849 articles of association rework (#758) * wip * use apostrophe * update main task wording * separate conversions and transfers * update conversion in full * deprecate old field * update cypress tests * update status * update status logic * update changelog * fix tests --------- Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/278436 trust modification order changes (#762) * wording changes * update cypress * update wording * feature/279036 direction to transfer (#763) * Updates to Direction to transfer page * Updates to Direction to transfer page * fixed cypress test and updated changelog * content update --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> * Feature/282906 confirm academy opened date (#767) * update wording on academy open date * update test * Feature/279039 third party leases (#766) * WIP * WIP * Added tests * renamed received --------- Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> * Feature/commercial transfer agreement (#755) * WIP - content * WIP * Add migration to include transfer_agreement_unamended column in transfer and conversion tasks data * Add migration * Update CHANGELOG and enhance commercial transfer agreement tests with new checkbox functionality * WIP - Fixing status * WIP * WIP * WIP - reversing Transfer changes * WIP - sorting migrations * WIP * Fixed failing cypress test * Fiix code smell * merge land questionnaire tasks (#769) * Feature/279037 125 year lease (#771) * content changes for 125 year lease * update changelog * Reorder DBS checks and TUPE Consultation tasks in the task list for clarity (#768) * Feature/283357 remove payroll date validation (#776) * Remove payroll date validation and clean up related code and tests * Update CHANGELOG to reflect removal of payroll date validation * fixes for cypress tests (#780) * fixes for cypress tests * 282908 - Updated Expenditure certificate task page for Conversions (copy/content change) * 282908 - Updated Changelog * 282908 - Remove redundant test * 282908 - Added 'select all that may apply' legend hint * Update taskHelper.ts * Update CHANGELOG.md --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephen Bradbury <82675733+SteBradbury@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Muhammad Ali Shah <113431816+alidfe@users.noreply.github.com> Co-authored-by: Stephen Bradbury <bradbury.ste@googlemail.com> Co-authored-by: Will Smith <will.smith@education.gov.uk> * Feature/282897 share information about opening (#794) * Moved share info about opening into 'confirm all conditions are met page' * Update CHANGELOG.md * Updated unit test * Feature/broken test tasklist (#797) * all fixed expect one. Confirm all conditions been met. Shared a tasklist in transfer but merged in conversion * fix api test --------- Co-authored-by: tmcinnes <tmcinnes@SL634600> * Feature/283349 - Nursery Arrangement / Childrens Centre (#796) * 283349 - Added new Confirm childrens centre conversion task, updated the Nursery Arrangement content, and added cypress tests for new task * 283349 - Added integration tests for UpdateChildrenCentreTask * 283349 - Added integration test and Security test for API task controller and added new util/helper for NotApplicable : null ternary --------- Co-authored-by: Will Smith <will.smith@education.gov.uk> * Feature/broken test tasklist (#798) * all fixed expect one. Confirm all conditions been met. Shared a tasklist in transfer but merged in conversion * fix api test * Fixed Conversion broke Transfers. * V2 code smell fix --------- Co-authored-by: tmcinnes <tmcinnes@SL634600> * Feature/253920 update accuracy task updates (#795) * (breaking): make accuracy of higher needs tasks UI changes * update model bindings * add db fields and domain * add migration * update handlers * update status checks * resolve test * remove surplus ui * Add ability to make option exclusive * remove new columns * add not applicable field * restore snapshot * add extra fields migration * add not applicable to status check * add exclusive behavior * add not applicable to command * add cypress tests * remove extra properties * tidy * add checklist helper tests * Feature/292851 tasklist prerelease (#801) * build task list from note task identifier * resolve cypress tests * task list updates * add missing test condition --------- Co-authored-by: tristancollen <159437649+tristancollen@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Thomas McInnes <128510230+thomasmcinnes-nimble@users.noreply.github.com> Co-authored-by: Muhammad Ali Shah <113431816+alidfe@users.noreply.github.com> Co-authored-by: Ali <Muhammad.ALI-SHAH@education.gov.uk> Co-authored-by: tmcinnes <tmcinnes@SL634600> Co-authored-by: Will Smith <123073118+WSmith95@users.noreply.github.com> Co-authored-by: Will Smith <will.smith@education.gov.uk> Co-authored-by: Tristan Collen <tristan.collen@nimbleapproach.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
User Story 277839: Master funding agreement