Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Key Stage text 'disadvantaged' to 'disadvantaged pupils' #97

Merged
merged 2 commits into from
Aug 12, 2021
Merged

Change Key Stage text 'disadvantaged' to 'disadvantaged pupils' #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6666ded
Change KS text 'disadvantaged' to 'disadvantaged pupils'
rf-mt Aug 11, 2021
b4cd8b0
Display KS4 performance table columns in year desc order
rf-mt Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...Internal.Tests/Pages/TaskList/KeyStagePerformance/KeyStage2PerformanceIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ public async Task Should_be_reference_only_and_display_KS2_data()

Document.QuerySelector($"#na-percentage-meeting-expected-in-rwm-{i}").TextContent.Trim().Should()
.Be(
$"{response.NationalAveragePercentageMeetingExpectedStdInRWM.NotDisadvantaged} (disadvantaged {response.NationalAveragePercentageMeetingExpectedStdInRWM.Disadvantaged})");
$"{response.NationalAveragePercentageMeetingExpectedStdInRWM.NotDisadvantaged}\n(disadvantaged pupils {response.NationalAveragePercentageMeetingExpectedStdInRWM.Disadvantaged})");
Document.QuerySelector($"#na-percentage-achieving-higher-in-rwm-{i}").TextContent.Should()
.Be(
$"{response.NationalAveragePercentageAchievingHigherStdInRWM.NotDisadvantaged} (disadvantaged {response.NationalAveragePercentageAchievingHigherStdInRWM.Disadvantaged})");
$"{response.NationalAveragePercentageAchievingHigherStdInRWM.NotDisadvantaged}\n(disadvantaged pupils {response.NationalAveragePercentageAchievingHigherStdInRWM.Disadvantaged})");
Document.QuerySelector($"#na-reading-progress-score-{i}").TextContent.Should().Be(response.NationalAverageReadingProgressScore.NotDisadvantaged);
Document.QuerySelector($"#na-writing-progress-score-{i}").TextContent.Should().Be(response.NationalAverageWritingProgressScore.NotDisadvantaged);
Document.QuerySelector($"#na-maths-progress-score-{i}").TextContent.Should().Be(response.NationalAverageMathsProgressScore.NotDisadvantaged);
Expand Down
164 changes: 82 additions & 82 deletions ...Internal.Tests/Pages/TaskList/KeyStagePerformance/KeyStage4PerformanceIntegrationTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ApplyToBecomeInternal/ApplyToBecomeInternal/Extensions/DisplayExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static string DisplayKeyStageDisadvantagedResult(DisadvantagedPupilsRespo
string.IsNullOrEmpty(disadvantagedPupilResponse?.Disadvantaged))
return NoData;

return $"{disadvantagedPupilResponse.NotDisadvantaged.FormatValue()}\n(disadvantaged {disadvantagedPupilResponse.Disadvantaged.FormatValue()})";
return $"{disadvantagedPupilResponse.NotDisadvantaged.FormatValue()}\n(disadvantaged pupils {disadvantagedPupilResponse.Disadvantaged.FormatValue()})";
}

