Code

Feature branch/funding redesign#6435

Code

Merged

duncanc19 merged 194 commits intomainNMDSdevopsServiceAdm/SopraSteria-SFC:mainfrom feature-branch/funding-redesignNMDSdevopsServiceAdm/SopraSteria-SFC:feature-branch/funding-redesignCopy head branch name to clipboardDec 11, 2024

+6,046-4,367

Commits

Commits on Oct 8, 2024

• Update WDF option in registration survey to be generic funding option

  duncanc19

  committed
  452faa5

• Create card for funding on home tab and move benefits bundle to Other links section

  duncanc19

  committed
  db9d27b

• Merge pull request #6381 from NMDSdevopsServiceAdm/feat/1536-registration-survey-funding-option

  Show description for fbadc2d
  duncanc19

  authored
  fbadc2d

• Update title for wdf journey

  ssrome

  committed
  d216d09

Commits on Oct 10, 2024

• Replace WDF image

  duncanc19

  committed
  3180af2

• Update funding card text on parent home tab

  duncanc19

  committed
  ca9fb25

• Add WDF report permission check for consistency across home tabs

  duncanc19

  committed
  a48d7a5

• Update spacing to match the designs more closely

  duncanc19

  committed
  9dc467c

Commits on Oct 11, 2024

• Merge pull request #6384 from NMDSdevopsServiceAdm/feat/1531-funding-stand-alone-home-page-changes

  Show description for 2f5ec4f
  duncanc19

  authored
  2f5ec4f

• Update messages for staff record meeting/not meeting

  duncanc19

  committed
  d7013b6

• Add grey box for staff record status message

  duncanc19

  committed
  9b2a1f8

• Add pagination buttons to top of staff record and fix alignment

  duncanc19

  committed
  27e4e3d

• Move Close staff record link into pagination component to reduce duplication

  duncanc19

  committed
  4c3e71f

• Switch the staff record name and caption

  duncanc19

  committed
  7077137

Commits on Oct 14, 2024

• Update styling for needs to be added message for single field (DOB)

  duncanc19

  committed
  dc55dcb

• Move WDF warning message into component

  duncanc19

  committed
  496113e

• Add summary panel for wdf

  ssrome

  committed
  6f027e5

Commits on Oct 15, 2024

• Add message for new workers on eligible workplace

  duncanc19

  committed
  876f981

• Change format of last updated date

  duncanc19

  committed
  2f65e76

• Add WDF warning for gender question

  duncanc19

  committed
  59efa98

• Add WDF warning for nationality question

  duncanc19

  committed
  4c2b058

• Add 'add info' messages to employment section of staff record

  duncanc19

  committed
  ab841c4

• Update wdf overview

  ssrome

  committed
  729f586

Commits on Oct 16, 2024

• Add updated add info messages to training and quals section of staff record

  duncanc19

  committed
  cd55cbb

Commits on Oct 17, 2024

• Move wdf messages and logic into summary panel

  ssrome

  committed
  3700074

• Merge branch 'feature-branch/funding-redesign' into feat/1542-funding-stand-alone-main-funding-page-changes

  ssrome

  committed
  dc23020

Commits on Oct 18, 2024

• Remove un-used code from wdf journey

  ssrome

  committed
  e2ebe18

• Update green icon on wdf summary panel

  ssrome

  committed
  e951786

• Add wdf find out more page

  ssrome

  committed
  5628248

• Add new path to wdf journey

  ssrome

  committed
  ea3196b

• Rename component

  ssrome

  committed
  2e04ed8

Commits on Oct 21, 2024

• Refactor tests

  ssrome

  committed
  1b51d21

• Merge branch 'feat/1542-funding-stand-alone-main-funding-page-changes' into feat/1538-funding-find-out-more-new-page

  ssrome

  committed
  fcd950f

• Add url to link on wdf-overview

  ssrome

  committed
  ae11983

Commits on Oct 22, 2024

• Add published filter to getPage from cms

  ssrome

  committed
  a0fd765

Commits on Oct 23, 2024

• Merge pull request #6389 from NMDSdevopsServiceAdm/feat/1542-funding-stand-alone-main-funding-page-changes

  Show description for b024acc
  ssrome

  authored
  b024acc

• Rename component

  ssrome

  committed
  09ad31a

