Skip to content

Commit

Permalink
Feature/results page print button (#286)
Browse files Browse the repository at this point in the history 
* added initial functionality to the your results page to be able to print

* Moved print button content to contentful
Fixed existing E2E tests
Added new cypress test to check functionality of button

* removed unused using statement + fixed small typo in the details page tests
  • Loading branch information
@DanielClarkeEducation
DanielClarkeEducation authored Aug 5, 2024
1 parent e6c12da commit 08eee12
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/Dfe.EarlyYearsQualification.Content/Entities/DetailsPage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ public class DetailsPage
public Document? RequirementsText { get; init; }

public NavigationLink? CheckAnotherQualificationLink { get; init; }

public string PrintButtonText { get; init; } = string.Empty;
}
3 changes: 2 additions & 1 deletion src/Dfe.EarlyYearsQualification.Web/Controllers/QualificationDetailsController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,8 @@ await govUkInsetTextRenderer.ToHtml(content.CheckAnotherQualificationText),
RequirementsText = await htmlRenderer.ToHtml(content.RequirementsText),
RatiosHeading = content.RatiosHeading,
RatiosText = await htmlRenderer.ToHtml(content.RatiosText),
CheckAnotherQualificationLink = MapToNavigationLinkModel(content.CheckAnotherQualificationLink)
CheckAnotherQualificationLink = MapToNavigationLinkModel(content.CheckAnotherQualificationLink),
PrintButtonText = content.PrintButtonText,
}
};
}
Expand Down
2 changes: 2 additions & 0 deletions src/Dfe.EarlyYearsQualification.Web/Models/Content/DetailsPageModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ public class DetailsPageModel
public string FurtherInfoText { get; init; } = string.Empty;

public NavigationLinkModel? CheckAnotherQualificationLink { get; init; }

public string PrintButtonText { get; init; } = string.Empty;
}
9 changes: 8 additions & 1 deletion src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ public static SecureHeadersMiddlewareConfiguration CustomConfiguration()

var ga4CspElement = new ContentSecurityPolicyElement
{ CommandType = CspCommandType.Uri, DirectiveOrUri = "*.google-analytics.com" };

var windowPrint = new ContentSecurityPolicyElement
{
CommandType = CspCommandType.Directive,
DirectiveOrUri = "sha256-/rCCQAYo5nH3kqWMvdaSato3ShxLfLrkODJIMZPKHSg="
};

configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(backButtonShaCspElement);
configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(cookiesPageShaCspElement);
Expand All @@ -86,7 +92,8 @@ public static SecureHeadersMiddlewareConfiguration CustomConfiguration()
configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(gtmCspElement);
configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(gtmInjectedScriptCspElement);
configuration.ContentSecurityPolicyConfiguration.ConnectSrc.Add(ga4CspElement);

configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(windowPrint);

return configuration;
}
}
9 changes: 8 additions & 1 deletion src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Index.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,16 @@
}
}
</dl>

<h2 class="govuk-heading-l govuk-!-static-margin-top-9" id="requirements-heading">@Model.Content!.RequirementsHeading</h2>

@Html.Raw(Model.Content!.RequirementsText)
<p class="govuk-body govuk-!-static-margin-top-9">

<div class="govuk-!-static-margin-top-6">
<button id="print-button" onclick="window.print();" class="govuk-link govuk-body-s print-button">@Model.Content!.PrintButtonText</button>
</div>

<p class="govuk-body govuk-!-static-margin-top-6">
<a id="check-another-qualification-link" href="@Model.Content.CheckAnotherQualificationLink?.Href" class="govuk-link">@Model.Content.CheckAnotherQualificationLink?.DisplayText</a>
</p>
</div>
Expand Down
Binary file added src/Dfe.EarlyYearsQualification.Web/wwwroot/assets/images/icon-print.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/Dfe.EarlyYearsQualification.Web/wwwroot/css/site.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,15 @@ body {

.govuk-skip-link:focus {
margin-bottom: 0!important;
}

.print-button {
background: url(../assets/images/icon-print.png) no-repeat 10px 50%;
background-size: 16px 18px;
padding: 10px 10px 10px 36px;
text-decoration: none;
border: 1px solid #b1b4b6;
color: #1d70b8;
cursor: pointer;
margin: 0;
}
18 changes: 17 additions & 1 deletion ...s/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/qualification-details-spec.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,20 @@ describe("A spec used to test the qualification details page", () => {
cy.get(".govuk-tag").eq(3).should("have.class", "govuk-tag--red");
cy.get(".govuk-tag").eq(4).should("have.class", "govuk-tag--red");
})
})