public static string DisplayConfidenceInterval(decimal? lowerBound, decimal? upperBound)
Expand Down
4 changes: 2 additions & 2 deletions ...Internal/ApplyToBecomeInternal/Pages/Components/KeyStage2PerformanceTables/default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</tr>
<tr class="govuk-table__row">
<th scope="row" class="govuk-table__header">National average</th>
<td class="govuk-table__cell" id="@("na-percentage-meeting-expected-in-rwm-" + index)">@vm.NationalAveragePercentageMeetingExpectedStdInRWM <br id="na-percentage-meeting-expected-in-rwm-disadvantaged"> (disadvantaged @vm.NationalAveragePercentageMeetingExpectedStdInRWMDisadvantaged)</td>
<td class="govuk-table__cell" id="@("na-percentage-achieving-higher-in-rwm-" + index)">@vm.NationalAveragePercentageAchievingHigherStdInRWM <br id="la-percentage-achieving-higher-in-rwm-disadvantaged"> (disadvantaged @vm.NationalAveragePercentageAchievingHigherStdInRWMDisadvantaged)</td>
<td class="govuk-table__cell" id="@("na-percentage-meeting-expected-in-rwm-" + index)">@vm.NationalAveragePercentageMeetingExpectedStdInRWM</td>
<td class="govuk-table__cell" id="@("na-percentage-achieving-higher-in-rwm-" + index)">@vm.NationalAveragePercentageAchievingHigherStdInRWM</td>
<td class="govuk-table__cell" id="@("na-reading-progress-score-" + index)">@vm.NationalAverageReadingProgressScore</td>
<td class="govuk-table__cell" id="@("na-writing-progress-score-" + index)">@vm.NationalAverageWritingProgressScore</td>
<td class="govuk-table__cell" id="@("na-maths-progress-score-" + index)">@vm.NationalAverageMathsProgressScore</td>
Expand Down
218 changes: 109 additions & 109 deletions ...Internal/ApplyToBecomeInternal/Pages/Components/KeyStage4PerformanceTables/default.cshtml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...Pages/TaskList/KeyStagePerformance/KeyStage2PerformanceTablesAdditionalInformation.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="govuk-grid-column-two-thirds">
<form method="post">
<h3 class="govuk-heading-m">Additional information</h3>
<p class="govuk-body">This information will populate into your HTB template under the school performance (Ofsted information) section.</p>
<p class="govuk-body">This information will populate into your HTB template under the key stage performance section.</p>
<govuk-textarea-input id="additional-information" name="key-stage-2-additional-information" asp-for="Project.KeyStage2PerformanceAdditionalInformation" rows="5" />
<button class="govuk-button" data-module="govuk-button">
Save and continue
Expand Down
2 changes: 1 addition & 1 deletion ...Pages/TaskList/KeyStagePerformance/KeyStage4PerformanceTablesAdditionalInformation.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="govuk-grid-column-two-thirds">
<form method="post">
<h3 class="govuk-heading-m">Additional information</h3>
<p class="govuk-body">This information will populate into your HTB template under the school performance (Ofsted information) section.</p>
<p class="govuk-body">This information will populate into your HTB template under the key stage performance section.</p>
<govuk-textarea-input id="additional-information" name="key-stage-4-additional-information" asp-for="Project.KeyStage4PerformanceAdditionalInformation" rows="5" />
<button class="govuk-button" data-module="govuk-button">
Save and continue
Expand Down
2 changes: 1 addition & 1 deletion ...Pages/TaskList/KeyStagePerformance/KeyStage5PerformanceTablesAdditionalInformation.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="govuk-grid-column-two-thirds">
<form method="post">
<h3 class="govuk-heading-m">Additional information</h3>
<p class="govuk-body">This information will populate into your HTB template under the school performance (Ofsted information) section.</p>
<p class="govuk-body">This information will populate into your HTB template under the key stage performance section.</p>
<govuk-textarea-input id="additional-information" name="key-stage-5-additional-information" asp-for="Project.KeyStage5PerformanceAdditionalInformation" rows="5" />
<button class="govuk-button" data-module="govuk-button">
Save and continue
Expand Down
6 changes: 2 additions & 4 deletions ...eInternal/ApplyToBecomeInternal/ViewComponents/KeyStage2PerformanceTablesViewComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ private KeyStage2PerformanceTableViewModel Build(KeyStage2PerformanceResponse ke
ReadingProgressScore = keyStage2Performance.ReadingProgressScore.NotDisadvantaged,
WritingProgressScore = keyStage2Performance.WritingProgressScore.NotDisadvantaged,
MathsProgressScore = keyStage2Performance.MathsProgressScore.NotDisadvantaged,
NationalAveragePercentageMeetingExpectedStdInRWM = keyStage2Performance.NationalAveragePercentageMeetingExpectedStdInRWM.NotDisadvantaged,
NationalAveragePercentageMeetingExpectedStdInRWMDisadvantaged = keyStage2Performance.NationalAveragePercentageMeetingExpectedStdInRWM.Disadvantaged,
NationalAveragePercentageAchievingHigherStdInRWM = keyStage2Performance.NationalAveragePercentageAchievingHigherStdInRWM.NotDisadvantaged,
NationalAveragePercentageAchievingHigherStdInRWMDisadvantaged = keyStage2Performance.NationalAveragePercentageAchievingHigherStdInRWM.Disadvantaged,
NationalAveragePercentageMeetingExpectedStdInRWM = DisplayExtensions.DisplayKeyStageDisadvantagedResult(keyStage2Performance.NationalAveragePercentageMeetingExpectedStdInRWM),
NationalAveragePercentageAchievingHigherStdInRWM = DisplayExtensions.DisplayKeyStageDisadvantagedResult(keyStage2Performance.NationalAveragePercentageAchievingHigherStdInRWM),
NationalAverageReadingProgressScore = keyStage2Performance.NationalAverageReadingProgressScore.NotDisadvantaged,
NationalAverageWritingProgressScore = keyStage2Performance.NationalAverageWritingProgressScore.NotDisadvantaged,
NationalAverageMathsProgressScore = keyStage2Performance.NationalAverageMathsProgressScore.NotDisadvantaged,
Expand Down
2 changes: 0 additions & 2 deletions ApplyToBecomeInternal/ApplyToBecomeInternal/ViewModels/KeyStage2PerformanceTableViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ public class KeyStage2PerformanceTableViewModel
public string WritingProgressScore { get; set; }
public string MathsProgressScore { get; set; }
public string NationalAveragePercentageMeetingExpectedStdInRWM { get; set; }
public string NationalAveragePercentageMeetingExpectedStdInRWMDisadvantaged { get; set; }
public string NationalAveragePercentageAchievingHigherStdInRWM { get; set; }
public string NationalAveragePercentageAchievingHigherStdInRWMDisadvantaged { get; set; }
public string NationalAverageReadingProgressScore { get; set; }
public string NationalAverageWritingProgressScore { get; set; }
public string NationalAverageMathsProgressScore { get; set; }
Expand Down