• Remove function from button

  ssrome

  committed
  7cf8be8

• Add back function for button

  ssrome

  committed
  c0e184b

Commits on Oct 24, 2024

• Add initial funding page

  ssrome

  committed
  0a0433d

• Update selector

  ssrome

  committed
  83f2ded

• Merge pull request #6391 from NMDSdevopsServiceAdm/feat/1538-funding-find-out-more-new-page

  Show description for d096220
  ssrome

  authored
  d096220

• Merge branch 'feature-branch/funding-redesign' into feat/1537-funding-funding-requirements-new-page

  ssrome

  committed
  088ef4c

• Add link to new page

  ssrome

  committed
  367110d

• Add content from cms to funding requirements page

  ssrome

  committed
  9b9be5a

Commits on Oct 25, 2024

• Update link on wdf-overview to funding-requirements

  ssrome

  committed
  9dd65d4

• Remove logic for displaying Add missing information message for basic record as mandatory fields should always be filled

  duncanc19

  committed
  8ca75d0

Commits on Oct 28, 2024

• Update url on funding pages

  ssrome

  committed
  bb16e2f

• Merge pull request #6395 from NMDSdevopsServiceAdm/feat/1537-funding-funding-requirements-new-page

  Show description for 0f3703e
  ssrome

  authored
  0f3703e

Commits on Oct 29, 2024

• WIP: Update wdf-field-confirmation to to have grey background and not wrap when full screen

  duncanc19

  committed
  0cc3e75

Commits on Oct 30, 2024

• Move no bottom border summary list class into shared stylesheet

  duncanc19

  committed
  786dcd0

• Rename class to make clear it is an extension of govuk styles

  duncanc19

  committed
  81ac0bc

• Use existing class instead of new one

  duncanc19

  committed
  8b0df2c

• Change from red cross to red flag in requirements state

  ssrome

  committed
  935f558

• Refactor basic record to have a reference object for displaying WDF confirmation message

  duncanc19

  committed
  212a474

Commits on Nov 1, 2024

• Refactor mainJob and contract Wdf field confirmation tests to set up way to reduce duplication across all Wdf confirmation tests

  duncanc19

  committed
  2a7c26d

• Refactor WDF confirmation tests

  duncanc19

  committed
  d652bb6

Commits on Nov 4, 2024

• Update incorrect test name

  duncanc19

  committed
  aabb432

• Update nesting of wdf confirmation component in employment to display correctly

  duncanc19

  committed
  0747834

• Update qualifications and training section of staff record to display new WDF confirmation styling

  duncanc19

  committed
  7755bfb

• Move showWdfConfirmation function into parent to reduce duplication

  duncanc19

  committed
  27b84bf

• Use wide value class to set widths of table and remove padding on all fields to simplify setting of table layout

  duncanc19

  committed
  f6ec682

• Align last updated date to right of page

  duncanc19

  committed
  aa341f2

• Rename red flag image file

  duncanc19

  committed
  f37bc50

• Update WDF staff record message to use flag instead of cross when not meeting requirements

  duncanc19

  committed
  7b0c53a

Commits on Nov 5, 2024

• Update sort options

  ssrome

  committed
  a47b83c

• Move component to shared directory and change name

  ssrome

  committed
  4c62a85

Commits on Nov 6, 2024

• Update breadcrumbs

  ssrome

  committed
  4e637af

Commits on Nov 7, 2024

• updated breadcrumbs on wdf your data page

  Jonopono123

  committed
  fcd7c95

Commits on Nov 8, 2024

• Use wide-key class across staff record components

  duncanc19

  committed
  b1b44ce

• Add temporary staffRecordView to wdf-field-confirmation keep existing styling on WDF workplace tab

  duncanc19

  committed
  5616e78

• Revert WDF warning red flag message to Add this information

  duncanc19

  committed
  542ade8

• Revert wide-value class changes

  duncanc19

  committed
  67013da

Commits on Nov 11, 2024

• Fix failed test

  ssrome

  committed
  d6ba41b

• Create directitve for staff summary

  ssrome

  committed
  8cf8d4f

• Remove commented out code

  ssrome

  committed
  08fa50d

• Wording updates from desk check

  duncanc19

  committed
  9be7dac