it("Clicking the print button brings up the print dialog", () => {
cy.setCookie('user_journey', '%7B%22WhereWasQualificationAwarded%22%3A%22england%22%2C%22WhenWasQualificationAwarded%22%3A%227%2F2015%22%2C%22LevelOfQualification%22%3A%223%22%2C%22WhatIsTheAwardingOrganisation%22%3A%22NCFE%22%2C%22SearchCriteria%22%3A%22%22%2C%22AdditionalQuestionsAnswers%22%3A%7B%22Test%20question%22%3A%22yes%22%2C%22Test%20question%202%22%3A%22no%22%7D%7D');
cy.visit("/qualifications/qualification-details/eyq-240");

var printStub;

cy.window().then(win => {
printStub = cy.stub(win, 'print')
})

cy.get("#print-button").click();
cy.window().then(win => {
expect(printStub).to.be.calledOnce
})
});
});
6 changes: 3 additions & 3 deletions tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/security-header-spec.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe("A spec that checks for security headers in the response", () => {
);
expect(response.headers).to.have.property(
"content-security-policy",
"script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=' https://www.googletagmanager.com/gtm.js https://www.googletagmanager.com/gtag/js;object-src 'self';frame-ancestors https://app.contentful.com;connect-src *.google-analytics.com;block-all-mixed-content;upgrade-insecure-requests;"
"script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=' 'sha256-/rCCQAYo5nH3kqWMvdaSato3ShxLfLrkODJIMZPKHSg=' https://www.googletagmanager.com/gtm.js https://www.googletagmanager.com/gtag/js;object-src 'self';frame-ancestors https://app.contentful.com;connect-src *.google-analytics.com;block-all-mixed-content;upgrade-insecure-requests;"
);
expect(response.headers).to.have.property(
"cross-origin-resource-policy",
Expand Down Expand Up @@ -62,7 +62,7 @@ describe("A spec that checks for security headers in the response", () => {
);
expect(response.headers).to.have.property(
"content-security-policy",
"script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=' https://www.googletagmanager.com/gtm.js https://www.googletagmanager.com/gtag/js;object-src 'self';frame-ancestors https://app.contentful.com;connect-src *.google-analytics.com;block-all-mixed-content;upgrade-insecure-requests;"
"script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=' 'sha256-/rCCQAYo5nH3kqWMvdaSato3ShxLfLrkODJIMZPKHSg=' https://www.googletagmanager.com/gtm.js https://www.googletagmanager.com/gtag/js;object-src 'self';frame-ancestors https://app.contentful.com;connect-src *.google-analytics.com;block-all-mixed-content;upgrade-insecure-requests;"
);
expect(response.headers).to.have.property(
"cross-origin-resource-policy",
Expand Down Expand Up @@ -97,7 +97,7 @@ describe("A spec that checks for security headers in the response", () => {
);
expect(response.headers).to.have.property(
"content-security-policy",
"script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=' https://www.googletagmanager.com/gtm.js https://www.googletagmanager.com/gtag/js;object-src 'self';frame-ancestors https://app.contentful.com;connect-src *.google-analytics.com;block-all-mixed-content;upgrade-insecure-requests;"
"script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=' 'sha256-/rCCQAYo5nH3kqWMvdaSato3ShxLfLrkODJIMZPKHSg=' https://www.googletagmanager.com/gtm.js https://www.googletagmanager.com/gtag/js;object-src 'self';frame-ancestors https://app.contentful.com;connect-src *.google-analytics.com;block-all-mixed-content;upgrade-insecure-requests;"
);
expect(response.headers).to.have.property(
"cross-origin-resource-policy",
Expand Down

0 comments on commit 08eee12

Please sign in to comment.