Merge pull request #99 from DFE-Digital/ks4-percentage-entering-ebacc

Add percentage entering Ebacc fields to KS4 performance tables
DFE-Digital · Aug 13, 2021 · cdc9acd · cdc9acd
2 parents 40348e1 + 89b6880
commit cdc9acd
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 112 deletions.
diff --git a/...omeInternal/ApplyToBecome.Data/Models/KeyStagePerformance/KeyStage4PerformanceResponse.cs b/...omeInternal/ApplyToBecome.Data/Models/KeyStagePerformance/KeyStage4PerformanceResponse.cs
@@ -36,5 +36,8 @@ public class KeyStage4PerformanceResponse
 		public DisadvantagedPupilsResponse LAAverageP8English { get; set; }
 		public DisadvantagedPupilsResponse LAAverageP8Maths { get; set; }
 		public DisadvantagedPupilsResponse LAAverageP8Ebacc { get; set; }
+		public decimal? Enteringebacc { get; set; }
+		public decimal? LAEnteringEbacc { get; set; }
+		public decimal? NationalEnteringEbacc { get; set; }
 	}
 }
diff --git a/...Internal.Tests/Pages/TaskList/KeyStagePerformance/KeyStage4PerformanceIntegrationTests.cs b/...Internal.Tests/Pages/TaskList/KeyStagePerformance/KeyStage4PerformanceIntegrationTests.cs
@@ -217,6 +217,16 @@ public async Task Should_be_reference_only_and_display_KS4_data()
 			Document.QuerySelector("#na-p8-score-ebacc").TextContent.Should()
 				.Be($"{keyStage4ResponseOrderedByYear.ElementAt(0).NationalAverageP8Ebacc.NotDisadvantaged}\n(disadvantaged pupils {keyStage4ResponseOrderedByYear.ElementAt(0).NationalAverageP8Ebacc.Disadvantaged})");
 
+			Document.QuerySelector("#percentage-entering-ebacc").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(0).Enteringebacc.ToString());
+			Document.QuerySelector("#percentage-entering-ebacc-previous-year").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(1).Enteringebacc.ToString());
+			Document.QuerySelector("#percentage-entering-ebacc-two-years-ago").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(2).Enteringebacc.ToString());
+			Document.QuerySelector("#la-percentage-entering-ebacc").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(0).LAEnteringEbacc.ToString());
+			Document.QuerySelector("#la-percentage-entering-ebacc-previous-year").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(1).LAEnteringEbacc.ToString());
+			Document.QuerySelector("#la-percentage-entering-ebacc-two-years-ago").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(2).LAEnteringEbacc.ToString());
+			Document.QuerySelector("#na-percentage-entering-ebacc").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(0).NationalEnteringEbacc.ToString());
+			Document.QuerySelector("#na-percentage-entering-ebacc-previous-year").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(1).NationalEnteringEbacc.ToString());
+			Document.QuerySelector("#na-percentage-entering-ebacc-two-years-ago").TextContent.Should().Contain(keyStage4ResponseOrderedByYear.ElementAt(2).NationalEnteringEbacc.ToString());
+
 
 			await NavigateAsync("Confirm and continue");
 			Document.Url.Should().BeUrl($"/task-list/{project.Id}");

diff --git a/...Internal/ApplyToBecomeInternal/Pages/Components/KeyStage4PerformanceTables/default.cshtml b/...Internal/ApplyToBecomeInternal/Pages/Components/KeyStage4PerformanceTables/default.cshtml
@@ -328,21 +328,21 @@
     <tbody class="govuk-table__body">
     <tr class="govuk-table__row">
         <th scope="row" class="govuk-table__header">@ViewData["SchoolName"]</th>
-        <td class="govuk-table__cell">no data</td>
-        <td class="govuk-table__cell">no data</td>
-        <td class="govuk-table__cell">no data</td>
+        <td class="govuk-table__cell" id="percentage-entering-ebacc">@Model.PercentageEnteringEbacc</td>
+        <td class="govuk-table__cell" id="percentage-entering-ebacc-previous-year">@Model.PercentageEnteringEbaccPreviousYear</td>
+        <td class="govuk-table__cell" id="percentage-entering-ebacc-two-years-ago">@Model.PercentageEnteringEbaccTwoYearsAgo</td>
     </tr>
     <tr class="govuk-table__row">
         <th scope="row" class="govuk-table__header">@ViewData["LocalAuthority"] LA average</th>
-        <td class="govuk-table__cell">no data</td>
-        <td class="govuk-table__cell">no data</td>
-        <td class="govuk-table__cell">no data</td>
+        <td class="govuk-table__cell" id="la-percentage-entering-ebacc">@Model.LaPercentageEnteringEbacc</td>
+        <td class="govuk-table__cell" id="la-percentage-entering-ebacc-previous-year">@Model.LaPercentageEnteringEbaccPreviousYear</td>
+        <td class="govuk-table__cell" id="la-percentage-entering-ebacc-two-years-ago">@Model.LaPercentageEnteringEbaccTwoYearsAgo</td>
     </tr>
     <tr class="govuk-table__row">
         <th scope="row" class="govuk-table__header">National average</th>
-        <td class="govuk-table__cell">no data</td>
-        <td class="govuk-table__cell">no data</td>
-        <td class="govuk-table__cell">no data</td>
+        <td class="govuk-table__cell" id="na-percentage-entering-ebacc">@Model.NaPercentageEnteringEbacc</td>
+        <td class="govuk-table__cell" id="na-percentage-entering-ebacc-previous-year">@Model.NaPercentageEnteringEbaccPreviousYear</td>
+        <td class="govuk-table__cell" id="na-percentage-entering-ebacc-two-years-ago">@Model.NaPercentageEnteringEbaccTwoYearsAgo</td>
     </tr>
     </tbody>
 </table>