Merge pull request #674 from DFE-Digital/ofsted-download

Column ordering updated
DFE-Digital · Dec 18, 2024 · 6c2a85a · 6c2a85a
2 parents d8b5b5f + 4c95dba
commit 6c2a85a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs b/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs
@@ -186,13 +186,13 @@ public async Task<byte[]> 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,23 +267,24 @@ 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,
                 previousRating.InspectionDate
             )
         );
 
+        // 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());
 

diff --git 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");
     }