• Update spacing of WDF messages

  duncanc19

  committed
  61fd4d9

• Change variable from an inupt

  ssrome

  committed
  9f6a43e

• Merge pull request #6414 from NMDSdevopsServiceAdm/feat/1540-funding-staff-record-tab-changes

  Show description for 96c8901
  ssrome

  authored
  96c8901

• Update icons for status message to use high res svgs

  duncanc19

  committed
  5313fd5

• Merge funding redesign feature branch

  duncanc19

  committed
  32b6679

• Add no visited state to pagination links

  duncanc19

  committed
  b851465

Commits on Nov 12, 2024

• Merge pull request #6411 from NMDSdevopsServiceAdm/feat/1535-funding-staff-record-changes

  Show description for d074484
  duncanc19

  authored
  d074484

• Updated title on WDF data page

  Jonopono123

  committed
  1f1f4fe

• merged feature branch in, some tests still failing

  Jonopono123

  committed
  6272be2

• fixed failing test

  Jonopono123

  committed
  02c2120

Commits on Nov 13, 2024

• Merge remote-tracking branch 'origin' into feature-branch/funding-changes

  duncanc19

  committed
  7ae3373

• Merge changes from main

  duncanc19

  committed
  e093c79

• refactored table layout

  Jonopono123

  committed
  0483762

• added generic tab panel

  Jonopono123

  committed
  064c7fa

• removed focusing from tests

  Jonopono123

  committed
  54617cf

• Merge feature branch in

  duncanc19

  committed
  c1b2216

• Added new select view panel to wdf-data component

  Jonopono123

  committed
  a2b8eac

• refactored select-view-panel to accomodate using fragments

  Jonopono123

  committed
  fe01b61

Commits on Nov 14, 2024

• Fixed issue with default tab selection

  Jonopono123

  committed
  34334f3

• removed test focus

  Jonopono123

  committed
  a9c6024

• removed unnecessary property setting in tests, refactored to use overrides in setup

  Jonopono123

  committed
  3676fbf

• refactored tests

  Jonopono123

  committed
  2578138

• added the new wdfFieldConfirmation to wdf workplace table

  Jonopono123

  committed
  1e44f8d

Commits on Nov 15, 2024

• Refactor to use showWdfConfirmations object instead of duplicated WDF checks in HTML template

  duncanc19

  committed
  16f3ea1

• Update styling for mainService WDF field confirmation and remove references to check answers page

  duncanc19

  committed
  6d6c6ff

• Update capacities WDF confirmation styling

  duncanc19

  committed
  730610d

• Update service users WDF confirmation styling

  duncanc19

  committed
  353f865

• Update sumber of staff WDF confirmation styling

  duncanc19

  committed
  a48e934

• Add wide-key class to have grey border to left of field answers

  duncanc19

  committed
  0a19064

• Use wdf-warning-message to update Add this information for employer type

  duncanc19

  committed
  c23f881

• Use wdf-warning-message to update Add this information for capacities

  duncanc19

  committed
  fd25472

• Use wdf-warning-message to update Add this information for serviceUsers and vacancies

  duncanc19

  committed
  8212275

• Use wdf-warning-message to update Add this information for starters and leavers

  duncanc19

  committed
  1fb7b47

• Remove summary-record-value component from fields which are not required for funding (were set to employer type which should always exist so would never render)

  duncanc19

  committed
  dc63a32

• Use wdf-warning-message to update Add this information for numberOfStaff

  duncanc19

  committed
  e6926be

• Use isEligible from wdf in workplace object to display message instead of field content

  duncanc19

  committed
  813fcbb

• Update styling of WDF add information message for main service

  duncanc19

  committed
  a62bd91

Commits on Nov 18, 2024

• Pass in activeTabIndex to set line under active tab correctly on page load

  duncanc19

  committed
  9652881

• Update WDF staff mismatch message styling to match other WDF warnings

  duncanc19

  committed
  badab5b

• Update staff-summary-record to use WDF eligibility instead of checking for empty field

  duncanc19

  committed
  39a546f

• Always display same breadcrumbs when on WDF data page

  duncanc19

  committed
  0593702

• Remove references to unused feature flag

  duncanc19

  committed
  b27083a

• Remove unneeded conditional class

  duncanc19

  committed
  4b62672

