From 1dca8ffc81359cbfa383f0ab82953e70297e98dd Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Wed, 18 Dec 2024 15:39:03 +0000 Subject: [PATCH 1/2] Column ordering updated --- .../Services/Export/ExportService.cs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs b/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs index 97efc3745..db9ee63af 100644 --- a/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs +++ b/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs @@ -186,13 +186,13 @@ public async Task ExportOfstedDataToSpreadsheetAsync(string uid) "Early Years Provision", "Sixth Form Provision", "Date of Previous Inspection", + BeforeOrAfterJoiningHeader, "Previous Quality of Education", "Previous Behaviour and Attitudes", "Previous Personal Development", "Previous Leadership and Management", "Previous Early Years Provision", "Previous Sixth Form Provision", - BeforeOrAfterJoiningHeader, "Effective Safeguarding", "Category of Concern" }; @@ -267,16 +267,8 @@ private static void GenerateOfstedRow( // Previous Inspection Date SetDateCell(worksheet, rowNumber, 11, previousRating.InspectionDate); - // Previous Ratings - SetTextCell(worksheet, rowNumber, 12, previousRating.QualityOfEducation.ToDisplayString()); - SetTextCell(worksheet, rowNumber, 13, previousRating.BehaviourAndAttitudes.ToDisplayString()); - SetTextCell(worksheet, rowNumber, 14, previousRating.PersonalDevelopment.ToDisplayString()); - SetTextCell(worksheet, rowNumber, 15, previousRating.EffectivenessOfLeadershipAndManagement.ToDisplayString()); - SetTextCell(worksheet, rowNumber, 16, previousRating.EarlyYearsProvision.ToDisplayString()); - SetTextCell(worksheet, rowNumber, 17, previousRating.SixthFormProvision.ToDisplayString()); - // Before/After Joining (Previous) - SetTextCell(worksheet, rowNumber, 18, + SetTextCell(worksheet, rowNumber, 12, IsOfstedRatingBeforeOrAfterJoining( previousRating.OverallEffectiveness, ofstedData?.DateAcademyJoinedTrust, @@ -284,6 +276,15 @@ private static void GenerateOfstedRow( ) ); + // Previous Ratings + SetTextCell(worksheet, rowNumber, 13, previousRating.QualityOfEducation.ToDisplayString()); + SetTextCell(worksheet, rowNumber, 14, previousRating.BehaviourAndAttitudes.ToDisplayString()); + SetTextCell(worksheet, rowNumber, 15, previousRating.PersonalDevelopment.ToDisplayString()); + SetTextCell(worksheet, rowNumber, 16, previousRating.EffectivenessOfLeadershipAndManagement.ToDisplayString()); + SetTextCell(worksheet, rowNumber, 17, previousRating.EarlyYearsProvision.ToDisplayString()); + SetTextCell(worksheet, rowNumber, 18, previousRating.SixthFormProvision.ToDisplayString()); + + // Safeguarding Effective SetTextCell(worksheet, rowNumber, 19, currentRating.SafeguardingIsEffective.ToDisplayString()); From 4c95dba6bdcab464272f6598ed015300a6daf743 Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Wed, 18 Dec 2024 15:45:13 +0000 Subject: [PATCH 2/2] Amend test to reflect column reordering for ofsted download --- .../Services/ExportServiceTests.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/DfE.FindInformationAcademiesTrusts.UnitTests/Services/ExportServiceTests.cs b/tests/DfE.FindInformationAcademiesTrusts.UnitTests/Services/ExportServiceTests.cs index ea3c29ab3..0c7f48bd4 100644 --- a/tests/DfE.FindInformationAcademiesTrusts.UnitTests/Services/ExportServiceTests.cs +++ b/tests/DfE.FindInformationAcademiesTrusts.UnitTests/Services/ExportServiceTests.cs @@ -410,13 +410,13 @@ public async Task ExportOfstedDataToSpreadsheet_ShouldGenerateCorrectHeadersAsyn worksheet.Cell(3, 9).Value.ToString().Should().Be("Early Years Provision"); worksheet.Cell(3, 10).Value.ToString().Should().Be("Sixth Form Provision"); worksheet.Cell(3, 11).Value.ToString().Should().Be("Date of Previous Inspection"); - worksheet.Cell(3, 12).Value.ToString().Should().Be("Previous Quality of Education"); - worksheet.Cell(3, 13).Value.ToString().Should().Be("Previous Behaviour and Attitudes"); - worksheet.Cell(3, 14).Value.ToString().Should().Be("Previous Personal Development"); - worksheet.Cell(3, 15).Value.ToString().Should().Be("Previous Leadership and Management"); - worksheet.Cell(3, 16).Value.ToString().Should().Be("Previous Early Years Provision"); - worksheet.Cell(3, 17).Value.ToString().Should().Be("Previous Sixth Form Provision"); - worksheet.Cell(3, 18).Value.ToString().Should().Be("Before/After Joining"); + worksheet.Cell(3, 12).Value.ToString().Should().Be("Before/After Joining"); + worksheet.Cell(3, 13).Value.ToString().Should().Be("Previous Quality of Education"); + worksheet.Cell(3, 14).Value.ToString().Should().Be("Previous Behaviour and Attitudes"); + worksheet.Cell(3, 15).Value.ToString().Should().Be("Previous Personal Development"); + worksheet.Cell(3, 16).Value.ToString().Should().Be("Previous Leadership and Management"); + worksheet.Cell(3, 17).Value.ToString().Should().Be("Previous Early Years Provision"); + worksheet.Cell(3, 18).Value.ToString().Should().Be("Previous Sixth Form Provision"); worksheet.Cell(3, 19).Value.ToString().Should().Be("Effective Safeguarding"); worksheet.Cell(3, 20).Value.ToString().Should().Be("Category of Concern"); }