diff --git a/app/assets/sass/_helpers.scss b/app/assets/sass/_helpers.scss index 2673e42d0..1440e7a65 100644 --- a/app/assets/sass/_helpers.scss +++ b/app/assets/sass/_helpers.scss @@ -15,5 +15,6 @@ body:not(.js-enabled) .app-js-only { .app-destructive-link { &.govuk-link, &.govuk-link:visited { color: govuk-colour("red"); + font-weight: normal; } } diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss index 6b40ea274..85626b755 100755 --- a/app/assets/sass/application.scss +++ b/app/assets/sass/application.scss @@ -13,13 +13,8 @@ $govuk-assets-path: "/dist/govuk/assets/"; @import "node_modules/@ministryofjustice/frontend/moj/all"; // Patterns that aren't in Frontend -@import "components/autocomplete"; -@import "components/footer"; -@import "components/summary-card"; -@import "components/task-list"; @import "patterns/related-items"; @import "patterns/start-page"; -@import "patterns/task-list"; // Misc @import "helpers"; @@ -36,9 +31,11 @@ $govuk-assets-path: "/dist/govuk/assets/"; @import "components/all-records-header"; @import "components/all-records-search"; @import "components/application-card"; +@import "components/autocomplete"; @import "components/banner"; @import "components/button-as-link"; @import "components/cookie-banner"; +@import "components/footer"; @import "components/invalid-answer"; @import "components/markdown"; @import "components/organisation-switcher"; @@ -63,7 +60,6 @@ $govuk-assets-path: "/dist/govuk/assets/"; @import "overrides/moj-filter"; @import "overrides/moj-pagination"; @import "overrides/status-grid"; -@import "overrides/summary-card"; @import "overrides/tabs"; // Add extra styles here, or re-organise the Sass files in whichever way makes most sense to you diff --git a/app/assets/sass/components/_summary-card.scss b/app/assets/sass/components/_summary-card.scss deleted file mode 100644 index f89904597..000000000 --- a/app/assets/sass/components/_summary-card.scss +++ /dev/null @@ -1,109 +0,0 @@ -//// -/// @group components/summary-card -//// - -.app-summary-card { - border: 1px solid $govuk-border-colour; - - &--incomplete { - border: 5px solid govuk-colour("blue"); - - .app-summary-card__title { - color: govuk-colour("blue"); - font-weight: bold !important; - } - - .app-summary-card__header { - background-color: govuk-colour("white") !important; - } - } - - &--error { - border: 5px solid govuk-colour('red'); - - .app-summary-card__title { - color: govuk-colour('red'); - font-weight: bold !important; - } - } - - .app-summary-card__header { - padding: govuk-spacing(3); - color: $govuk-text-colour; - background-color: govuk-colour("light-grey"); - align-items: center; - - @include govuk-media-query($from: desktop) { - display: flex; - justify-content: space-between; - align-items: start; - } - } - - .app-summary-card__title { - @include govuk-font($size: 19); - margin: 0; - } - - .app-summary-card__meta { - @include govuk-font($size: 16); - display: block; - margin: 0; - } - - .app-summary-card__actions { - @include govuk-font($size: 19); - } - - .app-summary-card__actions-list { - width: 100%; - margin: 0; - padding: 0; - } - - .app-summary-card__actions-list-item { - display: block; - white-space: nowrap; - - @include govuk-media-query($from: desktop) { - display: inline-block; - margin-left: govuk-spacing(2); - text-align: right; - } - } - - .app-summary-card__actions-list-item:first-child { - margin-left: 0; - } - - .app-summary-card__body { - @include govuk-font($size: 19); - padding: govuk-spacing(3); - } - - // Summary list component overrides - .govuk-summary-list { - margin-bottom: govuk-spacing(-2); - } - - @include govuk-media-query($until: desktop) { - .govuk-summary-list { - padding-top: govuk-spacing(3); - } - } - - .govuk-summary-list__row:last-child, - .govuk-summary-list__row:last-child > * { - border-bottom: 0; - } -} - -@media print { - .app-summary-card__header { - break-inside: avoid; - } - - .app-summary-card__actions { - display: none; - } -} diff --git a/app/assets/sass/components/_task-list.scss b/app/assets/sass/components/_task-list.scss deleted file mode 100644 index 6c463b2e5..000000000 --- a/app/assets/sass/components/_task-list.scss +++ /dev/null @@ -1,55 +0,0 @@ -//// -/// @group components/task-list -//// - -.app-task-list { - @include govuk-font($size: 19); - @include govuk-responsive-margin(9, "bottom"); - padding-left: 0; - list-style: none; -} - -.app-task-list__item { - position: relative; - margin-bottom: 0 !important; - padding-top: govuk-spacing(2); - padding-bottom: govuk-spacing(2); - border-bottom: 1px solid $govuk-border-colour; - @include govuk-clearfix; - - .govuk-tag { - @include govuk-media-query($until: 450px) { - margin-top: govuk-spacing(2); - } - - @include govuk-media-query($from: 450px) { - position: absolute; - top: govuk-spacing(2); - right: 0; - // float: right; // default alignment when not using aboslute positioning - } - } -} - -.app-task-list__item:first-child { - border-top: 1px solid $govuk-border-colour; -} - -.app-task-list__task-name { - display: block; - @include govuk-media-query($from: 450px) { - float: left; - } -} - -.app-task-list__hint { - display: inline-block; - margin-top: 10px; - margin-bottom: 0; -} - -@media print { - .app-task-list__task-name:after { - display: none; - } -} diff --git a/app/assets/sass/overrides/_moj-pagination.scss b/app/assets/sass/overrides/_moj-pagination.scss deleted file mode 100644 index 2952cc133..000000000 --- a/app/assets/sass/overrides/_moj-pagination.scss +++ /dev/null @@ -1,26 +0,0 @@ -//// -/// @group helpers/moj-pagination -//// -/// Removed margin to stop pagination overflowing container -/// Todo: investigate why this happens - -.moj-pagination { - margin-right: 0; - margin-left: 0; -} - -.moj-pagination__list { - padding-left: 0; - - .moj-pagination__item:first-of-type { - padding-left: 0; - } -} - -.moj-pagination__results { - padding-left: 0; - @include govuk-media-query($from: desktop) { - padding-right: 0; - padding-left: inherit; - } -} diff --git a/app/assets/sass/overrides/_summary-card.scss b/app/assets/sass/overrides/_summary-card.scss deleted file mode 100644 index 57df3c64b..000000000 --- a/app/assets/sass/overrides/_summary-card.scss +++ /dev/null @@ -1,7 +0,0 @@ -//// -/// @group helpers/summary-card -//// -/// Needed for when action links wrap -.app-summary-card__actions { - text-align: right; -} diff --git a/app/assets/sass/patterns/_task-list.scss b/app/assets/sass/patterns/_task-list.scss deleted file mode 100755 index 28365cde3..000000000 --- a/app/assets/sass/patterns/_task-list.scss +++ /dev/null @@ -1,71 +0,0 @@ -//// -/// @group patterns/task-list -//// - -.app-task-list { - margin-top: 0; - margin-bottom: 0; - padding-left: 0; - list-style-type: none; - @include govuk-media-query($from: tablet) { - min-width: 550px; - } -} - -.app-task-list__section { - display: table; - @include govuk-font($size:24, $weight: bold); -} - -.app-task-list__section-number { - display: table-cell; - - @include govuk-media-query($from: tablet) { - min-width: govuk-spacing(6); - padding-right: 0; - } -} - -.app-task-list__items { - @include govuk-font($size: 19); - @include govuk-responsive-margin(9, "bottom"); - padding-left: 0; - list-style: none; - @include govuk-media-query($from: tablet) { - padding-left: govuk-spacing(6); - } -} - -.app-task-list__item { - margin-bottom: 0 !important; - padding-top: govuk-spacing(2); - padding-bottom: govuk-spacing(2); - border-bottom: 1px solid $govuk-border-colour; - @include govuk-clearfix; -} - -.app-task-list__item:first-child { - border-top: 1px solid $govuk-border-colour; -} - -.app-task-list__task-name { - display: block; - @include govuk-media-query($from: 450px) { - float: left; - } -} - -// The `app-task-list__task-completed` class was previously used on the task -// list for the completed tag (changed in 86c90ec) – it's still included here to -// avoid breaking task lists in existing prototypes. -.app-task-list__tag, -.app-task-list__task-completed { - margin-top: govuk-spacing(2); - margin-bottom: govuk-spacing(1); - - @include govuk-media-query($from: 450px) { - margin-top: 0; - margin-bottom: 0; - float: right; - } -} diff --git a/app/routes.js b/app/routes.js index 206b46b46..2be9b50eb 100755 --- a/app/routes.js +++ b/app/routes.js @@ -18,6 +18,12 @@ router.all('*', (req, res, next) => { res.locals.referrer = req.query.referrer.split(',') } + if (req.query?.page) { + res.locals.page = req.query.page + res.locals.nextPage = parseInt(req.query.page) + 1 + res.locals.prevPage = parseInt(req.query.page) - 1 + } + // Only search by the query if there is one // (and get "undefined" instead of "{}" if there is no query) const hasQuery = !_.isEmpty(req.query) diff --git a/app/views/_components/summary-card/macro.njk b/app/views/_components/summary-card/macro.njk deleted file mode 100644 index e5220d724..000000000 --- a/app/views/_components/summary-card/macro.njk +++ /dev/null @@ -1,3 +0,0 @@ -{% macro appSummaryCard(params) %} - {%- include "./template.njk" -%} -{% endmacro %} diff --git a/app/views/_components/summary-card/template.njk b/app/views/_components/summary-card/template.njk deleted file mode 100644 index 668b3ac51..000000000 --- a/app/views/_components/summary-card/template.njk +++ /dev/null @@ -1,47 +0,0 @@ -{%- macro _actionLink(action) %} - {% if action.html %} - {{ action.html | safe }} - {% else %} - - {{ action.text }} - {%- if action.visuallyHiddenText -%} - {{ action.visuallyHiddenText }} - {% endif -%} - - {% endif %} -{% endmacro -%} - -
- {% if params.titleHtml or params.titleText or params.actions %} -
- {% set headingLevel = params.headingLevel if params.headingLevel else 2 %} - - {{ params.titleHtml | safe if params.titleHtml else params.titleText }} - - {% if params.actions.items.length %} -
- {% if params.actions.items.length == 1 %} - {{ _actionLink(params.actions.items[0]) | indent(12) | trim }} - {% else %} -
    - {% for action in params.actions.items %} - {% if action %} -
  • - {{ _actionLink(action) | indent(18) | trim }} -
    • - {% endif %} - {% endfor %} -
- {% endif %} -
- {% endif %} -
- {% endif %} - {% if params.html or params.text %} -
- {{ params.html | safe if params.html else params.text }} -
- {% endif %} -
diff --git a/app/views/_includes/pagination.njk b/app/views/_includes/pagination.njk index 5159f2f4d..947452251 100644 --- a/app/views/_includes/pagination.njk +++ b/app/views/_includes/pagination.njk @@ -1,35 +1,34 @@ +{# TODO: make pagination dynamic #} +

+ Showing 1 to 100 of 346 results +

+{% if not page %} + {% set page = 1 %} +{% endif %} -{% set pagination = { - from: 1, - to: 100, - count: count or 346, +{{ govukPagination({ + previous: { + href: "?page=" + prevPage + } if page > 1, next: { - text: 'Next', - href: '?page=' + 2 - }, - items: [{ - text: '1', - href: '?page=1', - selected: true - }, { - text: '2', - href: '?page=2', - selected: false - }, { - text: '3', - href: '?page=3' - }] -} %} - -{{ mojPagination({ - results: { - from: pagination.from, - to: pagination.to, - count: pagination.count - }, - previous: pagination.previous, - next: pagination.next, - items: pagination.items, - classes: 'govuk-!-margin-bottom-3' + href: "?page=" + nextPage + } if page < 3, + items: [ + { + number: 1, + href: "?page=1", + current: true if page == 1 + }, + { + number: 2, + href: "?page=2", + current: true if page == 2 + }, + { + number: 3, + href: "?page=3", + current: true if page == 3 + } + ] }) }} diff --git a/app/views/_includes/summary-cards/accredited-provider.njk b/app/views/_includes/summary-cards/accredited-provider.njk index 12c6b38b6..7ba44a841 100644 --- a/app/views/_includes/summary-cards/accredited-provider.njk +++ b/app/views/_includes/summary-cards/accredited-provider.njk @@ -8,7 +8,6 @@ {% endif %} {% endset %} - {% set recordBaseRows = [ { key: { @@ -57,20 +56,13 @@ }] } if canAmend } - ] %} - - -{% set recordBaseHtml %} - {{ govukSummaryList({ - rows: recordBaseRows - }) }} -{% endset %} +] %} - - - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Change of accredited provider details’", - html: recordBaseHtml +{{ govukSummaryList({ + card: { + title: { + text: "Change of accredited provider details" + } + }, + rows: recordBaseRows }) }} diff --git a/app/views/_includes/summary-cards/apply-importable/details.njk b/app/views/_includes/summary-cards/apply-importable/details.njk index 3aeb6e76e..fa32dd24d 100644 --- a/app/views/_includes/summary-cards/apply-importable/details.njk +++ b/app/views/_includes/summary-cards/apply-importable/details.njk @@ -29,14 +29,12 @@ {% endfor %} - {% if selectedTrainees | length > 1 %} {% endif %} {% endset %} - {% set rows = [ { key: { @@ -54,16 +52,14 @@ } ] } if canAmend - }] %} - -{% set summaryListHtml %} - {{ govukSummaryList({ - rows: rows - }) }} -{% endset %} + } +] %} -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Application import details", - html: summaryListHtml +{{ govukSummaryList({ + card: { + title: { + text: "Application import details" + } + }, + rows: rows }) }} diff --git a/app/views/_includes/summary-cards/bulk-details.njk b/app/views/_includes/summary-cards/bulk-details.njk index f51754801..26bb3fbe4 100644 --- a/app/views/_includes/summary-cards/bulk-details.njk +++ b/app/views/_includes/summary-cards/bulk-details.njk @@ -98,16 +98,13 @@ ] } if canAmend } if data.bulk.action == 'Recommend a group of trainees for EYTS or QTS' - ] %} +] %} -{% set summaryListHtml %} - {{ govukSummaryList({ - rows: rows - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: data.bulk.action, - html: summaryListHtml +{{ govukSummaryList({ + card: { + title: { + text: data.bulk.action + } + }, + rows: rows }) }} diff --git a/app/views/_includes/summary-cards/course-details.njk b/app/views/_includes/summary-cards/course-details.njk index 94aad04da..aa89371bc 100644 --- a/app/views/_includes/summary-cards/course-details.njk +++ b/app/views/_includes/summary-cards/course-details.njk @@ -312,16 +312,6 @@ ] | removeEmpty %} {% endif %} -{% set courseDetailsHtml %} - {{ govukSummaryList({ - rows: courseDetailsRows | highlightInvalidRows({ - treatEmptyAsMissing: true, - recordSource: record.source - }) - }) }} -{% endset %} - - {% set complete = courseDetails | sectionIsComplete %} {% set status = courseDetails | getStatusText %} {% set sectionIsRequired = record | requiresSection("courseDetails") %} @@ -352,16 +342,22 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Course details", - actions: { - items: [{ - href: recordPath + "/course-details/is-course-change" | addReferrer(referrer), - text: "Move the trainee to a new course" - }] - } if canAmend and showCourseChangeOption, - html: courseDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Course details" + }, + actions: { + items: [{ + href: recordPath + "/course-details/is-course-change" | addReferrer(referrer), + text: "Move the trainee to a new course" + }] + } if canAmend and showCourseChangeOption + }, + rows: courseDetailsRows | highlightInvalidRows({ + treatEmptyAsMissing: true, + recordSource: record.source + }) }) }} - + {% endif %} diff --git a/app/views/_includes/summary-cards/defer-details.njk b/app/views/_includes/summary-cards/defer-details.njk index a51a6b1fb..8eb5759f6 100644 --- a/app/views/_includes/summary-cards/defer-details.njk +++ b/app/views/_includes/summary-cards/defer-details.njk @@ -53,15 +53,11 @@ } ] %} -{% set deferDetailsHtml %} - {{ govukSummaryList({ - rows: deferDetailsRows - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Deferral details", - html: deferDetailsHtml +{{ govukSummaryList({ + card: { + title: { + text: "Defer details" + } + }, + rows: deferDetailsRows }) }} - diff --git a/app/views/_includes/summary-cards/degree/bursary-details.njk b/app/views/_includes/summary-cards/degree/bursary-details.njk index 09947d57c..2459c73b0 100644 --- a/app/views/_includes/summary-cards/degree/bursary-details.njk +++ b/app/views/_includes/summary-cards/degree/bursary-details.njk @@ -1,4 +1,3 @@ - {% set bursaryDegree = record.degree.items | find('id', record.degree.degreeToBeUsedForBursaries) %} {% if bursaryDegree %} @@ -10,7 +9,6 @@ {% set bursaryHtml = "Not provided" %} {% endif %} - {% set rows = [ { key: { @@ -29,14 +27,7 @@ ] } if canAmend } - ] %} - - -{% set bursaryDetailsHtml %} - {{ govukSummaryList({ - rows: rows - }) }} -{% endset %} +] %} {% set complete = record.contactDetails | sectionIsComplete %} {% set status = record.contactDetails | getStatusText %} @@ -62,11 +53,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Bursary details", - html: bursaryDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Bursary details" + } + }, + rows: rows }) }} - -{% endif %} +{% endif %} diff --git a/app/views/_includes/summary-cards/degree/details.njk b/app/views/_includes/summary-cards/degree/details.njk index 03e137e0a..04b2eedf9 100644 --- a/app/views/_includes/summary-cards/degree/details.njk +++ b/app/views/_includes/summary-cards/degree/details.njk @@ -55,8 +55,3 @@ }) }} {% endif %} - -{# {% if degreeCount > 1 %} - {% include "_includes/summary-cards/degree/bursary-details.njk" %} -{% endif %} - #} diff --git a/app/views/_includes/summary-cards/degree/single-degree-details.njk b/app/views/_includes/summary-cards/degree/single-degree-details.njk index 41920389f..5a9c2b577 100644 --- a/app/views/_includes/summary-cards/degree/single-degree-details.njk +++ b/app/views/_includes/summary-cards/degree/single-degree-details.njk @@ -171,16 +171,9 @@ gradeRow, graduationRow, bursaryRow - ] %} + ] %} {% endif %} - -{% set degreeDetailsHtml %} - {{ govukSummaryList({ - rows: degreeDetailsRows | highlightInvalidRows - }) }} -{% endset %} - {# Generate title text for card #} {% if isInternational %} {% if degree.type != 'UK ENIC not provided' %} @@ -193,16 +186,18 @@ {% set titleText = degree.type + ": " + (degree.subject | lower) %} {% endif %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: titleText | replace("**invalid**", ""), - actions: { - items: [{ - href: recordPath + "/degree/" + loop.index0 + "/confirm-delete" | addReferrer(referrer), - text: "Delete degree" - }] - } if canAmend, - html: degreeDetailsHtml +{{ govukSummaryList({ + card: { + title: { + text: titleText | replace("**invalid**", "") + }, + actions: { + items: [{ + href: recordPath + "/degree/" + loop.index0 + "/confirm-delete" | addReferrer(referrer), + text: "Delete degree", + classes: "app-destructive-link" + }] + } if canAmend + }, + rows: degreeDetailsRows | highlightInvalidRows }) }} - diff --git a/app/views/_includes/summary-cards/diversity.njk b/app/views/_includes/summary-cards/diversity.njk index 9fd5883d3..c0adf50e5 100644 --- a/app/views/_includes/summary-cards/diversity.njk +++ b/app/views/_includes/summary-cards/diversity.njk @@ -36,9 +36,6 @@ {% set disabilities = record.diversity.disabilities %} -{# {% set hasDisabilities = true if record.diversity.disabledAnswer == "They shared that they’re disabled" %} #} - - {% set hasDisabilities = false %} {% if disabilities | length > 0 %} @@ -64,39 +61,28 @@ {% endset %} {% set disabilitiesAnswerRow = { - key: { - text: "Disabilities and health conditions" - }, - value: { - text: disabledAnswer | safe or "Not provided" - }, - actions: { - items: [ - { - href: recordPath + "/diversity/disabilities" | addReferrer(referrer), - text: "Change", - visuallyHiddenText: "disabilities answer" - } - ] - } if canAmend - } %} - + key: { + text: "Disabilities and health conditions" + }, + value: { + text: disabledAnswer | safe or "Not provided" + }, + actions: { + items: [ + { + href: recordPath + "/diversity/disabilities" | addReferrer(referrer), + text: "Change", + visuallyHiddenText: "disabilities answer" + } + ] + } if canAmend +} %} {% set diversityRows = [ ethnicGroupRow, disabilitiesAnswerRow ] %} -{% set diversityHtml %} - {{ govukSummaryList({ - rows: diversityRows | highlightInvalidRows - }) }} -{% endset %} - - - - - {% set complete = record.diversity | sectionIsComplete %} {% set status = record.diversity | getStatusText %} {% set sectionIsRequired = record | requiresSection("diversity") %} @@ -125,10 +111,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Diversity information", - html: diversityHtml + {{ govukSummaryList({ + card: { + title: { + text: "Diversity information" + } + }, + rows: diversityRows | highlightInvalidRows }) }} - + {% endif %} diff --git a/app/views/_includes/summary-cards/funding.njk b/app/views/_includes/summary-cards/funding.njk index d11ae8a15..5f1e7eab8 100644 --- a/app/views/_includes/summary-cards/funding.njk +++ b/app/views/_includes/summary-cards/funding.njk @@ -94,67 +94,13 @@ {% set courseFundingRow = false %} {% endif %} - {% endif %} - -{# {% set degrees = record.degree.items %} -{% set degreeCount = degrees | length %} -{% set degreesRequired = record | requiresSection("degree") %} - -{% if degreeCount > 1 %} - - {% set bursaryDegree = record.degree.items | find('id', record.degree.degreeToBeUsedForBursaries) %} - - {% if bursaryDegree %} - {% set bursaryHtml %} -

{{ bursaryDegree | getDegreeName }}

-
{{ bursaryDegree | getDegreeHint }}
- {% endset %} - {% elseif record.degree.degreeToBeUsedForBursaries %} - {% set bursaryHtml = "Not provided" %} - {% endif %} - - {% set bursaryDegreeRow = { - key: { - text: "Degree that relates to awarded bursary" - }, - value: { - html: bursaryHtml or "Not provided" - }, - actions: { - items: [ - { - href: recordPath + "/degree/bursary-selection" | addReferrer(referrer), - text: "Change", - visuallyHiddenText: "address" - } - ] - } if canAmend - } - %} - -{% endif %} #} - - {% set fundingRows = [ initiativeRow, courseFundingRow ] %} -{# bursaryValueRow if routeHasFinancialSupport and not isSelfFunded, - bursaryDegreeRow if (routeHasFinancialSupport and not isSelfFunded and bursaryDegreeRow) #} - -{% set fundingHtml %} - {{ govukSummaryList({ - rows: fundingRows | highlightInvalidRows({ - treatEmptyAsMissing: true - }) - }) }} -{% endset %} - - - {% set complete = record.funding | sectionIsComplete %} {% set status = record.funding | getStatusText %} {% set sectionIsRequired = record | requiresSection("funding") %} @@ -192,17 +138,19 @@ icon: false }) }} - {% endif %} - - {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Funding", - html: fundingHtml + {{ govukSummaryList({ + card: { + title: { + text: "Funding" + } + }, + rows: fundingRows | highlightInvalidRows({ + treatEmptyAsMissing: true + }) }) }} {% endif %} diff --git a/app/views/_includes/summary-cards/gcse-details-complex.njk b/app/views/_includes/summary-cards/gcse-details-complex.njk index 983e009c9..207c492fb 100644 --- a/app/views/_includes/summary-cards/gcse-details-complex.njk +++ b/app/views/_includes/summary-cards/gcse-details-complex.njk @@ -1,6 +1,4 @@ {# Summary card for showing rich GCSE information (full grade, country, etc) #} - - {% set expectedDuration = 'Not provided' %} {% if record.courseDetails.duration | falsify %} {% set expectedDuration = record.courseDetails.duration + " years" %} @@ -30,14 +28,14 @@ {% elseif item.exam %} {% set grade = item.grade + " — " + item.exam + "" %} {% else %} - {% set grade = item.grade %} + {% set grade = item.grade %} {% endif %} {% set grades = grades | push(grade) %} {% endfor %} {% set grades = grades | commaSeparateLines | safe %} - + {% endif %} {% set gcseRow = { @@ -58,18 +56,11 @@ ] } if canAmend } %} - + {% set gcseRows = gcseRows | push(gcseRow) %} {% endfor %} - -{% set gcseDetailsHtml %} - {{ govukSummaryList({ - rows: gcseRows - }) }} -{% endset %} - {% set complete = record.gcse | sectionIsComplete %} {% set status = record.gcse | getStatusText %} {% set sectionIsRequired = record | requiresSection("gcseComplex") %} @@ -94,16 +85,19 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "GCSE or equivalent", - actions: { - items: [{ - href: recordPath + "/degree/" + loop.index0 + "/delete" | addReferrer(referrer), - text: "Delete degree" - }] - } if false, - html: gcseDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "GCSE or equivalent" + }, + actions: { + items: [{ + href: recordPath + "/degree/" + loop.index0 + "/delete" | addReferrer(referrer), + text: "Delete degree" + }] + } if false + }, + rows: gcseRows }) }} - + {% endif %} diff --git a/app/views/_includes/summary-cards/gcse-details.njk b/app/views/_includes/summary-cards/gcse-details.njk index 0c659d3bb..59fae5851 100644 --- a/app/views/_includes/summary-cards/gcse-details.njk +++ b/app/views/_includes/summary-cards/gcse-details.njk @@ -22,16 +22,15 @@ {% elseif item.exam %} {% set grade = item.grade + " — " + item.exam + "" %} {% else %} - {% set grade = item.grade %} + {% set grade = item.grade %} {% endif %} {% set grades = grades | push(grade) %} {% endfor %} {% set grades = grades | commaSeparateLines | safe %} - - {% endif %} + {% endif %} {% set gcseRow = { key: { @@ -50,22 +49,11 @@ ] } if canAmend } %} - + {% set gcseRows = gcseRows | push(gcseRow) %} {% endfor %} - - - -{% set gcseDetailsHtml %} - {{ govukSummaryList({ - rows: gcseRows - }) }} -{% endset %} - - - {% set complete = record.gcse | sectionIsComplete %} {% set status = record.gcse | getStatusText %} {% set sectionIsRequired = record | requiresSection("gcse") %} @@ -90,10 +78,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "GCSE or equivalent", - html: gcseDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "GCSE or equivalent" + } + }, + rows: gcseRows }) }} - + {% endif %} diff --git a/app/views/_includes/summary-cards/iqts.njk b/app/views/_includes/summary-cards/iqts.njk index 2705c2665..b09d979b7 100644 --- a/app/views/_includes/summary-cards/iqts.njk +++ b/app/views/_includes/summary-cards/iqts.njk @@ -1,4 +1,3 @@ - {% set iqtsRows = [ { key: { @@ -17,15 +16,7 @@ ] } if canAmend } - ] %} - - - -{% set contactDetailsHtml %} - {{ govukSummaryList({ - rows: iqtsRows | highlightInvalidRows - }) }} -{% endset %} +] %} {% set complete = record.iqts | sectionIsComplete %} {% set status = record.iqts | getStatusText %} @@ -55,11 +46,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "International training details", - html: contactDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "International training details" + } + }, + rows: iqtsRows | highlightInvalidRows }) }} - -{% endif %} +{% endif %} diff --git a/app/views/_includes/summary-cards/performance-profiles.njk b/app/views/_includes/summary-cards/performance-profiles.njk index 260e15b2b..c2e174c82 100644 --- a/app/views/_includes/summary-cards/performance-profiles.njk +++ b/app/views/_includes/summary-cards/performance-profiles.njk @@ -46,16 +46,13 @@ }] } if canAmend } - ] %} +] %} - {% set performanceProfileHtml %} - {{ govukSummaryList({ - rows: performanceProfileRows - }) }} - {% endset %} - - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Performance profile information", - html: performanceProfileHtml - }) }} +{{ govukSummaryList({ + card: { + title: { + text: "Performance profile information" + } + }, + rows: performanceProfileRows +}) }} diff --git a/app/views/_includes/summary-cards/personal-details.njk b/app/views/_includes/summary-cards/personal-details.njk index 20f6210de..62d3dd4b8 100644 --- a/app/views/_includes/summary-cards/personal-details.njk +++ b/app/views/_includes/summary-cards/personal-details.njk @@ -83,16 +83,6 @@ } ] | removeEmpty %} -{% set personalDetailsHtml %} - {{ govukSummaryList({ - rows: personalDetailsRows | highlightInvalidRows({ - treatEmptyAsMissing: true, - recordSource: record.source - }) - }) }} -{% endset %} - - {% set complete = record.personalDetails | sectionIsComplete %} {% set status = record.personalDetails | getStatusText %} {% set sectionIsRequired = record | requiresSection("personalDetails") %} @@ -121,10 +111,16 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Personal details", - html: personalDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Personal details" + } + }, + rows: personalDetailsRows | highlightInvalidRows({ + treatEmptyAsMissing: true, + recordSource: record.source + }) }) }} {% endif %} diff --git a/app/views/_includes/summary-cards/placements/no-placement-details.njk b/app/views/_includes/summary-cards/placements/no-placement-details.njk index de065e7d5..57107ea27 100644 --- a/app/views/_includes/summary-cards/placements/no-placement-details.njk +++ b/app/views/_includes/summary-cards/placements/no-placement-details.njk @@ -20,17 +20,14 @@ placementsDetailsNotAvailableRow ] %} -{% set placementDetailsHtml %} - {{ govukSummaryList({ - rows: placementDetailsRows | highlightInvalidRows({ +{{ govukSummaryList({ + card: { + title: { + text: "Placement details" + } + }, + rows: placementDetailsRows | highlightInvalidRows({ treatEmptyAsMissing: true, recordSource: record.source }) - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: 'Placement details', - html: placementDetailsHtml }) }} diff --git a/app/views/_includes/summary-cards/placements/placement-overview.njk b/app/views/_includes/summary-cards/placements/placement-overview.njk index 338496c1f..713470b86 100644 --- a/app/views/_includes/summary-cards/placements/placement-overview.njk +++ b/app/views/_includes/summary-cards/placements/placement-overview.njk @@ -77,15 +77,6 @@ } if not record | isDraft ) %} {% endif %} -{% set placementDetailsHtml %} - {{ govukSummaryList({ - rows: placementRows | highlightInvalidRows({ - treatEmptyAsMissing: true, - recordSource: record.source - }) - }) }} -{% endset %} - {% set complete = record.placement | sectionIsComplete %} {% set status = record.placement | getStatusText %} {% set sectionIsRequired = record | requiresSection("placement") %} @@ -109,15 +100,21 @@ {% include "_includes/incomplete.njk" %} {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: 'Placement details', - actions: { - items: [{ - href: recordPath + "/placements/confirm" | addReferrer(referrer), - text: "Manage placements" - }] - } if canAmend, - html: placementDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Placement details" + }, + actions: { + items: [{ + href: recordPath + "/placements/confirm" | addReferrer(referrer), + text: "Manage placements" + }] + } if canAmend + }, + rows: placementRows | highlightInvalidRows({ + treatEmptyAsMissing: true, + recordSource: record.source + }) }) }} {% endif %} diff --git a/app/views/_includes/summary-cards/placements/single-placement-details.njk b/app/views/_includes/summary-cards/placements/single-placement-details.njk index 157782ffb..9bcee652a 100644 --- a/app/views/_includes/summary-cards/placements/single-placement-details.njk +++ b/app/views/_includes/summary-cards/placements/single-placement-details.njk @@ -82,20 +82,18 @@ placementDurationRow if false ] %} -{% set placementDetailsHtml %} - {{ govukSummaryList({ - rows: placementDetailsRows - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: ordinalCount + ' placement', - actions: { - items: [{ - href: recordPath + "/placements/" + placement.id + "/confirm-delete" | addReferrer(referrer), - text: "Remove placement" - }] - } if canAmend, - html: placementDetailsHtml +{{ govukSummaryList({ + card: { + title: { + text: ordinalCount + " placement" + }, + actions: { + items: [{ + href: recordPath + "/placements/" + placement.id + "/confirm-delete" | addReferrer(referrer), + text: "Remove placement", + classes: "app-destructive-link" + }] + } if canAmend + }, + rows: placementDetailsRows }) }} diff --git a/app/views/_includes/summary-cards/provider-details.njk b/app/views/_includes/summary-cards/provider-details.njk index 72bb9b569..d1cde46f2 100644 --- a/app/views/_includes/summary-cards/provider-details.njk +++ b/app/views/_includes/summary-cards/provider-details.njk @@ -20,16 +20,13 @@ } ] %} -{% set providerDetailsHtml %} +{% if data.signedInProviders | length > 1 %} {{ govukSummaryList({ + card: { + title: { + text: "Provider" + } + }, rows: providerRows }) }} -{% endset %} - -{% if data.signedInProviders | length > 1 %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Provider", - html: providerDetailsHtml - }) }} {% endif %} diff --git a/app/views/_includes/summary-cards/qts-assessment-not-passed-details.njk b/app/views/_includes/summary-cards/qts-assessment-not-passed-details.njk index 68c8cb122..deb9d6499 100644 --- a/app/views/_includes/summary-cards/qts-assessment-not-passed-details.njk +++ b/app/views/_includes/summary-cards/qts-assessment-not-passed-details.njk @@ -9,7 +9,7 @@ {% set qualificationDetailsRowOutcomeText%} {% if record.qualificationDetails.standardsAssessedOutcome == "No" %} Standards not met - {% else %} + {% else %} Not provided {% endif %} {% endset %} @@ -101,14 +101,7 @@ } if canAmend } - ] %} - -{% set qualificationDetailsHtml %} - {{ govukSummaryList({ - rows: qualificationDetailsRows - }) }} - -{% endset %} +] %} {% set complete = record.contactDetails | sectionIsComplete %} {% set status = record.contactDetails | getStatusText %} @@ -129,10 +122,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Outcome details", - html: qualificationDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Outcome details" + } + }, + rows: qualificationDetailsRows }) }} - + {% endif %} diff --git a/app/views/_includes/summary-cards/qualification-details.njk b/app/views/_includes/summary-cards/qualification-details.njk index 545cc5a3d..b5b0552be 100644 --- a/app/views/_includes/summary-cards/qualification-details.njk +++ b/app/views/_includes/summary-cards/qualification-details.njk @@ -27,13 +27,13 @@ text: (outcomeDate or 'Not provided') if record | isAwarded else "Waiting for award - met standards on " + outcomeDate } if canAmend, actions: { - items: [ + items: [ { - href: recordPath + "/qualification/outcome-date-edit" | addReferrer(referrer), - text: "Change", - visuallyHiddenText: "award date" + href: recordPath + "/qualification/outcome-date-edit" | addReferrer(referrer), + text: "Change", + visuallyHiddenText: "award date" } - ] + ] } } if showAwardDateRow, { @@ -70,14 +70,7 @@ ] } if canAmend } if false - ] %} - -{% set qualificationDetailsHtml %} - {{ govukSummaryList({ - rows: qualificationDetailsRows - }) }} - -{% endset %} +] %} {% set complete = record.contactDetails | sectionIsComplete %} {% set status = record.contactDetails | getStatusText %} @@ -98,30 +91,22 @@ {% else %} -{# {% if dqtAllowsReverts %} - {% set revertUrl = recordPath + "/revert/teaching-status/details" | addReferrer(referrer) %} - {% else %} - {% set revertUrl = recordPath + "/revert/teaching-status/cannot-revert" | addReferrer(referrer) %} - {% endif %} #} - - {% set revertActionHtml %} - {% set revertUrl = recordPath + "/admin/revert/teaching-status/instructions" | addReferrer(referrer) %} - {# Admin #} - Remove {{ record | getQualificationText }} award - {% endset %} + {% set revertUrl = recordPath + "/admin/revert/teaching-status/instructions" | addReferrer(referrer) %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: (record | getQualificationText) + " details", + {{ govukSummaryList({ + card: { + title: { + text: (record | getQualificationText) + " details" + }, actions: { items: [{ - html: revertActionHtml, - _href: revertUrl, - _text: "Remove " + (record | getQualificationText) + " award", - _classes: 'app-destructive-link' + href: revertUrl, + text: "Remove " + (record | getQualificationText) + " award", + classes: "app-destructive-link" }] - } if activeTab == 'trainee-details' and data.isAdmin, - html: qualificationDetailsHtml - }) }} + } if activeTab == 'trainee-details' and data.isAdmin + }, + rows: qualificationDetailsRows +}) }} {% endif %} diff --git a/app/views/_includes/summary-cards/record-admin/delete-record.njk b/app/views/_includes/summary-cards/record-admin/delete-record.njk index 3e44a2060..7f7488c8e 100644 --- a/app/views/_includes/summary-cards/record-admin/delete-record.njk +++ b/app/views/_includes/summary-cards/record-admin/delete-record.njk @@ -1,5 +1,3 @@ - - {% set statusTag %} {{ govukTag({ text: "Deleted", @@ -7,7 +5,6 @@ })}} {% endset %} - {% set revertRows = [ { key: { @@ -49,17 +46,11 @@ } ] | removeEmpty %} -{% set revertHtml %} - {{ govukSummaryList({ - rows: revertRows, - attributes: { - style: "overflow:hidden;" +{{ govukSummaryList({ + card: { + title: { + text: "Delete trainee record" } - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Delete trainee record", - html: revertHtml + }, + rows: revertRows }) }} diff --git a/app/views/_includes/summary-cards/record-admin/dqt.njk b/app/views/_includes/summary-cards/record-admin/dqt.njk index 1034f8d20..0c1046bb4 100644 --- a/app/views/_includes/summary-cards/record-admin/dqt.njk +++ b/app/views/_includes/summary-cards/record-admin/dqt.njk @@ -1,4 +1,3 @@ - {% set code %} ``` { @@ -135,7 +134,6 @@ }) }} {% endset %} - {% set dqtRows = [ { key: { @@ -171,17 +169,14 @@ } ] | removeEmpty %} -{% set dqtHtml %} - {{ govukSummaryList({ - rows: dqtRows, - attributes: { - style: "overflow:hidden;" +{{ govukSummaryList({ + card: { + title: { + text: "DQT" } - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "DQT", - html: dqtHtml + }, + rows: dqtRows, + attributes: { + style: "overflow:hidden;" + } }) }} diff --git a/app/views/_includes/summary-cards/record-admin/hesa.njk b/app/views/_includes/summary-cards/record-admin/hesa.njk index d1c3e018a..f3c829730 100644 --- a/app/views/_includes/summary-cards/record-admin/hesa.njk +++ b/app/views/_includes/summary-cards/record-admin/hesa.njk @@ -1,4 +1,3 @@ - {% set code %} ``` { @@ -135,7 +134,6 @@ }) }} {% endset %} - {% set hesaRows = [ { key: { @@ -169,17 +167,14 @@ } ] | removeEmpty %} -{% set hesaHtml %} - {{ govukSummaryList({ - rows: hesaRows, - attributes: { - style: "overflow:hidden;" +{{ govukSummaryList({ + card: { + title: { + text: "HESA" } - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "HESA", - html: hesaHtml + }, + rows: hesaRows, + attributes: { + style: "overflow:hidden;" + } }) }} diff --git a/app/views/_includes/summary-cards/record-admin/revert-teaching-status.njk b/app/views/_includes/summary-cards/record-admin/revert-teaching-status.njk index 9000f6cd2..6face80b5 100644 --- a/app/views/_includes/summary-cards/record-admin/revert-teaching-status.njk +++ b/app/views/_includes/summary-cards/record-admin/revert-teaching-status.njk @@ -1,5 +1,3 @@ - - {% set statusTag %} {{ govukTag({ text: "TRN received", @@ -7,7 +5,6 @@ })}} {% endset %} - {% set revertRows = [ { key: { @@ -49,17 +46,14 @@ } ] | removeEmpty %} -{% set revertHtml %} - {{ govukSummaryList({ - rows: revertRows, - attributes: { - style: "overflow:hidden;" +{{ govukSummaryList({ + card: { + title: { + text: "Remove " + qualification + " award" } - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Remove " + qualification + " award", - html: revertHtml + }, + rows: revertRows, + attributes: { + style: "overflow:hidden;" + } }) }} diff --git a/app/views/_includes/summary-cards/record-admin/revert-withdrawal.njk b/app/views/_includes/summary-cards/record-admin/revert-withdrawal.njk index de3257c9c..2d36ac589 100644 --- a/app/views/_includes/summary-cards/record-admin/revert-withdrawal.njk +++ b/app/views/_includes/summary-cards/record-admin/revert-withdrawal.njk @@ -1,5 +1,3 @@ - - {% set statusTag %} {{ govukTag({ text: "TRN received", @@ -7,7 +5,6 @@ })}} {% endset %} - {% set revertRows = [ { key: { @@ -49,17 +46,14 @@ } ] | removeEmpty %} -{% set revertHtml %} - {{ govukSummaryList({ - rows: revertRows, - attributes: { - style: "overflow:hidden;" +{{ govukSummaryList({ + card: { + title: { + text: "Undo withdrawal" } - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Undo withdrawal", - html: revertHtml + }, + rows: revertRows, + attributes: { + style: "overflow:hidden;" + } }) }} diff --git a/app/views/_includes/summary-cards/record-setup.njk b/app/views/_includes/summary-cards/record-setup.njk index a581c8495..bda065260 100644 --- a/app/views/_includes/summary-cards/record-setup.njk +++ b/app/views/_includes/summary-cards/record-setup.njk @@ -34,16 +34,7 @@ ] } if canAmend } - ] %} - - -{% set recordBaseHtml %} - {{ govukSummaryList({ - rows: recordBaseRows - }) }} -{% endset %} - - +] %} {% set complete = record.recordSetup | sectionIsComplete %} @@ -55,10 +46,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Type of training", - html: recordBaseHtml + {{ govukSummaryList({ + card: { + title: { + text: "Type of training" + } + }, + rows: recordBaseRows }) }} - + {% endif %} diff --git a/app/views/_includes/summary-cards/reinstate-details.njk b/app/views/_includes/summary-cards/reinstate-details.njk index 8f4788f08..3d0a1f9a5 100644 --- a/app/views/_includes/summary-cards/reinstate-details.njk +++ b/app/views/_includes/summary-cards/reinstate-details.njk @@ -45,14 +45,11 @@ } ] %} -{% set reinstateDetailsHtml %} - {{ govukSummaryList({ - rows: reinstateDetailsRows - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Reinstatement details", - html: reinstateDetailsHtml +{{ govukSummaryList({ + card: { + title: { + text: "Reinstatement details" + } + }, + rows: reinstateDetailsRows }) }} diff --git a/app/views/_includes/summary-cards/schools.njk b/app/views/_includes/summary-cards/schools.njk index 4f58e0699..072e33662 100644 --- a/app/views/_includes/summary-cards/schools.njk +++ b/app/views/_includes/summary-cards/schools.njk @@ -58,23 +58,11 @@ } if canAmend } %} - {% set schoolsRows = [ leadPartnerRow if record | requiresField("leadPartner"), employingSchoolRow if record | requiresField("employingSchool") ] %} - -{% set schoolsHtml %} - {{ govukSummaryList({ - rows: schoolsRows | highlightInvalidRows({ - treatEmptyAsMissing: true - }) - }) }} -{% endset %} - - - {% set complete = record.schools | sectionIsComplete %} {% set status = record.schools | getStatusText %} {% set sectionIsRequired = record | requiresSection("schools") %} @@ -99,10 +87,15 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Schools", - html: schoolsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Schools" + } + }, + rows: schoolsRows | highlightInvalidRows({ + treatEmptyAsMissing: true + }) }) }} {% endif %} diff --git a/app/views/_includes/summary-cards/support/provider.njk b/app/views/_includes/summary-cards/support/provider.njk index 0a2737c0c..87908723f 100644 --- a/app/views/_includes/summary-cards/support/provider.njk +++ b/app/views/_includes/summary-cards/support/provider.njk @@ -1,4 +1,3 @@ - {{ govukSummaryList({ rows: [ { diff --git a/app/views/_includes/summary-cards/support/user.njk b/app/views/_includes/summary-cards/support/user.njk index 628ebb95c..ae4492466 100644 --- a/app/views/_includes/summary-cards/support/user.njk +++ b/app/views/_includes/summary-cards/support/user.njk @@ -1,4 +1,3 @@ -

General

{% set accountDatesHtml %} diff --git a/app/views/_includes/summary-cards/support/users/organisations/addOrEdit.njk b/app/views/_includes/summary-cards/support/users/organisations/addOrEdit.njk index 49cf86a87..f16706692 100644 --- a/app/views/_includes/summary-cards/support/users/organisations/addOrEdit.njk +++ b/app/views/_includes/summary-cards/support/users/organisations/addOrEdit.njk @@ -7,7 +7,6 @@ {% set provider = data.providers.all | lookUpProviderById(userOrganisationTemp.providerUuid) %} {% endif %} - {{ govukSummaryList({ rows: [ { diff --git a/app/views/_includes/summary-cards/trainee-progress.njk b/app/views/_includes/summary-cards/trainee-progress.njk index a25801f4c..dffa07964 100644 --- a/app/views/_includes/summary-cards/trainee-progress.njk +++ b/app/views/_includes/summary-cards/trainee-progress.njk @@ -8,7 +8,6 @@ {% endif %} {% endset %} - {% set providerRow = { key: { text: "Accredited provider" @@ -83,7 +82,6 @@ } } %} - {% set traineeIdRow = { key: { text: "Provider trainee ID" @@ -143,8 +141,6 @@ } } %} - - {% set recommendedForAwardContentHtml %} {{govukTag({ text: (record | getQualificationText) + " recommended", @@ -211,7 +207,6 @@ } } %} - {% set withdrawalContentHtml %} {{govukTag({ text: "Withdrawn", @@ -340,17 +335,14 @@ traineeStartDateRow ] | removeEmpty %} -{% set traineeProgressHtml %} - {{ govukSummaryList({ - rows: traineeProgressRows | highlightInvalidRows({ - treatEmptyAsMissing: true, - recordSource: record.source - }) - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Trainee progress", - html: traineeProgressHtml +{{ govukSummaryList({ + card: { + title: { + text: "Trainee progress" + } + }, + rows: traineeProgressRows | highlightInvalidRows({ + treatEmptyAsMissing: true, + recordSource: record.source + }) }) }} diff --git a/app/views/_includes/summary-cards/training-details/trainee-id.njk b/app/views/_includes/summary-cards/training-details/trainee-id.njk index f5d0fd882..0f9726716 100644 --- a/app/views/_includes/summary-cards/training-details/trainee-id.njk +++ b/app/views/_includes/summary-cards/training-details/trainee-id.njk @@ -1,4 +1,3 @@ - {% set recordBaseRows = [ { key: { @@ -17,21 +16,13 @@ ] } if canAmend } - ] %} - - -{% set recordBaseHtml %} - {{ govukSummaryList({ - rows: recordBaseRows - }) }} -{% endset %} - - - - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Record", - html: recordBaseHtml +] %} + +{{ govukSummaryList({ + card: { + title: { + text: "Record" + } + }, + rows: recordBaseRows }) }} - diff --git a/app/views/_includes/summary-cards/training-details/trainee-start-date.njk b/app/views/_includes/summary-cards/training-details/trainee-start-date.njk index a8280e6a8..7aa3cd30a 100644 --- a/app/views/_includes/summary-cards/training-details/trainee-start-date.njk +++ b/app/views/_includes/summary-cards/training-details/trainee-start-date.njk @@ -30,14 +30,11 @@ } ] %} -{% set recordBaseHtml %} - {{ govukSummaryList({ - rows: recordBaseRows - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Record", - html: recordBaseHtml +{{ govukSummaryList({ + card: { + title: { + text: "Record" + } + }, + rows: recordBaseRows }) }} diff --git a/app/views/_includes/summary-cards/training-details/training-details.njk b/app/views/_includes/summary-cards/training-details/training-details.njk index 30e887985..fce30454f 100644 --- a/app/views/_includes/summary-cards/training-details/training-details.njk +++ b/app/views/_includes/summary-cards/training-details/training-details.njk @@ -46,8 +46,6 @@ {% endif %} {%- endset %} - - {% set traineeStarted = record.trainingDetails.traineeStarted | falsify %} {% set traineeStartDateRow = { @@ -73,15 +71,6 @@ traineeIdRow if record | isDraft ] %} - -{% set trainingDetailsHtml %} - {{ govukSummaryList({ - rows: trainingDetailsRows - }) }} -{% endset %} - - - {% set complete = record.trainingDetails | sectionIsComplete %} {% set status = record.trainingDetails | getStatusText %} @@ -107,10 +96,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Training details", - html: trainingDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Training details" + } + }, + rows: trainingDetailRows }) }} {% endif %} diff --git a/app/views/_includes/summary-cards/training-details/training-year.njk b/app/views/_includes/summary-cards/training-details/training-year.njk index 9cb7bc601..69b448f75 100644 --- a/app/views/_includes/summary-cards/training-details/training-year.njk +++ b/app/views/_includes/summary-cards/training-details/training-year.njk @@ -18,14 +18,11 @@ } ] %} -{% set recordBaseHtml %} - {{ govukSummaryList({ - rows: recordBaseRows - }) }} -{% endset %} - -{{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Training year", - html: recordBaseHtml +{{ govukSummaryList({ + card: { + title: { + text: "Training year" + } + }, + rows: recordBaseRows }) }} diff --git a/app/views/_includes/summary-cards/undergraduate-qualification.njk b/app/views/_includes/summary-cards/undergraduate-qualification.njk index 059119aa5..6c8c1b87a 100644 --- a/app/views/_includes/summary-cards/undergraduate-qualification.njk +++ b/app/views/_includes/summary-cards/undergraduate-qualification.njk @@ -28,12 +28,6 @@ undergraduateQualificationRow ] %} -{% set undergraduateQualificationDetailsHtml %} - {{ govukSummaryList({ - rows: undergraduateQualificationRows - }) }} -{% endset %} - {% set complete = record.undergraduateQualification | sectionIsComplete %} {% set status = record.undergraduateQualification | getStatusText %} {% set sectionIsRequired = record | requiresSection("undergraduateQualification") %} @@ -58,10 +52,13 @@ {% else %} - {{ appSummaryCard({ - classes: "govuk-!-margin-bottom-6", - titleText: "Qualification on entry details", - html: undergraduateQualificationDetailsHtml + {{ govukSummaryList({ + card: { + title: { + text: "Qualification on entry details" + } + }, + rows: undergraduateQualificationRows }) }} - + {% endif %} diff --git a/app/views/_includes/summary-cards/withdraw-details.njk b/app/views/_includes/summary-cards/withdraw-details.njk index c8c1babd7..998adc593 100644 --- a/app/views/_includes/summary-cards/withdraw-details.njk +++ b/app/views/_includes/summary-cards/withdraw-details.njk @@ -6,7 +6,6 @@ {% endif %} {% endset %} - {% set withdrawalReason %} {% if record.withdraw.reasons | length > 1 %}