• Remove code which is not needed in WDF section

  duncanc19

  committed
  82cb467

• added change link to fields with confirmation box

  Jonopono123

  committed
  4b8d3f7

Commits on Nov 20, 2024

• Refactored tabs/summary links to respond to fragments

  Jonopono123

  committed
  509743c

• removed unnecessary function call

  Jonopono123

  committed
  6363111

• fixed failing tests

  Jonopono123

  committed
  d48cf78

• removed commented out code

  Jonopono123

  committed
  ac836c5

Commits on Nov 21, 2024

• changes requested in PR

  Jonopono123

  committed
  c43a032

• changes requested in PR

  Jonopono123

  committed
  1c4dc76

• minor refactor

  Jonopono123

  committed
  9ca8e20

• Merge pull request #6423 from NMDSdevopsServiceAdm/feat/1541-funding-workplace-changes

  Show description for 2325eb7
  Jonopono123

  authored
  2325eb7

• Refactor select-view-panel to handle more than two tabs

  duncanc19

  committed
  f0644cf

• Add your other workplaces tab for parent workplaces

  duncanc19

  committed
  e212c7e

• Display wdf-workplaces-summary component when My other workplaces tab selected

  duncanc19

  committed
  45867f0

• Remove status message and titles from workplaces summary as not in new tab version

  duncanc19

  committed
  18c7db4

• Remove WDF workplaces summary from routing

  duncanc19

  committed
  c5e12c5

• Update download link to say funding instead of WDF

  duncanc19

  committed
  f145e76

• Change WDF to funding in table headers and set width to stop wrapping

  duncanc19

  committed
  da7a7d5

• Update names of sorting options

  duncanc19

  committed
  e0ba403

• Move table into workplaces summary component

  duncanc19

  committed
  47567ff

• Delete table component

  duncanc19

  committed
  6b7d861

• Move sort by to right of funding report link

  duncanc19

  committed
  a3e75a1

• Update govuk-classes to ensure whole sort by dropdown content can be seen

  duncanc19

  committed
  3aaac14

• Remove unneeded code

  duncanc19

  committed
  48cb6cd

• Update file name to have funding instead of wdf for parent report

  duncanc19

  committed
  c043e93

• Remove parent from workplace list in My other workplaces

  duncanc19

  committed
  ac56e4e

• Fix tab index reference to match activeTab object

  duncanc19

  committed
  2d3d928

Commits on Nov 22, 2024

• removed unnecessary condition on no staff message

  Jonopono123

  committed
  374aa8b

Commits on Nov 25, 2024

• Update WDF data to use resolver instead of workplace in service

  duncanc19

  committed
  0073f80

• Merge pull request #6427 from NMDSdevopsServiceAdm/feat/1566-funding-no-staff

  Show description for 20c12d6
  Jonopono123

  authored
  20c12d6

Commits on Nov 27, 2024

• Update breadcrumbs for parent pages and simplify funding breadcrumb set up to use single journey

  duncanc19

  committed
  4bae62b

• Merge branch 'feature-branch/funding-redesign' into feat/1533-funding-parent-workplace-tab

  duncanc19

  committed
  45d4c6b

• Update summary panel to change only fragment when already on data page

  duncanc19

  committed
  b522136

• Display different title and pre-header when viewing sub

  duncanc19

  committed
  bf6ffca

• Remove unneeded variables and feature flag service

  duncanc19

  committed
  d61d575

• Correct fragment when navigating back to workplace data page from staff record

  duncanc19

  committed
  8778a71

• Update link for staff mismatch message to ensure user is taken to sub's staff records

  duncanc19

  committed
  c08ea0e

Commits on Nov 28, 2024

• Revert changes which are still required for functioning of workplace question pages

  duncanc19

  committed
  901fa63

• Update messages for orange flags on Your other workplaces tab

  duncanc19

  committed
  b446095

Commits on Nov 29, 2024

• Remove references to WDF from parent funding report

  duncanc19

  committed
  a8a1662

• Move tracking of fragment to set tab into subscriptions to ensure subscription is destroyed on destroy of component

  duncanc19

  committed
  47e6d03

• Merge pull request #6430 from NMDSdevopsServiceAdm/feat/1533-funding-parent-workplace-tab

  Show description for 7ebe377
  duncanc19

  authored
  7ebe377

Commits on Dec 2, 2024

• Add init to staff summary directive to ensure that overall eligibility is retrieved from report

  duncanc19

  committed
  50e678f

• Refactor spec file to avoid duplicate destructuring

  duncanc19

  committed
  c9da5cc

• Update message for ineligible staff record for workplace which has met eligibility to 'New staff record'

  duncanc19

  committed
  fe420b7

• Set wdfView on component load to ensure funding sorting options available, update tests to find option text to better mimic options available to user

  duncanc19

  committed
  402c0d2

• Merge pull request #6433 from NMDSdevopsServiceAdm/fix/funding-staff-summary-fixes

  Show description for 372933d
  duncanc19

  authored
  372933d

• Merge main into branch

  duncanc19

  committed
  7c44627

Commits on Dec 5, 2024

• Set links for staff records tab correctly for no staff records message

  duncanc19

  committed
  a42ef5a

• Merge pull request #6440 from NMDSdevopsServiceAdm/fix/funding-no-staff-records-link

  Show description for a677f6c
  duncanc19

  authored
  a677f6c

• Create funding report resolver

  duncanc19

  committed
  c40bb27

• Update wdf-data page to use report resolver

  duncanc19

  committed
  4f96771

• Update funding-requirements page to use report resolver

  duncanc19

  committed
  fdf8b25

• Update wdf-overview page to use report resolver

  duncanc19

  committed
  4e03383

• Update wdf-staff-summary to pass in eligibility as report already loaded in parent component

  duncanc19

  committed
  18d2d21

• Update wdf-staff-record to use report resolver

  duncanc19

  committed
  05f42c4

• Add getWDFReport back into wdf-data to refresh data when workplace fields all confirmed

  duncanc19

  committed
  9255af4

• Make requested spacing changes to make the pages closer to the designs

  duncanc19

  committed
  4c8b524

• Update wording of section heading from 'mandatory details' to 'mandatory information'

  duncanc19

  committed
  038cc79

• Update summary panel to use large icons and delete now unused tick-icon-green-24 image

  duncanc19

  committed
  eefbb48

• Update svgs for funding and benchmark cards on home tab

  duncanc19

  committed
  1cf2cb7

Commits on Dec 6, 2024

• Set widths on staff summary table to prevent wrapping of titles

  duncanc19

  committed
  4f713ad

• Merge pull request #6441 from NMDSdevopsServiceAdm/fix/flickering-dates-on-funding-pages

  Show description for 84c4441
  duncanc19

  authored
  84c4441

• Merge pull request #6442 from NMDSdevopsServiceAdm/fix/funding-styling-fixes

  Show description for 0230c59
  duncanc19

  authored
  0230c59

Commits on Dec 9, 2024

• Update staff mismatch warning message on funding workplaces summary to be generic as other cases for becoming ineligible

  duncanc19

  committed
  bae819c

• Set specific warning message for Capacities to make clear they must add for main service

  duncanc19

  committed
  82af290

• Merge pull request #6447 from NMDSdevopsServiceAdm/fix/update-funding-warning-messaging-for-capacities

  Show description for 82bd40a
  duncanc19

  authored
  82bd40a

Commits on Dec 10, 2024

• Update wdf-summary-panel to allow for specific messages

  duncanc19

  committed
  f04c27f

• Refactor tests to destructure setup tools

  duncanc19

  committed
  4a2c6d7

• Update spacing to prevent wrapping when displaying some data not meeting message

  duncanc19

  committed
  07aabde

• Update overview page to have some data message for Your other workplaces section

  duncanc19

  committed
  ccdc0f4

• Pass in subsidiaries eligibility to summary panel so correctly shows meeting message when all subs meeting even if parent not meeting

  duncanc19

  committed
  58fcaf7

• Fix WDF overview to display date last workplace met eligibility in met eligibility message

  duncanc19

  committed
  da79442

• Update WDF data page to have some data message for My other workplaces summary section

  duncanc19

  committed
  34e305a

Commits on Dec 11, 2024

• Merge pull request #6451 from NMDSdevopsServiceAdm/fix/add-some-subs-meeting-message-to-summary-panel

  Show description for a50a554
  duncanc19

  authored
  a50a554